From 5ab91e7137b1198b81f500fb8dde7c1b12807f30 Mon Sep 17 00:00:00 2001 From: cassidoxa Date: Mon, 19 Dec 2022 12:37:51 -0500 Subject: [PATCH] Fix tablet check --- tablets.asm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tablets.asm b/tablets.asm index 818d3c8..2eecce3 100644 --- a/tablets.asm +++ b/tablets.asm @@ -76,13 +76,13 @@ IsMedallion: CMP.w #$03 : BNE + ; Death Mountain LDA.b LinkPosX : CMP.w #1890 : !BGE ++ SEC - JMP .done + BRA .done ++ BRA .false + CMP.w #$30 : BNE + ; Desert LDA.b LinkPosX : CMP.w #512 : !BLT ++ SEC - JMP .done + BRA .done ++ + .false @@ -104,9 +104,5 @@ CheckTabletItem: LDA.l OverworldEventDataWRAM, X : AND.b #$40 ; What we wrote over RTL .tablet - LDA.b OverworldIndex : CMP.b #$03 : BEQ .ether - LDA.l NpcFlags+1 : AND.b #$02 : BNE .done - .ether - LDA.l NpcFlags+1 : AND.b #$01 - .done + TDC RTL