alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed fake world handling for IB transitions

Browse Source
This commit is contained in:
codemann8
2022-10-26 07:54:33 -05:00
parent 8517d70eba
commit 311b002b95
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Rom.py
View File

@@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127
JAP10HASH = '03a63945398191337e896e5771f77173' JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = 'f27719e0f1f5e61fb159f6bbc58a9afb' RANDOMIZERBASEHASH = 'ff9c003ee6c1277437a4480d583282fd'
class JsonRom(object): class JsonRom(object):

7
asm/owrando.asm
View File

@@ -631,7 +631,12 @@ OWShuffle:
;look up transitions in current area in table OWEdgeOffsets ;look up transitions in current area in table OWEdgeOffsets
;offset is (8bytes * OW Slot ID) + (2bytes * direction) ;offset is (8bytes * OW Slot ID) + (2bytes * direction)
asl : rep #$20 : and.w #$00ff : pha : sep #$20 ;2 bytes per 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 adc 1,S : tax
asl $700 : pla asl $700 : pla
;x = offset to edgeoffsets table ;x = offset to edgeoffsets table

BIN
data/base2current.bps
View File

Binary file not shown.