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

Fixed issue with mirror portal not spawning when entering OW from the DW in Crossed OWR

Browse Source
This commit is contained in:
codemann8
2022-03-07 19:03:52 -06:00
parent 4958d43d71
commit bd8b79ae5c
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
owrando.asm
View File

@@ -46,11 +46,13 @@ jsl OWOldManSpeed
;org $09c957 ; <- 4c957 ;org $09c957 ; <- 4c957
;dw #$cb5f ; matches value on Central Bonk Rocks screen ;dw #$cb5f ; matches value on Central Bonk Rocks screen
; override world check when spawning mirror portal sprite in Crossed OWR
org $0283dc
jsl.l OWLightWorldOrCrossed
;(replacing -> LDA $8A : AND.b #$40) ;(replacing -> LDA $8A : AND.b #$40)
org $00d8c4 ; < ? - Bank00.asm:4068 () org $00d8c4 ; < ? - Bank00.asm:4068 ()
jsl.l OWWorldCheck jsl.l OWWorldCheck
org $0283dc ; < ? - Bank02.asm:816 ()
jsl.l OWWorldCheck
org $02aa36 ; < ? - Bank02.asm:6559 () org $02aa36 ; < ? - Bank02.asm:6559 ()
jsl.l OWWorldCheck jsl.l OWWorldCheck
org $02aeca ; < ? - Bank02.asm:7257 () org $02aeca ; < ? - Bank02.asm:7257 ()
@@ -171,6 +173,12 @@ OWMirrorSpriteRestore:
+ rep #$30 : lda.w $04AC ; what we wrote over + rep #$30 : lda.w $04AC ; what we wrote over
rtl rtl
} }
OWLightWorldOrCrossed:
{
lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq +
lda #$00 : rtl
+ jsl OWWorldCheck : rtl
}
OWFluteCancel: OWFluteCancel:
{ {