diff options
| author | cadmic <cadmic24@gmail.com> | 2025-01-14 05:32:00 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-14 08:32:00 -0500 |
| commit | e2ed5568e5b7ec77796b43c12e30311e0fd84fec (patch) | |
| tree | 6a67eb428b4f2a8ca7f06a0261d59eaf25556aa1 /include | |
| parent | bdc6b5015374cdedcc7b599d3774537bc2802ae1 (diff) | |
[iQue] Match ovl_kaleido_scope (#2421)
* [iQue] Match ovl_kaleido_scope
* Add bug comment for OOB reads
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Preemptively fix merge conflicts
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/z64save.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/z64save.h b/include/z64save.h index 3d61f485f..142a11294 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -420,8 +420,8 @@ typedef enum LinkAge { #define CUR_EQUIP_VALUE(equip) ((s32)(gSaveContext.save.info.equips.equipment & gEquipMasks[equip]) >> gEquipShifts[equip]) #define OWNED_EQUIP_FLAG(equip, value) (gBitFlags[value] << gEquipShifts[equip]) #define OWNED_EQUIP_FLAG_ALT(equip, value) ((1 << (value)) << gEquipShifts[equip]) -#define CHECK_OWNED_EQUIP(equip, value) (OWNED_EQUIP_FLAG(equip, value) & gSaveContext.save.info.inventory.equipment) -#define CHECK_OWNED_EQUIP_ALT(equip, value) (gBitFlags[(value) + (equip) * 4] & gSaveContext.save.info.inventory.equipment) +#define CHECK_OWNED_EQUIP(equip, value) (gSaveContext.save.info.inventory.equipment & OWNED_EQUIP_FLAG(equip, value)) +#define CHECK_OWNED_EQUIP_ALT(equip, value) (gSaveContext.save.info.inventory.equipment & gBitFlags[(value) + (equip) * 4]) #define SWORD_EQUIP_TO_PLAYER(swordEquip) (swordEquip) #define SHIELD_EQUIP_TO_PLAYER(shieldEquip) (shieldEquip) @@ -432,7 +432,7 @@ typedef enum LinkAge { #define CAPACITY(upg, value) gUpgradeCapacities[upg][value] #define CUR_CAPACITY(upg) CAPACITY(upg, CUR_UPG_VALUE(upg)) -#define CHECK_QUEST_ITEM(item) (gBitFlags[item] & gSaveContext.save.info.inventory.questItems) +#define CHECK_QUEST_ITEM(item) (gSaveContext.save.info.inventory.questItems & gBitFlags[item]) #define CHECK_DUNGEON_ITEM(item, dungeonIndex) (gSaveContext.save.info.inventory.dungeonItems[dungeonIndex] & gBitFlags[item]) #define GET_GS_FLAGS(index) \ |