Overworld ambient SFX fixes

This commit is contained in:
qwertymodo
2019-10-10 14:57:30 -07:00
parent 2995889157
commit bb2fdc8041
2 changed files with 21 additions and 7 deletions

10
msu.asm
View File

@@ -300,8 +300,14 @@ CheckMusicLoadRequest:
.sfx_outdoors .sfx_outdoors
SEP #$10 SEP #$10
LDX.b #$05 LDX.b #$09
LDA $8A : CMP.b #$70 : BNE + ; Misery Mire
LDA $8A ; Dark Death Mountain
CMP.b #$43 : BEQ + : CMP.b #$45 : BEQ + : CMP.b #$47 : BEQ +
LDX.b #$05
+
CMP.b #$70 : BNE + ; Misery Mire
LDA $7EF2F0 : AND.b #$20 : BEQ .rain LDA $7EF2F0 : AND.b #$20 : BEQ .rain
+ +

View File

@@ -216,18 +216,26 @@ BirdTravel_LoadTargetAreaMusic:
; if we are in the light world go ahead and set chosen selection ; if we are in the light world go ahead and set chosen selection
LDA $7EF3CA : BEQ .checkInverted+4 LDA $7EF3CA : BEQ .checkInverted+4
LDX.b #$0F ; dark woods theme LDX.b #$09 ; dark overworld theme
; This music is used in dark woods
LDA $8A LDA $8A
CMP.b #$40 : BEQ + ; Misery Mire rain SFX
LDX.b #$0D ; dark death mountain theme CMP.b #$70 : BNE ++
LDA $7EF2F0 : AND.b #$20 : BNE ++
LDA.b #$01 : CMP $0131 : BEQ +
STA $012D
+ : BRA .checkInverted
++
; This music is used in dark death mountain ; This music is used in dark death mountain
CMP.b #$43 : BEQ + : CMP.b #$45 : BEQ + : CMP.b #$47 : BEQ + CMP.b #$43 : BEQ + : CMP.b #$45 : BEQ + : CMP.b #$47 : BEQ +
LDX.b #$09 ; dark overworld theme LDA.b #$05 : STA $012D
BRA .checkInverted
+ +
LDX.b #$0D ; dark death mountain theme
LDA.b #$09 : STA $012D
; if not inverted and light world, or inverted and dark world, skip moon pearl check ; if not inverted and light world, or inverted and dark world, skip moon pearl check
.checkInverted .checkInverted
LDA $7EF3CA : CLC : ROL #$03 : CMP InvertedMode : BEQ .lastCheck LDA $7EF3CA : CLC : ROL #$03 : CMP InvertedMode : BEQ .lastCheck