Fixed issue with Flute Cancel code using RAM claimed from upstream

2024-03-15 21:09:10 -05:00
parent 2e541a8778
commit 068d97f99b
2 changed files with 4 additions and 3 deletions
--- a/keydrop/dynamic_si_vram.asm
+++ b/keydrop/dynamic_si_vram.asm
@@ -114,6 +114,7 @@ nop #10
 			BRA .newSlot+1
 	
 		.overflow ; slot already in use, use overflow slot
+		STZ.w RandoOverworldTargetEdge
 		LDA.b #$02 : STA.w SprRedrawFlag, X
 		LDA.b IndoorsFlag : BEQ ++
 			LDA.b #!DynamicDropGFXSlotCount_UW
--- a/owrando.asm
+++ b/owrando.asm
@@ -306,9 +306,9 @@ OWFluteCancel:
 {
    lda.l OWFlags+1 : and.b #$01 : bne +
        jsl FluteMenu_LoadTransport : rtl
-    + lda.l HexToDecDigit4 : cmp.b #$01 : beq +
+    + lda.w RandoOverworldTargetEdge : bne +
        jsl FluteMenu_LoadTransport
-    + lda.b #$00 : sta.l HexToDecDigit4 : rtl
+    + stz.w RandoOverworldTargetEdge : rtl
 }
 OWFluteCancel2:
 {
@@ -317,7 +317,7 @@ OWFluteCancel2:
    + inc.w SubModuleInterface
    lda.l OWFlags+1 : and.b #$01 : beq +
    lda.b Joy1B_All : cmp.b #$40 : bne +
-        lda.b #$01 : sta.l HexToDecDigit4
+        lda.b #$01 : sta.w RandoOverworldTargetEdge
    + rtl 
 }
 OWSmithAccept: