Merged in DR v1.2.0.10

2023-03-02 18:57:26 -06:00
parent 750c412f59 13879317fe
commit 1453dd12a7
5 changed files with 20 additions and 29 deletions
--- a/doorrando/normal.asm
+++ b/doorrando/normal.asm
@@ -364,8 +364,7 @@ DoorToStraight:
        lda $a0 : cmp #$51 : bne .skip
        lda #$04 : sta $4e
    .skip pla
-    ; the ldx $0418 is now taken care of by TransitionCalculateLanding_Fix
-    .end cmp #$02 ;what we wrote over
+    .end LDX.w $0418 : CMP.b #$02 ; what we wrote over
    rtl
 }

@@ -434,7 +433,7 @@ HandleSpecialDoorLanding: {

        .noDoor
 	PLA
-    CMP #$34 : bne + ; inroom stairs
-        PHA : LDA #$26 : STA $045E : PLA
+    CMP.b #$34 : BNE + ; inroom stairs
+        PHA : LDA.b #$26 : STA.w $045E : PLA
    + RTL
 }