diff --git a/music.asm b/music.asm index 153a081..cb6bf5c 100644 --- a/music.asm +++ b/music.asm @@ -52,7 +52,8 @@ PreOverworld_LoadProperties_ChooseMusic: .endOfLightWorldChecks ; if we are in the light world go ahead and set chosen selection - LDA $7EF3CA : BEQ .checkInverted+4 + ;LDA $7EF3CA : BEQ .checkInverted+4 + JSL OWWorldCheck : BEQ .checkInverted+4 LDX.b #$0F ; dark woods theme @@ -68,7 +69,7 @@ PreOverworld_LoadProperties_ChooseMusic: ; if not inverted and light world, or inverted and dark world, skip moon pearl check .checkInverted - LDA $7EF3CA : CLC : ROL #$03 : CMP InvertedMode : BEQ .lastCheck + JSL OWWorldCheck : CLC : ROL #$03 : CMP InvertedMode : BEQ .lastCheck ; Does Link have a moon pearl? LDA $7EF357 : BNE + diff --git a/owrando.asm b/owrando.asm index 9c7086f..b3f9af8 100644 --- a/owrando.asm +++ b/owrando.asm @@ -32,8 +32,8 @@ org $06907f ; < 3107f - sprite_prep.asm:2170 (LDA $7EF3CA) lda $8a : and.b #$40 ; Dark Bonk Rocks Rain Sequence Guards (allowing Tile Swap on Dark Bonk Rocks) -org $09c957 ; <- 4c957 -dw #$cb5f ; matches value on Central Bonk Rocks screen +;org $09c957 ; <- 4c957 +;dw #$cb5f ; matches value on Central Bonk Rocks screen ;(replacing -> LDA $8A : AND.b #$40) org $00d8c4 ; < ? - Bank00.asm:4068 ()