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

This commit is contained in:
codemann8
2022-03-07 19:05:21 -06:00
parent 7a0c039233
commit dcc20883c9
3 changed files with 11 additions and 3 deletions

2
Rom.py
View File

@@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx
JAP10HASH = '03a63945398191337e896e5771f77173' JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '0b849317ee6817b9e9b21a9b53fb0744' RANDOMIZERBASEHASH = '02fd6794fe7ffec6999f98d6a021d3b8'
class JsonRom(object): class JsonRom(object):

View File

@@ -48,11 +48,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 ()
@@ -173,6 +175,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:
{ {

Binary file not shown.