diff --git a/include/z64cutscene.h b/include/z64cutscene.h index 76827116aa..7fcddc8d78 100644 --- a/include/z64cutscene.h +++ b/include/z64cutscene.h @@ -175,7 +175,7 @@ typedef enum CutsceneMiscType { /* 0x12 */ CS_MISC_STOP_STORM_AND_ADVANCE_TO_DAY, /* 0x13 */ CS_MISC_SET_FLAG_FAST_WINDMILL, /* 0x14 */ CS_MISC_SET_FLAG_DRAINED_WELL, - /* 0x15 */ CS_MISC_SET_FLAG_LAKE_HYLIA_RESTORED, + /* 0x15 */ CS_MISC_SET_FLAG_RESTORED_LAKE_HYLIA, /* 0x16 */ CS_MISC_VISMONO_BLACK_AND_WHITE, /* 0x17 */ CS_MISC_VISMONO_SEPIA, /* 0x18 */ CS_MISC_HIDE_ROOM, diff --git a/include/z64save.h b/include/z64save.h index d8c2facbea..f3f8eb9c82 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -537,7 +537,7 @@ typedef enum LinkAge { #define EVENTCHKINF_65 0x65 #define EVENTCHKINF_DRAINED_WELL 0x67 #define EVENTCHKINF_68 0x68 -#define EVENTCHKINF_69 0x69 +#define EVENTCHKINF_RESTORED_LAKE_HYLIA 0x69 #define EVENTCHKINF_TALON_WOKEN_IN_KAKARIKO 0x6A // 0x6B diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 60368ddc37..7908c7cca5 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 a64932f423..a6a08ccd16 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 459667c5a9..474ba145cb 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; } } diff --git a/tools/ZAPDConfigs/EnumData.xml b/tools/ZAPDConfigs/EnumData.xml index 3d9300ccb6..9ab185a2b8 100644 --- a/tools/ZAPDConfigs/EnumData.xml +++ b/tools/ZAPDConfigs/EnumData.xml @@ -173,7 +173,7 @@ - + diff --git a/tools/csdis.py b/tools/csdis.py index e2b8a8a034..2d299e2fab 100755 --- a/tools/csdis.py +++ b/tools/csdis.py @@ -330,7 +330,7 @@ cutscene_misc_types = { 0x12: "CS_MISC_STOP_STORM_AND_ADVANCE_TO_DAY", 0x13: "CS_MISC_SET_FLAG_FAST_WINDMILL", 0x14: "CS_MISC_SET_FLAG_DRAINED_WELL", - 0x15: "CS_MISC_SET_FLAG_LAKE_HYLIA_RESTORED", + 0x15: "CS_MISC_SET_FLAG_RESTORED_LAKE_HYLIA", 0x16: "CS_MISC_VISMONO_BLACK_AND_WHITE", 0x17: "CS_MISC_VISMONO_SEPIA", 0x18: "CS_MISC_HIDE_ROOM",