Clean up loot icon room transition handling

This commit is contained in:
2026-05-25 00:16:48 -05:00
parent e749b6d6bc
commit 05172929a3
4 changed files with 6 additions and 26 deletions
-3
View File
@@ -24,7 +24,6 @@ SpiralWarp: {
.abort .abort
SEP #$30 SEP #$30
stz.w $045e stz.w $045e
JSL UpdateLootHUD
lda.b PreviousRoom : and.b #$0f lda.b PreviousRoom : and.b #$0f
rtl ; clear,run hijacked code and get out rtl ; clear,run hijacked code and get out
@@ -86,7 +85,6 @@ SpiralWarp: {
ldy.b #$01 : jsr SetCamera ldy.b #$01 : jsr SetCamera
jsr StairCleanup jsr StairCleanup
JSL UpdateLootHUD
ply : plx : plb ; pull the stuff we pushed ply : plx : plb ; pull the stuff we pushed
lda.b PreviousRoom : and.b #$0f ; this is the code we are hijacking lda.b PreviousRoom : and.b #$0f ; this is the code we are hijacking
@@ -268,7 +266,6 @@ InroomStairsWarp: {
.skipCamera .skipCamera
jsr StairCleanup jsr StairCleanup
JSL UpdateLootHUD
ply : plx : plb ; pull the stuff we pushed ply : plx : plb ; pull the stuff we pushed
rts rts
+6 -23
View File
@@ -1,41 +1,24 @@
pushpc pushpc
org $82C0C3 org $828C73
JSL TransitionLinkOutOfDoorEnding JSL EnterRoom
NOP NOP
org $87956F
JSL UpdateHUDAndLandLink
org $829611
JSL UpdateHUDAndUpdateQuadrants
pullpc pullpc
UpdateHUDAndLandLink:
JSL UpdateLootHUD
LDA.b $51
STA.b LinkPosY
RTL
UpdateHUDAndUpdateQuadrants:
JSL UpdateLootHUD
JSL $82B803
RTL
ClearLootHUD: ClearLootHUD:
LDA.b GameMode LDA.b GameMode
CMP.b #$07 CMP.b #$07
BNE UpdateLootHUD BNE UpdateLootHUD
;
PHP PHP
REP #$20 REP #$20
LDA.w #!BlankTile : STA.w EnemyDropIndicator LDA.w #!BlankTile : STA.w EnemyDropIndicator
PLP PLP
RTL RTL
TransitionLinkOutOfDoorEnding: EnterRoom:
; what we wrote over ; what we wrote over
STZ.w $0418 STZ.w $0200
INC.b $B0 STZ.b $B0
; fall into UpdateLootHUD ; fall into UpdateLootHUD
Binary file not shown.
Binary file not shown.