From 05172929a3e5f6dd33c1f1ab2ad1d014dc845b2d Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Mon, 25 May 2026 00:16:48 -0500
Subject: [PATCH] Clean up loot icon room transition handling

---
 doorrando/spiral.asm       |   3 ---
 gk/loot_hud.asm            |  29 ++++++-----------------------
 menu/door_connectors.3bpp  | Bin 1536 -> 1536 bytes
 menu/door_connectors.3bppc | Bin 903 -> 902 bytes
 4 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/doorrando/spiral.asm b/doorrando/spiral.asm
index 4b4c8cc..4888bea 100644
--- a/doorrando/spiral.asm
+++ b/doorrando/spiral.asm
@@ -24,7 +24,6 @@ SpiralWarp: {
 .abort
     SEP #$30
     stz.w $045e
-    JSL UpdateLootHUD
     lda.b PreviousRoom : and.b #$0f
     rtl ; clear,run hijacked code and get out
 
@@ -86,7 +85,6 @@ SpiralWarp: {
     ldy.b #$01 : jsr SetCamera
 
     jsr StairCleanup
-    JSL UpdateLootHUD
 
     ply : plx : plb ; pull the stuff we pushed
     lda.b PreviousRoom : and.b #$0f ; this is the code we are hijacking
@@ -268,7 +266,6 @@ InroomStairsWarp: {
     .skipCamera
 
     jsr StairCleanup
-    JSL UpdateLootHUD
 
     ply : plx : plb ; pull the stuff we pushed
     rts
diff --git a/gk/loot_hud.asm b/gk/loot_hud.asm
index 25b4356..774a7ad 100644
--- a/gk/loot_hud.asm
+++ b/gk/loot_hud.asm
@@ -1,41 +1,24 @@
 pushpc
-org $82C0C3
-JSL TransitionLinkOutOfDoorEnding
+org $828C73
+JSL EnterRoom
 NOP
-
-org $87956F
-JSL UpdateHUDAndLandLink
-
-org $829611
-JSL UpdateHUDAndUpdateQuadrants
 pullpc
 
-UpdateHUDAndLandLink:
-	JSL UpdateLootHUD
-	LDA.b $51
-	STA.b LinkPosY
-	RTL
-
-UpdateHUDAndUpdateQuadrants:
-	JSL UpdateLootHUD
-	JSL $82B803
-	RTL
-
 ClearLootHUD:
 	LDA.b GameMode
 	CMP.b #$07
 	BNE UpdateLootHUD
-
+;
 	PHP
 	REP #$20
 	LDA.w #!BlankTile : STA.w EnemyDropIndicator
 	PLP
 	RTL
 
-TransitionLinkOutOfDoorEnding:
+EnterRoom:
 	; what we wrote over
-	STZ.w $0418
-	INC.b $B0
+	STZ.w $0200
+	STZ.b $B0
 
 ; fall into UpdateLootHUD
 
diff --git a/menu/door_connectors.3bpp b/menu/door_connectors.3bpp
index 0bbf942db15b0f272680fba1188842dbf6621a41..a80982cce0d58ad04b20935c4f2406a88fda0a1e 100644
GIT binary patch
delta 51
vcmZqRY2ewQ#lpwVz|O?Z!~g>9tgM?YSTY!efnv<;U?B*>&cZ%<GpjEEmM#Tc

delta 51
vcmZqRY2ewQ#lpwWz|Y3d#sC8RoSd62STY!efnx0ZU?B*>&%r-=GpjEEpYjE~

diff --git a/menu/door_connectors.3bppc b/menu/door_connectors.3bppc
index 26c0bd8fab11ca18f1e33210f74d220e6769afbe..7eac99fcdfe2cdca6ed705738e3301155e698ac7 100644
GIT binary patch
delta 79
zcmZo?Z)4w3!6c~3z{t+v%+A#MnSp_|S)4^_ay!#5U6J~I^$iU53=HDp%F2#FnxBoI
goxRPIRhfZ_lY^!8KST3R1}&ggmev=HlM9)}0MQN-7ytkO

delta 80
zcmZo;Z)e|7!NlKX#>Bwj%+J<p&BVybsXDonX_o<C{l5AJhI$4DadBm3$9jflZ5Bp$
j_BKyeWd<fr4wjbx49xrt{Old^tj)GeZJDf-3z)?K-F*?J