Fix potion refills counting in shops

Bee traps - graphics upgrade
This commit is contained in:
aerinon
2023-09-09 16:41:44 -06:00
parent b67e5c8433
commit 23ef62522b
4 changed files with 49 additions and 22 deletions

View File

@@ -738,18 +738,18 @@ endmacro
%InventoryItem($2B, $0085, $0000, $0000) ; 2B - Full bottle (red)
%InventoryItem($2C, $0085, $0000, $0000) ; 2C - Full bottle (green)
%InventoryItem($2D, $0085, $0000, $0000) ; 2D - Full bottle (blue)
%InventoryItem($2E, $0080, $0000, $0000) ; 2E - Potion refill (red)
%InventoryItem($2F, $0080, $0000, $0000) ; 2F - Potion refill (green)
%InventoryItem($30, $0080, $0000, $0000) ; 30 - Potion refill (blue)
%InventoryItem($2E, $0081, $0000, $0000) ; 2E - Potion refill (red)
%InventoryItem($2F, $0081, $0000, $0000) ; 2F - Potion refill (green)
%InventoryItem($30, $0081, $0000, $0000) ; 30 - Potion refill (blue)
%InventoryItem($31, $0011, $0000, $0000) ; 31 - 10 bombs
%InventoryItem($32, $0001, $0000, $0000) ; 32 - Big key
%InventoryItem($33, $0001, $0000, $0000) ; 33 - Map
%InventoryItem($34, $0001, $0000, $0000) ; 34 - 1 rupee
%InventoryItem($35, $0001, $0000, $0000) ; 35 - 5 rupees
%InventoryItem($36, $0001, $0000, $0000) ; 36 - 20 rupees
%InventoryItem($37, $0000, $0000, $0000) ; 37 - Green pendant
%InventoryItem($38, $0000, $0000, $0000) ; 38 - Red pendant
%InventoryItem($39, $0000, $0000, $0000) ; 39 - Blue pendant
%InventoryItem($37, $0001, $0000, $0000) ; 37 - Green pendant
%InventoryItem($38, $0001, $0000, $0000) ; 38 - Red pendant
%InventoryItem($39, $0001, $0000, $0000) ; 39 - Blue pendant
%InventoryItem($3A, $00A5, $0000, $0000) ; 3A - Bow And Arrows
%InventoryItem($3B, $00A5, $0000, $0000) ; 3B - Silver Bow
%InventoryItem($3C, $0085, $0000, $0000) ; 3C - Full bottle (bee)
@@ -868,13 +868,13 @@ endmacro
%InventoryItem($AD, $0041, $0000, SmallKeyCounter) ; AD - Small key of Ganon's Tower
%InventoryItem($AE, $0001, $0000, $0000) ; AE - Reserved
%InventoryItem($AF, $0001, $0000, SmallKeyCounter) ; AF - Generic small key
%InventoryItem($B0, $0080, $0000, $0000) ; B0 - Crystal 6
%InventoryItem($B1, $0080, $0000, $0000) ; B1 - Crystal 1
%InventoryItem($B2, $0080, $0000, $0000) ; B2 - Crystal 5
%InventoryItem($B3, $0080, $0000, $0000) ; B3 - Crystal 7
%InventoryItem($B4, $0080, $0000, $0000) ; B4 - Crystal 2
%InventoryItem($B5, $0080, $0000, $0000) ; B5 - Crystal 4
%InventoryItem($B6, $0080, $0000, $0000) ; B6 - Crystal 3
%InventoryItem($B0, $0081, $0000, $0000) ; B0 - Crystal 6
%InventoryItem($B1, $0081, $0000, $0000) ; B1 - Crystal 1
%InventoryItem($B2, $0081, $0000, $0000) ; B2 - Crystal 5
%InventoryItem($B3, $0081, $0000, $0000) ; B3 - Crystal 7
%InventoryItem($B4, $0081, $0000, $0000) ; B4 - Crystal 2
%InventoryItem($B5, $0081, $0000, $0000) ; B5 - Crystal 4
%InventoryItem($B6, $0081, $0000, $0000) ; B6 - Crystal 3
%InventoryItem($B7, $0000, $0000, $0000) ; B7 - Reserved
%InventoryItem($B8, $0001, $0000, $0000) ; B8 -
%InventoryItem($B9, $0001, $0000, $0000) ; B9 -
@@ -1434,7 +1434,7 @@ StandingItemGraphicsOffsets:
dw $0 ; CD -
dw $0 ; CE -
dw $0 ; CF -
dw $11E0 ; D0 - Bee trap
dw BigDecompressionBuffer+$09A0 ; D0 - Bee trap
dw $11E0 ; D1 - Apples
dw $11E0 ; D2 - Fairy
dw $11E0 ; D3 - Chicken