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

Merge branch 'OWMain' into overworld_kara

Browse Source
This commit is contained in:
karafruit
2021-10-30 09:56:26 -07:00
parent aeec3fe6c6 2e9f4c5abb
commit 82c5190f63
9 changed files with 92 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
events.asm
View File

@@ -198,8 +198,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