diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2025-02-16 09:30:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-16 09:30:27 -0800 |
| commit | 4780abbfd8e141b41807609aae80ae98f3090d1e (patch) | |
| tree | 421e0a22a5ef25078757a201d257ad2dff2e08ca /src/code/cutscene_camera.c | |
| parent | 1241a8ca5c25e964673b036db4cac40df5fae239 (diff) | |
Misc FAKE fixes (#1783)
* CutsceneCamera_UpdateSplines fake match
* CutsceneCamera_Init -1 splineIndex
* Eye Point comment
* func_80B781DC better fake
* func_80B32F04
* ObjSwitch_Update
* ObjSwitch_InitTrisCollider
* ObjAqua_Init
* EnTrt_ItemGiven
* func_80C10E98 partly
* EnTest7_WarpCsWarp this to 1
* EnTest6_InvertedSoTCutscene better fake
* EnTest6_DrawAmmoDropRupee
* EnPoSisters_MatchPlayerY
* func_8095B76C
* EnMinifrog_Init
* func_80A5C0B8
* EnKnight_UpdateEffects
* EnKnight_FlyingHeadAttack
* EnKakasi_Init
* EnInvadepoh_ModelInfo_GetNextFaceAnim
* BgAstrBombwall_InitCollider like func_809CE068
* Player_UpdateInterface
* Player_CsAction_TranslateReverse
* DynaPoly_AddBgActorToLookup better fake
* CutsceneManager_FindEntranceCsId
* func_800AE930 better fake
* Math3D_CylVsLineSeg better fake
* MapDisp_InitBossRoomStorey
* Play_Init
* EnTimeTag_Diary_Wait better fake
* Remove fake label from Player_SwordFromIA
* Player_PostLimbDrawGameplay partly
* EffectBlure_AddVertex prev temp
* Player_PostLimbDrawGameplay attempt 2
* AudioMgr_StopAllSfxExceptSystem
* Camera_Normal0
* Camera_Jump2
* Camera_Normal3
* PR review
Diffstat (limited to 'src/code/cutscene_camera.c')
| -rw-r--r-- | src/code/cutscene_camera.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/code/cutscene_camera.c b/src/code/cutscene_camera.c index b560e9c95..8c7d5538b 100644 --- a/src/code/cutscene_camera.c +++ b/src/code/cutscene_camera.c @@ -42,7 +42,7 @@ s32 CutsceneCamera_Init(Camera* camera, CutsceneCamera* csCamera) { csCamera->nextSplineTimer = csCamera->updateSplineTimer = 0; csCamera->cmdIndex = 0; - csCamera->splineIndex = 0xFFFF; + csCamera->splineIndex = -1; csCamera->splineNeedsInit = true; csCamera->state = CS_CAM_STATE_UPDATE_ALL; @@ -298,7 +298,7 @@ s32 CutsceneCamera_UpdateSplines(u8* script, CutsceneCamera* csCamera) { csCamera->atCmd = (CsCmdCamPoint*)&script[csCamera->cmdIndex]; csCamera->cmdIndex += (s16)(csCamera->eyeInterp.numEntries * sizeof(CsCmdCamPoint)); - // Misc Point + // Eye Point csCamera->eyeCmd = (CsCmdCamPoint*)&script[csCamera->cmdIndex]; csCamera->cmdIndex += (s16)(csCamera->eyeInterp.numEntries * sizeof(CsCmdCamPoint)); @@ -307,12 +307,10 @@ s32 CutsceneCamera_UpdateSplines(u8* script, CutsceneCamera* csCamera) { csCamera->cmdIndex += (s16)(csCamera->eyeInterp.numEntries * sizeof(CsCmdCamMisc)); // Other Params - csCamera->eyeInterp.curPoint = 0; - csCamera->atInterp.curPoint = 0; + csCamera->eyeInterp.curPoint = csCamera->atInterp.curPoint = 0; csCamera->splineNeedsInit = false; - //! FAKE: csCamera->splineIndex++; - csCamera->splineIndex = (csCamera->splineIndex & 0xFFFF) + 1; + csCamera->splineIndex++; csCamera->state = CS_CAM_STATE_UPDATE_ALL; csCamera->nextSplineTimer = csCamera->updateSplineTimer = 0; csCamera->eyeInterp.type = csCamera->atInterp.type = CS_CAM_INTERP_OFF; |
