From 4cd1cf5ba2800753d2a1f771e33b3861fd530089 Mon Sep 17 00:00:00 2001
From: Kat <north@tinymagnet.com>
Date: Sat, 8 Sep 2018 21:16:57 -0400
Subject: [PATCH] shopkeeper zero price fix

---
 shopkeeper.asm | 25 ++++++++++++++-----------
 tables.asm     | 19 +------------------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/shopkeeper.asm b/shopkeeper.asm
index 5edddb3..a6fe747 100644
--- a/shopkeeper.asm
+++ b/shopkeeper.asm
@@ -749,19 +749,22 @@ Shopkeeper_DrawNextPrice:
 		INY : LDA ($02), Y : STA !COLUMN_HIGH
 	PLY
 	LDA.l !SHOP_INVENTORY+1, X : STA $0C ; set value
-	JSR.w DrawPrice
-	SEP #$20 : STA $06 : STZ $07 ; set 8-bit accumulator & store result
-	PHA
-		LDA.b #!BIGRAM : STA $08
-		LDA.b #!BIGRAM>>8 : STA $09
-		LDA.b #$7E : PHA : PLB ; set data bank to $7E
+	
+	BEQ .free
+		JSR.w DrawPrice
+		SEP #$20 : STA $06 : STZ $07 ; set 8-bit accumulator & store result
+		PHA
+			LDA.b #!BIGRAM : STA $08
+			LDA.b #!BIGRAM>>8 : STA $09
+			LDA.b #$7E : PHA : PLB ; set data bank to $7E
 
-		PHX : PHA : LDA !SCRATCH_TEMP_X : TAX : PLA : JSL.l Sprite_DrawMultiple_quantity_preset : PLX
+			PHX : PHA : LDA !SCRATCH_TEMP_X : TAX : PLA : JSL.l Sprite_DrawMultiple_quantity_preset : PLX
 		
-		LDA 1,s
-		ASL #2 : !ADD $90 : STA $90 ; increment oam pointer
-	PLA
-	!ADD $92 : STA $92
+			LDA 1,s
+			ASL #2 : !ADD $90 : STA $90 ; increment oam pointer
+		PLA
+		!ADD $92 : STA $92
+	.free
 	PLP : PLY : PLX
 	PLB
 RTS
diff --git a/tables.asm b/tables.asm
index 8aa2ea1..9947154 100644
--- a/tables.asm
+++ b/tables.asm
@@ -1490,27 +1490,10 @@ org $30C800 ; PC 0x184800 - 0x1848FF - max 32 shops ; do not exceed 36 tracked i
 ShopTable:
 ;db [id][roomID-low][roomID-high][doorID][zero][shop_config][shopkeeper_config][sram_index]
 db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-;db $01, $FF, $00, $00, $00, $43, $A0, $00
-;db $02, $0F, $01, $60, $00, $03, $C1, $03
-;db $FF, $12, $01, $58, $00, $81, $E3, $06
-;db $02, $0F, $01, $57, $00, $03, $A0, $09
-;db $03, $0F, $01, $60, $00, $03, $A0, $0c
-;db $04, $0F, $01, $6F, $00, $03, $A0, $0f
-;db $05, $FF, $00, $00, $00, $03, $A0, $12
-;db $06, $1F, $01, $46, $00, $03, $A0, $15
-;db $FF, $12, $01, $58, $00, $03, $A0, $18
+
 org $30C900 ; PC 0x184900 - 0x184FFF - max 224 entries
 ShopContentsTable:
 ;db [id][item][price-low][price-high][max][repl_id][repl_price-low][repl_price-high]
-;db $01, $2E, $96, $00, $00, $FF, $00, $00
-;db $01, $AF, $50, $00, $00, $FF, $00, $00
-;db $01, $31, $32, $00, $00, $FF, $00, $00
-;db $02, $2E, $96, $00, $00, $FF, $00, $00
-;db $02, $AF, $50, $00, $00, $FF, $00, $00
-;db $02, $31, $32, $00, $00, $FF, $00, $00
-;db $FF, $5E, $96, $00, $00, $FF, $00, $00
-;db $FF, $30, $2C, $01, $00, $FF, $00, $00
-;db $FF, $31, $32, $00, $00, $FF, $00, $00
 db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
 ;================================================================================
 org $30D000 ; PC 0x185000 - 0x18503F