diff options
| author | mzxrules <mzxrules@gmail.com> | 2025-01-17 22:23:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-17 22:23:23 -0500 |
| commit | 161c789886460034f8bf2d39f68f05d54273ecc6 (patch) | |
| tree | 2b12c7c40690247375bd364cbb47911c3887f03f /include | |
| parent | 260d92dfb6d42a731a352f47787d4032e1e38504 (diff) | |
Restructure event flags in z64save.h (4/?): Haggling Townsfolk (#2395)
* Haggling Townsfolk flags
* suggestion
* so there's not going to be a We U?
Diffstat (limited to 'include')
| -rw-r--r-- | include/z64save.h | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/include/z64save.h b/include/z64save.h index ab753a515..fb8767b0a 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -968,12 +968,26 @@ typedef enum IngoRaceState { #define EVENTINF_MARATHON_ACTIVE 0x10 // EVENTINF 0x20-0x24 -#define EVENTINF_INDEX_20_21_22_23_24 2 -#define EVENTINF_20_MASK (1 << 0) -#define EVENTINF_21_MASK (1 << 1) -#define EVENTINF_22_MASK (1 << 2) -#define EVENTINF_23_MASK (1 << 3) -#define EVENTINF_24_MASK (1 << 4) +#define EVENTINF_INDEX_HAGGLING_TOWNSFOLK 0x2 +#define EVENTINF_HAGGLING_TOWNSFOLK_MESG_0 0x20 +#define EVENTINF_HAGGLING_TOWNSFOLK_MESG_1 0x21 +#define EVENTINF_HAGGLING_TOWNSFOLK_MESG_2 0x22 +#define EVENTINF_HAGGLING_TOWNSFOLK_MESG_3 0x23 +#define EVENTINF_HAGGLING_TOWNSFOLK_MESG_4 0x24 + +#define EVENTINF_HAGGLING_TOWNSFOLK_MASK \ + (EVENTINF_MASK(EVENTINF_HAGGLING_TOWNSFOLK_MESG_0) | EVENTINF_MASK(EVENTINF_HAGGLING_TOWNSFOLK_MESG_1) | \ + EVENTINF_MASK(EVENTINF_HAGGLING_TOWNSFOLK_MESG_2) | EVENTINF_MASK(EVENTINF_HAGGLING_TOWNSFOLK_MESG_3) | \ + EVENTINF_MASK(EVENTINF_HAGGLING_TOWNSFOLK_MESG_4)) + +#define GET_EVENTINF_ENMU_TALK_FLAGS() \ + gSaveContext.eventInf[EVENTINF_INDEX_HAGGLING_TOWNSFOLK] & EVENTINF_HAGGLING_TOWNSFOLK_MASK + +#define SET_EVENTINF_ENMU_TALK_FLAGS(talkFlags) \ + gSaveContext.eventInf[EVENTINF_INDEX_HAGGLING_TOWNSFOLK] |= (talkFlags); + +#define RESET_EVENTINF_ENMU_TALK_FLAGS() \ + gSaveContext.eventInf[EVENTINF_INDEX_HAGGLING_TOWNSFOLK] &= ~(EVENTINF_HAGGLING_TOWNSFOLK_MASK); #define EVENTINF_30 0x30 |