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

bugfixes

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
dialog.asm
View File

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

8
events.asm
View File

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

3
hooks.asm
View File

@@ -1122,6 +1122,9 @@ NOP #6 ; remove crystal room cutscene check that causes softlocks
;================================================================================ ;================================================================================
; Text Changes ; 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) org $02A005 ; <- 12005 - Bank02.asm:5667 (JSL Main_ShowTextMessage)
JSL.l DialogTriforce : NOP #4 JSL.l DialogTriforce : NOP #4
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------

4
newitems.asm
View File

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