diff options
| author | Garrett Cox <garrettjcox@gmail.com> | 2023-11-05 07:43:24 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-05 07:43:24 -0600 |
| commit | 20bb36c16419fb2811ea68583ba00a53abe739e6 (patch) | |
| tree | 0463b2f6b8362905cbcf2cdd4e9d889b5098bcac /soh/src/code/code_80097A00.c | |
| parent | 051314e8b1f452cbfa62abe7decac73b8b5ae071 (diff) | |
| parent | 129f410aba106b10b72e79a0d075464e95021db4 (diff) | |
Merge pull request #3352 from Archez/mergeDevelopIntoRando4
Merge develop into develop-rando
Diffstat (limited to 'soh/src/code/code_80097A00.c')
| -rw-r--r-- | soh/src/code/code_80097A00.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/soh/src/code/code_80097A00.c b/soh/src/code/code_80097A00.c index e2c8a61ef..9e20d66aa 100644 --- a/soh/src/code/code_80097A00.c +++ b/soh/src/code/code_80097A00.c @@ -191,22 +191,22 @@ void Inventory_ChangeEquipment(s16 equipment, u16 value) { u8 Inventory_DeleteEquipment(PlayState* play, s16 equipment) { Player* player = GET_PLAYER(play); s32 pad; - u16 sp26 = gSaveContext.equips.equipment & gEquipMasks[equipment]; + u16 equipValue = gSaveContext.equips.equipment & gEquipMasks[equipment]; // "Erasing equipment item = %d zzz=%d" - osSyncPrintf("装備アイテム抹消 = %d zzz=%d\n", equipment, sp26); + osSyncPrintf("装備アイテム抹消 = %d zzz=%d\n", equipment, equipValue); - if (sp26) { - sp26 >>= gEquipShifts[equipment]; + if (equipValue) { + equipValue >>= gEquipShifts[equipment]; gSaveContext.equips.equipment &= gEquipNegMasks[equipment]; - gSaveContext.inventory.equipment ^= gBitFlags[sp26 - 1] << gEquipShifts[equipment]; + gSaveContext.inventory.equipment ^= OWNED_EQUIP_FLAG(equipment, equipValue - 1); - if (equipment == EQUIP_TUNIC) { - gSaveContext.equips.equipment |= 0x0100; + if (equipment == EQUIP_TYPE_TUNIC) { + gSaveContext.equips.equipment |= EQUIP_VALUE_TUNIC_KOKIRI << (EQUIP_TYPE_TUNIC * 4); } - if (equipment == EQUIP_SWORD) { + if (equipment == EQUIP_TYPE_SWORD) { gSaveContext.equips.buttonItems[0] = ITEM_NONE; gSaveContext.infTable[29] = 1; } @@ -215,7 +215,7 @@ u8 Inventory_DeleteEquipment(PlayState* play, s16 equipment) { play->pauseCtx.cursorSpecialPos = PAUSE_CURSOR_PAGE_LEFT; } - return sp26; + return equipValue; } void Inventory_ChangeUpgrade(s16 upgrade, s16 value) { |