842bb043e6
# Conflicts: # LTTP_RND_GeneralBugfixes.asm # catfish.asm # compasses.asm # darkworldspawn.asm # hooks.asm # inventory.asm # newitems.asm # shopkeeper.asm # stats.asm # tables.asm Adn some updates from DR
332 lines
9.3 KiB
NASM
332 lines
9.3 KiB
NASM
RecordStairType: {
|
|
pha
|
|
lda.l DRMode : beq .norm
|
|
lda $040c : cmp #$ff : beq .norm
|
|
lda $0e
|
|
cmp #$25 : bcc ++ ; don't record straight staircases
|
|
sta $045e
|
|
++ pla : bra +
|
|
.norm pla : sta $a0
|
|
+ lda $063d, x
|
|
rtl
|
|
}
|
|
|
|
SpiralWarp: {
|
|
lda.l DRMode : beq .abort ; abort if not DR
|
|
lda $040c : cmp.b #$ff : beq .abort ; abort if not in dungeon
|
|
lda $045e : cmp #$5e : beq .gtg ; abort if not spiral - intended room is in A!
|
|
cmp #$5f : beq .gtg
|
|
cmp #$26 : beq .inroom
|
|
.abort
|
|
stz $045e : lda $a2 : and #$0f : rtl ; clear,run hijacked code and get out
|
|
.inroom
|
|
jsr InroomStairsWarp
|
|
lda $a2 : and #$0f ; this is the code we are hijacking
|
|
rtl
|
|
|
|
.gtg
|
|
phb : phk : plb : phx : phy ; push stuff
|
|
jsr LookupSpiralOffset
|
|
rep #$30 : and #$00FF : asl #2 : tax
|
|
lda.w SpiralTable, x : sta $00
|
|
lda.w SpiralTable+2, x : sta $02
|
|
sep #$30
|
|
lda $00 : sta $a0
|
|
; shift quadrant if necessary
|
|
stz $07 ; this is a x quad adjuster for those blasted staircase on the edges
|
|
lda $01 : and #$01 : !sub $a9
|
|
bne .xQuad
|
|
lda $0462 : and #$04 : bne .xqCont
|
|
inc $07
|
|
.xqCont lda $22 : bne .skipXQuad ; this is an edge case
|
|
dec $23 : bra .skipXQuad ; need to -1 if $22 is 0
|
|
.xQuad sta $06 : !add $a9 : sta $a9
|
|
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
|
|
lda $aa : lsr : sta $06 : lda $01 : and #$02 : lsr : !sub $06
|
|
beq .skipYQuad
|
|
sta $06 : asl : !add $aa : sta $aa
|
|
ldy #$01 : jsr ShiftQuadSimple
|
|
|
|
.skipYQuad
|
|
lda $01 : and #$04 : lsr : sta $048a ;fix layer calc 0->0 2->1
|
|
lda $01 : and #$08 : lsr #2 : sta $0492 ;fix from layer calc 0->0 2->1
|
|
; shift lower coordinates
|
|
lda $02 : sta $22 : bne .adjY : lda $23 : !add $07 : sta $23
|
|
.adjY lda $03 : sta $20 : bne .upDownAdj : inc $21
|
|
.upDownAdj ldx #$08
|
|
lda $0462 : and #$04 : beq .upStairs
|
|
ldx #$fd
|
|
lda $01 : and #$80 : bne .set53
|
|
; if target is also down adjust by (6,-15)
|
|
lda #$06 : !add $20 : sta $20 : lda #$eb : !add $22 : sta $22 : bra .set53
|
|
.upStairs
|
|
lda $01 : and #$80 : beq .set53
|
|
; if target is also up adjust by (-6, 14)
|
|
lda #$fa : !add $20 : sta $20 : lda #$14 : !add $22 : sta $22
|
|
bne .set53 : inc $23
|
|
.set53
|
|
txa : !add $22 : sta $53
|
|
|
|
lda $01 : and #$10 : sta $07 ; zeroHzCam check
|
|
ldy #$00 : jsr SetCamera
|
|
lda $01 : and #$20 : sta $07 ; zeroVtCam check
|
|
ldy #$01 : jsr SetCamera
|
|
|
|
jsr StairCleanup
|
|
ply : plx : plb ; pull the stuff we pushed
|
|
lda $a2 : and #$0f ; this is the code we are hijacking
|
|
rtl
|
|
}
|
|
|
|
StairCleanup: {
|
|
stz $045e ; clear the staircase flag
|
|
|
|
; animated tiles fix
|
|
lda.l DRMode : cmp #$02 : bne + ; only do this in crossed mode
|
|
ldx $a0 : lda.l TilesetTable, x
|
|
cmp $0aa1 : beq + ; already eq no need to decomp
|
|
sta $0aa1
|
|
tax : lda $02802e, x : tay
|
|
jsl DecompDungAnimatedTiles
|
|
+
|
|
stz $047a
|
|
rts
|
|
}
|
|
|
|
;Sets the offset in A
|
|
LookupSpiralOffset: {
|
|
;where link currently is in $a2: quad in a8 & #$03
|
|
;count doors
|
|
stz $00 : ldx #$00 : stz $01
|
|
|
|
.loop
|
|
lda $047e, x : cmp $00 : bcc .continue
|
|
sta $00
|
|
.continue inx #2
|
|
cpx #$08 : bcc .loop
|
|
|
|
lda $00 : lsr
|
|
cmp #$01 : beq .done
|
|
|
|
; look up the quad
|
|
lda $a9 : ora $aa : and #$03 : beq .quad0
|
|
cmp #$01 : beq .quad1
|
|
cmp #$02 : beq .quad2
|
|
bra .quad3
|
|
.quad0
|
|
inc $01 : lda $a2
|
|
cmp #$0c : beq .q0diff ;gt ent
|
|
cmp #$70 : bne .done ;hc stairwell
|
|
.q0diff lda $22 : cmp #$00 : beq .secondDoor
|
|
cmp #$98 : bcc .done ;gt ent and hc stairwell
|
|
.secondDoor inc $01 : bra .done
|
|
.quad1
|
|
lda $a2
|
|
cmp #$1a : beq .q1diff ;pod compass
|
|
cmp #$26 : beq .q1diff ;swamp elbows
|
|
cmp #$6a : beq .q1diff ;pod dark basement
|
|
cmp #$76 : bne .done ;swamp drain
|
|
.q1diff lda $22 : cmp #$98 : bcc .done
|
|
inc $01 : bra .done
|
|
.quad2
|
|
lda #$03 : sta $01 : lda $a2
|
|
cmp #$5f : beq .iceu ;ice u room
|
|
cmp #$3f : bne .done ;hammer ice exception
|
|
stz $01 : bra .done
|
|
.iceu lda $22 : cmp #$78 : bcc .done
|
|
inc $01 : bra .done
|
|
.quad3
|
|
lda $a2 : cmp #$40 : beq .done ; top of aga exception
|
|
lda #$02 : sta $01 ; always 2
|
|
|
|
.done
|
|
lda $a2 : tax : lda.w SpiralOffset,x
|
|
!add $01 ;add a thing (0 in easy case)
|
|
rts
|
|
}
|
|
|
|
InroomStairsWarp: {
|
|
phb : phk : plb : phx : phy ; push stuff
|
|
; find stairs by room and store index in X
|
|
lda $a0 : ldx #$07
|
|
.loop
|
|
cmp.w InroomStairsRoom,x
|
|
beq .found
|
|
dex
|
|
bne .loop
|
|
.found
|
|
rep #$30
|
|
txa : and #$00ff : asl : tay
|
|
lda.w InroomStairsTable,y : sta $00
|
|
sep #$30
|
|
sta $a0
|
|
|
|
; set position and everything else based on target door type
|
|
txa : and #$01 : eor #$01 : sta $07
|
|
; should be the same as lda $0462 : and #$04 : lsr #2 : eor #$01 : sta $07
|
|
lda $01 : and #$80 : beq .notEdge
|
|
lda $07 : sta $03 : beq +
|
|
lda $01 : jsr LoadSouthMidpoint : sta $22 : lda #$f4
|
|
bra ++
|
|
+
|
|
lda $01 : jsr LoadNorthMidpoint : sta $22 : dec $21 : lda #$f7
|
|
++
|
|
sta $20
|
|
lda $01 : and #$20 : beq +
|
|
lda #$01
|
|
+
|
|
sta $02
|
|
stz $07
|
|
lda $01 : and #$10 : lsr #4
|
|
JMP .layer
|
|
.notEdge
|
|
lda $01 : and #$03 : cmp #$03 : bne .normal
|
|
txa : and #$06 : sta $07
|
|
lda $01 : and #$30 : lsr #3 : tay
|
|
lda.w InroomStairsX+1,y : sta $02
|
|
lda.w InroomStairsY+1,y : sta $03
|
|
cpy $07 : beq .vanillaTransition
|
|
lda.w InroomStairsX,y : sta $22
|
|
lda.w InroomStairsY,y
|
|
ldy $07 : beq +
|
|
!add #$07
|
|
+
|
|
sta $20
|
|
inc $07
|
|
bra ++
|
|
.vanillaTransition
|
|
lda #$c0 : sta $07 ; leave camera
|
|
++
|
|
%StonewallCheck($1b)
|
|
lda $01 : and #$04 : lsr #2
|
|
bra .layer
|
|
.normal
|
|
lda $01 : sta $fe ; trap door
|
|
lda $07 : sta $03 : beq +
|
|
ldy $a0 : cpy #$51 : beq .specialFix ; throne room
|
|
cpy #$02 : beq .specialFix ; sewers pull switch
|
|
cpy #$71 : beq .specialFix ; castle armory
|
|
lda #$e0
|
|
bra ++
|
|
.specialFix
|
|
lda #$c8
|
|
bra ++
|
|
+
|
|
%StonewallCheck($43)
|
|
lda #$1b
|
|
++
|
|
sta $20
|
|
inc $07 : stz $02 : lda #$78 : sta $22
|
|
lda $01 : and #$03 : beq ++
|
|
cmp #$02 : !bge +
|
|
lda #$f8 : sta $22 : stz $07 : bra ++
|
|
+ inc $02
|
|
++
|
|
lda $01 : and #$04 : lsr #2
|
|
|
|
.layer
|
|
sta $ee
|
|
bne +
|
|
stz $0476
|
|
+
|
|
|
|
lda $02 : !sub $a9
|
|
beq .skipXQuad
|
|
sta $06 : !add $a9 : sta $a9
|
|
ldy #$00 : jsr ShiftQuadSimple
|
|
.skipXQuad
|
|
lda $aa : lsr : sta $06 : lda $03 : !sub $06
|
|
beq .skipYQuad
|
|
sta $06 : asl : !add $aa : sta $aa
|
|
ldy #$01 : jsr ShiftQuadSimple
|
|
.skipYQuad
|
|
|
|
lda $07 : bmi .skipCamera
|
|
ldy #$00 : jsr SetCamera ; horizontal camera
|
|
ldy #$01 : sty $07 : jsr SetCamera ; vertical camera
|
|
lda $20 : cmp #$e0 : bcc +
|
|
lda $e8 : bne +
|
|
lda #$10 : sta $e8 ; adjust vertical camera at bottom
|
|
+
|
|
.skipCamera
|
|
|
|
jsr StairCleanup
|
|
ply : plx : plb ; pull the stuff we pushed
|
|
rts
|
|
}
|
|
|
|
ShiftQuadSimple: {
|
|
lda.w CoordIndex,y : tax
|
|
lda $20,x : beq .skip
|
|
lda $21,x : !add $06 : sta $21,x ; coordinate update
|
|
.skip
|
|
lda.w CamQuadIndex,y : tax
|
|
lda $0601,x : !add $06 : sta $0601,x
|
|
lda $0605,x : !add $06 : sta $0605,x ; high bytes of these guys
|
|
rts
|
|
}
|
|
|
|
SetCamera: {
|
|
stz $04
|
|
tyx : lda $a9,x : bne .nonZeroHalf
|
|
lda.w CamQuadIndex,y : tax : lda $607,x : pha
|
|
lda.w CameraIndex,y : tax : pla : cmp $e3, x : bne .noQuadAdj
|
|
dec $e3,x
|
|
|
|
.noQuadAdj
|
|
lda $07 : bne .adj0
|
|
lda.w CoordIndex,y : tax
|
|
lda $20,x : beq .oddQuad
|
|
cmp #$79 : bcc .adj0
|
|
!sub #$78 : sta $04
|
|
tya : asl : !add #$04 : tax : jsr AdjCamBounds : bra .done
|
|
.oddQuad
|
|
lda #$80 : sta $04 : bra .adj1 ; this is such a weird case - quad cross boundary
|
|
.adj0
|
|
tya : asl : tax : jsr AdjCamBounds : bra .done
|
|
|
|
.nonZeroHalf ;meaning either right half or bottom half
|
|
lda $07 : bne .setQuad
|
|
lda.w CoordIndex,y : tax
|
|
lda $20,x : cmp #$78 : bcs .setQuad
|
|
!add #$78 : sta $04
|
|
lda.w CamQuadIndex,y : tax : lda $0603, x : pha
|
|
lda.w CameraIndex,y : tax : pla : sta $e3, x
|
|
.adj1
|
|
tya : asl : !add #$08 : tax : jsr AdjCamBounds : bra .done
|
|
|
|
.setQuad
|
|
lda.w CamQuadIndex,y : tax : lda $0607, x : pha
|
|
lda.w CameraIndex,y : tax : pla : sta $e3, x
|
|
tya : asl : !add #$0c : tax : jsr AdjCamBounds : bra .done
|
|
|
|
.done
|
|
lda.w CameraIndex,y : tax
|
|
lda $04 : sta $e2, x
|
|
rts
|
|
}
|
|
|
|
; input, expects X to be an appropriate offset into the CamBoundBaseLine table
|
|
; when $04 is 0 no coordinate are added
|
|
AdjCamBounds: {
|
|
rep #$20 : lda.w CamBoundBaseLine, x : sta $05
|
|
lda $04 : and #$00ff : beq .common
|
|
lda.w CoordIndex,y : tax
|
|
lda $20, x : and #$00ff : !add $05 : sta $05
|
|
.common
|
|
lda.w OppCamBoundIndex,y : tax
|
|
lda $05 : sta $0618, x
|
|
inc #2 : sta $061A, x : sep #$20
|
|
rts
|
|
}
|
|
|
|
SpiralPriorityHack: {
|
|
lda.l DRMode : beq +
|
|
lda #$01 : rtl ; always skip the priority code - until I figure out how to fix it
|
|
+ lda $0462 : and #$04 ; what we wrote over
|
|
rtl
|
|
} |