From 70933b01f831bd01e998fa31cb589eb49ecfc3f2 Mon Sep 17 00:00:00 2001
From: spannerisms <32842036+spannerisms@users.noreply.github.com>
Date: Mon, 5 Apr 2021 12:48:32 -0400
Subject: [PATCH] WOW

---
 bugfixes.asm       |  2 +-
 darkworldspawn.asm |  3 ++-
 dialog.asm         | 11 +++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bugfixes.asm b/bugfixes.asm
index 5e7a6be..1ca6cb6 100644
--- a/bugfixes.asm
+++ b/bugfixes.asm
@@ -114,7 +114,7 @@ RTS
 FixFrogSmith:
 	LDA.l $7EF3CA : BNE .darkWorld
 		LDA.l $7EF3CC : CMP.b #$07 : BNE .done
-		LDA.b #$08 :  ; make frog into smith in light world
+		LDA.b #$08 ; make frog into smith in light world
 		BRA .loadgfx
 	.darkWorld
 		LDA.l $7EF3CC : CMP.b #$08 : BNE .done
diff --git a/darkworldspawn.asm b/darkworldspawn.asm
index 43a55ae..e86344f 100644
--- a/darkworldspawn.asm
+++ b/darkworldspawn.asm
@@ -106,7 +106,8 @@ macro SetMinimum(base,filler,compare)
 	?done:
 endmacro
 RefreshRainAmmo:
-	LDA $7EF3C5 : CMP.b #$01 : BNE .done ; check if we're in rain state
+	LDA $7EF3C5 : CMP.b #$01 : BEQ .rain ; check if we're in rain state
+	RTL
 	.rain
 		LDA $7EF3C8
 		+ CMP.b #$03 : BNE + ; Uncle
diff --git a/dialog.asm b/dialog.asm
index 5e1a835..cc724fc 100644
--- a/dialog.asm
+++ b/dialog.asm
@@ -253,11 +253,14 @@ DialogResetSelectionIndex:
 RTL
 ;--------------------------------------------------------------------------------
 DialogItemReceive:
-	BCS .noMessage ; if doubling the item value overflowed it must be a rando item
+	BCS .nomessage ; if doubling the item value overflowed it must be a rando item
+	CPY #$98 : BCC ++ ;if the item is $4C or greater it must be a rando item
+.nomessage
 	LDA.w #$FFFF
-	CPY #$98 : BCS .done ;if the item is $4C or greater it must be a rando item
 
-	LDA.w Ancilla_ReceiveItem_item_messages, Y
+	BRA .done
+
+++	LDA.w Ancilla_ReceiveItem_item_messages, Y
 	.done
 	CMP.w #$FFFF
 RTL
@@ -392,7 +395,7 @@ Sprite_ShowMessageMinimal_Alt:
 	STZ $11
 
 	PHX : PHY
-	PEA ($00)
+	PEI ($00)
 	LDA.b $02 : PHA
 
 	LDA.b #$1C : STA.b $02