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

Fix post-Aga1 Kakariko music

Browse Source
This commit is contained in:
qwertymodo
2019-09-28 18:12:52 -07:00
parent adb4110c6b
commit 0c032c7d06
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hooks.asm
View File

@@ -2255,6 +2255,14 @@ JML.l PreOverworld_LoadProperties_ChooseMusic
org $028389 ; <- Bank02.asm:763 org $028389 ; <- Bank02.asm:763
PreOverworld_LoadProperties_SetSong: PreOverworld_LoadProperties_SetSong:
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; Remove Aga1 check for Kakariko music, always play track 7
org $02A992 ; (BCS $A999)
NOP #2
org $02A9B0 ; (BCS $A9B7)
NOP #2
org $02C1C8 ; (BCS $C1CC)
NOP #2
;--------------------------------------------------------------------------------
org $05CC58 ; <- Bank05.asm:1307 (LDA $040A : CMP.b #$18) org $05CC58 ; <- Bank05.asm:1307 (LDA $040A : CMP.b #$18)
JSL PsychoSolder_MusicCheck JSL PsychoSolder_MusicCheck
NOP #1 NOP #1

12
music.asm
View File

@@ -22,9 +22,9 @@ PreOverworld_LoadProperties_ChooseMusic:
LDX.b #$07 ; Default village theme LDX.b #$07 ; Default village theme
; Check what phase we're in ; Check what phase we're in
LDA $7EF3C5 : CMP.b #$03 : !BLT + ;LDA $7EF3C5 : CMP.b #$03 : !BLT +
LDX.b #$02 ; Default light world theme (phase >=3) ; LDX.b #$02 ; Default light world theme (phase >=3)
+ ;+
; Check if we're entering the village ; Check if we're entering the village
LDA $8A : CMP.b #$18 : BEQ .endOfLightWorldChecks LDA $8A : CMP.b #$18 : BEQ .endOfLightWorldChecks
@@ -184,9 +184,9 @@ BirdTravel_LoadTargetAreaMusic:
LDX.b #$07 ; Default village theme LDX.b #$07 ; Default village theme
; Check what phase we're in ; Check what phase we're in
LDA $7EF3C5 : CMP.b #$03 : !BLT + ;LDA $7EF3C5 : CMP.b #$03 : !BLT +
LDX.b #$02 ; Default light world theme (phase >=3) ; LDX.b #$02 ; Default light world theme (phase >=3)
+ ;+
; Check if we're entering the village ; Check if we're entering the village
LDA $8A : CMP.b #$18 : BEQ .endOfLightWorldChecks LDA $8A : CMP.b #$18 : BEQ .endOfLightWorldChecks