From 6735eb25d6e568a4fc74ea3688dabee8422775eb Mon Sep 17 00:00:00 2001 From: Jordan Longstaff Date: Sat, 7 Dec 2024 17:01:21 -0500 Subject: [PATCH] Rename EVENTCHKINF_02 (#2322) * Rename EVENTCHKINF_02 * Rename to EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS --- include/z64save.h | 2 +- src/code/z_actor.c | 4 ++-- src/overlays/actors/ovl_En_Md/z_en_md.c | 2 +- src/overlays/actors/ovl_En_Sa/z_en_sa.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/z64save.h b/include/z64save.h index aec6d749bf..bae44058a9 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -464,7 +464,7 @@ typedef enum LinkAge { * SaveContext.eventChkInf */ -#define EVENTCHKINF_02 0x02 +#define EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS 0x02 #define EVENTCHKINF_03 0x03 #define EVENTCHKINF_04 0x04 #define EVENTCHKINF_05 0x05 diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 7c42936896..114afb8efe 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -4770,7 +4770,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) { retTextId = 0x1047; } } else { - if (Flags_GetEventChkInf(EVENTCHKINF_02)) { + if (Flags_GetEventChkInf(EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS)) { if (Flags_GetInfTable(INFTABLE_03)) { retTextId = 0x1032; } else { @@ -5514,7 +5514,7 @@ void func_80036E50(u16 textId, s16 arg1) { case 1: switch (textId) { case 0x102F: - Flags_SetEventChkInf(EVENTCHKINF_02); + Flags_SetEventChkInf(EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS); Flags_SetInfTable(INFTABLE_0C); return; case 0x1033: diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c index 26062ea006..ea9219c8b0 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -480,7 +480,7 @@ s16 EnMd_UpdateTalkState(PlayState* play, Actor* thisx) { SET_EVENTCHKINF(EVENTCHKINF_0F); break; case 0x102F: - SET_EVENTCHKINF(EVENTCHKINF_02); + SET_EVENTCHKINF(EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS); SET_INFTABLE(INFTABLE_0C); break; case 0x1060: diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c index 72eba29b61..5c6b0c7886 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -155,7 +155,7 @@ u16 EnSa_GetTextId(PlayState* play, Actor* thisx) { return 0x1047; } } - if (GET_EVENTCHKINF(EVENTCHKINF_02)) { + if (GET_EVENTCHKINF(EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS)) { this->unk_208 = 0; this->unk_209 = TEXT_STATE_NONE; if (GET_INFTABLE(INFTABLE_03)) {