From 73df35c6ab50d5fbec57ae2fb154eb89c7bc7ff1 Mon Sep 17 00:00:00 2001 From: djevangelia <263709373+djevangelia@users.noreply.github.com> Date: Wed, 8 Jul 2026 21:58:24 +0200 Subject: Bugfix, child Hookshot first person in Hylia lab (#6847) --- soh/src/code/z_actor.c | 2 +- soh/src/code/z_camera.c | 56 +++++++++++++++++++++---------------------- soh/src/code/z_demo.c | 4 ++-- soh/src/code/z_message_PAL.c | 2 +- soh/src/code/z_onepointdemo.c | 30 +++++++++++------------ soh/src/code/z_play.c | 24 +++++++++---------- 6 files changed, 59 insertions(+), 59 deletions(-) (limited to 'soh/src/code') diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c index 3bde2e1eb..12f1038f7 100644 --- a/soh/src/code/z_actor.c +++ b/soh/src/code/z_actor.c @@ -1457,7 +1457,7 @@ void Actor_SwapHookshotAttachment(PlayState* play, Actor* actorA, Actor* actorB) void Actor_RequestHorseCameraSetting(PlayState* play, Player* player) { if ((play->roomCtx.curRoom.behaviorType1 != ROOM_BEHAVIOR_TYPE1_4) && func_800C0CB8(play)) { - Camera_ChangeSetting(Play_GetCamera(play, MAIN_CAM), CAM_SET_HORSE); + Camera_ChangeSetting(Play_GetCamera(play, CAM_ID_MAIN), CAM_SET_HORSE); } } diff --git a/soh/src/code/z_camera.c b/soh/src/code/z_camera.c index 24d7f434e..c103ef555 100644 --- a/soh/src/code/z_camera.c +++ b/soh/src/code/z_camera.c @@ -2715,8 +2715,8 @@ s32 Camera_Jump3(Camera* camera) { anim->mode = CAM_MODE_NORMAL; modeSwitch = true; } - } else if (((camera->waterYPos - eye->y) > OREG(45)) && (anim->mode != CAM_MODE_BOOMERANG)) { - anim->mode = CAM_MODE_BOOMERANG; + } else if (((camera->waterYPos - eye->y) > OREG(45)) && (anim->mode != CAM_MODE_AIM_BOOMERANG)) { + anim->mode = CAM_MODE_AIM_BOOMERANG; modeSwitch = true; } @@ -5281,7 +5281,7 @@ s32 Camera_Unique9(Camera* camera) { } } else { // We've gone through all the keyframes. - if (camera->thisIdx != MAIN_CAM) { + if (camera->thisIdx != CAM_ID_MAIN) { camera->timer = 0; } return true; @@ -5618,20 +5618,20 @@ s32 Camera_Unique9(Camera* camera) { break; case 19: { // Change the parent camera (or default)'s mode to normal - s32 camIdx = camera->parentCamIdx <= SUBCAM_NONE ? MAIN_CAM : camera->parentCamIdx; + s32 camIdx = camera->parentCamIdx <= SUBCAM_NONE ? CAM_ID_MAIN : camera->parentCamIdx; Camera_ChangeModeFlags(camera->play->cameraPtrs[camIdx], CAM_MODE_NORMAL, 1); } case 18: { // copy the current camera to the parent (or default)'s camera. - s32 camIdx = camera->parentCamIdx <= SUBCAM_NONE ? MAIN_CAM : camera->parentCamIdx; + s32 camIdx = camera->parentCamIdx <= SUBCAM_NONE ? CAM_ID_MAIN : camera->parentCamIdx; Camera* cam = camera->play->cameraPtrs[camIdx]; *eye = *eyeNext; Camera_Copy(cam, camera); } default: - if (camera->thisIdx != MAIN_CAM) { + if (camera->thisIdx != CAM_ID_MAIN) { camera->timer = 0; } } @@ -6052,7 +6052,7 @@ s32 Camera_Demo5(Camera* camera) { D_8011D6AC[1].eyeTargetInit.x = Rand_ZeroOne() * 10.0f; ONEPOINT_CS_INFO(camera)->keyFrames = D_8011D6AC; ONEPOINT_CS_INFO(camera)->keyFrameCnt = ARRAY_COUNT(D_8011D6AC); - if (camera->parentCamIdx != MAIN_CAM) { + if (camera->parentCamIdx != CAM_ID_MAIN) { ONEPOINT_CS_INFO(camera)->keyFrameCnt--; } else { camera->timer += D_8011D6AC[2].timerInit; @@ -6062,7 +6062,7 @@ s32 Camera_Demo5(Camera* camera) { D_8011D724[1].timerInit = camera->timer - 1; ONEPOINT_CS_INFO(camera)->keyFrames = D_8011D724; ONEPOINT_CS_INFO(camera)->keyFrameCnt = ARRAY_COUNT(D_8011D724); - if (camera->parentCamIdx != MAIN_CAM) { + if (camera->parentCamIdx != CAM_ID_MAIN) { ONEPOINT_CS_INFO(camera)->keyFrameCnt--; } else { camera->timer += D_8011D724[2].timerInit; @@ -6084,7 +6084,7 @@ s32 Camera_Demo5(Camera* camera) { D_8011D79C[1].timerInit = camera->timer - 1; - if (camera->parentCamIdx != MAIN_CAM) { + if (camera->parentCamIdx != CAM_ID_MAIN) { ONEPOINT_CS_INFO(camera)->keyFrameCnt -= 2; } else { camera->timer += D_8011D79C[2].timerInit + D_8011D79C[3].timerInit; @@ -6095,7 +6095,7 @@ s32 Camera_Demo5(Camera* camera) { D_8011D83C[0].timerInit = camera->timer; ONEPOINT_CS_INFO(camera)->keyFrames = D_8011D83C; ONEPOINT_CS_INFO(camera)->keyFrameCnt = ARRAY_COUNT(D_8011D83C); - if (camera->parentCamIdx != MAIN_CAM) { + if (camera->parentCamIdx != CAM_ID_MAIN) { ONEPOINT_CS_INFO(camera)->keyFrameCnt--; } else { camera->timer += D_8011D83C[1].timerInit; @@ -6108,7 +6108,7 @@ s32 Camera_Demo5(Camera* camera) { D_8011D88C[0].timerInit = camera->timer; ONEPOINT_CS_INFO(camera)->keyFrames = D_8011D88C; ONEPOINT_CS_INFO(camera)->keyFrameCnt = ARRAY_COUNT(D_8011D88C); - if (camera->parentCamIdx != MAIN_CAM) { + if (camera->parentCamIdx != CAM_ID_MAIN) { ONEPOINT_CS_INFO(camera)->keyFrameCnt--; } else { camera->timer += D_8011D88C[1].timerInit; @@ -6126,7 +6126,7 @@ s32 Camera_Demo5(Camera* camera) { D_8011D8DC[1].timerInit = (s16)(eyeTargetDist * 0.005f) + 8; ONEPOINT_CS_INFO(camera)->keyFrames = D_8011D8DC; ONEPOINT_CS_INFO(camera)->keyFrameCnt = ARRAY_COUNT(D_8011D8DC); - if (camera->parentCamIdx != MAIN_CAM) { + if (camera->parentCamIdx != CAM_ID_MAIN) { ONEPOINT_CS_INFO(camera)->keyFrameCnt -= 2; } else { camera->timer += D_8011D8DC[1].timerInit + D_8011D8DC[2].timerInit; @@ -6163,7 +6163,7 @@ s32 Camera_Demo5(Camera* camera) { } ONEPOINT_CS_INFO(camera)->keyFrames = D_8011D954; ONEPOINT_CS_INFO(camera)->keyFrameCnt = ARRAY_COUNT(D_8011D954); - if (camera->parentCamIdx != MAIN_CAM) { + if (camera->parentCamIdx != CAM_ID_MAIN) { ONEPOINT_CS_INFO(camera)->keyFrameCnt -= 2; } else { camera->timer += D_8011D954[2].timerInit + D_8011D954[3].timerInit; @@ -6188,7 +6188,7 @@ s32 Camera_Demo5(Camera* camera) { } ONEPOINT_CS_INFO(camera)->keyFrames = D_8011D9F4; ONEPOINT_CS_INFO(camera)->keyFrameCnt = ARRAY_COUNT(D_8011D9F4); - if (camera->parentCamIdx != MAIN_CAM) { + if (camera->parentCamIdx != CAM_ID_MAIN) { if (camera->play->state.frames & 1) { D_8011D9F4[0].rollTargetInit = -D_8011D9F4[0].rollTargetInit; D_8011D9F4[1].rollTargetInit = -D_8011D9F4[1].rollTargetInit; @@ -6250,7 +6250,7 @@ s32 Camera_Demo6(Camera* camera) { s16 stateTimers[4]; Vec3f* at = &camera->at; - mainCam = Play_GetCamera(camera->play, MAIN_CAM); + mainCam = Play_GetCamera(camera->play, CAM_ID_MAIN); camFocus = camera->target; stateTimers[1] = 0x37; stateTimers[2] = 0x46; @@ -6355,7 +6355,7 @@ s32 Camera_Demo9(Camera* camera) { f32* camFOV = &camera->fov; Demo9Anim* anim = &demo9->anim; - mainCam = Play_GetCamera(camera->play, MAIN_CAM); + mainCam = Play_GetCamera(camera->play, CAM_ID_MAIN); mainCamPlayerPosRot = &mainCam->playerPosRot; if (RELOAD_PARAMS) { values = sCameraSettings[camera->setting].cameraModes[camera->mode].values; @@ -7156,7 +7156,7 @@ void Camera_InitPlayerSettings(Camera* camera, Player* player) { Camera_QRegInit(); osSyncPrintf(VT_FGCOL(BLUE) "camera: personalize ---" VT_RST "\n"); - if (camera->thisIdx == MAIN_CAM) { + if (camera->thisIdx == CAM_ID_MAIN) { Camera_UpdateWater(camera); } } @@ -7398,7 +7398,7 @@ s32 Camera_UpdateHotRoom(Camera* camera) { s32 Camera_DbgChangeMode(Camera* camera) { s32 changeDir = 0; - if (!gDbgCamEnabled && camera->play->activeCamera == MAIN_CAM) { + if (!gDbgCamEnabled && camera->play->activeCamera == CAM_ID_MAIN) { if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CUP)) { osSyncPrintf("attention sound URGENCY\n"); Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_URGENCY); @@ -7525,7 +7525,7 @@ Vec3s Camera_Update(Camera* camera) { QuakeCamCalc quake; Player* player; - player = camera->play->cameraPtrs[MAIN_CAM]->player; + player = camera->play->cameraPtrs[CAM_ID_MAIN]->player; if (R_DBG_CAM_UPDATE) { osSyncPrintf("camera: in %x\n", camera); @@ -7631,7 +7631,7 @@ Vec3s Camera_Update(Camera* camera) { if ((gSaveContext.gameMode != GAMEMODE_NORMAL) && (gSaveContext.gameMode != GAMEMODE_END_CREDITS)) { sCameraInterfaceFlags = 0; Camera_UpdateInterface(sCameraInterfaceFlags); - } else if ((D_8011D3F0 != 0) && (camera->thisIdx == MAIN_CAM)) { + } else if ((D_8011D3F0 != 0) && (camera->thisIdx == CAM_ID_MAIN)) { D_8011D3F0--; sCameraInterfaceFlags = 0x3200; Camera_UpdateInterface(sCameraInterfaceFlags); @@ -7764,13 +7764,13 @@ Vec3s Camera_Update(Camera* camera) { * When the camera's timer is 0, change the camera to its parent */ void Camera_Finish(Camera* camera) { - Camera* mainCam = camera->play->cameraPtrs[MAIN_CAM]; + Camera* mainCam = camera->play->cameraPtrs[CAM_ID_MAIN]; Player* player = GET_PLAYER(camera->play); if (camera->timer == 0) { Play_ChangeCameraStatus(camera->play, camera->parentCamIdx, CAM_STAT_ACTIVE); - if ((camera->parentCamIdx == MAIN_CAM) && (camera->csId != 0)) { + if ((camera->parentCamIdx == CAM_ID_MAIN) && (camera->csId != 0)) { player->actor.freezeTimer = 0; player->stateFlags1 &= ~PLAYER_STATE1_IN_CUTSCENE; @@ -7790,7 +7790,7 @@ void Camera_Finish(Camera* camera) { PARENT_CAM(camera)->childCamIdx = camera->childCamIdx; } - if (PARENT_CAM(camera)->thisIdx == MAIN_CAM) { + if (PARENT_CAM(camera)->thisIdx == CAM_ID_MAIN) { PARENT_CAM(camera)->animState = 0; } @@ -7821,7 +7821,7 @@ s32 Camera_ChangeModeFlags(Camera* camera, s16 mode, u8 flags) { } if (!((sCameraSettings[camera->setting].unk_00 & 0x3FFFFFFF) & (1 << mode))) { - if (mode == CAM_MODE_FIRSTPERSON) { + if (mode == CAM_MODE_FIRST_PERSON) { osSyncPrintf("camera: error sound\n"); Sfx_PlaySfxCentered(NA_SE_SY_ERROR); } @@ -7849,7 +7849,7 @@ s32 Camera_ChangeModeFlags(Camera* camera, s16 mode, u8 flags) { Camera_CopyDataToRegs(camera, mode); modeChangeFlags = 0; switch (mode) { - case CAM_MODE_FIRSTPERSON: + case CAM_MODE_FIRST_PERSON: modeChangeFlags = 0x20; break; case CAM_MODE_BATTLE: @@ -7870,7 +7870,7 @@ s32 Camera_ChangeModeFlags(Camera* camera, s16 mode, u8 flags) { } switch (camera->mode) { - case CAM_MODE_FIRSTPERSON: + case CAM_MODE_FIRST_PERSON: if (modeChangeFlags & 0x20) { camera->animState = 0xA; } @@ -7932,7 +7932,7 @@ s32 Camera_ChangeModeFlags(Camera* camera, s16 mode, u8 flags) { // Clear free look if an action is performed that would move the camera (targeting, first person, talking) if (CVarGetInteger(CVAR_SETTING("FreeLook.Enabled"), 0) && SetCameraManual(camera) == 1 && ((mode >= CAM_MODE_TARGET && mode <= CAM_MODE_BATTLE) || - (mode >= CAM_MODE_FIRSTPERSON && mode <= CAM_MODE_CLIMBZ) || mode == CAM_MODE_HANGZ || + (mode >= CAM_MODE_FIRST_PERSON && mode <= CAM_MODE_CLIMBZ) || mode == CAM_MODE_HANGZ || mode == CAM_MODE_FOLLOWBOOMERANG)) { camera->play->manualCamera = false; } @@ -8346,7 +8346,7 @@ s32 func_8005B198() { s16 func_8005B1A4(Camera* camera) { camera->unk_14C |= 0x8; - if ((camera->thisIdx == MAIN_CAM) && (camera->play->activeCamera != MAIN_CAM)) { + if ((camera->thisIdx == CAM_ID_MAIN) && (camera->play->activeCamera != CAM_ID_MAIN)) { GET_ACTIVE_CAM(camera->play)->unk_14C |= 0x8; return camera->play->activeCamera; } diff --git a/soh/src/code/z_demo.c b/soh/src/code/z_demo.c index dc01a5d79..39599a5a8 100644 --- a/soh/src/code/z_demo.c +++ b/soh/src/code/z_demo.c @@ -1520,7 +1520,7 @@ size_t Cutscene_Command_07(PlayState* play, CutsceneContext* csCtx, u8* cmd, u8 if (D_8015FCC8 != 0) { sp2C = Play_GetCamera(play, csCtx->unk_14); sp2C->player = NULL; - Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT); + Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STAT_WAIT); Play_ChangeCameraStatus(play, csCtx->unk_14, CAM_STAT_ACTIVE); Play_CameraChangeSetting(play, csCtx->unk_14, CAM_SET_FREE0); sp28 = csCtx->cameraFocus->cameraRoll * 1.40625f; @@ -1563,7 +1563,7 @@ size_t Cutscene_Command_08(PlayState* play, CutsceneContext* csCtx, u8* cmd, u8 if (D_8015FCC8 != 0) { sp2C = Play_GetCamera(play, csCtx->unk_14); sp2C->player = NULL; - Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT); + Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STAT_WAIT); Play_ChangeCameraStatus(play, csCtx->unk_14, CAM_STAT_ACTIVE); Play_CameraChangeSetting(play, csCtx->unk_14, CAM_SET_FREE0); sp3C.x = csCtx->cameraFocus->pos.x; diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c index 57e442676..4c690445a 100644 --- a/soh/src/code/z_message_PAL.c +++ b/soh/src/code/z_message_PAL.c @@ -4670,7 +4670,7 @@ void Message_Update(PlayState* play) { ((msgCtx->textId < 0x88D || msgCtx->textId >= 0x893) || msgCtx->choiceIndex != 0) && (msgCtx->textId != 0x3055 && gSaveContext.cutsceneIndex < 0xFFF0)) { osSyncPrintf("=== day_time=%x ", ((void)0, gSaveContext.cutsceneIndex)); - if (play->activeCamera == MAIN_CAM) { + if (play->activeCamera == CAM_ID_MAIN) { if (gSaveContext.unk_13EE == 0 || gSaveContext.unk_13EE == 1 || gSaveContext.unk_13EE == 2) { gSaveContext.unk_13EE = 0x32; } diff --git a/soh/src/code/z_onepointdemo.c b/soh/src/code/z_onepointdemo.c index 8c0f4fd80..8aad2f0e7 100644 --- a/soh/src/code/z_onepointdemo.c +++ b/soh/src/code/z_onepointdemo.c @@ -60,7 +60,7 @@ void OnePointCutscene_SetCsCamPoints(Camera* camera, s16 actionParameters, s16 i s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor, s16 timer) { Camera* csCam = play->cameraPtrs[camIdx]; Camera* childCam = play->cameraPtrs[csCam->childCamIdx]; - Camera* mainCam = play->cameraPtrs[MAIN_CAM]; + Camera* mainCam = play->cameraPtrs[CAM_ID_MAIN]; Player* player = mainCam->player; VecSph spD0; s32 i; @@ -255,7 +255,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor csInfo->keyFrames = D_801211D4; csInfo->keyFrameCnt = 2; } - Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_UNK3); + Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STAT_UNK3); func_800C0808(play, camIdx, player, CAM_SET_CS_C); } break; case 2290: { @@ -329,7 +329,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor break; case 9601: Play_CameraChangeSetting(play, camIdx, CAM_SET_CS_3); - Play_CameraChangeSetting(play, MAIN_CAM, mainCam->prevSetting); + Play_CameraChangeSetting(play, CAM_ID_MAIN, mainCam->prevSetting); if (GameInteractor_Should(VB_CRAWL_SPEED_EXIT_CS, true, csCam, csId, D_80120430, D_8012042C, D_80120308, D_80120398)) { OnePointCutscene_SetCsCamPoints(csCam, D_80120430 | 0x1000, D_8012042C, D_80120308, D_80120398); @@ -337,7 +337,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor break; case 9602: Play_CameraChangeSetting(play, camIdx, CAM_SET_CS_3); - Play_CameraChangeSetting(play, MAIN_CAM, mainCam->prevSetting); + Play_CameraChangeSetting(play, CAM_ID_MAIN, mainCam->prevSetting); if (GameInteractor_Should(VB_CRAWL_SPEED_EXIT_CS, true, csCam, csId, D_80120430, D_8012042C, D_80120308, D_80120434)) { OnePointCutscene_SetCsCamPoints(csCam, D_80120430 | 0x1000, D_8012042C, D_80120308, D_80120434); @@ -529,7 +529,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor OnePointCutscene_AddVecSphToVec3f(&spB4, &spC0, &spD0); Play_CameraChangeSetting(play, camIdx, CAM_SET_FREE2); Play_CameraSetAtEye(play, camIdx, &spC0, &spB4); - Play_CopyCamera(play, MAIN_CAM, camIdx); + Play_CopyCamera(play, CAM_ID_MAIN, camIdx); csCam->roll = -1; csCam->fov = 55.0f; Player_SetCsAction(play, actor, 1); @@ -587,7 +587,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor spD0.pitch = 0x5DC; spD0.r = 120.0f; OnePointCutscene_AddVecSphToVec3f(&spB4, &spC0, &spD0); - Play_CameraSetAtEye(play, MAIN_CAM, &spC0, &spB4); + Play_CameraSetAtEye(play, CAM_ID_MAIN, &spC0, &spB4); i = Quake_Add(csCam, 3); Quake_SetSpeed(i, 22000); @@ -672,7 +672,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor case 3310: Play_CameraChangeSetting(play, camIdx, CAM_SET_FIRE_STAIRCASE); Player_SetCsActionWithHaltedActors(play, NULL, 8); - Play_CopyCamera(play, camIdx, MAIN_CAM); + Play_CopyCamera(play, camIdx, CAM_ID_MAIN); i = Quake_Add(csCam, 1); Quake_SetSpeed(i, 32000); @@ -966,7 +966,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor func_800C0808(play, camIdx, player, CAM_SET_TURN_AROUND); csCam->data2 = 0xC; } else { - Play_CopyCamera(play, camIdx, MAIN_CAM); + Play_CopyCamera(play, camIdx, CAM_ID_MAIN); Play_CameraChangeSetting(play, camIdx, CAM_SET_FREE2); } break; @@ -1137,7 +1137,7 @@ s32 OnePointCutscene_RemoveCamera(PlayState* play, s16 camIdx) { PARENT_CAM(camera)->childCamIdx = camera->childCamIdx; } nextCamIdx = (play->activeCamera == camIdx) ? camera->parentCamIdx : SUBCAM_NONE; - camera->parentCamIdx = MAIN_CAM; + camera->parentCamIdx = CAM_ID_MAIN; camera->childCamIdx = camera->parentCamIdx; camera->timer = -1; Play_ClearCamera(camera->play, camera->thisIdx); @@ -1183,7 +1183,7 @@ s16 OnePointCutscene_Init(PlayState* play, s16 csId, s16 timer, Actor* actor, s1 vChildCamIdx = play->cameraPtrs[parentCamIdx]->childCamIdx; vCsStatus = CAM_STAT_ACTIVE; - if (vChildCamIdx >= SUBCAM_FIRST) { + if (vChildCamIdx >= CAM_ID_SUB_FIRST) { OnePointCutscene_SetAsChild(play, vChildCamIdx, csCamIdx); vCsStatus = CAM_STAT_WAIT; } else { @@ -1202,7 +1202,7 @@ s16 OnePointCutscene_Init(PlayState* play, s16 csId, s16 timer, Actor* actor, s1 csCam->csId = csId; - if (parentCamIdx == MAIN_CAM) { + if (parentCamIdx == CAM_ID_MAIN) { Play_ChangeCameraStatus(play, parentCamIdx, CAM_STAT_UNK3); } else { Play_ChangeCameraStatus(play, parentCamIdx, CAM_STAT_WAIT); @@ -1214,7 +1214,7 @@ s16 OnePointCutscene_Init(PlayState* play, s16 csId, s16 timer, Actor* actor, s1 vCurCamIdx = csCamIdx; vNextCamIdx = play->cameraPtrs[csCamIdx]->childCamIdx; - while (vNextCamIdx >= SUBCAM_FIRST) { + while (vNextCamIdx >= CAM_ID_SUB_FIRST) { s16 nextCsId = play->cameraPtrs[vNextCamIdx]->csId; s16 thisCsId = play->cameraPtrs[csCamIdx]->csId; @@ -1276,7 +1276,7 @@ s32 OnePointCutscene_Attention(PlayState* play, Actor* actor) { } sUnused = -1; - parentCam = play->cameraPtrs[MAIN_CAM]; + parentCam = play->cameraPtrs[CAM_ID_MAIN]; if (parentCam->mode == CAM_MODE_FOLLOWBOOMERANG) { osSyncPrintf(VT_COL(YELLOW, BLACK) "actor attention demo camera: change mode BOOKEEPON -> NORMAL\n" VT_RST); Camera_ChangeMode(parentCam, CAM_MODE_NORMAL); @@ -1306,7 +1306,7 @@ s32 OnePointCutscene_Attention(PlayState* play, Actor* actor) { } // Actorcat is only undefined if the actor is in a higher category than all other attention cutscenes. In this case, // it goes in the first position of the list. Otherwise, it goes in the index found in the loop. - vParentCamIdx = (vLastHigherCat == -1) ? MAIN_CAM : parentCam->thisIdx; + vParentCamIdx = (vLastHigherCat == -1) ? CAM_ID_MAIN : parentCam->thisIdx; switch (actor->category) { case ACTORCAT_SWITCH: @@ -1377,7 +1377,7 @@ void OnePointCutscene_DisableAttention() { } s32 OnePointCutscene_CheckForCategory(PlayState* play, s32 category) { - Camera* parentCam = play->cameraPtrs[MAIN_CAM]; + Camera* parentCam = play->cameraPtrs[CAM_ID_MAIN]; while (parentCam->childCamIdx != SUBCAM_FREE) { parentCam = play->cameraPtrs[parentCam->childCamIdx]; diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index 3a9bdb9dd..801c01a59 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -406,9 +406,9 @@ void Play_Init(GameState* thisx) { Camera_ChangeStatus(&play->subCameras[i], CAM_STAT_UNK100); } - play->cameraPtrs[MAIN_CAM] = &play->mainCamera; - play->cameraPtrs[MAIN_CAM]->uid = 0; - play->activeCamera = MAIN_CAM; + play->cameraPtrs[CAM_ID_MAIN] = &play->mainCamera; + play->cameraPtrs[CAM_ID_MAIN]->uid = 0; + play->activeCamera = CAM_ID_MAIN; func_8005AC48(&play->mainCamera, 0xFF); // Sram_Init(this, &this->sramCtx); Regs_InitData(play); @@ -1863,7 +1863,7 @@ void func_800C016C(PlayState* play, Vec3f* src, Vec3f* dest) { s16 Play_CreateSubCamera(PlayState* play) { s16 i; - for (i = SUBCAM_FIRST; i < NUM_CAMS; i++) { + for (i = CAM_ID_SUB_FIRST; i < NUM_CAMS; i++) { if (play->cameraPtrs[i] == NULL) { break; } @@ -1878,7 +1878,7 @@ s16 Play_CreateSubCamera(PlayState* play) { CYAN) " " VT_RST "\n", i); - play->cameraPtrs[i] = &play->subCameras[i - SUBCAM_FIRST]; + play->cameraPtrs[i] = &play->subCameras[i - CAM_ID_SUB_FIRST]; Camera_Init(play->cameraPtrs[i], &play->view, &play->colCtx, play); play->cameraPtrs[i]->thisIdx = i; @@ -1902,7 +1902,7 @@ s16 Play_ChangeCameraStatus(PlayState* play, s16 camId, s16 status) { void Play_ClearCamera(PlayState* play, s16 camId) { s16 camIdx = (camId == SUBCAM_ACTIVE) ? play->activeCamera : camId; - if (camIdx == MAIN_CAM) { + if (camIdx == CAM_ID_MAIN) { osSyncPrintf(VT_COL(RED, WHITE) "camera control: error: never clear camera !!\n" VT_RST); } @@ -1920,13 +1920,13 @@ void Play_ClearCamera(PlayState* play, s16 camId) { void Play_ClearAllSubCameras(PlayState* play) { s16 i; - for (i = SUBCAM_FIRST; i < NUM_CAMS; i++) { + for (i = CAM_ID_SUB_FIRST; i < NUM_CAMS; i++) { if (play->cameraPtrs[i] != NULL) { Play_ClearCamera(play, i); } } - play->activeCamera = MAIN_CAM; + play->activeCamera = CAM_ID_MAIN; } Camera* Play_GetCamera(PlayState* play, s16 camId) { @@ -2030,7 +2030,7 @@ void func_800C08AC(PlayState* play, s16 camId, s16 arg2) { Play_ClearCamera(play, camIdx); - for (i = SUBCAM_FIRST; i < NUM_CAMS; i++) { + for (i = CAM_ID_SUB_FIRST; i < NUM_CAMS; i++) { if (play->cameraPtrs[i] != NULL) { osSyncPrintf( VT_COL(RED, WHITE) "camera control: error: return to main, other camera left. %d cleared!!\n" VT_RST, @@ -2040,10 +2040,10 @@ void func_800C08AC(PlayState* play, s16 camId, s16 arg2) { } if (arg2 <= 0) { - Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE); - play->cameraPtrs[MAIN_CAM]->childCamIdx = play->cameraPtrs[MAIN_CAM]->parentCamIdx = SUBCAM_FREE; + Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STAT_ACTIVE); + play->cameraPtrs[CAM_ID_MAIN]->childCamIdx = play->cameraPtrs[CAM_ID_MAIN]->parentCamIdx = SUBCAM_FREE; } else { - OnePointCutscene_Init(play, 1020, arg2, NULL, MAIN_CAM); + OnePointCutscene_Init(play, 1020, arg2, NULL, CAM_ID_MAIN); } } -- cgit v1.2.3