From 07751d3d44762c4dfed27a47364dfb2d291e1c1d Mon Sep 17 00:00:00 2001 From: Jordan Longstaff Date: Tue, 10 Dec 2024 00:18:40 -0500 Subject: [PATCH] Rename symbols related to Kakariko Well being drained (#2332) --- include/z64cutscene.h | 2 +- include/z64save.h | 2 +- src/code/z_demo.c | 4 ++-- .../actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c | 10 +++++----- src/overlays/actors/ovl_En_Fu/z_en_fu.c | 2 +- src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c | 2 +- tools/ZAPDConfigs/EnumData.xml | 2 +- tools/csdis.py | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/z64cutscene.h b/include/z64cutscene.h index 9b31762121..76827116aa 100644 --- a/include/z64cutscene.h +++ b/include/z64cutscene.h @@ -174,7 +174,7 @@ typedef enum CutsceneMiscType { /* 0x11 */ CS_MISC_QUAKE_STOP, /* 0x12 */ CS_MISC_STOP_STORM_AND_ADVANCE_TO_DAY, /* 0x13 */ CS_MISC_SET_FLAG_FAST_WINDMILL, - /* 0x14 */ CS_MISC_SET_FLAG_WELL_DRAINED, + /* 0x14 */ CS_MISC_SET_FLAG_DRAINED_WELL, /* 0x15 */ CS_MISC_SET_FLAG_LAKE_HYLIA_RESTORED, /* 0x16 */ CS_MISC_VISMONO_BLACK_AND_WHITE, /* 0x17 */ CS_MISC_VISMONO_SEPIA, diff --git a/include/z64save.h b/include/z64save.h index 3dea790385..a83b04639a 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -535,7 +535,7 @@ typedef enum LinkAge { #define EVENTCHKINF_5B 0x5B #define EVENTCHKINF_5C 0x5C #define EVENTCHKINF_65 0x65 -#define EVENTCHKINF_67 0x67 +#define EVENTCHKINF_DRAINED_WELL 0x67 #define EVENTCHKINF_68 0x68 #define EVENTCHKINF_69 0x69 #define EVENTCHKINF_TALON_WOKEN_IN_KAKARIKO 0x6A diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 993405c152..60368ddc37 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -400,8 +400,8 @@ void CutsceneCmd_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdMisc* cmd) { SET_EVENTCHKINF(EVENTCHKINF_65); break; - case CS_MISC_SET_FLAG_WELL_DRAINED: - SET_EVENTCHKINF(EVENTCHKINF_67); + case CS_MISC_SET_FLAG_DRAINED_WELL: + SET_EVENTCHKINF(EVENTCHKINF_DRAINED_WELL); break; case CS_MISC_SET_FLAG_LAKE_HYLIA_RESTORED: diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c index b709fc11e3..f09c33325f 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c @@ -14,7 +14,7 @@ void BgSpot01Idomizu_Destroy(Actor* thisx, PlayState* play); void BgSpot01Idomizu_Update(Actor* thisx, PlayState* play); void BgSpot01Idomizu_Draw(Actor* thisx, PlayState* play); -void func_808ABB84(BgSpot01Idomizu* this, PlayState* play); +void BgSpot01Idomizu_UpdateWaterLevel(BgSpot01Idomizu* this, PlayState* play); ActorProfile Bg_Spot01_Idomizu_Profile = { /**/ ACTOR_BG_SPOT01_IDOMIZU, @@ -36,20 +36,20 @@ void BgSpot01Idomizu_Init(Actor* thisx, PlayState* play) { BgSpot01Idomizu* this = (BgSpot01Idomizu*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); - if (GET_EVENTCHKINF(EVENTCHKINF_67) || LINK_AGE_IN_YEARS == YEARS_ADULT) { + if (GET_EVENTCHKINF(EVENTCHKINF_DRAINED_WELL) || LINK_AGE_IN_YEARS == YEARS_ADULT) { this->waterHeight = -550.0f; } else { this->waterHeight = 52.0f; } - this->actionFunc = func_808ABB84; + this->actionFunc = BgSpot01Idomizu_UpdateWaterLevel; this->actor.world.pos.y = this->waterHeight; } void BgSpot01Idomizu_Destroy(Actor* thisx, PlayState* play) { } -void func_808ABB84(BgSpot01Idomizu* this, PlayState* play) { - if (GET_EVENTCHKINF(EVENTCHKINF_67)) { +void BgSpot01Idomizu_UpdateWaterLevel(BgSpot01Idomizu* this, PlayState* play) { + if (GET_EVENTCHKINF(EVENTCHKINF_DRAINED_WELL)) { this->waterHeight = -550.0f; } play->colCtx.colHeader->waterBoxes[0].ySurface = this->actor.world.pos.y; diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index 942bb6777e..a1429d8c05 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -134,7 +134,7 @@ void EnFu_WaitChild(EnFu* this, PlayState* play) { u16 textId = MaskReaction_GetTextId(play, MASK_REACTION_SET_WINDMILL_MAN); if (textId == 0) { - textId = GET_EVENTCHKINF(EVENTCHKINF_67) ? 0x5033 : 0x5032; + textId = GET_EVENTCHKINF(EVENTCHKINF_DRAINED_WELL) ? 0x5033 : 0x5032; } // if ACTOR_FLAG_TALK is set and textId is 0x5033, change animation diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c index 71b32c4434..bc45e22551 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c @@ -3886,7 +3886,7 @@ void KaleidoScope_Update(PlayState* play) { if (CHECK_QUEST_ITEM(QUEST_SONG_STORMS)) { pauseCtx->worldMapPoints[WORLD_MAP_POINT_KAKARIKO_VILLAGE] = WORLD_MAP_POINT_STATE_HIGHLIGHT; } - if (GET_EVENTCHKINF(EVENTCHKINF_67)) { + if (GET_EVENTCHKINF(EVENTCHKINF_DRAINED_WELL)) { pauseCtx->worldMapPoints[WORLD_MAP_POINT_KAKARIKO_VILLAGE] = WORLD_MAP_POINT_STATE_SHOW; } if (GET_EVENTCHKINF(EVENTCHKINF_AA)) { diff --git a/tools/ZAPDConfigs/EnumData.xml b/tools/ZAPDConfigs/EnumData.xml index cddffeb2a6..3d9300ccb6 100644 --- a/tools/ZAPDConfigs/EnumData.xml +++ b/tools/ZAPDConfigs/EnumData.xml @@ -172,7 +172,7 @@ - + diff --git a/tools/csdis.py b/tools/csdis.py index f5b0808ed6..e2b8a8a034 100755 --- a/tools/csdis.py +++ b/tools/csdis.py @@ -329,7 +329,7 @@ cutscene_misc_types = { 0x11: "CS_MISC_QUAKE_STOP", 0x12: "CS_MISC_STOP_STORM_AND_ADVANCE_TO_DAY", 0x13: "CS_MISC_SET_FLAG_FAST_WINDMILL", - 0x14: "CS_MISC_SET_FLAG_WELL_DRAINED", + 0x14: "CS_MISC_SET_FLAG_DRAINED_WELL", 0x15: "CS_MISC_SET_FLAG_LAKE_HYLIA_RESTORED", 0x16: "CS_MISC_VISMONO_BLACK_AND_WHITE", 0x17: "CS_MISC_VISMONO_SEPIA",