alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pack more shops into SRAM

Browse Source
This commit is contained in:
Kevin Cathcart
2018-02-15 23:45:27 -05:00
parent bb99f138de
commit 77db3a90da
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shopkeeper.asm
View File

@@ -155,7 +155,7 @@ SpritePrep_ShopKeeper:
LDA ShopTable+5, X : STA !SHOP_TYPE LDA ShopTable+5, X : STA !SHOP_TYPE
AND.b #$03 : ASL #2 : STA !SHOP_CAPACITY AND.b #$03 : ASL #2 : STA !SHOP_CAPACITY
LDA ShopTable+6, X : STA !SHOP_MERCHANT LDA ShopTable+6, X : STA !SHOP_MERCHANT
TXA : LSR #3 : PHA : ASL : !ADD 1,s : STA !SHOP_SRAM_INDEX : PLA LDA ShopTable+7, X : STA !SHOP_SRAM_INDEX
BRA .success BRA .success
+ +
LDA ShopTable, X : AND.w #$00FF : CMP.w #$00FF : BEQ .fail LDA ShopTable, X : AND.w #$00FF : CMP.w #$00FF : BEQ .fail

18
tables.asm
View File

@@ -1432,17 +1432,17 @@ db $FF, $FF, $FF, $FF
; ss - sprite type ; ss - sprite type
org $30C800 ; PC 0x184800 - 0x18487F - max 16 shops org $30C800 ; PC 0x184800 - 0x18487F - max 16 shops
ShopTable: ShopTable:
;db [id][roomID-low][roomID-high][doorID][zero][shop_config][shopkeeper_config][pad] ;db [id][roomID-low][roomID-high][doorID][zero][shop_config][shopkeeper_config][sram_index]
db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
db $01, $0F, $01, $57, $00, $03, $51, $00 db $01, $0F, $01, $57, $00, $03, $51, $00
db $02, $0F, $01, $60, $00, $03, $51, $00 db $02, $0F, $01, $60, $00, $03, $51, $03
db $FF, $12, $01, $58, $00, $03, $50, $00 db $FF, $12, $01, $58, $00, $03, $50, $06
db $02, $0F, $01, $57, $00, $03, $50, $00 db $02, $0F, $01, $57, $00, $03, $50, $09
db $03, $0F, $01, $60, $00, $03, $50, $00 db $03, $0F, $01, $60, $00, $03, $50, $0c
db $04, $0F, $01, $6F, $00, $03, $50, $00 db $04, $0F, $01, $6F, $00, $03, $50, $0f
db $05, $FF, $00, $00, $00, $03, $50, $00 db $05, $FF, $00, $00, $00, $03, $50, $12
db $06, $1F, $01, $46, $00, $03, $50, $00 db $06, $1F, $01, $46, $00, $03, $50, $15
db $FF, $12, $01, $58, $00, $03, $50, $00 db $FF, $12, $01, $58, $00, $03, $50, $18
org $30C880 ; PC 0x184880 - 0x184FFF - max 240 entries org $30C880 ; PC 0x184880 - 0x184FFF - max 240 entries
ShopContentsTable: ShopContentsTable:
;db [id][item][price-low][price-high][max][repl_id][repl_price-low][repl_price-high] ;db [id][item][price-low][price-high][max][repl_id][repl_price-low][repl_price-high]