alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into kara

Browse Source
This commit is contained in:
Kara Alexandra
2021-10-30 16:37:59 -07:00
parent f3e0def5a2 7f749e9578
commit c323a71340
4 changed files with 12 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
events.asm
View File

@@ -190,8 +190,17 @@ RTL
;--------------------------------------------------------------------------------
OnLinkDamagedFromPit:
JSL.l OHKOTimer
LDA.b #$14 : STA $11 ; thing we wrote over
RTL
LDA.l AllowAccidentalMajorGlitch
BEQ ++
-- LDA.b #$14 : STA $11 ; thing we wrote over
RTL
++ LDA.b $10 : CMP.b #$12 : BNE --
STZ.b $11
RTL
;--------------------------------------------------------------------------------
OnLinkDamagedFromPitOutdoors:
JML.l OHKOTimer ; make sure this is last