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

Merge branch 'fix_ohko' into kara

Browse Source
This commit is contained in:
Kara Alexandra
2021-08-09 15:32:51 -07:00
parent dafef001be 230b15a294
commit 74e2f96e0a
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
events.asm
View File

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

2
hooks.asm
View File

@@ -2699,8 +2699,6 @@ JSL FastTextScroll : NOP
org $01FFEE : JSL IncrementDamageTakenCounter_Eight ; overworld pit
org $079506 : JSL IncrementDamageTakenCounter_Eight ; underworld pit
org $0780C6 : JSL IncrementDamageTakenCounter_Arb
org $07B0B1 : JSL IncrementMagicUseCounter
;================================================================================