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

Merge remote-tracking branch 'baserom/master' into DRMain

Browse Source 
# Conflicts:
#	hooks.asm
#	newhud.asm
#	utilities.asm
This commit is contained in:
aerinon
2021-10-21 14:15:54 -06:00
parent 319aba5e4d 1ef55470d5
commit 27654b9ac9
12 changed files with 123 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
events.asm
View File

@@ -37,7 +37,7 @@ RTL
OnDungeonExit:
PHA : PHP
SEP #$20 ; set 8-bit accumulator
JSL.l PodEGFix
JSL.l SQEGFix
PLP : PLA
STA $040C : STZ $04AC ; thing we wrote over
@@ -50,8 +50,8 @@ OnDungeonExit:
RTL
;--------------------------------------------------------------------------------
OnQuit:
JSL.l PodEGFix
JSL.l SQEGFix
LDA.b #$00 : STA $7F5035 ; bandaid patch bug with mirroring away from text
LDA.b #$10 : STA $1C ; thing we wrote over
RTL
;--------------------------------------------------------------------------------
@@ -184,6 +184,7 @@ OnInitFileSelect:
RTL
;--------------------------------------------------------------------------------
OnLinkDamaged:
JSL.l IncrementDamageTakenCounter_Arb
JSL.l FlipperKill
JML.l OHKOTimer