let's dev 2/11/18

fixes for retro/shops/generic keys
This commit is contained in:
Karkat
2018-02-11 00:02:49 -05:00
parent 6728d21fd5
commit ac274f444c
9 changed files with 173 additions and 55 deletions

View File

@@ -1415,19 +1415,54 @@ db $FF, $FF, $FF, $FF
; t - 0=Shop - 1=TakeAny
; d - 0=Check Door - 1=Skip Door Check
; qq - # of items for sale
;shopkeeper_config - -ppp --ss
; ppp - palette
; ss - sprite type
org $30C800 ; PC 0x184800 - 0x18487F - max 16 shops
ShopTable:
;db [id][roomID-low][roomID-high][doorID][zero][shop_config][pad][pad]
;db $01, $1F, $01, $46, $00, $03, $00, $00 ; Kakariko shop
;db $FF, $12, $01, $58, $00, $03, $00, $00
;db [id][roomID-low][roomID-high][doorID][zero][shop_config][shopkeeper_config][pad]
db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
db $00, $12, $01, $6E, $00, $03, $51, $00
db $01, $10, $01, $75, $00, $03, $50, $00
db $02, $0F, $01, $57, $00, $03, $50, $00
db $03, $0F, $01, $60, $00, $03, $50, $00
db $04, $0F, $01, $6F, $00, $03, $50, $00
db $05, $FF, $00, $00, $00, $03, $50, $00
db $06, $1F, $01, $46, $00, $03, $50, $00
db $FF, $12, $01, $58, $00, $03, $50, $00
org $30C880 ; PC 0x184880 - 0x184FFF - max 240 entries
ShopContentsTable:
;db [id][item][price-low][price-high][max][repl_id][repl_price-low][repl_price-high]
db $FF, $AF, $50, $00, $00, $FF, $00, $00
db $FF, $27, $0A, $00, $00, $FF, $00, $00
db $FF, $12, $F4, $01, $01, $2F, $3C, $00
;db $FF, $AF, $50, $00, $00, $FF, $00, $00
;db $FF, $31, $0A, $00, $00, $FF, $00, $00
;db $FF, $12, $F4, $01, $01, $2F, $3C, $00
db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
;db $00, $2E, $96, $00, $00, $FF, $00, $00
;db $00, $AF, $50, $00, $00, $FF, $00, $00
;db $00, $31, $32, $00, $00, $FF, $00, $00
;db $01, $05, $F4, $01, $00, $FF, $00, $00
;db $01, $AF, $50, $00, $00, $FF, $00, $00
;db $01, $44, $1E, $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 $03, $2E, $96, $00, $00, $FF, $00, $00
;db $03, $AF, $50, $00, $00, $FF, $00, $00
;db $03, $31, $32, $00, $00, $FF, $00, $00
;db $04, $2E, $96, $00, $00, $FF, $00, $00
;db $04, $AF, $50, $00, $00, $FF, $00, $00
;db $04, $31, $32, $00, $00, $FF, $00, $00
;db $05, $2E, $96, $00, $00, $FF, $00, $00
;db $05, $AF, $50, $00, $00, $FF, $00, $00
;db $05, $31, $32, $00, $00, $FF, $00, $00
;db $06, $2E, $96, $00, $00, $FF, $00, $00
;db $06, $AF, $50, $00, $00, $FF, $00, $00
;db $06, $31, $32, $00, $00, $FF, $00, $00
;db $FF, $2E, $96, $00, $00, $FF, $00, $00
;db $FF, $AF, $50, $00, $00, $FF, $00, $00
;db $FF, $31, $32, $00, $00, $FF, $00, $00
;db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
;================================================================================
org $30D000
MSUTrackList: