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

update minecart directional logic

Browse Source
This commit is contained in:
scawful
2024-06-16 17:41:47 -04:00
parent c103739041
commit 376b4e7e79
1 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Sprites/Objects/minecart.asm
View File

@@ -455,10 +455,6 @@ Sprite_Minecart_Main:
; =========================================================
North = $00
East = $01
South = $02
West = $03
HandleTileDirections:
{
@@ -516,13 +512,13 @@ HandleTileDirections:
.stop_east
; Set the new direction to east and flip the cart's orientation
LDA.b #West : STA SprSubtype, X : STA.w !MinecartDirection
LDA #$03 : STA !SpriteDirection, X
LDA #$02 : STA !SpriteDirection, X
JMP .go_horiz
.stop_west
; Set the new direction to west and flip the cart's orientation
LDA.b #East : STA SprSubtype, X : STA.w !MinecartDirection
LDA #$02 : STA !SpriteDirection, X
LDA #$03 : STA !SpriteDirection, X
; -----------------------------------------------
.go_horiz
@@ -546,9 +542,11 @@ HandleTileDirections:
; Are we moving left or right?
LDA SprSubtype, X : CMP.b #$03 : BEQ .inverse_horiz_velocity
LDA.b #!MinecartSpeed : STA SprXSpeed, X
LDA.b #East : STA !MinecartDirection
JMP .done
.inverse_horiz_velocity
LDA.b #-!MinecartSpeed : STA SprXSpeed, X
LDA.b #West : STA !MinecartDirection
JMP .done
.vert
; Are we moving up or down?
@@ -661,31 +659,35 @@ HandleDynamicSwitchTileDirections:
.east_or_west
LDA SwitchRam : BNE .go_west
LDA #$01 : STA SprSubtype, X
STA.w !MinecartDirection
LDA #$03 : STA !SpriteDirection, X
%GotoAction(3) ; Minecart_MoveEast
LDA SprY, X : AND #$F8 : STA SprY, X
; LDA SprY, X : AND #$F8 : STA SprY, X
RTS
.go_west
LDA #$03 : STA SprSubtype, X
STA.w !MinecartDirection
LDA #$02 : STA !SpriteDirection, X
%GotoAction(5) ; Minecart_MoveWest
LDA SprY, X : AND #$F8 : STA SprY, X
; LDA SprY, X : AND #$F8 : STA SprY, X
RTS
.north_or_south
LDA SwitchRam : BEQ .go_south
LDA SwitchRam : BNE .go_south
LDA #$00 : STA SprSubtype, X
STA.w !MinecartDirection
STA !SpriteDirection, X
%GotoAction(2) ; Minecart_MoveNorth
LDA SprX, X : AND #$F8 : STA SprX, X
; LDA SprX, X : AND #$F8 : STA SprX, X
RTS
.go_south
LDA #$02 : STA SprSubtype, X
STA.w !MinecartDirection
LDA #$01 : STA !SpriteDirection, X
%GotoAction(4) ; Minecart_MoveSouth
LDA SprX, X : AND #$F8 : STA SprX, X
; LDA SprX, X : AND #$F8 : STA SprX, X
RTS
@@ -740,6 +742,8 @@ CheckForPlayerInput:
LDY !SpriteDirection, X
LDA $F0 : AND .d_pad_press, Y : STA $00 : AND.b #$08 : BEQ .not_pressing_up
LDA.b #$00 : STA !SpriteDirection, X ; Moving Up
LDA.b #North : STA !MinecartDirection
STA SprSubtype, X
%GotoAction(2) ; Minecart_MoveNorth
BRA .return
@@ -747,20 +751,26 @@ CheckForPlayerInput:
.not_pressing_up:
LDA $00 : AND.b #$04 : BEQ .not_pressing_down
LDA.b #$01 : STA !SpriteDirection, X
LDA #$02 : STA SprSubtype, X
LDA.b #South : STA !MinecartDirection
STA SprSubtype, X
%GotoAction(4) ; Minecart_MoveSouth
BRA .return
.not_pressing_down
LDA $00 : AND.b #$02 : BEQ .not_pressing_left
LDA.b #$02 : STA !SpriteDirection, X
LDA #$03 : STA SprSubtype, X
LDA.b #West : STA !MinecartDirection
STA SprSubtype, X
%GotoAction(5) ; Minecart_MoveWest
BRA .return
.not_pressing_left
LDA $00 : AND.b #$01 : BEQ .always
LDA.b #$03 : STA !SpriteDirection, X
LDA.b #East : STA !MinecartDirection
STA SprSubtype, X
%GotoAction(3) ; Minecart_MoveEast