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

Animate rupee items in shops

Browse Source
This commit is contained in:
codemann8
2023-05-05 22:09:37 -05:00
parent 20f8ef457e
commit 48b2238109
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
shopkeeper.asm
View File

@@ -815,8 +815,13 @@ Shopkeeper_DrawNextItem:
CMP.b #$2E : BNE + : BRA .potion CMP.b #$2E : BNE + : BRA .potion
+ CMP.b #$2F : BNE + : BRA .potion + CMP.b #$2F : BNE + : BRA .potion
+ CMP.b #$30 : BEQ .potion + CMP.b #$30 : BEQ .potion
+ CMP.b #$34 : BCC .normal : CMP.b #$36+1 : BCS .normal
BRA .rupee
.normal .normal
LDA.w .tile_indices, Y : BRA + ; get item gfx index LDA.w .tile_indices, Y : BRA + ; get item gfx index
.rupee
LDA.b #$0B ; rupee is #$0B because it's already there in VRAM
BRA .vramLoc
.potion .potion
LDA.b #$C0 ; potion is #$C0 because it's already there in VRAM LDA.b #$C0 ; potion is #$C0 because it's already there in VRAM
+ +
@@ -828,18 +833,23 @@ Shopkeeper_DrawNextItem:
XBA XBA
AND #$FE AND #$FE
.vramLoc
STA.l !SPRITE_OAM+4 STA.l !SPRITE_OAM+4
PHA
PHX : LDA #0 : XBA : TXA : LSR #2 : TAX : LDA.l !SHOP_INVENTORY_DISGUISE, X : PLX : CMP #$0 : BNE ++ PHX : LDA #0 : XBA : TXA : LSR #2 : TAX : LDA.l !SHOP_INVENTORY_DISGUISE, X : PLX : CMP #$0 : BNE ++
LDA.l !SHOP_INVENTORY, X ; get item palette LDA.l !SHOP_INVENTORY, X ; get item palette
++ ++
JSL.l GetSpritePalette : STA.l !SPRITE_OAM+5 JSL.l GetSpritePalette : STA.l !SPRITE_OAM+5
LDA.w .tile_indices, Y : AND.b #$01 : BEQ +; get tile index sheet PLA
AND.b #$01 : BNE .oam1 ; special case for rupee item
LDA.w .tile_indices, Y : AND.b #$01 : BEQ ++ ; get tile index sheet
.oam1
LDA.l !SPRITE_OAM+5 LDA.l !SPRITE_OAM+5
ORA.b #$1 ORA.b #$1
STA.l !SPRITE_OAM+5 STA.l !SPRITE_OAM+5
+ ++
LDA.b #$00 : STA.l !SPRITE_OAM+6 LDA.b #$00 : STA.l !SPRITE_OAM+6