diff --git a/Rom.py b/Rom.py index d71b9078..8a95becc 100644 --- a/Rom.py +++ b/Rom.py @@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'af1ee009b2a843e091d5d095b428ce1a' +RANDOMIZERBASEHASH = 'eb83b66abc743105de77b9ceaa4c6d57' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index 00afe10c..c1415483 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -52,6 +52,10 @@ jsl OWOldManSpeed org $0283dc jsl.l OWLightWorldOrCrossed +; override world check when viewing overworld (incl. title screen portion) +org $0aba6c ; < ? - Bank0a.asm:474 () +jsl.l OWMapWorldCheck16 : nop + ;(replacing -> LDA $8A : AND.b #$40) org $00d8c4 ; < ? - Bank00.asm:4068 () jsl.l OWWorldCheck @@ -77,8 +81,6 @@ org $07aa34 ; < ? - Bank07.asm:6718 () jsl.l OWWorldCheck org $08d408 ; < ? - ancilla_morph_poof.asm:48 () jsl.l OWWorldCheck -org $0aba6c ; < ? - Bank0a.asm:474 () -jsl.l OWWorldCheck16 : nop org $0aba99 ; < ? - Bank0a.asm:515 () jsl.l OWWorldCheck org $0bfeab ; < ? - Bank0b.asm:36 () @@ -135,6 +137,13 @@ OWWorldCheck16: ldx $8a : lda.l OWTileWorldAssoc,x plx : and.w #$00ff : rtl } +OWMapWorldCheck16: +{ + lda $10 : cmp #$0014 : beq .return ; attract module, return with Z flag cleared + jsl OWWorldCheck16 + .return + rtl +} OWWhirlpoolUpdate: { diff --git a/data/base2current.bps b/data/base2current.bps index 3fc229eb..287ab512 100644 Binary files a/data/base2current.bps and b/data/base2current.bps differ