From 6336df5fcd26f664bc040540394ff612561a5bad Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Fri, 29 Apr 2022 20:19:48 +0200 Subject: 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 --- src/code/z_map_data.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'src/code/z_map_data.c') diff --git a/src/code/z_map_data.c b/src/code/z_map_data.c index 3ee22c7a0..881950c6d 100644 --- a/src/code/z_map_data.c +++ b/src/code/z_map_data.c @@ -239,8 +239,26 @@ static s16 sOwEntranceIconPosY[24] = { }; static u16 sOwEntranceFlag[20] = { - 0xFFFF, 0x0008, 0x0007, 0xFFFF, 0x0000, 0x0003, 0x0005, 0xFFFF, 0x0002, 0xFFFF, - 0xFFFF, 0x0006, 0x000B, 0xFFFF, 0xFFFF, 0x0001, 0x0004, 0xFFFF, 0xFFFF, 0x000D, + 0xFFFF, + INFTABLE_1A8_SHIFT, + INFTABLE_1A7_SHIFT, + 0xFFFF, + INFTABLE_1A0_SHIFT, + INFTABLE_1A3_SHIFT, + INFTABLE_1A5_SHIFT, + 0xFFFF, + INFTABLE_1A2_SHIFT, + 0xFFFF, + 0xFFFF, + INFTABLE_1A6_SHIFT, + INFTABLE_1AB_SHIFT, + 0xFFFF, + 0xFFFF, + INFTABLE_1A1_SHIFT, + INFTABLE_1A4_SHIFT, + 0xFFFF, + 0xFFFF, + INFTABLE_1AD_SHIFT, }; static f32 sFloorCoordY[10][8] = { -- cgit v1.2.3