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

Merge branch 'fix_ohko' into overworld_kara

Browse Source
This commit is contained in:
karafruit
2021-08-09 15:33:03 -07:00
parent a12b5a9188 230b15a294
commit 0816bb7cab
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

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

2
hooks.asm
View File

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