Fix for shops and powder

Fix for dungeon indicator
This commit is contained in:
aerinon
2023-08-28 11:32:46 -06:00
parent 09702e659d
commit b688149dfa
8 changed files with 29 additions and 28 deletions

15
ram.asm
View File

@@ -520,11 +520,12 @@ ShopCapacity: skip 1 ; Four lower bits of shop_config in ShopTable
ShopScratch: skip 1 ; Scratch byte used in shop drawing routines
ShopSRAMIndex: skip 1 ; SRAM index for purchase counts
ShopMerchant: skip 1 ; Loaded from ShopTable and used to jump to one of four drawing routines
ShopInventoryPlayer: skip 1 ; Multiworld id for player inventory
ShopInventoryDisguise: skip 1 ; Bee trap is disguised as another item in shop
ShopPriceColumn: skip 3 ; Stores coordinates for drawing prices in shops
ShopkeeperRefill: skip 1 ; Flag for the shopkeeper refill action
skip 6 ; Unused
PowderFlag: skip 1 ; Flag for powder junk
ShopPriceColumn: skip 3 ; Stores coordinates for drawing prices in shops
ShopInventoryPlayer: skip 3 ; Multiworld id for player inventory
ShopInventoryDisguise: skip 3 ; Bee trap is disguised as another item in shop
skip 1 ; Unused
skip 2 ; Reserved for OneMind
OneMindId: skip 1 ; Current OneMind player
OneMindTimerRAM: skip 2 ; Frame counter for OneMind
@@ -924,10 +925,10 @@ endmacro
%assertRAM(ShopScratch, $7F5061)
%assertRAM(ShopSRAMIndex, $7F5062)
%assertRAM(ShopMerchant, $7F5063)
%assertRAM(ShopInventoryPlayer, $7F5064)
%assertRAM(ShopInventoryDisguise, $7F5065)
%assertRAM(ShopkeeperRefill, $7F5064)
%assertRAM(ShopPriceColumn, $7F5066)
%assertRAM(ShopkeeperRefill, $7F5069)
%assertRAM(ShopInventoryPlayer, $7F5069)
%assertRAM(ShopInventoryDisguise, $7F506C)
%assertRAM(OneMindId, $7F5072)
%assertRAM(OneMindTimerRAM, $7F5073)
%assertRAM(ClockStatus, $7F507E)