diff options
| -rw-r--r-- | include/z64save.h | 2 | ||||
| -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 | ||||
| -rw-r--r-- | tools/overlayhelpers/mscriptdis.py | 2 | ||||
| -rwxr-xr-x | tools/weekeventregconvert.py | 2 |
6 files changed, 9 insertions, 8 deletions
diff --git a/include/z64save.h b/include/z64save.h index 5a13877e8..36bbaf8af 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -1327,7 +1327,7 @@ typedef enum { #define WEEKEVENTREG_73_20 PACK_WEEKEVENTREG_FLAG(73, 0x20) #define WEEKEVENTREG_73_40 PACK_WEEKEVENTREG_FLAG(73, 0x40) -#define WEEKEVENTREG_73_80 PACK_WEEKEVENTREG_FLAG(73, 0x80) +#define WEEKEVENTREG_ENTERED_BOMBERS_CODE PACK_WEEKEVENTREG_FLAG(73, 0x80) #define WEEKEVENTREG_74_01 PACK_WEEKEVENTREG_FLAG(74, 0x01) #define WEEKEVENTREG_74_02 PACK_WEEKEVENTREG_FLAG(74, 0x02) #define WEEKEVENTREG_74_04 PACK_WEEKEVENTREG_FLAG(74, 0x04) 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]; diff --git a/tools/overlayhelpers/mscriptdis.py b/tools/overlayhelpers/mscriptdis.py index 8369e3f8d..1cbbefbe1 100644 --- a/tools/overlayhelpers/mscriptdis.py +++ b/tools/overlayhelpers/mscriptdis.py @@ -652,7 +652,7 @@ week_event_reg = { (73 << 8) | 0x10: "WEEKEVENTREG_73_10", (73 << 8) | 0x20: "WEEKEVENTREG_73_20", (73 << 8) | 0x40: "WEEKEVENTREG_73_40", - (73 << 8) | 0x80: "WEEKEVENTREG_73_80", + (73 << 8) | 0x80: "WEEKEVENTREG_ENTERED_BOMBERS_CODE", (74 << 8) | 0x01: "WEEKEVENTREG_74_01", (74 << 8) | 0x02: "WEEKEVENTREG_74_02", (74 << 8) | 0x04: "WEEKEVENTREG_74_04", diff --git a/tools/weekeventregconvert.py b/tools/weekeventregconvert.py index 2ca67f466..2ff55f146 100755 --- a/tools/weekeventregconvert.py +++ b/tools/weekeventregconvert.py @@ -595,7 +595,7 @@ weekEventReg = { (73 << 8) | 0x10: "WEEKEVENTREG_73_10", (73 << 8) | 0x20: "WEEKEVENTREG_73_20", (73 << 8) | 0x40: "WEEKEVENTREG_73_40", - (73 << 8) | 0x80: "WEEKEVENTREG_73_80", + (73 << 8) | 0x80: "WEEKEVENTREG_ENTERED_BOMBERS_CODE", (74 << 8) | 0x01: "WEEKEVENTREG_74_01", (74 << 8) | 0x02: "WEEKEVENTREG_74_02", (74 << 8) | 0x04: "WEEKEVENTREG_74_04", |