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

Update minecart and pedestal sprite positions; clean up switch track code

Browse Source
This commit is contained in:
scawful
2025-03-24 21:02:28 -04:00
parent 706dcc0710
commit 62b4ad4e99
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sprites/Objects/minecart.asm
View File

@@ -317,13 +317,13 @@ Sprite_Minecart_Prep:
; already been given a position. This is necessary to allow for more ; already been given a position. This is necessary to allow for more
; than one stopping point to be in one room. ; than one stopping point to be in one room.
.TrackStartingX .TrackStartingX
dw $1190, $12D0, $1300, $1100, $1300, $1300, $1300, $1300 dw $1190, $1160, $1300, $1100, $1300, $1300, $1300, $1300
dw $1300, $1300, $1300, $1300, $1300, $1300, $1300, $1300 dw $1300, $1300, $1300, $1300, $1300, $1300, $1300, $1300
dw $1300, $1300, $1300, $1300, $1300, $1300, $1300, $1300 dw $1300, $1300, $1300, $1300, $1300, $1300, $1300, $1300
dw $1300, $1300, $1300, $1300, $1300, $1300, $1300, $1300 dw $1300, $1300, $1300, $1300, $1300, $1300, $1300, $1300
.TrackStartingY .TrackStartingY
dw $1380, $1120, $1100, $10D0, $1100, $1100, $1100, $1100 dw $1380, $10C9, $1100, $10D0, $1100, $1100, $1100, $1100
dw $1100, $1100, $1100, $1100, $1100, $1100, $1100, $1100 dw $1100, $1100, $1100, $1100, $1100, $1100, $1100, $1100
dw $1100, $1100, $1100, $1100, $1100, $1100, $1100, $1100 dw $1100, $1100, $1100, $1100, $1100, $1100, $1100, $1100
dw $1100, $1100, $1100, $1100, $1100, $1100, $1100, $1100 dw $1100, $1100, $1100, $1100, $1100, $1100, $1100, $1100

1
Sprites/Objects/pedestal.asm
View File

@@ -5,6 +5,7 @@
; Fortress Secrets (Map 5E) ; Fortress Secrets (Map 5E)
pushpc pushpc
; Sprite_B3_PedestalPlaque
org $1EE05F org $1EE05F
JSL CheckForBook JSL CheckForBook
pullpc pullpc

12
Sprites/Objects/switch_track.asm
View File

@@ -29,9 +29,7 @@
!ImpervSwordHammer = 00 ; 01 = Impervious to sword and hammer attacks !ImpervSwordHammer = 00 ; 01 = Impervious to sword and hammer attacks
!Boss = 00 ; 00 = normal sprite, 01 = sprite is a boss !Boss = 00 ; 00 = normal sprite, 01 = sprite is a boss
%Set_Sprite_Properties(Sprite_RotatingTrack_Prep, Sprite_RotatingTrack_Long); %Set_Sprite_Properties(Sprite_RotatingTrack_Prep, Sprite_RotatingTrack_Long)
; =========================================================
Sprite_RotatingTrack_Long: Sprite_RotatingTrack_Long:
{ {
@@ -44,8 +42,6 @@ Sprite_RotatingTrack_Long:
RTL RTL
} }
; =========================================================
Sprite_RotatingTrack_Prep: Sprite_RotatingTrack_Prep:
{ {
PHB : PHK : PLB PHB : PHK : PLB
@@ -55,10 +51,10 @@ Sprite_RotatingTrack_Prep:
; We use AND #$F8 to clamp to a 8x8 grid. ; We use AND #$F8 to clamp to a 8x8 grid.
; Subtract 8 from the Y position to get the tile right above instead. ; Subtract 8 from the Y position to get the tile right above instead.
LDA.w SprY, X : AND #$F8 : SEC : SBC.b #$08 : STA.b $00 LDA.w SprY, X : AND #$F8 : SEC : SBC.b #$08 : STA.b $00
LDA.w SprYH, X : STA.b $01 LDA.w SprYH, X : STA.b $01
LDA.w SprX, X : AND #$F8 : STA.b $02 LDA.w SprX, X : AND #$F8 : STA.b $02
LDA.w SprXH, X : STA.b $03 LDA.w SprXH, X : STA.b $03
; Fetch tile attributes based on current coordinates ; Fetch tile attributes based on current coordinates
LDA.b #$00 : JSL Sprite_GetTileAttr LDA.b #$00 : JSL Sprite_GetTileAttr
@@ -140,8 +136,6 @@ Sprite_RotatingTrack_Main:
} }
} }
; =========================================================
Sprite_RotatingTrack_Draw: Sprite_RotatingTrack_Draw:
{ {
JSL Sprite_PrepOamCoord JSL Sprite_PrepOamCoord