diff --git a/Core/player.asm b/Core/player.asm index 89aa008..f778eb3 100644 --- a/Core/player.asm +++ b/Core/player.asm @@ -1,10 +1,3 @@ -POSY = $7E0020 -POSYH = $7E0021 -POSX = $7E0022 -POSXH = $7E0023 -POSZ = $7E0024 -POSZH = $7E0025 - ; Link_ControlHandler - Indexed by $5D ; dw LinkState_Default ; 0x00 ; dw LinkState_Pits ; 0x01 @@ -36,4 +29,4 @@ POSZH = $7E0025 ; dw LinkState_ReadingDesertTablet ; 0x1B ; dw LinkState_TemporaryBunny ; 0x1C ; dw LinkState_TreePull ; 0x1D -; dw LinkState_SpinAttack ; 0x1E \ No newline at end of file +; dw LinkState_SpinAttack ; 0x1E diff --git a/Sprites/Objects/minecart.asm b/Sprites/Objects/minecart.asm index c563512..ae7eb5f 100644 --- a/Sprites/Objects/minecart.asm +++ b/Sprites/Objects/minecart.asm @@ -259,7 +259,7 @@ Sprite_Minecart_Main: LDA.w SprMiscF, X : BNE .active_cart LDA $F4 : AND.b #$80 : BEQ .not_ready ; Check for B button .active_cart - JSL Link_CancelDash ; Stop the player from dashing + JSL Link_CancelDash ; Stop the player from dashing LDA #$02 : STA $02F5 ; Somaria platform and moving LDA $0FDA : SEC : SBC #$0B : STA $20 ; Adjust player pos LDA #$01 : STA !LinkInCart ; Set Link in cart flag @@ -295,7 +295,7 @@ Sprite_Minecart_Main: LDA.w SprMiscF, X : BNE .active_cart LDA $F4 : AND.b #$80 : BEQ .not_ready ; Check for B button .active_cart - JSL Link_CancelDash ; Stop the player from dashing + JSL Link_CancelDash ; Stop the player from dashing LDA #$02 : STA $02F5 ; Somaria platform and moving LDA $0FDA : SEC : SBC #$0B : STA $20 ; Adjust player pos LDA #$01 : STA !LinkInCart ; Set Link in cart flag @@ -375,7 +375,7 @@ Sprite_Minecart_Main: LDA.b #!MinecartSpeed : STA.w SprYSpeed, X JMP .continue .fast_speed - LDA.b #!DoubleSpeed : STA.w SprYSpeed, X + LDA.b #!DoubleSpeed : STA.w SprYSpeed, X .continue JSL Sprite_MoveVert @@ -396,8 +396,8 @@ Sprite_Minecart_Main: %InitMovement() LDA $36 : BNE .fast_speed - LDA.b #-!MinecartSpeed : STA.w SprXSpeed, X - JMP .continue + LDA.b #-!MinecartSpeed : STA.w SprXSpeed, X + JMP .continue .fast_speed LDA.b #-!DoubleSpeed : STA.w SprXSpeed, X .continue