mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-07-08 06:21:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename symbols related to Kakariko Well being drained (#2332)

Browse Source
This commit is contained in:
Jordan Longstaff
2024-12-10 00:18:40 -05:00
committed by GitHub
parent c21c3fe3da
commit 07751d3d44
8 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_demo.c
+2 -2
View File
@@ -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:
src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c
+5 -5
View File
@@ -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;
src/overlays/actors/ovl_En_Fu/z_en_fu.c
+1 -1
View File
@@ -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
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
+1 -1
View File
@@ -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)) {