mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-02 18:18:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup SubCameras (#936)

Browse Source 
* Cleanup SubCameras

* Add small bit of docs, remove comments

* Fix merge from master, missed test7
This commit is contained in:
engineer124
2022-07-22 10:24:37 -04:00
committed by GitHub
parent 5f6c3df4ce
commit f2b628241d
47 changed files with 732 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_demo.c
+2 -2
View File
@@ -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) {
src/code/z_eventmgr.c
+1 -1
View File
@@ -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")