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

Remove bounce from tile collision from movement fns

Browse Source
This commit is contained in:
scawful
2024-05-22 20:16:30 -04:00
parent 5a13d69569
commit 5f4e6b6908
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Sprites/Objects/minecart.asm
View File

@@ -282,7 +282,6 @@ Sprite_Minecart_Main:
.not_ready .not_ready
.lifting .lifting
JSR HandleLiftAndToss JSR HandleLiftAndToss
JSR HandleTossedCart
RTS RTS
} }
@@ -318,8 +317,6 @@ Sprite_Minecart_Main:
.not_ready .not_ready
.lifting .lifting
JSR HandleLiftAndToss JSR HandleLiftAndToss
JSR HandleTossedCart
RTS RTS
} }
@@ -337,7 +334,6 @@ Sprite_Minecart_Main:
LDA.b #-!DoubleSpeed : STA SprYSpeed, X LDA.b #-!DoubleSpeed : STA SprYSpeed, X
.continue .continue
JSL Sprite_MoveVert JSL Sprite_MoveVert
JSL Sprite_BounceFromTileCollision
; Get direction of the cart (0 to 3) ; Get direction of the cart (0 to 3)
LDY.w !SpriteDirection, X LDY.w !SpriteDirection, X
@@ -355,6 +351,7 @@ Sprite_Minecart_Main:
{ {
%PlayAnimation(0,1,8) %PlayAnimation(0,1,8)
%InitMovement() %InitMovement()
LDA $36 : BNE .fast_speed LDA $36 : BNE .fast_speed
LDA.b #!MinecartSpeed : STA $0D50, X LDA.b #!MinecartSpeed : STA $0D50, X
JMP .continue JMP .continue
@@ -362,7 +359,6 @@ Sprite_Minecart_Main:
LDA.b #!DoubleSpeed : STA $0D50, X LDA.b #!DoubleSpeed : STA $0D50, X
.continue .continue
JSL Sprite_MoveHoriz JSL Sprite_MoveHoriz
JSL Sprite_BounceFromTileCollision
; Get direction of the cart (0 to 3) ; Get direction of the cart (0 to 3)
LDY.w !SpriteDirection, X LDY.w !SpriteDirection, X
@@ -380,6 +376,7 @@ Sprite_Minecart_Main:
{ {
%PlayAnimation(2,3,8) %PlayAnimation(2,3,8)
%InitMovement() %InitMovement()
LDA $36 : BNE .fast_speed LDA $36 : BNE .fast_speed
LDA.b #!MinecartSpeed : STA SprYSpeed, X LDA.b #!MinecartSpeed : STA SprYSpeed, X
JMP .continue JMP .continue
@@ -387,7 +384,6 @@ Sprite_Minecart_Main:
LDA.b #!DoubleSpeed : STA SprYSpeed, X LDA.b #!DoubleSpeed : STA SprYSpeed, X
.continue .continue
JSL Sprite_MoveVert JSL Sprite_MoveVert
JSL Sprite_BounceFromTileCollision
; Get direction of the cart (0 to 3) ; Get direction of the cart (0 to 3)
LDY.w !SpriteDirection, X LDY.w !SpriteDirection, X
@@ -405,6 +401,7 @@ Sprite_Minecart_Main:
{ {
%PlayAnimation(0,1,8) %PlayAnimation(0,1,8)
%InitMovement() %InitMovement()
LDA $36 : BNE .fast_speed LDA $36 : BNE .fast_speed
LDA.b #-!MinecartSpeed : STA $0D50, X LDA.b #-!MinecartSpeed : STA $0D50, X
JMP .continue JMP .continue
@@ -412,7 +409,6 @@ Sprite_Minecart_Main:
LDA.b #-!DoubleSpeed : STA $0D50, X LDA.b #-!DoubleSpeed : STA $0D50, X
.continue .continue
JSL Sprite_MoveHoriz JSL Sprite_MoveHoriz
JSL Sprite_BounceFromTileCollision
; Get direction of the cart (0 to 3) ; Get direction of the cart (0 to 3)
LDY.w !SpriteDirection, X LDY.w !SpriteDirection, X