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

move LinkCarryOrToss

Browse Source
This commit is contained in:
scawful
2024-07-06 17:08:44 -04:00
parent ecd75a49bf
commit 16d3e80219
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Sprites/Objects/minecart.asm
View File

@@ -64,12 +64,6 @@ Right = $03
; 3 - right ; 3 - right
!SpriteDirection = $0DE0 !SpriteDirection = $0DE0
; Bitfield for carry-related actions.
; .... ..tl
; t - tossing object
; l - lifting object
!LinkCarryOrToss = $0309
; ========================================================= ; =========================================================
Sprite_Minecart_Long: Sprite_Minecart_Long:
@@ -216,7 +210,7 @@ HandleToss:
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
JSR HandleToss JSR HandleToss
.not_tossing .not_tossing
JSL Sprite_CheckIfLifted JSL Sprite_CheckIfLifted
@@ -264,7 +258,7 @@ Sprite_Minecart_Main:
Minecart_WaitHoriz: Minecart_WaitHoriz:
{ {
%PlayAnimation(0,1,8) %PlayAnimation(0,1,8)
LDA !LinkCarryOrToss : AND #$03 : BNE .lifting LDA LinkCarryOrToss : AND #$03 : BNE .lifting
LDA SprTimerA, X : BNE .not_ready LDA SprTimerA, X : BNE .not_ready
JSR CheckIfPlayerIsOn : BCC .not_ready JSR CheckIfPlayerIsOn : BCC .not_ready
LDA.w SprMiscF, X : BNE .active_cart LDA.w SprMiscF, X : BNE .active_cart
@@ -300,7 +294,7 @@ Sprite_Minecart_Main:
Minecart_WaitVert: Minecart_WaitVert:
{ {
%PlayAnimation(2,3,8) %PlayAnimation(2,3,8)
LDA !LinkCarryOrToss : AND #$03 : BNE .lifting LDA LinkCarryOrToss : AND #$03 : BNE .lifting
LDA SprTimerA, X : BNE .not_ready LDA SprTimerA, X : BNE .not_ready
JSR CheckIfPlayerIsOn : BCC .not_ready JSR CheckIfPlayerIsOn : BCC .not_ready
LDA.w SprMiscF, X : BNE .active_cart LDA.w SprMiscF, X : BNE .active_cart