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

More fixes for problems with staircases (quads 01 & 02)

Browse Source
This commit is contained in:
aerinon
2019-09-23 23:55:05 -06:00
parent 8e50c6d8eb
commit 3df4fe08b3
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
asm/spiral.asm
View File

@@ -13,7 +13,7 @@ SpiralWarp: {
lda $045e : cmp #$5e : beq .gtg ; abort if not spiral - intended room is in A! lda $045e : cmp #$5e : beq .gtg ; abort if not spiral - intended room is in A!
cmp #$5f : beq .gtg cmp #$5f : beq .gtg
.abort .abort
lda $a2 : and #$0f : rtl ; run highjack code and get out stz $045e :lda $a2 : and #$0f : rtl ; clear,run highjack code and get out
.gtg .gtg
phb : phk : plb : phx : phy ; push stuff phb : phk : plb : phx : phy ; push stuff
@@ -61,6 +61,7 @@ SpiralWarp: {
lda $01 : and #$20 : sta $07 ; zeroVtCam check lda $01 : and #$20 : sta $07 ; zeroVtCam check
ldy #$01 : jsr SetCamera ldy #$01 : jsr SetCamera
stz $045e
ply : plx : plb ; pull the stuff we pushed ply : plx : plb ; pull the stuff we pushed
lda $a2 : and #$0f ; this is the code we are hijacking lda $a2 : and #$0f ; this is the code we are hijacking
rtl rtl
@@ -90,9 +91,11 @@ LookupSpiralOffset: {
inc $01 : lda $22 : cmp #$98 : bcc .done ;gt ent and hc stairwell inc $01 : lda $22 : cmp #$98 : bcc .done ;gt ent and hc stairwell
inc $01 : bra .done inc $01 : bra .done
.quad1 .quad1
lda $22 : cmp #$98 : bcc .done ;swamp/pod dual stairs lda $040c : cmp $0a : beq .q1diff : cmp $0c : bne .done
.q1diff lda $22 : cmp #$98 : bcc .done ;swamp/pod dual stairs
inc $01 : bra .done inc $01 : bra .done
.quad2 ;ice room .quad2 ;ice room
lda $040c : cmp $12 : bne .done
lda #$03 : sta $01 lda #$03 : sta $01
lda $22 : cmp #$78 : bcc .done lda $22 : cmp #$78 : bcc .done
inc $01 : bra .done inc $01 : bra .done