textbox fixes
This commit is contained in:
Karkat
2017-09-22 21:08:34 -04:00
parent 17ccee2025
commit 1d8e4f6cb8
4 changed files with 11 additions and 6 deletions

View File

@@ -14,6 +14,7 @@ RTL
; $7F5700 - $7F57FF - Dialog Buffer
;--------------------------------------------------------------------------------
ResetDialogPointer:
STZ $1CF0 : STZ $1CF1 ; reset decompression buffer
LDA.b #$00 : STA $7F5035 ; zero out the alternate flag
LDA.b #$1C : STA $1CE9 ; thing we wrote over
RTL
@@ -84,6 +85,7 @@ macro LoadDialogAddress(address)
LDA $00 : PHA
LDA $01 : PHA
LDA $02 : PHA
STZ $1CF0 : STZ $1CF1 ; reset decompression buffer
LDA.b #$01 : STA $7F5035 ; set flag
%CopyDialog(<address>)
PLA : STA $02

View File

@@ -92,10 +92,10 @@ RTL
PostItemAnimation:
LDA.b #$00 : STA !ITEM_BUSY ; mark item as finished
;LDA $7F50A0 : BEQ +
; JSL.l Main_ShowTextMessage
; LDA.b #$00 : STA $7F50A0
;+
LDA $7F50A0 : BEQ +
JSL.l Main_ShowTextMessage
LDA.b #$00 : STA $7F50A0
+
STZ $02E9 : LDA $0C5E, X ; thing we wrote over to get here
RTL

View File

@@ -1122,6 +1122,9 @@ NOP #6 ; remove crystal room cutscene check that causes softlocks
;================================================================================
; Text Changes
;--------------------------------------------------------------------------------
org $08C5ED ; <- 445ED - ancilla_receive_item.asm:395 (STA $1CF0 : CMP.w #$0070 : BNE .notGeezerSpeech)
NOP #3
;--------------------------------------------------------------------------------
org $02A005 ; <- 12005 - Bank02.asm:5667 (JSL Main_ShowTextMessage)
JSL.l DialogTriforce : NOP #4
;--------------------------------------------------------------------------------

View File

@@ -167,8 +167,8 @@ AddReceivedItemExpandedGetItem:
PHX
JSR.w ProcessEventItems : CPX.b #$00 : BEQ ++
JSL.l Main_ShowTextMessage
;LDA.b #$01 : STA $7F50A0
;JSL.l Main_ShowTextMessage
LDA.b #$01 : STA $7F50A0
BRL .done
++