Merge branch 'master' into DRMain

# Conflicts:
#	tables.asm
This commit is contained in:
aerinon
2022-01-05 14:26:48 -07:00
11 changed files with 180 additions and 212 deletions

View File

@@ -1875,7 +1875,7 @@ Enable_TerrorPin_AI_Fix:
db #$01
;Shop slot count as check
org $30E560 ; PC 0x18650
org $30E560 ; PC 0x186560
EnableShopItemCount:
db #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00
db #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00