diff options
| author | Jordan Longstaff <JordanLongstaff@users.noreply.github.com> | 2024-12-09 22:24:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-09 22:24:06 -0500 |
| commit | b76fe9d0b87ce2c208ec4122d1304bbc09ff3ff8 (patch) | |
| tree | 0231d1e4f38e7f89c5e00e32a44b2c20fe3b50bb | |
| parent | 9305a7145809454ece3a8b049dec9d71363006f8 (diff) | |
Rename EVENTCHKINF_4D (#2329)
* Rename EVENTCHKINF_4D
* Second rename
| -rw-r--r-- | include/z64save.h | 2 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/z64save.h b/include/z64save.h index 7006eecfc..381af91c8 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -522,7 +522,7 @@ typedef enum LinkAge { #define EVENTCHKINF_4A 0x4A #define EVENTCHKINF_OPENED_DOOR_OF_TIME 0x4B #define EVENTCHKINF_4C 0x4C -#define EVENTCHKINF_4D 0x4D +#define EVENTCHKINF_CREATED_RAINBOW_BRIDGE 0x4D #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 diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c index 4a67c02d1..2ec1f0150 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c +++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c @@ -49,7 +49,7 @@ void BgGjyoBridge_Init(Actor* thisx, PlayState* play) { this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, thisx, colHeader); - if (GET_EVENTCHKINF(EVENTCHKINF_4D)) { + if (GET_EVENTCHKINF(EVENTCHKINF_CREATED_RAINBOW_BRIDGE)) { this->actionFunc = func_808787A4; } else { this->dyna.actor.draw = NULL; @@ -85,7 +85,7 @@ void BgGjyoBridge_SpawnBridge(BgGjyoBridge* this, PlayState* play) { (play->csCtx.actorCues[2]->id == 2)) { this->dyna.actor.draw = BgGjyoBridge_Draw; DynaPoly_EnableCollision(play, &play->colCtx.dyna, this->dyna.bgId); - SET_EVENTCHKINF(EVENTCHKINF_4D); + SET_EVENTCHKINF(EVENTCHKINF_CREATED_RAINBOW_BRIDGE); } } |