diff --git a/Rom.py b/Rom.py index 9a638eb8..b6a39375 100644 --- a/Rom.py +++ b/Rom.py @@ -43,7 +43,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '0b3b7a09b48e024c8e48d6c6768ca59a' +RANDOMIZERBASEHASH = '168c7d6e330a134e7565baedab79aa15' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index 0283980e..ee1afb53 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -447,6 +447,7 @@ OWBonkDropSparkle: LDA.w $0E90,X : BEQ .nosparkle LDA.w SprRedrawFlag,X : BNE .nosparkle LDA.b GameMode : CMP.b #$0E : BEQ .nosparkle + LDA.b LinkState : CMP.b #$08 : BCC + : CMP.b #$0A+1 : BCS + : BRA .nosparkle : + ; skip if we're mid-medallion JSL Sprite_SpawnSparkleGarnish ; move sparkle down 1 tile PHX : TYX : PLY diff --git a/data/base2current.bps b/data/base2current.bps index 674039c4..65e2169a 100644 Binary files a/data/base2current.bps and b/data/base2current.bps differ