alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

shop maybe fix

Browse Source
This commit is contained in:
Kat
2020-07-09 02:04:00 -04:00
parent 7955a37cd9
commit af7cce9ae5
2 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
shopkeeper.asm
View File

@@ -194,19 +194,20 @@ SpritePrep_ShopKeeper:
BRL -
.stop
;STA $FFFFFF
LDA $A0 : CMP.b #$FF : BNE .normal
.dumb
LDA $2137
LDA $213F
LDA $213D
CMP.b #60
!BLT .dumb
.normal
LDA #$80 : STA $2100
JSR Shopkeeper_UploadVRAMTiles
LDA #$0F : STA $2100
;JSR.w QueueItemDMA
;LDA $A0 : CMP.b #$FF : BNE .normal
;.dumb
; LDA $2137
; LDA $213F
; LDA $213D
; CMP.b #60
; !BLT .dumb
;.normal
;LDA #$80 : STA $2100
;JSR Shopkeeper_UploadVRAMTiles
;LDA #$0F : STA $2100
LDA.b #Shopkeeper_UploadVRAMTilesLong>>16 : STA !NMI_AUX+2
LDA.b #Shopkeeper_UploadVRAMTilesLong>>8 : STA !NMI_AUX+1
LDA.b #Shopkeeper_UploadVRAMTilesLong>>0 : STA !NMI_AUX
.done
LDA.l !SHOP_TYPE : BIT.b #$20 : BEQ .notTakeAll ; Take-all
@@ -245,11 +246,11 @@ dw $0000, $0000
dw $0080, $0000
dw $0100, $0000
;--------------------------------------------------------------------------------
QueueItemDMA:
LDA.b #Shopkeeper_UploadVRAMTilesLong>>0 : STA !NMI_AUX
LDA.b #Shopkeeper_UploadVRAMTilesLong>>8 : STA !NMI_AUX+1
LDA.b #Shopkeeper_UploadVRAMTilesLong>>16 : STA !NMI_AUX+2
RTS
;QueueItemDMA:
; LDA.b #Shopkeeper_UploadVRAMTilesLong>>0 : STA !NMI_AUX
; LDA.b #Shopkeeper_UploadVRAMTilesLong>>8 : STA !NMI_AUX+1
; LDA.b #Shopkeeper_UploadVRAMTilesLong>>16 : STA !NMI_AUX+2
;RTS
;--------------------------------------------------------------------------------
; X - Tile Buffer Offset
; Y - Item ID