From 398a6535d8e06ff155d658052859aa398f371d42 Mon Sep 17 00:00:00 2001
From: Kevin Cathcart <kevincathcart@gmail.com>
Date: Thu, 29 Mar 2018 20:41:38 -0400
Subject: [PATCH 1/4] Fix broken build

---
 darkworldspawn.asm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/darkworldspawn.asm b/darkworldspawn.asm
index 0c2da73..9c45827 100644
--- a/darkworldspawn.asm
+++ b/darkworldspawn.asm
@@ -53,6 +53,7 @@ JMP DoWorldFix
 	.pyramid
 	LDA #$40 : STA $7EF3CA ; set flag to dark world
 	LDA $7EF3CC : CMP #$08 : BNE + : LDA.b #$07 : STA $7EF3CC : + ; convert dwarf to frog
+	.done
 RTL
 ;--------------------------------------------------------------------------------
 FakeWorldFix:

From ec92f7b6dc030ae53b6dd30fb42f4b1ea33751d8 Mon Sep 17 00:00:00 2001
From: Kevin Cathcart <kevincathcart@gmail.com>
Date: Thu, 29 Mar 2018 21:13:20 -0400
Subject: [PATCH 2/4] Prevent overfilling on escape death

---
 darkworldspawn.asm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/darkworldspawn.asm b/darkworldspawn.asm
index 9c45827..53c51ca 100644
--- a/darkworldspawn.asm
+++ b/darkworldspawn.asm
@@ -77,9 +77,9 @@ FixAgahnimFollowers:
 	JSL PrepDungeonExit ; thing we wrote over
 RTL
 ;--------------------------------------------------------------------------------
-macro SetMinimum(base,compare)
-	LDA.l <compare> : CMP.l <base> : !BLT ?done
-		STA.l <base>
+macro SetMinimum(base,filler,compare)
+	LDA.l <compare> : SUB.l <base> : !BLT ?done
+		STA.l <filler>
 	?done:
 endmacro
 RefreshRainAmmo:
@@ -87,19 +87,19 @@ RefreshRainAmmo:
 	.rain
 		LDA $7EF3C8
 		+ CMP.b #$03 : BNE + ; Uncle
-			%SetMinimum($7EF36E,RainDeathRefillMagic_Uncle)
-			%SetMinimum($7EF375,RainDeathRefillBombs_Uncle)
-			%SetMinimum($7EF377,RainDeathRefillArrows_Uncle)
+			%SetMinimum($7EF36E,$7EF373,RainDeathRefillMagic_Uncle)
+			%SetMinimum($7EF343,$7EF375,RainDeathRefillBombs_Uncle)
+			%SetMinimum($7EF377,$7EF376,RainDeathRefillArrows_Uncle)
 			BRA .done
 		+ CMP.b #$02 : BNE + ; Cell
-			%SetMinimum($7EF36E,RainDeathRefillMagic_Cell)
-			%SetMinimum($7EF375,RainDeathRefillBombs_Cell)
-			%SetMinimum($7EF377,RainDeathRefillArrows_Cell)
+			%SetMinimum($7EF36E,$7EF373,RainDeathRefillMagic_Cell)
+			%SetMinimum($7EF343,$7EF375,RainDeathRefillBombs_Cell)
+			%SetMinimum($7EF377,$7EF376,RainDeathRefillArrows_Cell)
 			BRA .done
 		+ CMP.b #$04 : BNE + ; Mantle
-			%SetMinimum($7EF36E,RainDeathRefillMagic_Mantle)
-			%SetMinimum($7EF375,RainDeathRefillBombs_Mantle)
-			%SetMinimum($7EF377,RainDeathRefillArrows_Mantle)
+			%SetMinimum($7EF36E,$7EF373,RainDeathRefillMagic_Mantle)
+			%SetMinimum($7EF343,$7EF375,RainDeathRefillBombs_Mantle)
+			%SetMinimum($7EF377,$7EF376,RainDeathRefillArrows_Mantle)
 		+
 	.done
 RTL

From fde2910c3fd32bd75aab61fcf4b4abfbc16783aa Mon Sep 17 00:00:00 2001
From: Kevin Cathcart <kevincathcart@gmail.com>
Date: Thu, 29 Mar 2018 21:20:54 -0400
Subject: [PATCH 3/4] Restore rain state ammo on death, not just on load

---
 events.asm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/events.asm b/events.asm
index b827221..78357f5 100644
--- a/events.asm
+++ b/events.asm
@@ -21,6 +21,7 @@ OnPlayerDead:
 	PHA
 		JSL.l SetDeathWorldChecked
 		JSL.l SetSilverBowMode
+		JSL.l RefreshRainAmmo
 	PLA
 RTL
 ;--------------------------------------------------------------------------------

From b1dd9678644c47898ef2eb73c2183bf6ccaa502a Mon Sep 17 00:00:00 2001
From: Kevin Cathcart <kevincathcart@gmail.com>
Date: Thu, 29 Mar 2018 21:23:41 -0400
Subject: [PATCH 4/4] Include missing "!" (Metal gear solid sound)

---
 darkworldspawn.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/darkworldspawn.asm b/darkworldspawn.asm
index 53c51ca..f46f960 100644
--- a/darkworldspawn.asm
+++ b/darkworldspawn.asm
@@ -78,7 +78,7 @@ FixAgahnimFollowers:
 RTL
 ;--------------------------------------------------------------------------------
 macro SetMinimum(base,filler,compare)
-	LDA.l <compare> : SUB.l <base> : !BLT ?done
+	LDA.l <compare> : !SUB.l <base> : !BLT ?done
 		STA.l <filler>
 	?done:
 endmacro