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

Rename WEEKEVENTREG flags

This commit is contained in:
JordanLongstaff 2025-12-17 11:31:24 -05:00
parent b1f29c1800
commit 9102d026a8
5 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/z64save.h
View File

@ -1326,12 +1326,12 @@ typedef enum {
#define WEEKEVENTREG_73_10 PACK_WEEKEVENTREG_FLAG(73, 0x10)
#define WEEKEVENTREG_73_20 PACK_WEEKEVENTREG_FLAG(73, 0x20)
#define WEEKEVENTREG_DEKU_LEARNED_WHERE_JIM_IS PACK_WEEKEVENTREG_FLAG(73, 0x40)
#define WEEKEVENTREG_DEKU_LEARNED_WHERE_BOMBER_JIM_IS PACK_WEEKEVENTREG_FLAG(73, 0x40)
#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)
#define WEEKEVENTREG_74_08 PACK_WEEKEVENTREG_FLAG(74, 0x08)
#define WEEKEVENTREG_DEKU_TALKED_TO_BOMBER_2 PACK_WEEKEVENTREG_FLAG(74, 0x01)
#define WEEKEVENTREG_DEKU_TALKED_TO_BOMBER_3 PACK_WEEKEVENTREG_FLAG(74, 0x02)
#define WEEKEVENTREG_DEKU_TALKED_TO_BOMBER_4 PACK_WEEKEVENTREG_FLAG(74, 0x04)
#define WEEKEVENTREG_DEKU_TALKED_TO_BOMBER_5 PACK_WEEKEVENTREG_FLAG(74, 0x08)
#define WEEKEVENTREG_74_10 PACK_WEEKEVENTREG_FLAG(74, 0x10)
#define WEEKEVENTREG_74_20 PACK_WEEKEVENTREG_FLAG(74, 0x20)
#define WEEKEVENTREG_74_40 PACK_WEEKEVENTREG_FLAG(74, 0x40)

2
src/code/z_elf_message.c
View File

@ -90,7 +90,7 @@ u16 QuestHint_GetTatlTextId(PlayState* play) {
return 0x241;
}
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_86_02) || CHECK_WEEKEVENTREG(WEEKEVENTREG_DEKU_LEARNED_WHERE_JIM_IS)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_86_02) || CHECK_WEEKEVENTREG(WEEKEVENTREG_DEKU_LEARNED_WHERE_BOMBER_JIM_IS)) {
return 0x23F;
}

20
src/overlays/actors/ovl_En_Bombers/z_en_bombers.c
View File

