From 04aabc8bd8de73bf755751befad7e16c93772777 Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@gmail.com>
Date: Mon, 13 Mar 2023 15:54:19 -0600
Subject: [PATCH 1/2] Clear standing item data on transition to overworld
 Standard+retro no arrow filler unless you have the bow

---
 darkworldspawn.asm         | 14 ++++++++++----
 keydrop/standing_items.asm |  9 +++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/darkworldspawn.asm b/darkworldspawn.asm
index 31bc730..84ae763 100644
--- a/darkworldspawn.asm
+++ b/darkworldspawn.asm
@@ -114,17 +114,23 @@ RefreshRainAmmo:
 		+ CMP.b #$03 : BNE + ; Uncle
 			%SetMinimum(CurrentMagic,MagicFiller,RainDeathRefillMagic_Uncle)
 			%SetMinimum(BombsEquipment,BombsFiller,RainDeathRefillBombs_Uncle)
-			%SetMinimum(CurrentArrows,ArrowsFiller,RainDeathRefillArrows_Uncle)
-			BRA .done
+			LDA.l ArrowMode : BEQ ++
+			LDA.l BowEquipment : BEQ +++
+			++ %SetMinimum(CurrentArrows,ArrowsFiller,RainDeathRefillArrows_Uncle)
+			+++ BRA .done
 		+ CMP.b #$02 : BNE + ; Cell
 			%SetMinimum(CurrentMagic,MagicFiller,RainDeathRefillMagic_Cell)
 			%SetMinimum(BombsEquipment,BombsFiller,RainDeathRefillBombs_Cell)
-			%SetMinimum(CurrentArrows,ArrowsFiller,RainDeathRefillArrows_Cell)
+			LDA.l ArrowMode : BEQ ++
+			LDA.l BowEquipment : BEQ .done
+			++ %SetMinimum(CurrentArrows,ArrowsFiller,RainDeathRefillArrows_Cell)
 			BRA .done
 		+ CMP.b #$04 : BNE + ; Mantle
 			%SetMinimum(CurrentMagic,MagicFiller,RainDeathRefillMagic_Mantle)
 			%SetMinimum(BombsEquipment,BombsFiller,RainDeathRefillBombs_Mantle)
-			%SetMinimum(CurrentArrows,ArrowsFiller,RainDeathRefillArrows_Mantle)
+			LDA.l ArrowMode : BEQ ++
+			LDA.l BowEquipment : BEQ .done
+			++ %SetMinimum(CurrentArrows,ArrowsFiller,RainDeathRefillArrows_Mantle)
 		+
 	.done
 RTL
diff --git a/keydrop/standing_items.asm b/keydrop/standing_items.asm
index 99349a3..c2c9023 100644
--- a/keydrop/standing_items.asm
+++ b/keydrop/standing_items.asm
@@ -9,6 +9,10 @@ org $829C25
 org $89C2BB
 	JSL ClearSpriteData
 
+; underworld -> overworld transition
+org $8282D1
+	JSL ClearSpriteData2
+
 org $89C327
 	JSL LoadSpriteData
 
@@ -303,6 +307,7 @@ RTS
 
 ClearSpriteData:
 	STZ.b $02 : STZ.b $03 ; what we overrode
+ClearSpriteData_Shared:
 	PHX
 		LDA #$00 : LDX #$00
 		.loop
@@ -312,6 +317,10 @@ ClearSpriteData:
 	PLX
 	RTL
 
+ClearSpriteData2:
+	LDA.b #$82 : STA.b $99
+	JMP ClearSpriteData_Shared
+
 ; Runs during sprite load of the room
 LoadSpriteData:
 	INY : INY

From 69a6e7f9189ab21b0c7c6910bb6cbcdf84bf9091 Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@gmail.com>
Date: Tue, 14 Mar 2023 16:06:32 -0600
Subject: [PATCH 2/2] Version area reservation

---
 doorrando/doorrando.asm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doorrando/doorrando.asm b/doorrando/doorrando.asm
index 2a2ff56..6511dd2 100644
--- a/doorrando/doorrando.asm
+++ b/doorrando/doorrando.asm
@@ -41,6 +41,11 @@ DRScroll:
 db 0
 OffsetTable:
 dw -8, 8
+org $A78010
+DRVersionInfo:
+dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
+
+org $A78020
 
 incsrc normal.asm
 incsrc scroll.asm