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

change subtype on cart based on toss direction

Browse Source
This commit is contained in:
scawful
2024-05-22 20:15:45 -04:00
parent 50a99fcdc3
commit 845e285a33
1 changed files with 49 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
Sprites/Objects/minecart.asm
View File

@@ -101,7 +101,7 @@ Sprite_Minecart_Prep:
LDA #$00 : STA $0CD2, X ; No bump damage LDA #$00 : STA $0CD2, X ; No bump damage
LDA #$00 : STA $0B6B, X ; Set interactive hitbox? LDA #$00 : STA $0B6B, X ; Set interactive hitbox?
STZ.w $012B STZ.w !MinecartDirection
LDA SprSubtype, X : CMP.b #$00 : BEQ .north LDA SprSubtype, X : CMP.b #$00 : BEQ .north
CMP.b #$01 : BEQ .east CMP.b #$01 : BEQ .east
@@ -109,7 +109,6 @@ Sprite_Minecart_Prep:
CMP.b #$03 : BEQ .west CMP.b #$03 : BEQ .west
.north .north
STZ.w !MinecartDirection
%GotoAction(1) ; Minecart_WaitVert %GotoAction(1) ; Minecart_WaitVert
JMP .done JMP .done
.east .east
@@ -157,49 +156,64 @@ macro MoveCart()
endmacro endmacro
macro StopCart() macro StopCart()
STZ $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
; =========================================================
; Handle the tossing of the cart
; Changes the subtype of the cart to indicate the direction
; the cart is facing and sets the velocity of the cart
; based on the direction it is facing.
HandleToss:
{
; Check links facing direction $2F and apply velocity
LDA $2F : CMP.b #$00 : BEQ .toss_north
CMP.b #$02 : BEQ .toss_south
CMP.b #$04 : BEQ .toss_east
CMP.b #$06 : BEQ .toss_west
.toss_north
LDA.b #-!DoubleSpeed : STA SprYSpeed, X
LDA #$00 : STA SprSubtype, X : STA !SpriteDirection, X
%GotoAction(1) ; Minecart_WaitVert
JMP .continue
.toss_south
LDA.b #!DoubleSpeed : STA SprYSpeed, X
LDA #$02 : STA SprSubtype, X
LDA #$01 : STA !SpriteDirection, X
%GotoAction(1) ; Minecart_WaitVert
JMP .continue
.toss_east
LDA.b #-!DoubleSpeed : STA SprXSpeed, X
LDA #$01 : STA SprSubtype, X
LDA #$03 : STA !SpriteDirection, X
%GotoAction(0) ; Minecart_WaitHoriz
JMP .continue
.toss_west
LDA.b #!DoubleSpeed : STA SprXSpeed, X
LDA #$03 : STA SprSubtype, X
LDA #$02 : STA !SpriteDirection, X
%GotoAction(0) ; Minecart_WaitHoriz
.continue
LDA #$01 : STA SprMiscG, X
LDA #$10 : STA SprTimerC, X
STA SprYRound, X : STA SprXRound, X
RTS
}
HandleLiftAndToss: HandleLiftAndToss:
{ {
JSR CheckIfPlayerIsOn : BCC .not_tossing JSR CheckIfPlayerIsOn : BCC .not_tossing
LDA.w !LinkCarryOrToss : CMP.b #$02 : BNE .not_tossing LDA.w !LinkCarryOrToss : CMP.b #$02 : BNE .not_tossing
; Check links facing direction $2F and apply velocity JSR HandleToss
LDA $2F : CMP.b #$00 : BEQ .toss_north
CMP.b #$02 : BEQ .toss_south
CMP.b #$04 : BEQ .toss_east
CMP.b #$06 : BEQ .toss_west
.toss_north
LDA.b #-!DoubleSpeed : STA SprYSpeed, X
LDA #$00 : STA SprSubtype, X
LDA #$02 : STA !SpriteDirection, X
JMP .continue
.toss_south
LDA.b #!DoubleSpeed : STA SprYSpeed, X
LDA #$02 : STA SprSubtype, X
LDA #$01 : STA !SpriteDirection, X
JMP .continue
.toss_east
LDA.b #-!DoubleSpeed : STA SprXSpeed, X
LDA #$03 : STA SprSubtype, X
LDA #$02 : STA !SpriteDirection, X
JMP .continue
.toss_west
LDA.b #!DoubleSpeed : STA SprXSpeed, X
LDA #$03 : STA SprSubtype, X
LDA #$03 : STA !SpriteDirection, X
.continue
LDA #$01 : STA SprMiscG, X
LDA #$10 : STA SprTimerC, X
STA SprYRound, X : STA SprXRound, X
.not_tossing .not_tossing
JSL Sprite_CheckIfLifted JSL Sprite_CheckIfLifted
JSL Sprite_Move JSL Sprite_Move
RTS JSR HandleTossedCart
RTS
} }
HandleTossedCart: HandleTossedCart: