diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2022-11-05 15:48:36 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-05 15:48:36 -0300 |
| commit | ba4368d0e8ebaeabf57cd5ae0105afb4f4eee6f8 (patch) | |
| tree | a19b3428181ab3a744aec94c74925b810867b833 /src/code/z_schedule.c | |
| parent | baaa79b979e446afa8ff16dca83b07a58b9dce6a (diff) | |
Macros for `weekEventReg` and `eventInf` (#984)
* make macros
* script
* Use the script on the whole codebase
* fix script
* Rename GET to CHECk
* More replacements
* Update weekeventflags on schedule scripts
* eventinf defines
* eventinfconvert
* run the scripts on the codebase
* format
* RACE_FLAGS
* format
* remove redundant parenthesis
* format
* add macros to permuter_settings
* comments on WEEKEVENTREG_
* format
* CHECK_WEEKEVENTREG_ALT
* don't automatically generate the macros on the script to allow naming them
* format D_801C66D0 a bit
* add TODOs
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_En_Baisen/z_en_baisen.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_Boss_06/z_boss_06.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_En_Raf/z_en_raf.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* new files
* format
* weekeventreg
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* update
* format
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* flags
* a
* eventinf stuff
* format
* EnGakufu
* flags
* run the script
* format
* whoops
* cleanup
* fix
* update weekeventregs
* format
* format
* review
* format
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Diffstat (limited to 'src/code/z_schedule.c')
| -rw-r--r-- | src/code/z_schedule.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/code/z_schedule.c b/src/code/z_schedule.c index 6a2492631..fdefb0f42 100644 --- a/src/code/z_schedule.c +++ b/src/code/z_schedule.c @@ -8,9 +8,9 @@ s32 Schedule_CheckFlagS(PlayState* play, u8** script, ScheduleOutput* output) { ScheduleCmdCheckFlagS* cmd = (ScheduleCmdCheckFlagS*)*script; - u16 flag = (cmd->flagByte << 8) | cmd->flagMask; + u16 flag = PACK_WEEKEVENTREG_FLAG(cmd->flagByte, cmd->flagMask); - if (gSaveContext.save.weekEventReg[flag >> 8] & (flag & 0xFF)) { + if (CHECK_WEEKEVENTREG(flag)) { *script += cmd->offset; } @@ -19,9 +19,9 @@ s32 Schedule_CheckFlagS(PlayState* play, u8** script, ScheduleOutput* output) { s32 Schedule_CheckFlagL(PlayState* play, u8** script, ScheduleOutput* output) { ScheduleCmdCheckFlagL* cmd = (ScheduleCmdCheckFlagL*)*script; - u16 flag = (cmd->flagByte << 8) | cmd->flagMask; + u16 flag = PACK_WEEKEVENTREG_FLAG(cmd->flagByte, cmd->flagMask); - if (gSaveContext.save.weekEventReg[flag >> 8] & (flag & 0xFF)) { + if (CHECK_WEEKEVENTREG(flag)) { *script += (s16)((cmd->offsetH << 8) | cmd->offsetL); } |