diff options
| author | Jordan Longstaff <JordanLongstaff@users.noreply.github.com> | 2024-12-07 18:19:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-07 18:19:55 -0500 |
| commit | df2450ac178a59a483bc06f595243d583cfa5a22 (patch) | |
| tree | 645138bffcbb7fe6b154bc966271734b8aaf53d8 | |
| parent | 6735eb25d6e568a4fc74ea3688dabee8422775eb (diff) | |
Replaced EVENTCHKINF_4E (#2327)
* Replaced EVENTCHKINF_4E
* Add "set but unused" comment
Co-authored-by: mzxrules <mzxrules@gmail.com>
---------
Co-authored-by: mzxrules <mzxrules@gmail.com>
| -rw-r--r-- | include/z64save.h | 2 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c | 2 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/z64save.h b/include/z64save.h index bae44058a..20a1d0274 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -523,7 +523,7 @@ typedef enum LinkAge { #define EVENTCHKINF_4B 0x4B #define EVENTCHKINF_4C 0x4C #define EVENTCHKINF_4D 0x4D -#define EVENTCHKINF_4E 0x4E +#define EVENTCHKINF_CAUGHT_BY_CASTLE_GUARDS 0x4E // set but unused #define EVENTCHKINF_WATCHED_SHEIK_AFTER_MASTER_SWORD_CS 0x4F // Cutscene in Temple of Time as adult after pulling the Master Sword for the first time #define EVENTCHKINF_50 0x50 #define EVENTCHKINF_51 0x51 diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index d4927a40d..71f5379cb 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -346,7 +346,7 @@ void EnHeishi1_Kick(EnHeishi1* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) { Message_CloseTextbox(play); if (!this->loadStarted) { - SET_EVENTCHKINF(EVENTCHKINF_4E); + SET_EVENTCHKINF(EVENTCHKINF_CAUGHT_BY_CASTLE_GUARDS); play->nextEntranceIndex = ENTR_HYRULE_CASTLE_3; play->transitionTrigger = TRANS_TRIGGER_START; this->loadStarted = true; diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index 7dc72a610..898f4e120 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -208,7 +208,7 @@ void func_80A55D00(EnHeishi3* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play) && (this->respawnFlag == 0)) { - SET_EVENTCHKINF(EVENTCHKINF_4E); + SET_EVENTCHKINF(EVENTCHKINF_CAUGHT_BY_CASTLE_GUARDS); play->nextEntranceIndex = ENTR_HYRULE_CASTLE_4; play->transitionTrigger = TRANS_TRIGGER_START; this->respawnFlag = 1; |