diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2022-07-22 10:24:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-22 15:24:37 +0100 |
| commit | f2b628241d5ffffd21cc8fb3a58247563d81352b (patch) | |
| tree | 24fd04cd7f615acd076b58e6a967ad9d5c9185fe /src/code | |
| parent | 5f6c3df4ce45aa93f9281c3232b3b1d4c9efdf9a (diff) | |
Cleanup SubCameras (#936)
* Cleanup SubCameras
* Add small bit of docs, remove comments
* Fix merge from master, missed test7
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_demo.c | 4 | ||||
| -rw-r--r-- | src/code/z_eventmgr.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 674197be4..1c003abfb 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -1475,8 +1475,8 @@ void func_800EDA84(PlayState* play, CutsceneContext* csCtx) { Audio_SetCutsceneFlag(true); csCtx->frames = 0xFFFF; - csCtx->csCamId = ActorCutscene_GetCurrentCamera(0x7F); - func_8016119C(Play_GetCamera(play, csCtx->csCamId), &sCutsceneCameraInfo); + csCtx->subCamId = ActorCutscene_GetCurrentSubCamId(0x7F); + func_8016119C(Play_GetCamera(play, csCtx->subCamId), &sCutsceneCameraInfo); csCtx->unk_18 = 0xFFFF; if (gSaveContext.cutsceneTrigger == 0) { diff --git a/src/code/z_eventmgr.c b/src/code/z_eventmgr.c index 1c61431b9..7128368ac 100644 --- a/src/code/z_eventmgr.c +++ b/src/code/z_eventmgr.c @@ -42,7 +42,7 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/func_800F2178.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_GetCurrentCamera.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/ActorCutscene_GetCurrentSubCamId.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_eventmgr/func_800F21CC.s") |