diff --git a/Rom.py b/Rom.py index 4e12827a..b229a7ac 100644 --- a/Rom.py +++ b/Rom.py @@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'f27719e0f1f5e61fb159f6bbc58a9afb' +RANDOMIZERBASEHASH = 'ff9c003ee6c1277437a4480d583282fd' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index 3472bfae..a046b8da 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -631,7 +631,12 @@ OWShuffle: ;look up transitions in current area in table OWEdgeOffsets ;offset is (8bytes * OW Slot ID) + (2bytes * direction) asl : rep #$20 : and.w #$00ff : pha : sep #$20 ;2 bytes per direction - lda $8a : and #$40 : !add $700 : rep #$30 : and #$00ff : asl #3 + + lda $8a : tax : 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 + adc 1,S : tax asl $700 : pla ;x = offset to edgeoffsets table diff --git a/data/base2current.bps b/data/base2current.bps index 168d67f9..66c714ea 100644 Binary files a/data/base2current.bps and b/data/base2current.bps differ