falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Format

This commit is contained in:
Pablo 2025-08-01 18:01:22 +02:00
parent 1acc53cfc6
commit c4fe373beb
3 changed files with 15 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/upgrade.h
View File

@ -160,4 +160,4 @@ static_assert(
#define CAPACITY(upg, value) gUpgradeCapacities[upg][value] #define CAPACITY(upg, value) gUpgradeCapacities[upg][value]
#define CUR_CAPACITY(upg) CAPACITY(upg, CUR_UPG_VALUE(upg)) #define CUR_CAPACITY(upg) CAPACITY(upg, CUR_UPG_VALUE(upg))
#endif #endif

32
src/code/z_inventory.c
View File

@ -31,25 +31,15 @@ u16 gEquipNegMasks[EQUIP_TYPE_MAX] = {
}; };
u32 gUpgradeMasks[UPG_MAX] = { u32 gUpgradeMasks[UPG_MAX] = {
GET_UPGRADE_BITMASK(UPG_QUIVER), GET_UPGRADE_BITMASK(UPG_QUIVER), GET_UPGRADE_BITMASK(UPG_BOMB_BAG), GET_UPGRADE_BITMASK(UPG_STRENGTH),
GET_UPGRADE_BITMASK(UPG_BOMB_BAG), GET_UPGRADE_BITMASK(UPG_SCALE), GET_UPGRADE_BITMASK(UPG_WALLET), GET_UPGRADE_BITMASK(UPG_BULLET_BAG),
GET_UPGRADE_BITMASK(UPG_STRENGTH), GET_UPGRADE_BITMASK(UPG_DEKU_STICKS), GET_UPGRADE_BITMASK(UPG_DEKU_NUTS),
GET_UPGRADE_BITMASK(UPG_SCALE),
GET_UPGRADE_BITMASK(UPG_WALLET),
GET_UPGRADE_BITMASK(UPG_BULLET_BAG),
GET_UPGRADE_BITMASK(UPG_DEKU_STICKS),
GET_UPGRADE_BITMASK(UPG_DEKU_NUTS),
}; };
u32 gUpgradeNegMasks[UPG_MAX] = { u32 gUpgradeNegMasks[UPG_MAX] = {
~GET_UPGRADE_BITMASK(UPG_QUIVER), ~GET_UPGRADE_BITMASK(UPG_QUIVER), ~GET_UPGRADE_BITMASK(UPG_BOMB_BAG), ~GET_UPGRADE_BITMASK(UPG_STRENGTH),
~GET_UPGRADE_BITMASK(UPG_BOMB_BAG), ~GET_UPGRADE_BITMASK(UPG_SCALE), ~GET_UPGRADE_BITMASK(UPG_WALLET), ~GET_UPGRADE_BITMASK(UPG_BULLET_BAG),
~GET_UPGRADE_BITMASK(UPG_STRENGTH), ~GET_UPGRADE_BITMASK(UPG_DEKU_STICKS), ~GET_UPGRADE_BITMASK(UPG_DEKU_NUTS),
~GET_UPGRADE_BITMASK(UPG_SCALE),
~GET_UPGRADE_BITMASK(UPG_WALLET),
~GET_UPGRADE_BITMASK(UPG_BULLET_BAG),
~GET_UPGRADE_BITMASK(UPG_DEKU_STICKS),
~GET_UPGRADE_BITMASK(UPG_DEKU_NUTS),
}; };
u8 gEquipShifts[EQUIP_TYPE_MAX] = { u8 gEquipShifts[EQUIP_TYPE_MAX] = {
@ -60,14 +50,8 @@ u8 gEquipShifts[EQUIP_TYPE_MAX] = {
}; };
u8 gUpgradeShifts[UPG_MAX] = { u8 gUpgradeShifts[UPG_MAX] = {
SHIFT_UPG_QUIVER, SHIFT_UPG_QUIVER, SHIFT_UPG_BOMB_BAG, SHIFT_UPG_STRENGTH, SHIFT_UPG_SCALE,
SHIFT_UPG_BOMB_BAG, SHIFT_UPG_WALLET, SHIFT_UPG_BULLET_BAG, SHIFT_UPG_DEKU_STICKS, SHIFT_UPG_DEKU_NUTS,
SHIFT_UPG_STRENGTH,
SHIFT_UPG_SCALE,
SHIFT_UPG_WALLET,
SHIFT_UPG_BULLET_BAG,
SHIFT_UPG_DEKU_STICKS,
SHIFT_UPG_DEKU_NUTS,
}; };
u16 gUpgradeCapacities[UPG_MAX][4] = { u16 gUpgradeCapacities[UPG_MAX][4] = {

26
src/code/z_sram.c
View File

@ -185,16 +185,9 @@ static Inventory sNewSaveInventory = {
// equipment // equipment
(((1 << EQUIP_INV_TUNIC_KOKIRI) << (EQUIP_TYPE_TUNIC * 4)) | (((1 << EQUIP_INV_TUNIC_KOKIRI) << (EQUIP_TYPE_TUNIC * 4)) |
((1 << EQUIP_INV_BOOTS_KOKIRI) << (EQUIP_TYPE_BOOTS * 4))), ((1 << EQUIP_INV_BOOTS_KOKIRI) << (EQUIP_TYPE_BOOTS * 4))),
GET_PACKED_UPGRADES_VALUE( GET_PACKED_UPGRADES_VALUE(UPG_QUIVER_NONE, UPG_BOMB_BAG_NONE, UPG_STRENGTH_NONE, UPG_SCALE_NONE, UPG_WALLET_CHILD,
UPG_QUIVER_NONE, UPG_BULLET_BAG_NONE, UPG_DEKU_STICKS_NONE,
UPG_BOMB_BAG_NONE, UPG_DEKU_NUTS_NONE), // upgrades
UPG_STRENGTH_NONE,
UPG_SCALE_NONE,
UPG_WALLET_CHILD,
UPG_BULLET_BAG_NONE,
UPG_DEKU_STICKS_NONE,
UPG_DEKU_NUTS_NONE
), // upgrades
0, // questItems 0, // questItems
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // dungeonItems { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // dungeonItems
{ {
@ -354,16 +347,9 @@ static Inventory sDebugSaveInventory = {
(((1 << EQUIP_INV_BOOTS_KOKIRI) << (EQUIP_TYPE_BOOTS * 4)) | (((1 << EQUIP_INV_BOOTS_KOKIRI) << (EQUIP_TYPE_BOOTS * 4)) |
((1 << EQUIP_INV_BOOTS_IRON) << (EQUIP_TYPE_BOOTS * 4)) | ((1 << EQUIP_INV_BOOTS_IRON) << (EQUIP_TYPE_BOOTS * 4)) |
((1 << EQUIP_INV_BOOTS_HOVER) << (EQUIP_TYPE_BOOTS * 4)))), ((1 << EQUIP_INV_BOOTS_HOVER) << (EQUIP_TYPE_BOOTS * 4)))),
GET_PACKED_UPGRADES_VALUE( GET_PACKED_UPGRADES_VALUE(UPG_QUIVER_NORMAL, UPG_BOMB_BAG_NORMAL, UPG_STRENGTH_GORON_BRACELET, UPG_SCALE_SILVER,
UPG_QUIVER_NORMAL, UPG_WALLET_ADULT, UPG_BULLET_BAG_NORMAL, UPG_DEKU_STICKS_10,
UPG_BOMB_BAG_NORMAL, UPG_DEKU_NUTS_20), // upgrades
UPG_STRENGTH_GORON_BRACELET,
UPG_SCALE_SILVER,
UPG_WALLET_ADULT,
UPG_BULLET_BAG_NORMAL,
UPG_DEKU_STICKS_10,
UPG_DEKU_NUTS_20
), // upgrades
0x1E3FFFF, // questItems 0x1E3FFFF, // questItems
{ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // dungeonItems { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // dungeonItems
{ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8 }, // dungeonKeys { 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8 }, // dungeonKeys