From f2b628241d5ffffd21cc8fb3a58247563d81352b Mon Sep 17 00:00:00 2001
From: engineer124 <47598039+engineer124@users.noreply.github.com>
Date: Fri, 22 Jul 2022 10:24:37 -0400
Subject: Cleanup SubCameras (#936)

* Cleanup SubCameras

* Add small bit of docs, remove comments

* Fix merge from master, missed test7
---
 src/code/z_demo.c     | 4 ++--
 src/code/z_eventmgr.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/code')

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")
 
-- 
cgit v1.2.3