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

Bug fixes for that one dumb pod spiral staircase

Browse Source
This commit is contained in:
aerinon
2019-11-04 12:49:25 -07:00
parent 0c6ea6a14d
commit 8b7bbc25ff
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Rom.py
View File

@@ -18,7 +18,7 @@ from EntranceShuffle import door_addresses
JAP10HASH = '03a63945398191337e896e5771f77173' JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '3aee2a56ccbb16e5a26be7cd57202e41' RANDOMIZERBASEHASH = 'c6f57f505c5b96642ba6ffe5ed9b94df'
class JsonRom(object): class JsonRom(object):

6
asm/spiral.asm
View File

@@ -24,14 +24,16 @@ SpiralWarp: {
sep #$30 sep #$30
lda $00 : sta $a0 lda $00 : sta $a0
; shift quadrant if necessary ; shift quadrant if necessary
stz $07 stz $07 ; this is a x quad adjuster for those blasted staircase on the edges
lda $01 : and #$01 : !sub $a9 lda $01 : and #$01 : !sub $a9
bne .xQuad bne .xQuad
inc $07 inc $07
lda $22 : bne .skipXQuad ; this is an edge case lda $22 : bne .skipXQuad ; this is an edge case
dec $23 : bra .skipXQuad ; need to -1 if $22 is 0 dec $23 : bra .skipXQuad ; need to -1 if $22 is 0
.xQuad sta $06 : !add $a9 : sta $a9 .xQuad sta $06 : !add $a9 : sta $a9
ldy #$00 : jsr ShiftQuadSimple lda $0462 : and #$04 : bne .xCont
inc $07 ; up stairs are going to -1 the quad anyway during transition, need to add this back
.xCont ldy #$00 : jsr ShiftQuadSimple
.skipXQuad .skipXQuad
lda $aa : lsr : sta $06 : lda $01 : and #$02 : lsr : !sub $06 lda $aa : lsr : sta $06 : lda $01 : and #$02 : lsr : !sub $06

2
data/base2current.json
View File

File diff suppressed because one or more lines are too long