@ -248,12 +248,12 @@ void EnBombers_UpdateRegularTextId(EnBombers* this, PlayState* play) {
case PLAYER_FORM_DEKU:
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_73_20)) {
this->actor.textId = 0x75A;
} else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEKU_LEARNED_WHERE_JIM_IS)) {
} else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_DEKU_LEARNED_WHERE_BOMBER_JIM_IS)) {
this->actor.textId = 0x749;
if (((this->number == ENBOMBERS_NO_2) && CHECK_WEEKEVENTREG(WEEKEVENTREG_74_01)) ||
((this->number == ENBOMBERS_NO_3) && CHECK_WEEKEVENTREG(WEEKEVENTREG_74_02)) ||
((this->number == ENBOMBERS_NO_4) && CHECK_WEEKEVENTREG(WEEKEVENTREG_74_04)) ||
((this->number == ENBOMBERS_NO_5) && CHECK_WEEKEVENTREG(WEEKEVENTREG_74_08))) {
if (((this->number == ENBOMBERS_NO_2) && CHECK_WEEKEVENTREG(WEEKEVENTREG_DEKU_TALKED_TO_BOMBER_2)) ||
((this->number == ENBOMBERS_NO_3) && CHECK_WEEKEVENTREG(WEEKEVENTREG_DEKU_TALKED_TO_BOMBER_3)) ||
((this->number == ENBOMBERS_NO_4) && CHECK_WEEKEVENTREG(WEEKEVENTREG_DEKU_TALKED_TO_BOMBER_4)) ||
((this->number == ENBOMBERS_NO_5) && CHECK_WEEKEVENTREG(WEEKEVENTREG_DEKU_TALKED_TO_BOMBER_5))) {
this->actor.textId = 0x74A;
}
} else {
@ -454,25 +454,25 @@ void EnBombers_UpdateTalk(EnBombers* this, PlayState* play) {
} else if (this->actor.textId == 0x748) {
switch (this->number) {
case ENBOMBERS_NO_2:
SET_WEEKEVENTREG(WEEKEVENTREG_74_01);
SET_WEEKEVENTREG(WEEKEVENTREG_DEKU_TALKED_TO_BOMBER_2);
break;
case ENBOMBERS_NO_3:
SET_WEEKEVENTREG(WEEKEVENTREG_74_02);
SET_WEEKEVENTREG(WEEKEVENTREG_DEKU_TALKED_TO_BOMBER_3);
break;
case ENBOMBERS_NO_4:
SET_WEEKEVENTREG(WEEKEVENTREG_74_04);
SET_WEEKEVENTREG(WEEKEVENTREG_DEKU_TALKED_TO_BOMBER_4);
break;
case ENBOMBERS_NO_5:
SET_WEEKEVENTREG(WEEKEVENTREG_74_08);
SET_WEEKEVENTREG(WEEKEVENTREG_DEKU_TALKED_TO_BOMBER_5);
break;
default:
break;
}
SET_WEEKEVENTREG(WEEKEVENTREG_DEKU_LEARNED_WHERE_JIM_IS);
SET_WEEKEVENTREG(WEEKEVENTREG_DEKU_LEARNED_WHERE_BOMBER_JIM_IS);
}
switch (hasMoreText) {

10
tools/overlayhelpers/mscriptdis.py
View File

@ -651,12 +651,12 @@ week_event_reg = {
(73 << 8) | 0x08: "WEEKEVENTREG_73_08",
(73 << 8) | 0x10: "WEEKEVENTREG_73_10",
(73 << 8) | 0x20: "WEEKEVENTREG_73_20",
(73 << 8) | 0x40: "WEEKEVENTREG_DEKU_LEARNED_WHERE_JIM_IS",
(73 << 8) | 0x40: "WEEKEVENTREG_DEKU_LEARNED_WHERE_BOMBER_JIM_IS",
(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",
(74 << 8) | 0x08: "WEEKEVENTREG_74_08",
(74 << 8) | 0x01: "WEEKEVENTREG_DEKU_TALKED_TO_BOMBER_2",
(74 << 8) | 0x02: "WEEKEVENTREG_DEKU_TALKED_TO_BOMBER_3",
(74 << 8) | 0x04: "WEEKEVENTREG_DEKU_TALKED_TO_BOMBER_4",
(74 << 8) | 0x08: "WEEKEVENTREG_DEKU_TALKED_TO_BOMBER_5",
(74 << 8) | 0x10: "WEEKEVENTREG_74_10",
(74 << 8) | 0x20: "WEEKEVENTREG_74_20",
(74 << 8) | 0x40: "WEEKEVENTREG_74_40",

10
tools/weekeventregconvert.py
View File

@ -594,12 +594,12 @@ weekEventReg = {
(73 << 8) | 0x08: "WEEKEVENTREG_73_08",
(73 << 8) | 0x10: "WEEKEVENTREG_73_10",
(73 << 8) | 0x20: "WEEKEVENTREG_73_20",
(73 << 8) | 0x40: "WEEKEVENTREG_DEKU_LEARNED_WHERE_JIM_IS",
(73 << 8) | 0x40: "WEEKEVENTREG_DEKU_LEARNED_WHERE_BOMBER_JIM_IS",
(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",
(74 << 8) | 0x08: "WEEKEVENTREG_74_08",
(74 << 8) | 0x01: "WEEKEVENTREG_DEKU_TALKED_TO_BOMBER_2",
(74 << 8) | 0x02: "WEEKEVENTREG_DEKU_TALKED_TO_BOMBER_3",
(74 << 8) | 0x04: "WEEKEVENTREG_DEKU_TALKED_TO_BOMBER_4",
(74 << 8) | 0x08: "WEEKEVENTREG_DEKU_TALKED_TO_BOMBER_5",
(74 << 8) | 0x10: "WEEKEVENTREG_74_10",
(74 << 8) | 0x20: "WEEKEVENTREG_74_20",
(74 << 8) | 0x40: "WEEKEVENTREG_74_40",