diff options
| author | Jordan Longstaff <JordanLongstaff@users.noreply.github.com> | 2024-12-11 05:51:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-11 05:51:51 -0500 |
| commit | c780c4e147ddeb56c59fa44e2d9ccc7d9fbc00b8 (patch) | |
| tree | c76d9e85e77440b3c4f7301a443881090a943044 /src | |
| parent | b01b20697e11c6b9c3b285ac045f1d7f49da3122 (diff) | |
Rename EVENTCHKINF_69 (#2330)
* Rename EVENTCHKINF_69
* Rename CS flag
Diffstat (limited to 'src')
| -rw-r--r-- | src/code/z_demo.c | 4 | ||||
| -rw-r--r-- | src/code/z_scene_table.c | 2 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 60368ddc3..7908c7cca 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -404,8 +404,8 @@ void CutsceneCmd_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdMisc* cmd) { SET_EVENTCHKINF(EVENTCHKINF_DRAINED_WELL); break; - case CS_MISC_SET_FLAG_LAKE_HYLIA_RESTORED: - SET_EVENTCHKINF(EVENTCHKINF_69); + case CS_MISC_SET_FLAG_RESTORED_LAKE_HYLIA: + SET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA); break; case CS_MISC_VISMONO_BLACK_AND_WHITE: diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index a64932f42..a6a08ccd1 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -1226,7 +1226,7 @@ void Scene_DrawConfigLakeHylia(PlayState* play) { OPEN_DISPS(play->state.gfxCtx, "../z_scene_table.c", 7058); - if (IS_CUTSCENE_LAYER || (LINK_IS_ADULT && !GET_EVENTCHKINF(EVENTCHKINF_69))) { + if (IS_CUTSCENE_LAYER || (LINK_IS_ADULT && !GET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA))) { play->roomCtx.drawParams[0] = 87; } diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c index 459667c5a..474ba145c 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c @@ -124,7 +124,7 @@ void BgSpot06Objects_Init(Actor* thisx, PlayState* play) { Collider_SetJntSph(play, &this->collider, thisx, &sJntSphInit, this->colliderItem); if (LINK_IS_ADULT && Flags_GetSwitch(play, this->switchFlag)) { - if (!GET_EVENTCHKINF(EVENTCHKINF_69)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA)) { thisx->home.pos.y = thisx->world.pos.y = WATER_LEVEL_LOWERED; } else { thisx->home.pos.y = thisx->world.pos.y = WATER_LEVEL_RAISED; @@ -150,7 +150,7 @@ void BgSpot06Objects_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(thisx, sInitChainWaterPlane); thisx->flags = ACTOR_FLAG_4 | ACTOR_FLAG_5; - if (LINK_IS_ADULT && !GET_EVENTCHKINF(EVENTCHKINF_69)) { + if (LINK_IS_ADULT && !GET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA)) { if (!IS_CUTSCENE_LAYER) { this->lakeHyliaWaterLevel = -681.0f; play->colCtx.colHeader->waterBoxes[LHWB_GERUDO_VALLEY_RIVER_LOWER].ySurface = @@ -482,7 +482,7 @@ void BgSpot06Objects_Draw(Actor* thisx, PlayState* play) { * cleared. */ void BgSpot06Objects_WaterPlaneCutsceneWait(BgSpot06Objects* this, PlayState* play) { - if (GET_EVENTCHKINF(EVENTCHKINF_69)) { + if (GET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA)) { this->actionFunc = BgSpot06Objects_WaterPlaneCutsceneRise; } } |