diff --git a/Rom.py b/Rom.py index f7c91289..6048605c 100644 --- a/Rom.py +++ b/Rom.py @@ -43,7 +43,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'd72b50e97435c3f36b8278d2921e88a0' +RANDOMIZERBASEHASH = '87be9d9bd56b6ad8e4b9697ecfc31841' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index 1e91896a..3c0c022c 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -78,6 +78,8 @@ org $8ab7af ;LDA $F2 : ORA $F0 : AND #$C0 jml OWFluteCancel2 : nop org $8ab90d ;JSL $02E99D jsl OWFluteCancel +org $8ab816 +JSL OWMapFluteCancelIcon ; allows Frog sprite to spawn in LW and also allows his friend to spawn in their house org $868a76 ; < 30a76 - sprite_prep.asm:785 (LDA $7EF3CA : AND.w #$40) @@ -334,6 +336,20 @@ OWFluteCancel2: lda.b #$01 : sta.w RandoOverworldTargetEdge + rtl } +OWMapFluteCancelIcon: +{ + STA.b Scrap0B : LDX.b #$10 ; what we wrote over + LDA.l OWFlags+1 : AND.b #$01 : BEQ .return + LDA.b GameSubMode : CMP.b #$0A : BNE .return + LDA.b FrameCounter : AND.b #$10 : BNE .return + LDA.b #$7E : STA.b Scrap0D + LDA.b #$34 : STA.b Scrap0C + STZ.b Scrap0B + LDA.b Scrap0E : CLC : ADC.b #$04 : STA.b Scrap0E + LDA.b Scrap0F : CLC : ADC.b #$04 : STA.b Scrap0F + .return + RTL +} OWSmithAccept: { lda.l FollowerIndicator : cmp.b #$07 : beq + diff --git a/data/base2current.bps b/data/base2current.bps index b45c5fea..8890dd42 100644 Binary files a/data/base2current.bps and b/data/base2current.bps differ