diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2022-04-29 20:19:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-29 14:19:48 -0400 |
| commit | 6336df5fcd26f664bc040540394ff612561a5bad (patch) | |
| tree | bc752b5a7f859ecb8512952afc480da5688dcbaa /src/elf_message | |
| parent | 16790bc253c5b52b140938ef831bb699f7927d58 (diff) | |
Defines for `SaveContext` flags (`eventChkInf`, `itemGetInf`, `infTable`, `eventInf`) (#1094)
* script-assisted `itemGetInf` flags
* comment near non-trivial `itemGetInf` usage
* Run formatter
* Try something with the itemgetinf flags that can't use the packed value
* Add defines for `eventChkInf` (direct access)
* Add defines for `eventChkInf` (access through `Flags_GetEventChkInf`)
* Add defines for `eventChkInf` (access through `Flags_SetEventChkInf`)
* Add defines for `infTable` (direct access)
* Add defines for `infTable` (used by `Flags_GetInfTable`)
* Add defines for `infTable` (used by `Flags_SetInfTable`)
* Add defines for `eventInf`
* parenthesis cleanup near `GET_EVENTCHKINF` usage
* parenthesis cleanup near `GET_ITEMGETINF` usage
* parenthesis cleanup near `GET_INFTABLE` usage
* fixup one `eventInf` usage
* parenthesis cleanup near `GET_EVENTINF` usage
* parenthesis cleanup near `Flags_GetEventChkInf` usage
* slight `z64save.h` formatting improvement
* Improve itemGetInf flags in z_bg_dy_yoseizo
* Questionable improvement in z_en_ge2
* Questionable improvement in z_en_daiku
* Questionable improvement in z_en_mu
* Run formatter
* Parentheses around `gSaveContext` macros arguments
* Move individual flags define to the end of z64save.h, and improve comments separating the groups
Diffstat (limited to 'src/elf_message')
| -rw-r--r-- | src/elf_message/elf_message_field.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/elf_message/elf_message_field.c b/src/elf_message/elf_message_field.c index fe1e8ee97..57736c5a3 100644 --- a/src/elf_message/elf_message_field.c +++ b/src/elf_message/elf_message_field.c @@ -2,32 +2,32 @@ #include "z64elf_message.h" ElfMessage gOverworldNaviMsgs[] = { - ELF_MSG_FLAG(CHECK, 0x40, false, 0x05), /* eventChkInf[0] & 0x20 */ - ELF_MSG_FLAG(CHECK, 0x41, false, 0x09), /* eventChkInf[0] & 0x200 */ - ELF_MSG_FLAG(CHECK, 0x42, false, 0x12), /* eventChkInf[1] & 0x4 */ - ELF_MSG_FLAG(CHECK, 0x43, false, 0x14), /* eventChkInf[1] & 0x10 */ - ELF_MSG_FLAG(CHECK, 0x44, false, 0x40), /* eventChkInf[4] & 0x1 */ + ELF_MSG_FLAG(CHECK, 0x40, false, EVENTCHKINF_05), + ELF_MSG_FLAG(CHECK, 0x41, false, EVENTCHKINF_09), + ELF_MSG_FLAG(CHECK, 0x42, false, EVENTCHKINF_12), + ELF_MSG_FLAG(CHECK, 0x43, false, EVENTCHKINF_14), + ELF_MSG_FLAG(CHECK, 0x44, false, EVENTCHKINF_40), ELF_MSG_SONG(CHECK, 0x45, false, ITEM_SONG_SARIA), ELF_MSG_STRENGTH_UPG(CHECK, 0x46, true, 0), - ELF_MSG_FLAG(CHECK, 0x47, false, 0x25), /* eventChkInf[2] & 0x20 */ + ELF_MSG_FLAG(CHECK, 0x47, false, EVENTCHKINF_25), ELF_MSG_MAGIC(CHECK, 0x48, false), - ELF_MSG_FLAG(CHECK, 0x49, false, 0x33), /* eventChkInf[3] & 0x8 */ - ELF_MSG_FLAG(CHECK, 0x4A, false, 0x37), /* eventChkInf[3] & 0x80 */ - ELF_MSG_FLAG(CHECK, 0x4B, false, 0x80), /* eventChkInf[8] & 0x1 */ - ELF_MSG_FLAG(CHECK, 0x4C, false, 0x43), /* eventChkInf[4] & 0x8 */ - ELF_MSG_FLAG(CHECK, 0x4D, false, 0x45), /* eventChkInf[4] & 0x20 */ + ELF_MSG_FLAG(CHECK, 0x49, false, EVENTCHKINF_33), + ELF_MSG_FLAG(CHECK, 0x4A, false, EVENTCHKINF_37), + ELF_MSG_FLAG(CHECK, 0x4B, false, EVENTCHKINF_80), + ELF_MSG_FLAG(CHECK, 0x4C, false, EVENTCHKINF_43), + ELF_MSG_FLAG(CHECK, 0x4D, false, EVENTCHKINF_45), ELF_MSG_ITEM(CHECK, 0x4E, true, ITEM_HOOKSHOT, ITEM_NONE), ELF_MSG_MEDALLION(CHECK, 0x50, false, ITEM_MEDALLION_FOREST), ELF_MSG_MEDALLION(CHECK, 0x51, false, ITEM_MEDALLION_FIRE), ELF_MSG_BOOTS(CHECK, 0x52, false, ITEM_BOOTS_IRON), ELF_MSG_MEDALLION(CHECK, 0x53, false, ITEM_MEDALLION_WATER), - ELF_MSG_FLAG(CHECK, 0x54, false, 0xAA), /* eventChkInf[10] & 0x400 */ + ELF_MSG_FLAG(CHECK, 0x54, false, EVENTCHKINF_AA), ELF_MSG_ITEM(CHECK, 0x55, true, ITEM_LENS, ITEM_NONE), ELF_MSG_MEDALLION(CHECK, 0x57, false, ITEM_MEDALLION_SHADOW), ELF_MSG_SONG(CHECK, 0x58, false, ITEM_SONG_REQUIEM), ELF_MSG_STRENGTH_UPG(CHECK, 0x56, true, 1), ELF_MSG_MEDALLION(CHECK, 0x5A, false, ITEM_MEDALLION_SPIRIT), ELF_MSG_ITEM(CHECK, 0x5B, true, ITEM_ARROW_LIGHT, ITEM_NONE), - ELF_MSG_FLAG(CHECK, 0x5C, false, 0xC3), /* eventChkInf[12] & 0x8 */ + ELF_MSG_FLAG(CHECK, 0x5C, false, EVENTCHKINF_C3), ELF_MSG_END(0x5F), }; |