alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Merge pull request #179 from cassidoxa/tablets

Browse Source 
Fix tablet flags
This commit is contained in:
Lexi Rose
2022-12-29 11:29:59 -06:00
committed by GitHub
parent 186cbba855 5ab91e7137
commit c23facd617
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tablets.asm
View File

@@ -76,13 +76,13 @@ IsMedallion:
CMP.w #$03 : BNE + ; Death Mountain CMP.w #$03 : BNE + ; Death Mountain
LDA.b LinkPosX : CMP.w #1890 : !BGE ++ LDA.b LinkPosX : CMP.w #1890 : !BGE ++
SEC SEC
JMP .done BRA .done
++ ++
BRA .false BRA .false
+ CMP.w #$30 : BNE + ; Desert + CMP.w #$30 : BNE + ; Desert
LDA.b LinkPosX : CMP.w #512 : !BLT ++ LDA.b LinkPosX : CMP.w #512 : !BLT ++
SEC SEC
JMP .done BRA .done
++ ++
+ +
.false .false
@@ -104,9 +104,5 @@ CheckTabletItem:
LDA.l OverworldEventDataWRAM, X : AND.b #$40 ; What we wrote over LDA.l OverworldEventDataWRAM, X : AND.b #$40 ; What we wrote over
RTL RTL
.tablet .tablet
LDA.b OverworldIndex : CMP.b #$03 : BEQ .ether TDC
LDA.l NpcFlags+1 : AND.b #$02 : BNE .done
.ether
LDA.l NpcFlags+1 : AND.b #$01
.done
RTL RTL