mirror
/
mm
mirror of https://github.com/zeldaret/mm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename `WEEKEVENTREG_73_80` (#1842)

This commit is contained in:
Jordan Longstaff 2025-12-09 06:22:23 -05:00 committed by GitHub
parent d6143abe52
commit 18a8a1bea7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/z64save.h
View File

@ -1327,7 +1327,7 @@ typedef enum {
#define WEEKEVENTREG_73_20 PACK_WEEKEVENTREG_FLAG(73, 0x20) #define WEEKEVENTREG_73_20 PACK_WEEKEVENTREG_FLAG(73, 0x20)
#define WEEKEVENTREG_73_40 PACK_WEEKEVENTREG_FLAG(73, 0x40) #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_01 PACK_WEEKEVENTREG_FLAG(74, 0x01)
#define WEEKEVENTREG_74_02 PACK_WEEKEVENTREG_FLAG(74, 0x02) #define WEEKEVENTREG_74_02 PACK_WEEKEVENTREG_FLAG(74, 0x02)
#define WEEKEVENTREG_74_04 PACK_WEEKEVENTREG_FLAG(74, 0x04) #define WEEKEVENTREG_74_04 PACK_WEEKEVENTREG_FLAG(74, 0x04)

2
src/code/z_elf_message.c
View File

@ -74,7 +74,7 @@ u16 QuestHint_GetTatlTextId(PlayState* play) {
return 0x223; return 0x223;
} }
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_73_80)) { if (CHECK_WEEKEVENTREG(WEEKEVENTREG_ENTERED_BOMBERS_CODE)) {
return 0x222; return 0x222;
} }

4
src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
View File

@ -154,8 +154,8 @@ void EnBomBowlMan_Init(Actor* thisx, PlayState* play) {
this->path = SubS_GetPathByIndex(play, this->pathIndex, ENBOMBOWLMAN_PATH_INDEX_NONE); this->path = SubS_GetPathByIndex(play, this->pathIndex, ENBOMBOWLMAN_PATH_INDEX_NONE);
this->unk_2C8 = 80.0f; this->unk_2C8 = 80.0f;
if ((gSaveContext.save.entrance == ENTRANCE(EAST_CLOCK_TOWN, 2)) && CHECK_WEEKEVENTREG(WEEKEVENTREG_73_80) && if ((gSaveContext.save.entrance == ENTRANCE(EAST_CLOCK_TOWN, 2)) &&
!CHECK_QUEST_ITEM(QUEST_BOMBERS_NOTEBOOK)) { CHECK_WEEKEVENTREG(WEEKEVENTREG_ENTERED_BOMBERS_CODE) && !CHECK_QUEST_ITEM(QUEST_BOMBERS_NOTEBOOK)) {
this->csId = this->actor.csId; this->csId = this->actor.csId;
if (this->csId == 0) { if (this->csId == 0) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);

5
src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c
View File

@ -114,7 +114,8 @@ void EnBombers2_Init(Actor* thisx, PlayState* play) {
this->actor.attentionRangeType = ATTENTION_RANGE_6; this->actor.attentionRangeType = ATTENTION_RANGE_6;
Collider_InitAndSetCylinder(play, &this->collider, &this->actor, &sCylinderInit); 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; 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; cos = Math_CosS(this->actor.home.rot.y + 0xC100) * 50.0f;
this->unk_2AC = true; this->unk_2AC = true;
@ -363,7 +364,7 @@ void func_80C0520C(EnBombers2* this, PlayState* play) {
EnBombers2_ChangeAnim(this, ENBOMBERS_ANIM_6, 1.0f); EnBombers2_ChangeAnim(this, ENBOMBERS_ANIM_6, 1.0f);
this->unk_2A8 = 0; this->unk_2A8 = 0;
this->unk_2C0 = 1; this->unk_2C0 = 1;
SET_WEEKEVENTREG(WEEKEVENTREG_73_80); SET_WEEKEVENTREG(WEEKEVENTREG_ENTERED_BOMBERS_CODE);
CutsceneManager_Stop(this->csId); CutsceneManager_Stop(this->csId);
this->unk_2AC = true; this->unk_2AC = true;
this->actor.textId = sTextIds[this->textIdIndex]; this->actor.textId = sTextIds[this->textIdIndex];

2
tools/overlayhelpers/mscriptdis.py
View File

@ -652,7 +652,7 @@ week_event_reg = {
(73 << 8) | 0x10: "WEEKEVENTREG_73_10", (73 << 8) | 0x10: "WEEKEVENTREG_73_10",
(73 << 8) | 0x20: "WEEKEVENTREG_73_20", (73 << 8) | 0x20: "WEEKEVENTREG_73_20",
(73 << 8) | 0x40: "WEEKEVENTREG_73_40", (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) | 0x01: "WEEKEVENTREG_74_01",
(74 << 8) | 0x02: "WEEKEVENTREG_74_02", (74 << 8) | 0x02: "WEEKEVENTREG_74_02",
(74 << 8) | 0x04: "WEEKEVENTREG_74_04", (74 << 8) | 0x04: "WEEKEVENTREG_74_04",

2
tools/weekeventregconvert.py
View File

@ -595,7 +595,7 @@ weekEventReg = {
(73 << 8) | 0x10: "WEEKEVENTREG_73_10", (73 << 8) | 0x10: "WEEKEVENTREG_73_10",
(73 << 8) | 0x20: "WEEKEVENTREG_73_20", (73 << 8) | 0x20: "WEEKEVENTREG_73_20",
(73 << 8) | 0x40: "WEEKEVENTREG_73_40", (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) | 0x01: "WEEKEVENTREG_74_01",
(74 << 8) | 0x02: "WEEKEVENTREG_74_02", (74 << 8) | 0x02: "WEEKEVENTREG_74_02",
(74 << 8) | 0x04: "WEEKEVENTREG_74_04", (74 << 8) | 0x04: "WEEKEVENTREG_74_04",