scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup switch track

Browse Source
This commit is contained in:
scawful
2025-02-16 10:53:07 -05:00
parent ee09b6dacc
commit 56c098a884
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Sprites/Objects/minecart.asm
View File

@@ -202,8 +202,8 @@ Sprite_Minecart_Prep:
.inRoom
; Check if the coordinates match, if not kill the sprite.
; If cart isn't appearring in room, check here for values to match
; against the MiencartTrack table values.
; If cart isn't appearing in room, check here for values to match
; against the MinecartTrack table values.
; print "MinecartPrep_CheckCoords ", pc
LDA.w !MinecartTrackX, Y : CMP.w SprCachedX : BNE .killMinecart
LDA.w !MinecartTrackY, Y : CMP.w SprCachedY : BNE .killMinecart
@@ -308,7 +308,7 @@ Sprite_Minecart_Prep:
; This is which room each track should start in if it hasn't already
; been given a track.
.TrackStartingRooms
dw $0098, $0088, $0089, $0088, $0089, $0089, $0089, $0089
dw $0098, $0088, $0087, $0088, $0089, $0089, $0089, $0089
dw $0089, $0089, $0089, $0089, $0089, $0089, $0089, $0089
dw $0089, $0089, $0089, $0089, $0089, $0089, $0089, $0089
dw $0089, $0089, $0089, $0089, $0089, $0089, $0089, $0089

9
Sprites/Objects/switch_track.asm
View File

@@ -50,7 +50,7 @@ Sprite_RotatingTrack_Prep:
{
PHB : PHK : PLB
LDA.b #$80 : STA.w SprDefl, X
; Setup Minecart position to look for tile IDs
; We use AND #$F8 to clamp to a 8x8 grid.
; Subtract 8 from the Y position to get the tile right above instead.
@@ -94,8 +94,7 @@ Sprite_RotatingTrack_Main:
dw BottomLeftToTopLeft
dw TopRightToBottomRight
dw BottomRightToBottomLeft
; -------------------------------------------------------
; 00 = TopLeft -> TopRight
TopLeftToTopRight:
{
@@ -107,7 +106,6 @@ Sprite_RotatingTrack_Main:
RTS
}
; -------------------------------------------------------
; 01 = BottomLeft -> TopLeft
BottomLeftToTopLeft:
{
@@ -119,7 +117,6 @@ Sprite_RotatingTrack_Main:
RTS
}
; -------------------------------------------------------
; 02 = TopRight -> BottomRight
TopRightToBottomRight:
{
@@ -131,7 +128,6 @@ Sprite_RotatingTrack_Main:
RTS
}
; -------------------------------------------------------
; 03 = BottomRight -> BottomLeft
BottomRightToBottomLeft:
{
@@ -217,4 +213,3 @@ Sprite_RotatingTrack_Draw:
db $BD
}
; =========================================================