diff options
| author | Jordan Longstaff <JordanLongstaff@users.noreply.github.com> | 2025-12-09 06:22:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-09 08:22:23 -0300 |
| commit | 18a8a1bea7dcbcfba58da59391deb770f19a6090 (patch) | |
| tree | 06a8deeea06c74194427bfcf92d73751ded915c0 /src | |
| parent | d6143abe52cdeee0f4132a3b11cf60fb76f757db (diff) | |
Rename `WEEKEVENTREG_73_80` (#1842)
Diffstat (limited to 'src')
| -rw-r--r-- | src/code/z_elf_message.c | 2 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c | 4 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c index 029b07fa1..cd486a8a4 100644 --- a/src/code/z_elf_message.c +++ b/src/code/z_elf_message.c @@ -74,7 +74,7 @@ u16 QuestHint_GetTatlTextId(PlayState* play) { return 0x223; } - if (CHECK_WEEKEVENTREG(WEEKEVENTREG_73_80)) { + if (CHECK_WEEKEVENTREG(WEEKEVENTREG_ENTERED_BOMBERS_CODE)) { return 0x222; } diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index 390b30689..219a94cd3 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -154,8 +154,8 @@ void EnBomBowlMan_Init(Actor* thisx, PlayState* play) { this->path = SubS_GetPathByIndex(play, this->pathIndex, ENBOMBOWLMAN_PATH_INDEX_NONE); this->unk_2C8 = 80.0f; - if ((gSaveContext.save.entrance == ENTRANCE(EAST_CLOCK_TOWN, 2)) && CHECK_WEEKEVENTREG(WEEKEVENTREG_73_80) && - !CHECK_QUEST_ITEM(QUEST_BOMBERS_NOTEBOOK)) { + if ((gSaveContext.save.entrance == ENTRANCE(EAST_CLOCK_TOWN, 2)) && + CHECK_WEEKEVENTREG(WEEKEVENTREG_ENTERED_BOMBERS_CODE) && !CHECK_QUEST_ITEM(QUEST_BOMBERS_NOTEBOOK)) { this->csId = this->actor.csId; if (this->csId == 0) { Actor_Kill(&this->actor); diff --git a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c index 17ebd7c17..ca088d2fd 100644 --- a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c +++ b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c @@ -114,7 +114,8 @@ void EnBombers2_Init(Actor* thisx, PlayState* play) { this->actor.attentionRangeType = ATTENTION_RANGE_6; Collider_InitAndSetCylinder(play, &this->collider, &this->actor, &sCylinderInit); - if (CHECK_WEEKEVENTREG(WEEKEVENTREG_73_80) || (gSaveContext.save.entrance == ENTRANCE(EAST_CLOCK_TOWN, 2))) { + if (CHECK_WEEKEVENTREG(WEEKEVENTREG_ENTERED_BOMBERS_CODE) || + (gSaveContext.save.entrance == ENTRANCE(EAST_CLOCK_TOWN, 2))) { this->actor.world.pos.x += Math_SinS(this->actor.home.rot.y + 0xC100) * 50.0f; cos = Math_CosS(this->actor.home.rot.y + 0xC100) * 50.0f; this->unk_2AC = true; @@ -363,7 +364,7 @@ void func_80C0520C(EnBombers2* this, PlayState* play) { EnBombers2_ChangeAnim(this, ENBOMBERS_ANIM_6, 1.0f); this->unk_2A8 = 0; this->unk_2C0 = 1; - SET_WEEKEVENTREG(WEEKEVENTREG_73_80); + SET_WEEKEVENTREG(WEEKEVENTREG_ENTERED_BOMBERS_CODE); CutsceneManager_Stop(this->csId); this->unk_2AC = true; this->actor.textId = sTextIds[this->textIdIndex]; |