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

Fix minecart tossing bug and increase distance tossed

Browse Source
This commit is contained in:
scawful
2024-05-19 17:16:54 -04:00
parent 8f30f03f75
commit fd1e8a097e
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Sprites/Objects/minecart.asm
View File

@@ -85,7 +85,7 @@ Sprite_Minecart_Long:
Sprite_Minecart_Prep: Sprite_Minecart_Prep:
{ {
PHB : PHK : PLB PHB : PHK : PLB
STZ.w SprMiscG, X
; If the subtype is > 4, then it's a dummy cart ; If the subtype is > 4, then it's a dummy cart
LDA SprSubtype, X : CMP.b #$04 : BCC .continue LDA SprSubtype, X : CMP.b #$04 : BCC .continue
LDA SprSubtype, X : SEC : SBC.b #$04 : STA SprSubtype, X LDA SprSubtype, X : SEC : SBC.b #$04 : STA SprSubtype, X
@@ -179,6 +179,7 @@ endmacro
HandleLiftAndToss: HandleLiftAndToss:
{ {
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 ; Check links facing direction $2F and apply velocity
LDA $2F : CMP.b #$00 : BEQ .toss_north LDA $2F : CMP.b #$00 : BEQ .toss_north
@@ -197,23 +198,24 @@ HandleLiftAndToss:
.toss_west .toss_west
LDA.b #!MinecartSpeed : STA SprXSpeed, X LDA.b #!MinecartSpeed : STA SprXSpeed, X
.continue .continue
LDA #$0F : STA SprTimerB, X LDA #$01 : STA SprMiscG, X
LDA #$20 : STA SprTimerC, X
.not_tossing .not_tossing
JSL Sprite_CheckIfLifted JSL Sprite_CheckIfLifted
JSL Sprite_MoveXyz JSL Sprite_Move
RTS RTS
} }
HandleTossedCart: HandleTossedCart:
{ {
LDA SprHeight, X : BEQ .not_tossed LDA.w SprMiscG, X : BEQ .not_tossed
LDA.w SprHeight, X : BEQ .low_enough
LDA.w SprTimerB, X : BNE .wait_a_bit
; Decrease the height towards the ground
DEC.w SprHeight, X DEC.w SprHeight, X
.wait_a_bit RTS
; If the cart is on the ground, stop tossing .low_enough
LDA SprHeight, X : BNE .not_tossed
LDA.w SprTimerC, X : BNE .not_tossed
STZ.w SprMiscG, X STZ.w SprMiscG, X
STZ.w SprYSpeed, X STZ.w SprYSpeed, X
STZ.w SprXSpeed, X STZ.w SprXSpeed, X
@@ -243,10 +245,7 @@ Sprite_Minecart_Main:
Minecart_WaitHoriz: Minecart_WaitHoriz:
{ {
%PlayAnimation(0,1,8) %PlayAnimation(0,1,8)
JSR HandleTossedCart
LDA SprTimerA, X : BNE .not_ready LDA SprTimerA, X : BNE .not_ready
LDA !LinkCarryOrToss : AND #$03 : BNE .lifting LDA !LinkCarryOrToss : AND #$03 : BNE .lifting
JSR CheckIfPlayerIsOn : BCC .not_ready JSR CheckIfPlayerIsOn : BCC .not_ready
LDA $F4 : AND.b #$80 : BEQ .not_ready ; Check for B button LDA $F4 : AND.b #$80 : BEQ .not_ready ; Check for B button
@@ -272,6 +271,7 @@ Sprite_Minecart_Main:
.not_ready .not_ready
.lifting .lifting
JSR HandleLiftAndToss JSR HandleLiftAndToss
JSR HandleTossedCart
RTS RTS
} }
@@ -280,10 +280,7 @@ Sprite_Minecart_Main:
Minecart_WaitVert: Minecart_WaitVert:
{ {
%PlayAnimation(2,3,8) %PlayAnimation(2,3,8)
JSR HandleTossedCart
LDA SprTimerA, X : BNE .not_ready LDA SprTimerA, X : BNE .not_ready
LDA !LinkCarryOrToss : AND #$03 : BNE .lifting LDA !LinkCarryOrToss : AND #$03 : BNE .lifting
JSR CheckIfPlayerIsOn : BCC .not_ready JSR CheckIfPlayerIsOn : BCC .not_ready
LDA $F4 : AND.b #$80 : BEQ .not_ready ; Check for B button LDA $F4 : AND.b #$80 : BEQ .not_ready ; Check for B button
@@ -309,6 +306,8 @@ Sprite_Minecart_Main:
.not_ready .not_ready
.lifting .lifting
JSR HandleLiftAndToss JSR HandleLiftAndToss
JSR HandleTossedCart
RTS RTS
} }