From 1d8e4f6cb81c9341d495bb3709805d5af26a1c2b Mon Sep 17 00:00:00 2001
From: Karkat <north@tinymagnet.com>
Date: Fri, 22 Sep 2017 21:08:34 -0400
Subject: [PATCH] bugfixes

textbox fixes
---
 dialog.asm   | 2 ++
 events.asm   | 8 ++++----
 hooks.asm    | 3 +++
 newitems.asm | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/dialog.asm b/dialog.asm
index 5b2dced..6ed2c8d 100644
--- a/dialog.asm
+++ b/dialog.asm
@@ -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
diff --git a/events.asm b/events.asm
index b4c4dbe..c2951d4 100644
--- a/events.asm
+++ b/events.asm
@@ -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
diff --git a/hooks.asm b/hooks.asm
index 57a95a1..4f6979e 100644
--- a/hooks.asm
+++ b/hooks.asm
@@ -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
 ;--------------------------------------------------------------------------------
diff --git a/newitems.asm b/newitems.asm
index 5644879..47ed53d 100755
--- a/newitems.asm
+++ b/newitems.asm
@@ -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
 	++