diff --git a/Rom.py b/Rom.py index b229a7ac..8d3bf9ca 100644 --- a/Rom.py +++ b/Rom.py @@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'ff9c003ee6c1277437a4480d583282fd' +RANDOMIZERBASEHASH = '3954c4e449c908a9e086a1fd5797c98b' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index a046b8da..363d9587 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -632,7 +632,7 @@ OWShuffle: ;offset is (8bytes * OW Slot ID) + (2bytes * direction) asl : rep #$20 : and.w #$00ff : pha : sep #$20 ;2 bytes per direction - lda $8a : tax : lda.l OWTileWorldAssoc,X : eor.l CurrentWorld : beq + + ldx $8a : lda.l OWTileWorldAssoc,X : eor.l CurrentWorld : beq + ; fake world, will treat this OW area as opposite world txa : eor.b #$40 : tax + txa : and #$40 : !add $700 : rep #$30 : and #$00ff : asl #3 diff --git a/data/base2current.bps b/data/base2current.bps index 66c714ea..66b01ab4 100644 Binary files a/data/base2current.bps and b/data/base2current.bps differ