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] 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