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 0bbf942..a80982c 100644 Binary files a/menu/door_connectors.3bpp and b/menu/door_connectors.3bpp differ diff --git a/menu/door_connectors.3bppc b/menu/door_connectors.3bppc index 26c0bd8..7eac99f 100644 Binary files a/menu/door_connectors.3bppc and b/menu/door_connectors.3bppc differ