diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2022-05-13 04:35:31 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-12 20:35:31 +0200 |
| commit | bf56c94f0fdd31774441c9a4473c392af069ce3e (patch) | |
| tree | 1ecd06b6ae04f5d6c97093e1a31546d71c4a5d88 /docs/tutorial | |
| parent | 92aef346f2bd7167b892beddafd0959801df0e3c (diff) | |
Document Sub-Cameras (#989)
* Copying SubCam Changes from PR 908, made it to the end of bosses
* Finish copying over PR
* format
* More cleanup
* clean-up
* PR Suggestions, Clean-Up, Improvement in CS
* Remove substructs from fd/fd2
* format
* Improve fishing
* minor fix
* Make CutsceneCameraDir more general
* `sActiveCamMove` -> `sCamMove`
* Fix conflict with object kankyo
* Add CAM_ID_MAIN to object_kankyo
* Improve cam cutscenes further
* Revert cutscene cmd names (better for a separate PR)
* At -> LookAt in the context of Cutscenes
* Missed naming in diving game
* Format
* Fill in Ganon2 Names (now that it's matching)
* format
* `sActiveCamId` -> `sReturnToCamId`
* activeCamId -> returnToCamId
* Discord Discussions
* FIRST
* Move macro to bottom, comments
* More suggestions
* PR suggestion, cleanup comment
* Oops
* add comments
* Adjust comment
* Change edge-case
* whoops
Co-authored-by: fig02 <fig02srl@gmail.com>
Diffstat (limited to 'docs/tutorial')
| -rw-r--r-- | docs/tutorial/other_functions.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/tutorial/other_functions.md b/docs/tutorial/other_functions.md index 97ed8d1ea..e284ebf73 100644 --- a/docs/tutorial/other_functions.md +++ b/docs/tutorial/other_functions.md @@ -380,7 +380,7 @@ void func_80A87CEC(EnJj *this, GlobalContext *globalCtx) { globalCtx->csCtx.segment = &D_80A88164; gSaveContext.cutsceneTrigger = (u8)1U; func_8003EBF8(globalCtx, &globalCtx->colCtx.dyna, (s32) temp_v1->bgId); - func_8005B1A4(globalCtx->cameraPtrs[globalCtx->activeCamera]); + func_8005B1A4(globalCtx->cameraPtrs[globalCtx->activeCamId]); gSaveContext.unkEDA = (u16) (gSaveContext.unkEDA | 0x400); func_80078884((u16)0x4802U); } @@ -394,7 +394,7 @@ Easy things to sort out: - We can remove the casts from `(u8)1U` and just leave `1`. -- `globalCtx->cameraPtrs[globalCtx->activeCamera]` has a macro: it is `GET_ACTIVE_CAM(globalCtx)`, so this line can be written as +- `globalCtx->cameraPtrs[globalCtx->activeCamId]` has a macro: it is `GET_ACTIVE_CAM(globalCtx)`, so this line can be written as ```C func_8005B1A4(GET_ACTIVE_CAM(globalCtx)); ``` |