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

[iQue] Match ovl_kaleido_scope (#2421)

Browse Source 
* [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>
This commit is contained in:
cadmic
2025-01-14 05:32:00 -08:00
committed by GitHub
parent bdc6b50153
commit e2ed5568e5
6 changed files with 121 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64save.h
+3 -3
View File
@@ -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) \