diff --git a/darkworldspawn.asm b/darkworldspawn.asm
index 0c2da73..f46f960 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:
@@ -76,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:
@@ -86,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
diff --git a/events.asm b/events.asm
index 02218fc..d1b0d52 100644
--- a/events.asm
+++ b/events.asm
@@ -21,6 +21,7 @@ OnPlayerDead:
 	PHA
 		JSL.l SetDeathWorldChecked
 		JSL.l SetSilverBowMode
+		JSL.l RefreshRainAmmo
 	PLA
 RTL
 ;--------------------------------------------------------------------------------