diff --git a/Rom.py b/Rom.py index 289d0cb8..3f46f8d9 100644 --- a/Rom.py +++ b/Rom.py @@ -28,7 +28,7 @@ from OverworldShuffle import default_flute_connections, flute_data JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '3da95206e813425551577d6854fdf7ab' +RANDOMIZERBASEHASH = '5d2041f4387123c2de98dd41e6e5c4c6' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index 8837f8a8..03a4443f 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -20,7 +20,7 @@ jsl OWFluteCancel ; allows Frog sprite to spawn in LW and also allows his friend to spawn in their house org $068a76 ; < 30a76 - sprite_prep.asm:785 (LDA $7EF3CA : AND.w #$40) -lda $1b : eor #1 : nop #2 +lda $1b : eor.b #1 : nop #2 ; allows Frog to be accepted at Blacksmith org $06b3ee ; < 333ee - sprite_smithy_bros.asm:347 (LDA $7EF3CC : CMP.b #$08 : BEQ .no_returning_smithy_tagalong) @@ -29,7 +29,7 @@ db #$b0 ; BCS to replace BEQ ; load Stumpy per screen's original world, not current world flag org $06907f ; < 3107f - sprite_prep.asm:2170 (LDA $7EF3CA) -lda $8a : eor #$40 +lda $8a : and.b #$40 ;(replacing -> LDA $8A : AND.b #$40) org $00d8c4 ; < ? - Bank00.asm:4068 ()