alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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

48
framehook.asm
View File

@@ -53,28 +53,28 @@ NMIHookAction:
JML.l NMIHookReturn JML.l NMIHookReturn
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;!NMI_AUX = "$7F5044" !NMI_AUX = "$7F5044"
;PostNMIHookAction: PostNMIHookAction:
; LDA !NMI_AUX+2 : BEQ + LDA !NMI_AUX : BEQ +
; LDA $00 : PHA ; preserve DP ram LDA $00 : PHA ; preserve DP ram
; LDA $01 : PHA LDA $01 : PHA
; LDA $02 : PHA LDA $02 : PHA
;
; LDA !NMI_AUX+2 : STA $02 ; set up jump pointer LDA !NMI_AUX+2 : STA $02 ; set up jump pointer
; LDA !NMI_AUX+1 : STA $01 LDA !NMI_AUX+1 : STA $01
; LDA !NMI_AUX+0 : STA $00 LDA !NMI_AUX+0 : STA $00
;
; PHK : PER .return-1 ; push stack for RTL return PHK : PER .return-1 ; push stack for RTL return
; JMP [$0000] JMP [$0000]
;
; .return .return
; LDA.b #$00 : STA !NMI_AUX+2 ; zero bank byte of NMI hook pointer LDA.b #$00 : STA !NMI_AUX ; zero bank byte of NMI hook pointer
;
; PLA : STA $02 PLA : STA $02
; PLA : STA $01 PLA : STA $01
; PLA : STA $00 PLA : STA $00
; + +
;
; LDA $13 : STA $2100 ; thing we wrote over, turn screen back on LDA $13 : STA $2100 ; thing we wrote over, turn screen back on
;JML.l PostNMIHookReturn JML.l PostNMIHookReturn
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------

37
shopkeeper.asm
View File

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