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

update minecart corner tile move timing

Browse Source
This commit is contained in:
scawful
2024-07-04 14:39:49 -04:00
parent 5bf4d5ea7b
commit 60420d885f
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Sprites/Objects/minecart.asm
View File

@@ -80,10 +80,8 @@ Sprite_Minecart_Long:
JSR Sprite_Minecart_DrawBottom ; Draw the bottom half in front of Link JSR Sprite_Minecart_DrawBottom ; Draw the bottom half in front of Link
JSL Sprite_CheckActive ; Check if game is not paused JSL Sprite_CheckActive ; Check if game is not paused
BCC .SpriteIsNotActive ; Skip Main code is sprite is innactive BCC .SpriteIsNotActive ; Skip Main code is sprite is innactive
JSR Sprite_Minecart_Main ; Call the main sprite code
JSR Sprite_Minecart_Main ; Call the main sprite code .SpriteIsNotActive
.SpriteIsNotActive
PLB ; Get back the databank we stored previously PLB ; Get back the databank we stored previously
RTL ; Go back to original code RTL ; Go back to original code
} }
@@ -167,10 +165,10 @@ macro MoveCart()
endmacro endmacro
macro StopCart() macro StopCart()
STZ.w $02F5 STZ.w $02F5
STZ.w SprYSpeed, X STZ.w SprYSpeed, X
STZ.w SprXSpeed, X STZ.w SprXSpeed, X
STZ.w !LinkInCart STZ.w !LinkInCart
endmacro endmacro
; ========================================================= ; =========================================================
@@ -581,27 +579,27 @@ HandleTileDirections:
STA !SpriteDirection, X STA !SpriteDirection, X
%GotoAction(2) ; Minecart_MoveNorth %GotoAction(2) ; Minecart_MoveNorth
LDA SprX, X : AND #$F8 : STA.w SprX, X LDA SprX, X : AND #$F8 : STA.w SprX, X
RTS JMP .done
.move_east .move_east
LDA #$01 : STA.w SprSubtype, X : STA !MinecartDirection LDA #$01 : STA.w SprSubtype, X : STA !MinecartDirection
STA !MinecartDirection STA !MinecartDirection
LDA #$03 : STA !SpriteDirection, X LDA #$03 : STA !SpriteDirection, X
LDA SprY, X : AND #$F8 : STA.w SprY, X LDA SprY, X : AND #$F8 : STA.w SprY, X
%GotoAction(3) ; Minecart_MoveEast %GotoAction(3) ; Minecart_MoveEast
RTS JMP .done
.move_south .move_south
LDA #$02 : STA.w SprSubtype, X : STA !MinecartDirection LDA #$02 : STA.w SprSubtype, X : STA !MinecartDirection
LDA #$01 : STA !SpriteDirection, X LDA #$01 : STA !SpriteDirection, X
%GotoAction(4) ; Minecart_MoveSouth %GotoAction(4) ; Minecart_MoveSouth
LDA SprX, X : AND #$F8 : STA.w SprX, X LDA SprX, X : AND #$F8 : STA.w SprX, X
RTS JMP .done
.move_west .move_west
LDA #$03 : STA.w SprSubtype, X : STA !MinecartDirection LDA #$03 : STA.w SprSubtype, X : STA !MinecartDirection
LDA #$02 : STA !SpriteDirection, X LDA #$02 : STA !SpriteDirection, X
LDA SprY, X : AND #$F8 : STA.w SprY, X LDA SprY, X : AND #$F8 : STA.w SprY, X
%GotoAction(5) ; Minecart_MoveWest %GotoAction(5) ; Minecart_MoveWest
.done .done
LDA #$04 : STA.w SprTimerA, X LDA #$0F : STA.w SprTimerA, X
RTS RTS
; Direction to move on tile collision ; Direction to move on tile collision