From 2fe641ed5c804e4ecace51b5655a1203d1f483fd Mon Sep 17 00:00:00 2001 From: engineer124 Date: Mon, 23 May 2022 17:56:34 +1000 Subject: [PATCH] More docs --- include/z64.h | 2 +- src/code/z_demo.c | 41 +++---- src/code/z_kaleido_setup.c | 2 +- src/code/z_parameter.c | 111 ++++++++++-------- src/code/z_play.c | 4 +- .../actors/ovl_Bg_Ingate/z_bg_ingate.c | 2 +- src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c | 2 +- src/overlays/actors/ovl_Door_Ana/z_door_ana.c | 2 +- .../actors/ovl_Door_Warp1/z_door_warp1.c | 18 +-- .../actors/ovl_En_Aob_01/z_en_aob_01.c | 4 +- src/overlays/actors/ovl_En_Baba/z_en_baba.c | 2 +- .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c | 2 +- .../actors/ovl_En_Bomjima/z_en_bomjima.c | 2 +- .../actors/ovl_En_Bomjimb/z_en_bomjimb.c | 4 +- src/overlays/actors/ovl_En_Dns/z_en_dns.c | 2 +- src/overlays/actors/ovl_En_Fall/z_en_fall.c | 2 +- src/overlays/actors/ovl_En_Gb2/z_en_gb2.c | 4 +- src/overlays/actors/ovl_En_Gk/z_en_gk.c | 2 +- src/overlays/actors/ovl_En_Holl/z_en_holl.c | 6 +- src/overlays/actors/ovl_En_Horse/z_en_horse.c | 2 +- .../z_en_horse_game_check.c | 2 +- src/overlays/actors/ovl_En_Hs/z_en_hs.c | 2 +- src/overlays/actors/ovl_En_In/z_en_in.c | 4 +- .../actors/ovl_En_Invadepoh/z_en_invadepoh.c | 6 +- .../actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c | 2 +- src/overlays/actors/ovl_En_Kgy/z_en_kgy.c | 2 +- .../actors/ovl_En_Look_Nuts/z_en_look_nuts.c | 2 +- src/overlays/actors/ovl_En_Ma4/z_en_ma4.c | 6 +- .../actors/ovl_En_Ma_Yto/z_en_ma_yto.c | 2 +- src/overlays/actors/ovl_En_Mag/z_en_mag.c | 4 +- .../actors/ovl_En_Mt_tag/z_en_mt_tag.c | 4 +- .../actors/ovl_En_Pamera/z_en_pamera.c | 2 +- src/overlays/actors/ovl_En_Shn/z_en_shn.c | 2 +- .../actors/ovl_En_Suttari/z_en_suttari.c | 2 +- src/overlays/actors/ovl_En_Test4/z_en_test4.c | 2 +- src/overlays/actors/ovl_En_Test6/z_en_test6.c | 4 +- src/overlays/actors/ovl_En_Test7/z_en_test7.c | 2 +- src/overlays/actors/ovl_En_Trt/z_en_trt.c | 2 +- .../actors/ovl_En_Tru_Mt/z_en_tru_mt.c | 2 +- .../actors/ovl_En_Warp_tag/z_en_warp_tag.c | 2 +- .../ovl_En_Weather_Tag/z_en_weather_tag.c | 3 +- src/overlays/actors/ovl_En_Zov/z_en_zov.c | 2 +- .../actors/ovl_Obj_Nozoki/z_obj_nozoki.c | 2 +- .../actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c | 2 +- .../actors/ovl_Obj_Wturn/z_obj_wturn.c | 2 +- 45 files changed, 146 insertions(+), 137 deletions(-) diff --git a/include/z64.h b/include/z64.h index 9578aedb3..8702b0a4c 100644 --- a/include/z64.h +++ b/include/z64.h @@ -1404,7 +1404,7 @@ struct GlobalContext { /* 0x1886C */ AnimatedMaterial* sceneMaterialAnims; /* 0x18870 */ void* specialEffects; /* 0x18874 */ u8 skyboxId; - /* 0x18875 */ s8 sceneLoadFlag; // "fade_direction" + /* 0x18875 */ s8 transitionTrigger; // "fade_direction" /* 0x18876 */ s16 unk_18876; /* 0x18878 */ s16 bgCoverAlpha; /* 0x1887A */ u16 nextEntranceIndex; diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 01ed87e70..d4c9ad97a 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -81,7 +81,7 @@ CutsceneStateHandler sCsStateHandlers2[] = { }; void Cutscene_Update2(GlobalContext* globalCtx, CutsceneContext* csCtx) { - if ((gSaveContext.cutsceneTrigger != 0) && (globalCtx->sceneLoadFlag == 0x14)) { + if ((gSaveContext.cutsceneTrigger != 0) && (globalCtx->transitionTrigger == 0x14)) { gSaveContext.cutsceneTrigger = 0; } @@ -292,7 +292,7 @@ void Cutscene_Command_Misc(GlobalContext* globalCtx2, CutsceneContext* csCtx, Cs if (isStartFrame) { globalCtx->nextEntranceIndex = 0x1C00; gSaveContext.nextCutsceneIndex = 0xFFF8; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 3; } break; @@ -571,7 +571,7 @@ void Cutscene_TerminatorImpl(GlobalContext* globalCtx, CutsceneContext* csCtx, C if (cmd->base == 1) { globalCtx->nextEntranceIndex = globalCtx->csCtx.sceneCsList[globalCtx->csCtx.currentCsIndex].nextEntranceIndex; gSaveContext.nextCutsceneIndex = 0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; if (gSaveContext.gameMode != 1) { Scene_SetExitFade(globalCtx); } else { @@ -604,12 +604,12 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt case 0x1F: if (gSaveContext.save.weekEventReg[20] & 2) { globalCtx->nextEntranceIndex = 0x3010; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 3; } else { globalCtx->nextEntranceIndex = 0x8600; gSaveContext.nextCutsceneIndex = 0xFFF0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 3; } break; @@ -617,12 +617,12 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt case 0x44: if (gSaveContext.save.weekEventReg[33] & 0x80) { globalCtx->nextEntranceIndex = 0xAE70; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 3; } else { globalCtx->nextEntranceIndex = 0xAE00; gSaveContext.nextCutsceneIndex = 0xFFF0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 3; } break; @@ -631,7 +631,7 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt gSaveContext.save.weekEventReg[55] |= 0x80; globalCtx->nextEntranceIndex = 0x6A80; gSaveContext.nextCutsceneIndex = 0xFFF0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 3; break; @@ -639,7 +639,7 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt gSaveContext.save.weekEventReg[52] |= 0x20; globalCtx->nextEntranceIndex = 0x2000; gSaveContext.nextCutsceneIndex = 0xFFF1; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 3; break; } @@ -666,7 +666,7 @@ void Cutscene_Command_ChooseCreditsScenes(GlobalContext* globalCtx, CutsceneCont globalCtx->nextEntranceIndex = 0x1C00; gSaveContext.nextCutsceneIndex = 0xFFF9; } - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; break; case 3: @@ -679,7 +679,7 @@ void Cutscene_Command_ChooseCreditsScenes(GlobalContext* globalCtx, CutsceneCont globalCtx->nextEntranceIndex = 0x1C10; gSaveContext.nextCutsceneIndex = 0xFFF9; } - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; break; case 4: @@ -692,7 +692,7 @@ void Cutscene_Command_ChooseCreditsScenes(GlobalContext* globalCtx, CutsceneCont globalCtx->nextEntranceIndex = 0x1C20; gSaveContext.nextCutsceneIndex = 0xFFF9; } - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; break; case 5: @@ -705,7 +705,7 @@ void Cutscene_Command_ChooseCreditsScenes(GlobalContext* globalCtx, CutsceneCont globalCtx->nextEntranceIndex = 0x1C30; gSaveContext.nextCutsceneIndex = 0xFFF9; } - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; break; case 6: @@ -718,7 +718,7 @@ void Cutscene_Command_ChooseCreditsScenes(GlobalContext* globalCtx, CutsceneCont globalCtx->nextEntranceIndex = 0x1C50; gSaveContext.nextCutsceneIndex = 0xFFF9; } - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; break; case 7: @@ -731,14 +731,14 @@ void Cutscene_Command_ChooseCreditsScenes(GlobalContext* globalCtx, CutsceneCont globalCtx->nextEntranceIndex = 0x1C60; gSaveContext.nextCutsceneIndex = 0xFFF9; } - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; break; case 8: // Ikana canyon globalCtx->nextEntranceIndex = 0x2000; gSaveContext.nextCutsceneIndex = 0xFFF3; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; break; case 9: @@ -751,7 +751,7 @@ void Cutscene_Command_ChooseCreditsScenes(GlobalContext* globalCtx, CutsceneCont globalCtx->nextEntranceIndex = 0x1C70; gSaveContext.nextCutsceneIndex = 0xFFF9; } - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; break; case 10: @@ -764,7 +764,7 @@ void Cutscene_Command_ChooseCreditsScenes(GlobalContext* globalCtx, CutsceneCont globalCtx->nextEntranceIndex = 0x1C40; gSaveContext.nextCutsceneIndex = 0xFFF9; } - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; break; case 11: @@ -777,7 +777,7 @@ void Cutscene_Command_ChooseCreditsScenes(GlobalContext* globalCtx, CutsceneCont globalCtx->nextEntranceIndex = 0x1C80; gSaveContext.nextCutsceneIndex = 0xFFF9; } - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; break; } } @@ -1175,7 +1175,8 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, bcopy(cutscenePtr, &cutsceneEndFrame, sizeof(s32)); cutscenePtr += sizeof(s32); - if (((u16)cutsceneEndFrame < csCtx->frames) && (globalCtx->sceneLoadFlag != 0x14) && (csCtx->state != CS_STATE_4)) { + if (((u16)cutsceneEndFrame < csCtx->frames) && (globalCtx->transitionTrigger != 0x14) && + (csCtx->state != CS_STATE_4)) { csCtx->state = CS_STATE_3; return; } diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c index 78f05903d..3c9db3638 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -70,7 +70,7 @@ void KaleidoSetup_Update(GlobalContext* globalCtx) { } if ((pauseCtx->state == 0) && (pauseCtx->debugState == 0) && (globalCtx->gameOverCtx.state == GAMEOVER_INACTIVE)) { - if ((globalCtx->sceneLoadFlag == 0) && (globalCtx->transitionMode == 0)) { + if ((globalCtx->transitionTrigger == 0) && (globalCtx->transitionMode == 0)) { if ((gSaveContext.save.cutscene < 0xFFF0) && (gSaveContext.nextCutsceneIndex < 0xFFF0)) { if (!Play_InCsMode(globalCtx) || ((msgCtx->msgMode != 0) && (msgCtx->currentTextId == 0xFF))) { if ((globalCtx->unk_1887C < 2) && (gSaveContext.magicState != MAGIC_STATE_STEP_CAPACITY) && diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 03c7c7209..fa4117d49 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -148,9 +148,9 @@ u16 sMinigameScoreDigits[] = { 0, 0, 0, 0 }; u16 sCUpInvisible = 0; u16 sCUpTimer = 0; -s16 sMagicBarOutlinePrimRed = 255; -s16 sMagicBarOutlinePrimGreen = 255; -s16 sMagicBarOutlinePrimBlue = 255; +s16 sMagicMeterOutlinePrimRed = 255; +s16 sMagicMeterOutlinePrimGreen = 255; +s16 sMagicMeterOutlinePrimBlue = 255; s16 sMagicBorderRatio = 2; s16 sMagicBorderStep = 1; @@ -1638,7 +1638,7 @@ void func_80110038(GlobalContext* globalCtx) { gSaveContext.unk_3F22 = 0; } - if ((globalCtx->sceneLoadFlag == 0) && (globalCtx->transitionMode == 0)) { + if ((globalCtx->transitionTrigger == 0) && (globalCtx->transitionMode == 0)) { if (ActorCutscene_GetCurrentIndex() == -1) { Interface_ChangeAlpha(50); } @@ -1898,7 +1898,7 @@ void func_80110038(GlobalContext* globalCtx) { } } - if (phi_t3 && (globalCtx->activeCamera == 0) && (globalCtx->sceneLoadFlag == 0) && + if (phi_t3 && (globalCtx->activeCamera == 0) && (globalCtx->transitionTrigger == 0) && (globalCtx->transitionMode == 0)) { gSaveContext.unk_3F22 = 0; Interface_ChangeAlpha(50); @@ -1982,7 +1982,7 @@ void func_80111CB4(GlobalContext* globalCtx) { if (globalCtx->transitionMode != 0) { Interface_ChangeAlpha(1); } else if ((gSaveContext.minigameState == 1) && (gSaveContext.save.entranceIndex == 0x6400) && - (Cutscene_GetSceneSetupIndex(globalCtx) != 0) && (globalCtx->sceneLoadFlag == 0)) { + (Cutscene_GetSceneSetupIndex(globalCtx) != 0) && (globalCtx->transitionTrigger == 0)) { Interface_ChangeAlpha(12); } else if ((gSaveContext.minigameState == 1) && (gSaveContext.eventInf[3] & 0x20)) { Interface_ChangeAlpha(17); @@ -2040,7 +2040,7 @@ void func_80111CB4(GlobalContext* globalCtx) { if (globalCtx->transitionMode != 0) { Interface_ChangeAlpha(1); } else if ((gSaveContext.minigameState == 1) && (gSaveContext.save.entranceIndex == 0x6400) && - (Cutscene_GetSceneSetupIndex(globalCtx) != 0) && (globalCtx->sceneLoadFlag == 0)) { + (Cutscene_GetSceneSetupIndex(globalCtx) != 0) && (globalCtx->transitionTrigger == 0)) { Interface_ChangeAlpha(12); } else if (gSaveContext.minigameState == 1) { Interface_ChangeAlpha(8); @@ -2108,12 +2108,12 @@ void func_80111CB4(GlobalContext* globalCtx) { } } } else if ((gSaveContext.minigameState == 1) && (gSaveContext.save.entranceIndex == 0x8E10) && - (globalCtx->sceneLoadFlag == 0) && (globalCtx->transitionMode == 0)) { + (globalCtx->transitionTrigger == 0) && (globalCtx->transitionMode == 0)) { gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_DISABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED; Interface_ChangeAlpha(12); - } else if ((gSaveContext.save.entranceIndex == 0xD010) && (globalCtx->sceneLoadFlag == 0) && + } else if ((gSaveContext.save.entranceIndex == 0xD010) && (globalCtx->transitionTrigger == 0) && (globalCtx->transitionMode == 0)) { gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_DISABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED; @@ -2136,7 +2136,7 @@ void func_80111CB4(GlobalContext* globalCtx) { } if (sp28) { gSaveContext.unk_3F22 = 0; - if ((globalCtx->sceneLoadFlag == 0) && (globalCtx->transitionMode == 0)) { + if ((globalCtx->transitionTrigger == 0) && (globalCtx->transitionMode == 0)) { Interface_ChangeAlpha(50); } } @@ -3170,12 +3170,12 @@ void Magic_Add(GlobalContext* globalCtx, s16 magicToAdd) { void Magic_Reset(GameState* gamestate) { if ((gSaveContext.magicState != MAGIC_STATE_STEP_CAPACITY) && (gSaveContext.magicState != MAGIC_STATE_FILL)) { - sMagicBarOutlinePrimRed = sMagicBarOutlinePrimGreen = sMagicBarOutlinePrimBlue = 255; + sMagicMeterOutlinePrimRed = sMagicMeterOutlinePrimGreen = sMagicMeterOutlinePrimBlue = 255; gSaveContext.magicState = MAGIC_STATE_IDLE; } } -s32 Magic_Consume(GlobalContext* globalCtx, s16 magicToConsume, s16 consumeType) { +s32 Magic_Consume(GlobalContext* globalCtx, s16 magicToConsume, s16 type) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; if (!gSaveContext.save.playerData.isMagicAcquired) { @@ -3189,9 +3189,10 @@ s32 Magic_Consume(GlobalContext* globalCtx, s16 magicToConsume, s16 consumeType) return false; } - switch (consumeType) { - case MAGIC_BAR_CONSUME_NOW: // Deku Bubble + switch (type) { + case MAGIC_BAR_CONSUME_NOW: case MAGIC_BAR_CONSUME_NOW_ALT: + // Deku Bubble if ((gSaveContext.magicState == MAGIC_STATE_IDLE) || (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS)) { if (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS) { @@ -3225,7 +3226,7 @@ s32 Magic_Consume(GlobalContext* globalCtx, s16 magicToConsume, s16 consumeType) return false; } - case MAGIC_BAR_CONSUME_LENS: // Lens + case MAGIC_BAR_CONSUME_LENS: if (gSaveContext.magicState == MAGIC_STATE_IDLE) { if (gSaveContext.save.playerData.magic != 0) { interfaceCtx->magicConsumptionTimer = 80; @@ -3240,7 +3241,8 @@ s32 Magic_Consume(GlobalContext* globalCtx, s16 magicToConsume, s16 consumeType) return false; } - case MAGIC_BAR_CONSUME_WAIT_PREVIEW: // Spin Attack + case MAGIC_BAR_CONSUME_WAIT_PREVIEW: + // Spin Attack if ((gSaveContext.magicState == MAGIC_STATE_IDLE) || (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS)) { if (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS) { @@ -3254,7 +3256,8 @@ s32 Magic_Consume(GlobalContext* globalCtx, s16 magicToConsume, s16 consumeType) return false; } - case MAGIC_BAR_CONSUME_GORON_ZORA: // Zora Shock, Goron Spike Roll + case MAGIC_BAR_CONSUME_GORON_ZORA: + // Zora Shock, Goron Spike Roll if (gSaveContext.save.playerData.magic != 0) { interfaceCtx->magicConsumptionTimer = 10; gSaveContext.magicState = MAGIC_STATE_CONSUME_GORON_ZORA_SETUP; @@ -3263,7 +3266,8 @@ s32 Magic_Consume(GlobalContext* globalCtx, s16 magicToConsume, s16 consumeType) return false; } - case MAGIC_BAR_CONSUME_GIANTS_MASK: // Giants Mask + case MAGIC_BAR_CONSUME_GIANTS_MASK: + // Wearing Giants Mask if (gSaveContext.magicState == MAGIC_STATE_IDLE) { if (gSaveContext.save.playerData.magic != 0) { interfaceCtx->magicConsumptionTimer = R_MAGIC_CONSUME_TIMER_GIANT; @@ -3279,7 +3283,9 @@ s32 Magic_Consume(GlobalContext* globalCtx, s16 magicToConsume, s16 consumeType) return false; } - case MAGIC_BAR_CONSUME_DEITY_BEAM: // Fierce Deity Beam + case MAGIC_BAR_CONSUME_DEITY_BEAM: + // Using Fierce Deity Beam + // Consumes magic immediately if ((gSaveContext.magicState == MAGIC_STATE_IDLE) || (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS)) { if (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS) { @@ -3294,10 +3300,9 @@ s32 Magic_Consume(GlobalContext* globalCtx, s16 magicToConsume, s16 consumeType) play_sound(NA_SE_SY_ERROR); return false; } - - default: - return false; } + + return false; } void Magic_UpdateAddRequest(void) { @@ -3331,33 +3336,33 @@ void Magic_UpdateMeterBorderColor(void) { s16 borderChangeB; s16 index = sMagicBorderIndices[sMagicBorderStep]; - borderChangeR = ABS_ALT(sMagicBarOutlinePrimRed - sMagicBorderColors[index][0]) / sMagicBorderRatio; - borderChangeG = ABS_ALT(sMagicBarOutlinePrimGreen - sMagicBorderColors[index][1]) / sMagicBorderRatio; - borderChangeB = ABS_ALT(sMagicBarOutlinePrimBlue - sMagicBorderColors[index][2]) / sMagicBorderRatio; + borderChangeR = ABS_ALT(sMagicMeterOutlinePrimRed - sMagicBorderColors[index][0]) / sMagicBorderRatio; + borderChangeG = ABS_ALT(sMagicMeterOutlinePrimGreen - sMagicBorderColors[index][1]) / sMagicBorderRatio; + borderChangeB = ABS_ALT(sMagicMeterOutlinePrimBlue - sMagicBorderColors[index][2]) / sMagicBorderRatio; - if (sMagicBarOutlinePrimRed >= sMagicBorderColors[index][0]) { - sMagicBarOutlinePrimRed -= borderChangeR; + if (sMagicMeterOutlinePrimRed >= sMagicBorderColors[index][0]) { + sMagicMeterOutlinePrimRed -= borderChangeR; } else { - sMagicBarOutlinePrimRed += borderChangeR; + sMagicMeterOutlinePrimRed += borderChangeR; } - if (sMagicBarOutlinePrimGreen >= sMagicBorderColors[index][1]) { - sMagicBarOutlinePrimGreen -= borderChangeG; + if (sMagicMeterOutlinePrimGreen >= sMagicBorderColors[index][1]) { + sMagicMeterOutlinePrimGreen -= borderChangeG; } else { - sMagicBarOutlinePrimGreen += borderChangeG; + sMagicMeterOutlinePrimGreen += borderChangeG; } - if (sMagicBarOutlinePrimBlue >= sMagicBorderColors[index][2]) { - sMagicBarOutlinePrimBlue -= borderChangeB; + if (sMagicMeterOutlinePrimBlue >= sMagicBorderColors[index][2]) { + sMagicMeterOutlinePrimBlue -= borderChangeB; } else { - sMagicBarOutlinePrimBlue += borderChangeB; + sMagicMeterOutlinePrimBlue += borderChangeB; } sMagicBorderRatio--; if (sMagicBorderRatio == 0) { - sMagicBarOutlinePrimRed = sMagicBorderColors[index][0]; - sMagicBarOutlinePrimGreen = sMagicBorderColors[index][1]; - sMagicBarOutlinePrimBlue = sMagicBorderColors[index][2]; + sMagicMeterOutlinePrimRed = sMagicBorderColors[index][0]; + sMagicMeterOutlinePrimGreen = sMagicBorderColors[index][1]; + sMagicMeterOutlinePrimBlue = sMagicBorderColors[index][2]; sMagicBorderRatio = sMagicBorderColorTimerIndex[sMagicBorderStep]; @@ -3423,7 +3428,7 @@ void Magic_Update(GlobalContext* globalCtx) { gSaveContext.save.playerData.magic = 0; } gSaveContext.magicState = MAGIC_STATE_METER_FLASH_1; - sMagicBarOutlinePrimRed = sMagicBarOutlinePrimGreen = sMagicBarOutlinePrimBlue = 255; + sMagicMeterOutlinePrimRed = sMagicMeterOutlinePrimGreen = sMagicMeterOutlinePrimBlue = 255; } // fallthrough @@ -3436,13 +3441,14 @@ void Magic_Update(GlobalContext* globalCtx) { break; case MAGIC_STATE_RESET: - sMagicBarOutlinePrimRed = sMagicBarOutlinePrimGreen = sMagicBarOutlinePrimBlue = 255; + sMagicMeterOutlinePrimRed = sMagicMeterOutlinePrimGreen = sMagicMeterOutlinePrimBlue = 255; gSaveContext.magicState = MAGIC_STATE_IDLE; break; case MAGIC_STATE_CONSUME_LENS: + // Slowly consume magic while lens is on if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.debugState == 0) && (msgCtx->msgMode == 0) && - (globalCtx->gameOverCtx.state == 0) && (globalCtx->sceneLoadFlag == 0) && + (globalCtx->gameOverCtx.state == 0) && (globalCtx->transitionTrigger == 0) && (globalCtx->transitionMode == 0) && !Play_InCsMode(globalCtx)) { if ((gSaveContext.save.playerData.magic == 0) || @@ -3451,10 +3457,11 @@ void Magic_Update(GlobalContext* globalCtx) { (BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) != ITEM_LENS) && (BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) != ITEM_LENS)) || !globalCtx->actorCtx.lensActive) { + // Force lens off and set magic meter state to idle globalCtx->actorCtx.lensActive = false; play_sound(NA_SE_SY_GLASSMODE_OFF); gSaveContext.magicState = MAGIC_STATE_IDLE; - sMagicBarOutlinePrimRed = sMagicBarOutlinePrimGreen = sMagicBarOutlinePrimBlue = 255; + sMagicMeterOutlinePrimRed = sMagicMeterOutlinePrimGreen = sMagicMeterOutlinePrimBlue = 255; break; } @@ -3482,7 +3489,7 @@ void Magic_Update(GlobalContext* globalCtx) { // fallthrough case MAGIC_STATE_CONSUME_GORON_ZORA: if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.debugState == 0) && (msgCtx->msgMode == 0) && - (globalCtx->gameOverCtx.state == 0) && (globalCtx->sceneLoadFlag == 0) && + (globalCtx->gameOverCtx.state == 0) && (globalCtx->transitionTrigger == 0) && (globalCtx->transitionMode == 0)) { if (!Play_InCsMode(globalCtx)) { interfaceCtx->magicConsumptionTimer--; @@ -3504,7 +3511,7 @@ void Magic_Update(GlobalContext* globalCtx) { case MAGIC_STATE_CONSUME_GIANTS_MASK: if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.debugState == 0) && (msgCtx->msgMode == 0) && - (globalCtx->gameOverCtx.state == 0) && (globalCtx->sceneLoadFlag == 0) && + (globalCtx->gameOverCtx.state == 0) && (globalCtx->transitionTrigger == 0) && (globalCtx->transitionMode == 0)) { if (!Play_InCsMode(globalCtx)) { interfaceCtx->magicConsumptionTimer--; @@ -3548,16 +3555,16 @@ void Magic_DrawMeter(GlobalContext* globalCtx) { gDPSetEnvColor(OVERLAY_DISP++, 100, 50, 50, 255); OVERLAY_DISP = func_8010CFBC(OVERLAY_DISP, gMagicMeterEndTex, 8, 16, 18, magicBarY, 8, 16, 1 << 10, 1 << 10, - sMagicBarOutlinePrimRed, sMagicBarOutlinePrimGreen, sMagicBarOutlinePrimBlue, + sMagicMeterOutlinePrimRed, sMagicMeterOutlinePrimGreen, sMagicMeterOutlinePrimBlue, interfaceCtx->magicAlpha); OVERLAY_DISP = func_8010CFBC(OVERLAY_DISP, gMagicMeterMidTex, 24, 16, 26, magicBarY, ((void)0, gSaveContext.magicCapacity), - 16, 1 << 10, 1 << 10, sMagicBarOutlinePrimRed, sMagicBarOutlinePrimGreen, - sMagicBarOutlinePrimBlue, interfaceCtx->magicAlpha); + 16, 1 << 10, 1 << 10, sMagicMeterOutlinePrimRed, sMagicMeterOutlinePrimGreen, + sMagicMeterOutlinePrimBlue, interfaceCtx->magicAlpha); OVERLAY_DISP = func_8010D480(OVERLAY_DISP, gMagicMeterEndTex, 8, 16, ((void)0, gSaveContext.magicCapacity) + 26, magicBarY, - 8, 16, 1 << 10, 1 << 10, sMagicBarOutlinePrimRed, sMagicBarOutlinePrimGreen, - sMagicBarOutlinePrimBlue, interfaceCtx->magicAlpha, 3, 0x100); + 8, 16, 1 << 10, 1 << 10, sMagicMeterOutlinePrimRed, sMagicMeterOutlinePrimGreen, + sMagicMeterOutlinePrimBlue, interfaceCtx->magicAlpha, 3, 0x100); gDPPipeSync(OVERLAY_DISP++); gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, PRIMITIVE, PRIMITIVE, @@ -5114,7 +5121,7 @@ void func_8011C808(GlobalContext* globalCtx) { gSaveContext.save.time = 0x400A; globalCtx->nextEntranceIndex = 0x54C0; gSaveContext.nextCutsceneIndex = 0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 3; } @@ -5173,7 +5180,7 @@ void Interface_DrawTimers(GlobalContext* globalCtx) { (globalCtx->gameOverCtx.state == 0) && ((msgCtx->msgMode == 0) || ((msgCtx->msgMode != 0) && (msgCtx->currentTextId >= 0x1BB2) && (msgCtx->currentTextId <= 0x1BB6))) && - !(player->stateFlags1 & 0x200) && (globalCtx->sceneLoadFlag == 0) && (globalCtx->transitionMode == 0) && + !(player->stateFlags1 & 0x200) && (globalCtx->transitionTrigger == 0) && (globalCtx->transitionMode == 0) && !Play_InCsMode(globalCtx)) { if (D_801BF968) { @@ -5353,7 +5360,7 @@ void Interface_DrawTimers(GlobalContext* globalCtx) { if ((globalCtx->sceneNum == SCENE_OKUJOU) && (gSaveContext.sceneSetupIndex == 3)) { globalCtx->nextEntranceIndex = 0x5410; gSaveContext.nextCutsceneIndex = 0xFFF0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; } else { func_8011C808(globalCtx); } @@ -5601,7 +5608,7 @@ void Interface_UpdateTimers(GlobalContext* globalCtx) { (globalCtx->gameOverCtx.state == 0) && ((msgCtx->msgMode == 0) || ((msgCtx->currentTextId >= 0x100) && (msgCtx->currentTextId <= 0x200)) || ((msgCtx->currentTextId >= 0x1BB2) && (msgCtx->currentTextId <= 0x1BB6))) && - (globalCtx->sceneLoadFlag == 0) && (globalCtx->transitionMode == 0) && !Play_InCsMode(globalCtx)) { + (globalCtx->transitionTrigger == 0) && (globalCtx->transitionMode == 0) && !Play_InCsMode(globalCtx)) { if (D_801BF96C) { var3 = osGetTime(); diff --git a/src/code/z_play.c b/src/code/z_play.c index aa360934e..6227eb3bd 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -215,7 +215,7 @@ void func_80169EFC(GameState* gameState) { globalCtx->nextEntranceIndex = gSaveContext.respawn[RESTART_MODE_DOWN].entranceIndex; gSaveContext.respawnFlag = 1; func_80169ECC(globalCtx); - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 2; } @@ -227,7 +227,7 @@ void func_80169F78(GameState* gameState) { globalCtx->nextEntranceIndex = gSaveContext.respawn[RESTART_MODE_TOP].entranceIndex; gSaveContext.respawnFlag = -1; func_80169ECC(globalCtx); - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 2; } diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index 973760773..0e68e6d93 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -249,7 +249,7 @@ void func_809542A0(BgIngate* this, GlobalContext* globalCtx) { globalCtx->nextEntranceIndex = 0xA810; } gSaveContext.nextCutsceneIndex = 0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 3; gSaveContext.nextTransition = 3; this->actionFunc = func_80953F8C; diff --git a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c index b778f3fcc..1d4ca29bd 100644 --- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c +++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c @@ -1566,7 +1566,7 @@ void DmStk_Update(Actor* thisx, GlobalContext* globalCtx) { if ((globalCtx->actorCtx.unk5 & 2) && (globalCtx->msgCtx.msgMode != 0) && (globalCtx->msgCtx.currentTextId == 0x5E6) && !FrameAdvance_IsEnabled(&globalCtx->state) && - (globalCtx->sceneLoadFlag == 0) && (ActorCutscene_GetCurrentIndex() == -1) && + (globalCtx->transitionTrigger == 0) && (ActorCutscene_GetCurrentIndex() == -1) && (globalCtx->csCtx.state == 0)) { gSaveContext.save.time = ((void)0, gSaveContext.save.time) + (u16)REG(15); if (REG(15) != 0) { diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index c20f17cce..bfb9d222a 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -129,7 +129,7 @@ void DoorAna_WaitOpen(DoorAna* this, GlobalContext* globalCtx) { s32 grottoType = DOORANA_GET_TYPE(&this->actor); if (Math_StepToF(&this->actor.scale.x, 0.01f, 0.001f)) { - if (this->actor.targetMode != 0 && globalCtx->sceneLoadFlag == 0 && globalCtx->transitionMode == 0 && + if (this->actor.targetMode != 0 && globalCtx->transitionTrigger == 0 && globalCtx->transitionMode == 0 && (player->stateFlags1 & 0x80000000) && player->unk_AE7 == 0) { if (grottoType == DOORANA_TYPE_VISIBLE_SCENE_EXIT) { diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index dd41ac015..c7f013570 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -486,7 +486,7 @@ void func_808B98A8(DoorWarp1* this, GlobalContext* globalCtx) { if (DOORWARP1_GET_FF00_1(&this->dyna.actor) != 0xFF) { globalCtx->nextEntranceIndex = globalCtx->setupExitList[DOORWARP1_GET_FF00_3(&this->dyna.actor)]; Scene_SetExitFade(globalCtx); - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; } else { func_80169FDC(&globalCtx->state); } @@ -704,7 +704,7 @@ void func_808BA10C(DoorWarp1* this, GlobalContext* globalCtx) { gSaveContext.nextCutsceneIndex = phi_v0_3 + 0xFFF0; } - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 3; gSaveContext.nextTransition = 3; } else { @@ -713,13 +713,13 @@ void func_808BA10C(DoorWarp1* this, GlobalContext* globalCtx) { if (gSaveContext.save.weekEventReg[20] & 2) { gSaveContext.save.weekEventReg[7] |= 0x80; globalCtx->nextEntranceIndex = 0x3010; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 3; gSaveContext.nextTransition = 3; } else { globalCtx->nextEntranceIndex = 0x8600; gSaveContext.nextCutsceneIndex = 0xFFF0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 3; gSaveContext.nextTransition = 3; } @@ -728,7 +728,7 @@ void func_808BA10C(DoorWarp1* this, GlobalContext* globalCtx) { case 1: gSaveContext.save.weekEventReg[33] |= 0x80; globalCtx->nextEntranceIndex = 0xAE70; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 3; gSaveContext.nextTransition = 3; break; @@ -737,14 +737,14 @@ void func_808BA10C(DoorWarp1* this, GlobalContext* globalCtx) { if (gSaveContext.save.weekEventReg[55] & 0x80) { globalCtx->nextEntranceIndex = 0x6A90; gSaveContext.nextCutsceneIndex = 0xFFF0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 3; gSaveContext.nextTransition = 3; } else { gSaveContext.save.weekEventReg[55] |= 0x80; globalCtx->nextEntranceIndex = 0x6A80; gSaveContext.nextCutsceneIndex = 0xFFF0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 3; gSaveContext.nextTransition = 3; } @@ -754,7 +754,7 @@ void func_808BA10C(DoorWarp1* this, GlobalContext* globalCtx) { gSaveContext.save.weekEventReg[52] |= 0x20; globalCtx->nextEntranceIndex = 0x20F0; gSaveContext.nextCutsceneIndex = 0xFFF2; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 3; gSaveContext.nextTransition = 3; break; @@ -766,7 +766,7 @@ void func_808BA10C(DoorWarp1* this, GlobalContext* globalCtx) { } globalCtx->nextEntranceIndex = globalCtx->setupExitList[DOORWARP1_GET_FF00_3(&this->dyna.actor)]; Scene_SetExitFade(globalCtx); - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; } else { func_80169FDC(&globalCtx->state); } diff --git a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c index 89f949a9d..4138fa060 100644 --- a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c +++ b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c @@ -421,7 +421,7 @@ void func_809C1C9C(EnAob01* this, GlobalContext* globalCtx) { gSaveContext.nextTransition = 0x40; gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & (u8)~7) | 2; gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & 7) | (this->unk_432 * 8); - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; } } @@ -671,7 +671,7 @@ void func_809C2788(EnAob01* this, GlobalContext* globalCtx) { gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & (u8)~7) | 3; globalCtx->unk_1887F = 0x40; gSaveContext.nextTransition = 3; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; } } } diff --git a/src/overlays/actors/ovl_En_Baba/z_en_baba.c b/src/overlays/actors/ovl_En_Baba/z_en_baba.c index 4d9c7bad3..67c4e68de 100644 --- a/src/overlays/actors/ovl_En_Baba/z_en_baba.c +++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.c @@ -255,7 +255,7 @@ void func_80BA8C4C(GlobalContext* globalCtx, u16 nextEntrance) { globalCtx->nextEntranceIndex = nextEntrance; globalCtx->unk_1887F = 0x40; gSaveContext.nextTransition = 0x40; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; } void func_80BA8C90(EnBaba* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index 4270ae46f..534c143df 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -335,7 +335,7 @@ void func_809C51B4(EnBomBowlMan* this, GlobalContext* globalCtx) { ((globalCtx->msgCtx.msgMode == 0) || (Message_GetState(&globalCtx->msgCtx) == 6))) { globalCtx->nextEntranceIndex = Entrance_CreateIndexFromSpawn(6); gSaveContext.nextCutsceneIndex = 0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 0x56; gSaveContext.nextTransition = 3; gSaveContext.save.weekEventReg[75] &= (u8)~0x40; diff --git a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c index 300679a4e..12fd9d2cb 100644 --- a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c +++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c @@ -759,7 +759,7 @@ void func_80BFFBC4(EnBomjima* this, GlobalContext* globalCtx) { func_801477B4(globalCtx); globalCtx->nextEntranceIndex = Entrance_CreateIndexFromSpawn(6); gSaveContext.nextCutsceneIndex = 0; - globalCtx->sceneLoadFlag = 20; + globalCtx->transitionTrigger = 20; globalCtx->unk_1887F = 0x56; gSaveContext.nextTransition = 3; ActorCutscene_Stop(this->unk_2D4[1]); diff --git a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c index a0392018a..7caf48737 100644 --- a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c +++ b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c @@ -789,11 +789,11 @@ void func_80C02CA4(EnBomjimb* this, GlobalContext* globalCtx) { globalCtx->nextEntranceIndex = globalCtx->setupExitList[this->unk_2B2]; gSaveContext.nextCutsceneIndex = 0; Scene_SetExitFade(globalCtx); - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; } else { globalCtx->nextEntranceIndex = Entrance_CreateIndexFromSpawn(5); gSaveContext.nextCutsceneIndex = 0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 0x56; gSaveContext.nextTransition = 3; } diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index 6b7943504..728294b79 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -442,7 +442,7 @@ void func_8092D330(EnDns* this, GlobalContext* globalCtx) { this->unk_2C6 &= ~0x100; globalCtx->nextEntranceIndex = 0x5010; gSaveContext.nextCutsceneIndex = 0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 3; gSaveContext.nextTransition = 3; } diff --git a/src/overlays/actors/ovl_En_Fall/z_en_fall.c b/src/overlays/actors/ovl_En_Fall/z_en_fall.c index dabd62e0f..242527739 100644 --- a/src/overlays/actors/ovl_En_Fall/z_en_fall.c +++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.c @@ -342,7 +342,7 @@ void EnFall_CrashingMoon_HandleGiantsCutscene(EnFall* this, GlobalContext* globa } else if (globalCtx->csCtx.frames > 1600) { globalCtx->nextEntranceIndex = 0x2C00; gSaveContext.nextCutsceneIndex = 0xFFF2; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 2; gSaveContext.nextTransition = 2; sGiantsCutsceneState = 9; diff --git a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c index 51508fc20..4d94023c1 100644 --- a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c +++ b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c @@ -359,14 +359,14 @@ void func_80B0FE18(GlobalContext* globalCtx) { globalCtx->nextEntranceIndex = 0x9C10; globalCtx->unk_1887F = 0x40; gSaveContext.nextTransition = 0x40; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; } void func_80B0FE7C(GlobalContext* globalCtx) { globalCtx->nextEntranceIndex = 0x9C20; globalCtx->unk_1887F = 0x40; gSaveContext.nextTransition = 0x40; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; } void func_80B0FEBC(EnGb2* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Gk/z_en_gk.c b/src/overlays/actors/ovl_En_Gk/z_en_gk.c index 6981c8874..9449762ab 100644 --- a/src/overlays/actors/ovl_En_Gk/z_en_gk.c +++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.c @@ -724,7 +724,7 @@ void func_80B51B40(EnGk* this, GlobalContext* globalCtx) { if (this->unk_31C == 0xE8F) { globalCtx->nextEntranceIndex = 0xD010; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 3; gSaveContext.nextTransition = 3; Magic_Add(globalCtx, diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c index 7e54332a1..fd981483d 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -162,7 +162,7 @@ void EnHoll_VisibleIdle(EnHoll* this, GlobalContext* globalCtx) { func_800B9010(&this->actor, NA_SE_EV_INVISIBLE_MONKEY - SFX_FLAG); } } - if ((globalCtx->sceneLoadFlag != 0) || (globalCtx->transitionMode != 0)) { + if ((globalCtx->transitionTrigger != 0) || (globalCtx->transitionMode != 0)) { this->alpha = 255; } else { f32 enHollBottom = EN_HOLL_BOTTOM_DEFAULT; @@ -191,7 +191,7 @@ void EnHoll_VisibleIdle(EnHoll* this, GlobalContext* globalCtx) { globalCtx->nextEntranceIndex = globalCtx->setupExitList[EN_HOLL_GET_EXIT_LIST_INDEX(this)]; gSaveContext.unk_3DBB = 1; Scene_SetExitFade(globalCtx); - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1878C(globalCtx); } else { this->actor.room = globalCtx->doorCtx.transitionActorList[enHollId].sides[this->playerSide ^ 1].room; @@ -309,7 +309,7 @@ void EnHoll_Update(Actor* thisx, GlobalContext* globalCtx) { EnHoll* this = THIS; Player* player = GET_PLAYER(globalCtx); - if ((globalCtx->sceneLoadFlag == 0) && (globalCtx->transitionMode == 0) && !(player->stateFlags1 & 0x200)) { + if ((globalCtx->transitionTrigger == 0) && (globalCtx->transitionMode == 0) && !(player->stateFlags1 & 0x200)) { this->actionFunc(this, globalCtx); } } diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index 75ef98bf9..02cb8ba0b 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -2917,7 +2917,7 @@ void EnHorse_UpdateHorsebackArchery(EnHorse* this, GlobalContext* globalCtx) { if (((this->hbaFlags & 1) || (this->hbaTimer > 45)) && (sp28 != 1) && (gSaveContext.minigameState != 3)) { gSaveContext.save.cutscene = 0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 0x40; } diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index 7b9fa684e..1a5f33f45 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -173,7 +173,7 @@ s32 func_808F8EB0(EnHorseGameCheck* this, GlobalContext* globalCtx) { D_801BDAA0 = 1; } globalCtx->nextEntranceIndex = 0xCE20; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; return false; } diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index e15e3adb3..dba5f9f16 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -215,7 +215,7 @@ void func_809532C0(EnHs* this, GlobalContext* globalCtx) { void func_809532D0(EnHs* this, GlobalContext* globalCtx) { if (DECR(this->unk_2A2) == 0) { globalCtx->nextEntranceIndex = globalCtx->setupExitList[ENHS_GET_F(&this->actor)]; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; gSaveContext.save.weekEventReg[25] |= 8; this->actionFunc = func_809532C0; } diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index 31bd34cc6..6ea4e07c9 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -820,7 +820,7 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) { func_800FD750(NA_BGM_HORSE); globalCtx->nextEntranceIndex = 0xCE50; globalCtx->unk_1887F = 5; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; gSaveContext.save.weekEventReg[57] |= 1; break; case 0x3478: @@ -1067,7 +1067,7 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) { func_800FD750(NA_BGM_HORSE); globalCtx->nextEntranceIndex = 0xCE50; globalCtx->unk_1887F = 5; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; gSaveContext.save.weekEventReg[57] |= 1; break; case 0x349D: diff --git a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c index 557b96b31..3f26aee78 100644 --- a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c +++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c @@ -1998,7 +1998,7 @@ void func_80B47108(EnInvadepoh* this, GlobalContext* globalCtx) { if (this->actionTimer <= 0) { globalCtx->nextEntranceIndex = 0x6460; gSaveContext.nextCutsceneIndex = 0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 0x49; gSaveContext.nextTransition = 0x48; D_801BDAA0 = 1; @@ -2016,7 +2016,7 @@ void func_80B471E0(EnInvadepoh* this, GlobalContext* globalCtx) { if (D_80B4E998) { globalCtx->nextEntranceIndex = 0x6470; gSaveContext.nextCutsceneIndex = 0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 0x48; gSaveContext.nextTransition = 0x48; func_80B47248(this); @@ -2039,7 +2039,7 @@ void func_80B47278(EnInvadepoh* this) { void func_80B47298(EnInvadepoh* this, GlobalContext* globalCtx) { globalCtx->nextEntranceIndex = 0x6400; gSaveContext.nextCutsceneIndex = 0xFFF3; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 0x48; gSaveContext.nextTransition = 0x48; gSaveContext.save.weekEventReg[89] |= 0x10; diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c index a3878d9f2..3f62b864f 100644 --- a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c +++ b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c @@ -368,7 +368,7 @@ void func_80C144E4(EnJgameTsn* this) { void func_80C144F8(EnJgameTsn* this, GlobalContext* globalCtx) { globalCtx->nextEntranceIndex = 0x68D0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 0x50; gSaveContext.nextTransition = 3; } diff --git a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c index 9a6ffeffd..d9781972c 100644 --- a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c +++ b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c @@ -515,7 +515,7 @@ void func_80B41A48(EnKgy* this, GlobalContext* globalCtx) { this->unk_2E4--; } else { globalCtx->nextEntranceIndex = globalCtx->setupExitList[ENKGY_GET_1F(&this->actor)]; - globalCtx->sceneLoadFlag = 20; + globalCtx->transitionTrigger = 20; } } diff --git a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c index 73a559a70..7e2937507 100644 --- a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c +++ b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c @@ -298,7 +298,7 @@ void EnLookNuts_SendPlayerToSpawn(EnLookNuts* this, GlobalContext* globalCtx) { globalCtx->nextEntranceIndex = Entrance_CreateIndexFromSpawn(this->spawnIndex); gSaveContext.nextCutsceneIndex = 0; Scene_SetExitFade(globalCtx); - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; gSaveContext.save.weekEventReg[17] |= 4; } } diff --git a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c index 4d96184be..089d63907 100644 --- a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c +++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c @@ -668,7 +668,7 @@ void EnMa4_SetupBeginHorsebackGame(EnMa4* this) { void EnMa4_BeginHorsebackGame(EnMa4* this, GlobalContext* globalCtx) { globalCtx->nextEntranceIndex = 0x6400; gSaveContext.nextCutsceneIndex = 0xFFF0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 0x50; gSaveContext.nextTransition = 3; } @@ -760,7 +760,7 @@ void EnMa4_HorsebackGameEnd(EnMa4* this, GlobalContext* globalCtx) { globalCtx->nextEntranceIndex = 0x6410; gSaveContext.nextCutsceneIndex = 0; sFrameCounter = 0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; if (this->poppedBalloonCounter == 10) { globalCtx->unk_1887F = 0x50; @@ -865,7 +865,7 @@ void EnMa4_SetupBeginDescribeThemCs(EnMa4* this) { void EnMa4_BeginDescribeThemCs(EnMa4* this, GlobalContext* globalCtx) { globalCtx->nextEntranceIndex = 0x6400; gSaveContext.nextCutsceneIndex = 0xFFF5; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 0x40; gSaveContext.nextTransition = 2; } diff --git a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c index 5847aa897..5577b5aad 100644 --- a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c +++ b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c @@ -1088,7 +1088,7 @@ void EnMaYto_PostMilkRunEnd(EnMaYto* this, GlobalContext* globalCtx) { globalCtx->nextEntranceIndex = 0x6480; } gSaveContext.nextCutsceneIndex = 0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 0x50; gSaveContext.nextTransition = 3; } diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c index 907ba619b..621b4fc27 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -381,7 +381,7 @@ void EnMag_Update(Actor* thisx, GlobalContext* globalCtx) { if (CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_START) || CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_A) || CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_B)) { - if (globalCtx->sceneLoadFlag != 0x14) { + if (globalCtx->transitionTrigger != 0x14) { Audio_SetCutsceneFlag(false); D_801BB12C++; if (D_801BB12C >= 2) { @@ -389,7 +389,7 @@ void EnMag_Update(Actor* thisx, GlobalContext* globalCtx) { } play_sound(NA_SE_SY_PIECE_OF_HEART); gSaveContext.gameMode = 2; // Go to FileChoose - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 2; globalCtx->nextEntranceIndex = 0x1C00; gSaveContext.save.cutscene = 0; diff --git a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c index 2d1dcc4ad..39c9b28a0 100644 --- a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c +++ b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c @@ -242,7 +242,7 @@ s32 EnMttag_ExitRace(GlobalContext* globalCtx, s32 arg1, s32 nextTransition) { gSaveContext.nextCutsceneIndex = 0; } - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = arg1; gSaveContext.nextTransition = nextTransition; func_801477B4(globalCtx); @@ -428,7 +428,7 @@ void EnMttag_PotentiallyRestartRace(EnMttag* this, GlobalContext* globalCtx) { gSaveContext.nextCutsceneIndex = 0; } - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 2; gSaveContext.nextTransition = 2; func_801477B4(globalCtx); diff --git a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c index 06cf9b22d..cd8afbd71 100644 --- a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c +++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c @@ -684,7 +684,7 @@ void func_80BD9B4C(EnPamera* this, GlobalContext* globalCtx) { void func_80BD9C70(EnPamera* this, GlobalContext* globalCtx) { globalCtx->nextEntranceIndex = 0x2020; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 0x46; gSaveContext.nextTransition = 2; } diff --git a/src/overlays/actors/ovl_En_Shn/z_en_shn.c b/src/overlays/actors/ovl_En_Shn/z_en_shn.c index bc5f24ee2..5a0ea95f3 100644 --- a/src/overlays/actors/ovl_En_Shn/z_en_shn.c +++ b/src/overlays/actors/ovl_En_Shn/z_en_shn.c @@ -260,7 +260,7 @@ s32 func_80AE6704(EnShn* thisx, GlobalContext* globalCtx) { func_800B7298(globalCtx, &this->actor, 7); globalCtx->nextEntranceIndex = 0x8460; gSaveContext.nextCutsceneIndex = 0; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 3; gSaveContext.nextTransition = 7; this->unk_2C6++; diff --git a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c index 613e6d6c7..f27ff6ec8 100644 --- a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c +++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c @@ -223,7 +223,7 @@ void EnSuttari_SetNextEntrance(GlobalContext* globalCtx, u16 nextEntranceIndex) globalCtx->nextEntranceIndex = nextEntranceIndex; globalCtx->unk_1887F = 0x40; gSaveContext.nextTransition = 0x40; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; } void EnSuttari_UpdateTime(void) { diff --git a/src/overlays/actors/ovl_En_Test4/z_en_test4.c b/src/overlays/actors/ovl_En_Test4/z_en_test4.c index fc3b5182b..4f11d5ae2 100644 --- a/src/overlays/actors/ovl_En_Test4/z_en_test4.c +++ b/src/overlays/actors/ovl_En_Test4/z_en_test4.c @@ -457,7 +457,7 @@ void func_80A42AB8(EnTest4* this, GlobalContext* globalCtx) { globalCtx->nextEntranceIndex = 0xD800; } gSaveContext.nextCutsceneIndex = 0xFFF1; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 2; player->stateFlags1 |= 0x200; Actor_MarkForDeath(&this->actor); diff --git a/src/overlays/actors/ovl_En_Test6/z_en_test6.c b/src/overlays/actors/ovl_En_Test6/z_en_test6.c index de1a18241..7d04f6fdd 100644 --- a/src/overlays/actors/ovl_En_Test6/z_en_test6.c +++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.c @@ -979,7 +979,7 @@ void func_80A92950(EnTest6* this, GlobalContext* globalCtx) { Play_SetRespawnData(&globalCtx->state, 1, ((void)0, gSaveContext.save.entranceIndex & 0xFFFF), player->unk_3CE, 0xBFF, &player->unk_3C0, player->unk_3CC); this->unk_276 = 99; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->nextEntranceIndex = gSaveContext.respawn[RESTART_MODE_RETURN].entranceIndex; globalCtx->unk_1887F = 2; if ((gSaveContext.save.time > CLOCK_TIME(18, 0)) || (gSaveContext.save.time < CLOCK_TIME(6, 0))) { @@ -1060,7 +1060,7 @@ void func_80A92950(EnTest6* this, GlobalContext* globalCtx) { Play_SetRespawnData(&globalCtx->state, 1, ((void)0, gSaveContext.save.entranceIndex & 0xFFFF), player->unk_3CE, 0xBFF, &player->unk_3C0, player->unk_3CC); this->unk_276 = 99; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->nextEntranceIndex = gSaveContext.respawn[RESTART_MODE_RETURN].entranceIndex; globalCtx->unk_1887F = 2; gSaveContext.respawnFlag = 2; diff --git a/src/overlays/actors/ovl_En_Test7/z_en_test7.c b/src/overlays/actors/ovl_En_Test7/z_en_test7.c index c5fda21f0..1c536952c 100644 --- a/src/overlays/actors/ovl_En_Test7/z_en_test7.c +++ b/src/overlays/actors/ovl_En_Test7/z_en_test7.c @@ -669,7 +669,7 @@ void func_80AF2350(EnTest7* this, GlobalContext* globalCtx) { } } - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->unk_1887F = 2; gSaveContext.seqIndex = 0xFF; gSaveContext.nightSeqIndex = 0xFF; diff --git a/src/overlays/actors/ovl_En_Trt/z_en_trt.c b/src/overlays/actors/ovl_En_Trt/z_en_trt.c index 4499948dc..0ffd73efd 100644 --- a/src/overlays/actors/ovl_En_Trt/z_en_trt.c +++ b/src/overlays/actors/ovl_En_Trt/z_en_trt.c @@ -1040,7 +1040,7 @@ void EnTrt_ShopkeeperGone(EnTrt* this, GlobalContext* globalCtx) { } globalCtx->unk_1887F = 0x40; gSaveContext.nextTransition = 0x40; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; } } diff --git a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c index e191cc3cd..ce4f92f1b 100644 --- a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c +++ b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c @@ -376,7 +376,7 @@ void func_80B76BB8(EnTruMt* this, GlobalContext* globalCtx) { globalCtx->nextEntranceIndex = 0xA810; globalCtx->unk_1887F = 3; gSaveContext.nextTransition = 3; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; } } } diff --git a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c index 5759b0a9b..754f96240 100644 --- a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c +++ b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c @@ -243,7 +243,7 @@ void EnWarpTag_GrottoReturn(EnWarptag* this, GlobalContext* globalCtx) { if (this->grottoExitDelay++ == 10) { globalCtx->nextEntranceIndex = globalCtx->setupExitList[GET_WARPTAG_EXIT_INDEX(&this->dyna.actor)]; Scene_SetExitFade(globalCtx); - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; func_8019F128(NA_SE_OC_SECRET_HOLE_OUT); func_801A4058(5); if (1) {} diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c index 3d6023616..5eea78fec 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c @@ -486,7 +486,8 @@ void EnWeatherTag_Update(Actor* thisx, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); if ((globalCtx->actorCtx.unk5 & 2) && (globalCtx->msgCtx.msgMode != 0) && (globalCtx->msgCtx.currentTextId == 0x5E6) && (!FrameAdvance_IsEnabled(&globalCtx->state)) && - (globalCtx->sceneLoadFlag == 0) && (ActorCutscene_GetCurrentIndex() == -1) && (globalCtx->csCtx.state == 0)) { + (globalCtx->transitionTrigger == 0) && (ActorCutscene_GetCurrentIndex() == -1) && + (globalCtx->csCtx.state == 0)) { gSaveContext.save.time = ((void)0, gSaveContext.save.time) + (u16)REG(0xF); if (REG(0xF) != 0) { diff --git a/src/overlays/actors/ovl_En_Zov/z_en_zov.c b/src/overlays/actors/ovl_En_Zov/z_en_zov.c index f593709cf..9bb9cb976 100644 --- a/src/overlays/actors/ovl_En_Zov/z_en_zov.c +++ b/src/overlays/actors/ovl_En_Zov/z_en_zov.c @@ -425,7 +425,7 @@ void func_80BD1DB8(EnZov* this, GlobalContext* globalCtx) { case 0x1039: globalCtx->nextEntranceIndex = globalCtx->setupExitList[ENZOV_GET_FE00(&this->actor)]; globalCtx->unk_1887F = 5; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; gSaveContext.save.weekEventReg[78] |= 1; this->actionFunc = func_80BD1D94; globalCtx->msgCtx.unk11F10 = 0; diff --git a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c index 2ff0e093e..56c839ed8 100644 --- a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c +++ b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c @@ -443,7 +443,7 @@ void func_80BA3344(ObjNozoki* this, GlobalContext* globalCtx) { } } else if ((this->dyna.actor.textId == 0) || Actor_TextboxIsClosing(&this->dyna.actor, globalCtx)) { globalCtx->nextEntranceIndex = 0xE20; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; } } diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c index 95f0eb3a8..7d647b919 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -457,7 +457,7 @@ void ObjTokeidai_TowerOpening_EndCutscene(ObjTokeidai* this, GlobalContext* glob gSaveContext.save.cutscene = 0; gSaveContext.nextCutsceneIndex = 0; gSaveContext.respawnFlag = 2; - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; globalCtx->nextEntranceIndex = gSaveContext.respawn[RESTART_MODE_RETURN].entranceIndex; globalCtx->unk_1887F = 2; if (gSaveContext.respawn[RESTART_MODE_RETURN].playerParams == 0xCFF) { diff --git a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c index 34d82523f..6dd29c77a 100644 --- a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c +++ b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c @@ -117,7 +117,7 @@ void func_808A7C78(ObjWturn* this, GlobalContext* globalCtx) { } else { globalCtx->nextEntranceIndex = 0xAA10; } - globalCtx->sceneLoadFlag = 0x14; + globalCtx->transitionTrigger = 0x14; } }