alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Reverting Dark Bonk Rocks rain state sprite fix

Browse Source
This commit is contained in:
codemann8
2021-07-08 20:26:18 -05:00
parent a474212475
commit 195fd74e0b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
music.asm
View File

@@ -52,7 +52,8 @@ PreOverworld_LoadProperties_ChooseMusic:
.endOfLightWorldChecks .endOfLightWorldChecks
; 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
JSL OWWorldCheck : BEQ .checkInverted+4
LDX.b #$0F ; dark woods theme 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 ; 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 JSL OWWorldCheck : CLC : ROL #$03 : CMP InvertedMode : BEQ .lastCheck
; Does Link have a moon pearl? ; Does Link have a moon pearl?
LDA $7EF357 : BNE + LDA $7EF357 : BNE +

4
owrando.asm
View File

@@ -32,8 +32,8 @@ org $06907f ; < 3107f - sprite_prep.asm:2170 (LDA $7EF3CA)
lda $8a : and.b #$40 lda $8a : and.b #$40
; Dark Bonk Rocks Rain Sequence Guards (allowing Tile Swap on Dark Bonk Rocks) ; Dark Bonk Rocks Rain Sequence Guards (allowing Tile Swap on Dark Bonk Rocks)
org $09c957 ; <- 4c957 ;org $09c957 ; <- 4c957
dw #$cb5f ; matches value on Central Bonk Rocks screen ;dw #$cb5f ; matches value on Central Bonk Rocks screen
;(replacing -> LDA $8A : AND.b #$40) ;(replacing -> LDA $8A : AND.b #$40)
org $00d8c4 ; < ? - Bank00.asm:4068 () org $00d8c4 ; < ? - Bank00.asm:4068 ()