diff --git a/include/z64save.h b/include/z64save.h index 20a1d0274d..7006eecfc0 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -520,7 +520,7 @@ typedef enum LinkAge { #define EVENTCHKINF_48 0x48 #define EVENTCHKINF_49 0x49 #define EVENTCHKINF_4A 0x4A -#define EVENTCHKINF_4B 0x4B +#define EVENTCHKINF_OPENED_DOOR_OF_TIME 0x4B #define EVENTCHKINF_4C 0x4C #define EVENTCHKINF_4D 0x4D #define EVENTCHKINF_CAUGHT_BY_CASTLE_GUARDS 0x4E // set but unused diff --git a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c index f24ed0c28a..870a3edd6c 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c +++ b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c @@ -46,7 +46,7 @@ void BgTokiHikari_Init(Actor* thisx, PlayState* play) { this->actionFunc = BgTokiHikari_DoNothing; break; case 1: - if (!GET_EVENTCHKINF(EVENTCHKINF_4B)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_OPENED_DOOR_OF_TIME)) { this->actionFunc = func_808BA204; this->unk_14C = 0.0f; } else { diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index 2a3e8c4531..d5b09d9219 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -1541,8 +1541,8 @@ void DemoEffect_UpdateJewelChild(DemoEffect* this, PlayState* play) { if (play->csCtx.state && play->csCtx.actorCues[this->cueChannel]) { switch (play->csCtx.actorCues[this->cueChannel]->id) { case 3: - if (GET_EVENTCHKINF(EVENTCHKINF_4B)) { - SET_EVENTCHKINF(EVENTCHKINF_4B); + if (GET_EVENTCHKINF(EVENTCHKINF_OPENED_DOOR_OF_TIME)) { + SET_EVENTCHKINF(EVENTCHKINF_OPENED_DOOR_OF_TIME); } DemoEffect_MoveJewelActivateDoorOfTime(this, play); if ((play->gameplayFrames & 1) == 0) { @@ -1575,7 +1575,7 @@ void DemoEffect_UpdateJewelChild(DemoEffect* this, PlayState* play) { } if (gSaveContext.save.entranceIndex == ENTR_TEMPLE_OF_TIME_0) { - if (!GET_EVENTCHKINF(EVENTCHKINF_4B)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_OPENED_DOOR_OF_TIME)) { hasCue = (play->csCtx.state != CS_STATE_IDLE) && (play->csCtx.actorCues[this->cueChannel] != NULL); if (!hasCue) { diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index caea0b981f..ed4aba58da 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -237,7 +237,7 @@ void DemoKankyo_Init(Actor* thisx, PlayState* play) { case DEMOKANKYO_DOOR_OF_TIME: this->actor.scale.x = this->actor.scale.y = this->actor.scale.z = 1.0f; this->unk_150[0].unk_18 = 0.0f; - if (!GET_EVENTCHKINF(EVENTCHKINF_4B)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_OPENED_DOOR_OF_TIME)) { Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_TOKI, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0x0000); } else { @@ -424,7 +424,7 @@ void DemoKankyo_UpdateDoorOfTime(DemoKankyo* this, PlayState* play) { this->unk_150[0].unk_18 += 1.0f; if (this->unk_150[0].unk_18 >= 102.0f) { Actor_PlaySfx(&this->actor, NA_SE_EV_STONEDOOR_STOP); - SET_EVENTCHKINF(EVENTCHKINF_4B); + SET_EVENTCHKINF(EVENTCHKINF_OPENED_DOOR_OF_TIME); Actor_Kill(this->actor.child); DemoKankyo_SetupAction(this, DemoKankyo_KillDoorOfTimeCollision); } diff --git a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c index e2e6ada56b..bf423a09b5 100644 --- a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c +++ b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c @@ -49,7 +49,7 @@ void DoorToki_Destroy(Actor* thisx, PlayState* play) { void DoorToki_Update(Actor* thisx, PlayState* play) { DoorToki* this = (DoorToki*)thisx; - if (GET_EVENTCHKINF(EVENTCHKINF_4B)) { + if (GET_EVENTCHKINF(EVENTCHKINF_OPENED_DOOR_OF_TIME)) { DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId); } else { DynaPoly_EnableCollision(play, &play->colCtx.dyna, this->dyna.bgId); diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index edd7cc8762..b8898c3d58 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -195,7 +195,7 @@ void func_80ABF28C(EnOkarinaTag* this, PlayState* play) { if ((this->ocarinaSong != 6) || (gSaveContext.save.info.scarecrowSpawnSongSet)) { if ((this->switchFlag >= 0) && Flags_GetSwitch(play, this->switchFlag)) { this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - } else if (((this->type != 4) || !GET_EVENTCHKINF(EVENTCHKINF_4B)) && + } else if (((this->type != 4) || !GET_EVENTCHKINF(EVENTCHKINF_OPENED_DOOR_OF_TIME)) && ((this->type != 6) || !GET_EVENTCHKINF(EVENTCHKINF_1D)) && (this->actor.xzDistToPlayer < (90.0f + this->interactRange)) && (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < 80.0f)) {