mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-06-02 02:00:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Defines for SaveContext flags (eventChkInf, itemGetInf, infTable, eventInf) (#1094)

Browse Source 
* 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
This commit is contained in:
Dragorn421
2022-04-29 20:19:48 +02:00
committed by GitHub
parent 16790bc253
commit 6336df5fcd
146 changed files with 1931 additions and 1315 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_map_data.c
+20 -2
View File
@@ -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] = {