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

fix dynamic track logic and clamp position on redirection

Browse Source
This commit is contained in:
scawful
2024-05-24 20:42:28 -04:00
parent ecd99b22c3
commit 5b0a02cd97
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Sprites/Objects/minecart.asm
View File

@@ -623,36 +623,44 @@ HandleDynamicSwitchTileDirections:
JSL CheckIfHitBoxesOverlap : BCC .no_b0 JSL CheckIfHitBoxesOverlap : BCC .no_b0
LDA !MinecartDirection : CMP.b #$00 : BEQ .east_or_west LDA !MinecartDirection : CMP.b #$00 : BEQ .east_or_west
CMP.b #$02 : BEQ .north_or_south CMP.b #$01 : BEQ .north_or_south
CMP.b #$02 : BEQ .east_or_west
CMP.b #$03 : BEQ .north_or_south
.no_b0
RTS
.east_or_west .east_or_west
LDA SwitchRam : BEQ .go_west LDA SwitchRam : BNE .go_west
LDA #$01 : STA SprSubtype, X LDA #$01 : STA SprSubtype, X
LDA #$03 : STA !SpriteDirection, X LDA #$03 : STA !SpriteDirection, X
%GotoAction(3) ; Minecart_MoveEast %GotoAction(3) ; Minecart_MoveEast
LDA SprY, X : AND #$F8 : STA SprY, X
RTS RTS
.go_west .go_west
LDA #$03 : STA SprSubtype, X LDA #$03 : STA SprSubtype, X
LDA #$02 : STA !SpriteDirection, X LDA #$02 : STA !SpriteDirection, X
%GotoAction(5) ; Minecart_MoveWest %GotoAction(5) ; Minecart_MoveWest
LDA SprY, X : AND #$F8 : STA SprY, X
RTS RTS
.north_or_south .north_or_south
LDA SwitchRam : BNE .go_south LDA SwitchRam : BEQ .go_south
LDA #$00 : STA SprSubtype, X LDA #$00 : STA SprSubtype, X
STA !SpriteDirection, X STA !SpriteDirection, X
%GotoAction(2) ; Minecart_MoveNorth %GotoAction(2) ; Minecart_MoveNorth
LDA SprX, X : AND #$F8 : STA SprX, X
RTS RTS
.go_south .go_south
LDA #$02 : STA SprSubtype, X LDA #$02 : STA SprSubtype, X
LDA #$01 : STA !SpriteDirection, X LDA #$01 : STA !SpriteDirection, X
%GotoAction(4) ; Minecart_MoveSouth %GotoAction(4) ; Minecart_MoveSouth
LDA SprX, X : AND #$F8 : STA SprX, X
RTS RTS
.no_b0
RTS
} }
; ========================================================= ; =========================================================