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

Corrected some music fade-outs during mosaic transitions

Browse Source
This commit is contained in:
codemann8
2025-08-19 10:14:04 -05:00
parent 8ac480947d
commit ea4f39e116
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hooks.asm
View File

@@ -2234,8 +2234,6 @@ org $82A9B0 ; (BCS $A9B7)
NOP #2 NOP #2
org $82C1C8 ; (BCS $C1CC) org $82C1C8 ; (BCS $C1CC)
NOP #2 NOP #2
org $82ADA0 ; (LDA.b #$F1 : STA $012C)
JSL Overworld_MosaicDarkWorldChecks : NOP
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $85CC58 ; <- Bank05.asm:1307 (LDA $040A : CMP.b #$18) org $85CC58 ; <- Bank05.asm:1307 (LDA $040A : CMP.b #$18)
JSL PsychoSolder_MusicCheck : NOP #1 JSL PsychoSolder_MusicCheck : NOP #1

29
music.asm
View File

@@ -173,24 +173,21 @@ RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; Additional dark world checks to determine whether or not to fade out music pushpc
; on mosaic transitions org $82AD6C
; ; Determine whether or not to fade out music on mosaic transitions
; On entry, A = $8A (overworld area being loaded) OverworldMosaicTransition_HandleSong:
Overworld_MosaicDarkWorldChecks: LDA.b GameSubMode : CMP.b #$0D : BNE .dont_fade
CMP.b #$40 : BEQ .checkCrystals LDA.w CurrentControlRequest : CMP.b #$04 : BEQ .dont_fade
CMP.b #$42 : BEQ .checkCrystals BRA .fade_song
CMP.b #$50 : BEQ .checkCrystals
CMP.b #$51 : BNE .doFade
.checkCrystals warnpc $82ADA0
LDA.l CrystalsField : CMP.b #$7F : BEQ .done org $82ADA0
.fade_song
org $82ADA5
.dont_fade
.doFade pullpc
LDA.b #$F1 : STA.w MusicControlRequest ; thing we wrote over, fade out music
.done
RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------