diff --git a/Rom.py b/Rom.py index 4b97fc4e..2404438e 100644 --- a/Rom.py +++ b/Rom.py @@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'bffd4e834049ca5f5295601436fc6009' +RANDOMIZERBASEHASH = '308b65c6becf8ce95cb40550458b6da0' class JsonRom(object): diff --git a/asm/doorrando.asm b/asm/doorrando.asm index 807095c7..fe0cc415 100644 --- a/asm/doorrando.asm +++ b/asm/doorrando.asm @@ -44,3 +44,4 @@ warnpc $288000 ; deals with own hooks incsrc keydropshuffle.asm +incsrc owrando.asm diff --git a/asm/owrando.asm b/asm/owrando.asm new file mode 100644 index 00000000..ff9da2c4 --- /dev/null +++ b/asm/owrando.asm @@ -0,0 +1,22 @@ +org $aa8000 +db $4f, $52 ;OR +OWShuffleMode: +dw 1 +OWShuffleFlags: +dw 0 +OWShuffleReserved: +dw 0 + + + +;Hooks +org $02a999 +jsl OWEdgeTransition : nop #4 ;LDA $02A4E3,X : ORA $7EF3CA + +;Code +org $aaa000 +OWEdgeTransition: +{ + LDA $02A4E3,X : ORA $7EF3CA + rtl +} \ No newline at end of file diff --git a/data/base2current.bps b/data/base2current.bps index 71800df8..8487fa28 100644 Binary files a/data/base2current.bps and b/data/base2current.bps differ