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:
#	LTTP_RND_GeneralBugfixes.asm
#	hooks.asm
#	music.asm
This commit is contained in:
aerinon
2022-02-09 09:59:56 -07:00
parent 7bf2a259a4 c515beb853
commit 93fe72466d
9 changed files with 519 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
music.asm
View File

@@ -286,7 +286,7 @@ Overworld_MosaicDarkWorldChecks:
;--------------------------------------------------------------------------------
; This is the where the music can change due to an UW transition
;
;
; On entry, A=16bit XY=8bit, A & X safe to mod, Y unknown
Underworld_DoorDown_Entry:
LDX #$FF ; some junk value to be used later to determine if the below lines will change the track
@@ -302,3 +302,10 @@ Underworld_DoorDown_Entry:
.done
LDA $A0 : RTL
;--------------------------------------------------------------------------------
;--------------------------------------------------------------------------------
; Check if the boss in ToH has been defeated (16-bit accumulator)
CheckHeraBossDefeated:
LDA $7EF00F : AND #$00FF
RTL
;--------------------------------------------------------------------------------