diff --git a/Rom.py b/Rom.py index cced7fc7..e2d04757 100644 --- a/Rom.py +++ b/Rom.py @@ -43,7 +43,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '030a90f43980701de227341dd1a78a50' +RANDOMIZERBASEHASH = '001235f09be679140ef2f940b8b7f5c2' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index 4c8a5082..0283980e 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -306,9 +306,9 @@ OWFluteCancel: { lda.l OWFlags+1 : and.b #$01 : bne + jsl FluteMenu_LoadTransport : rtl - + lda.l HexToDecDigit4 : cmp.b #$01 : beq + + + lda.w RandoOverworldTargetEdge : bne + jsl FluteMenu_LoadTransport - + lda.b #$00 : sta.l HexToDecDigit4 : rtl + + stz.w RandoOverworldTargetEdge : rtl } OWFluteCancel2: { @@ -317,7 +317,7 @@ OWFluteCancel2: + inc.w SubModuleInterface lda.l OWFlags+1 : and.b #$01 : beq + lda.b Joy1B_All : cmp.b #$40 : bne + - lda.b #$01 : sta.l HexToDecDigit4 + lda.b #$01 : sta.w RandoOverworldTargetEdge + rtl } OWSmithAccept: @@ -587,6 +587,7 @@ OWBonkDrops: .increment_collection REP #$20 LDA.l TotalItemCounter : INC : STA.l TotalItemCounter + INC.w UpdateHUDFlag SEP #$20 + BRA .return diff --git a/data/base2current.bps b/data/base2current.bps index cfd41138..a79604a9 100644 Binary files a/data/base2current.bps and b/data/base2current.bps differ