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

Merge branch 'master' into DRMain

Browse Source 
# Conflicts:
#	tables.asm
This commit is contained in:
aerinon
2022-01-05 14:26:48 -07:00
parent 6757e35dca 2a3d6fae58
commit c88a301708
11 changed files with 180 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
events.asm
View File

@@ -185,7 +185,7 @@ RTL
;--------------------------------------------------------------------------------
OnLinkDamaged:
JSL.l IncrementDamageTakenCounter_Arb
JSL.l FlipperKill
;JSL.l FlipperKill
JML.l OHKOTimer
;--------------------------------------------------------------------------------