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

Housekeeping

Browse Source
This commit is contained in:
scawful
2024-10-06 18:41:52 -04:00
parent d3baacab34
commit 9f93d49718
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Core/player.asm
View File

@@ -1,10 +1,3 @@
POSY = $7E0020
POSYH = $7E0021
POSX = $7E0022
POSXH = $7E0023
POSZ = $7E0024
POSZH = $7E0025
; Link_ControlHandler - Indexed by $5D ; Link_ControlHandler - Indexed by $5D
; dw LinkState_Default ; 0x00 ; dw LinkState_Default ; 0x00
; dw LinkState_Pits ; 0x01 ; dw LinkState_Pits ; 0x01

10
Sprites/Objects/minecart.asm
View File

@@ -259,7 +259,7 @@ Sprite_Minecart_Main:
LDA.w SprMiscF, X : BNE .active_cart LDA.w SprMiscF, X : BNE .active_cart
LDA $F4 : AND.b #$80 : BEQ .not_ready ; Check for B button LDA $F4 : AND.b #$80 : BEQ .not_ready ; Check for B button
.active_cart .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 #$02 : STA $02F5 ; Somaria platform and moving
LDA $0FDA : SEC : SBC #$0B : STA $20 ; Adjust player pos LDA $0FDA : SEC : SBC #$0B : STA $20 ; Adjust player pos
LDA #$01 : STA !LinkInCart ; Set Link in cart flag LDA #$01 : STA !LinkInCart ; Set Link in cart flag
@@ -295,7 +295,7 @@ Sprite_Minecart_Main:
LDA.w SprMiscF, X : BNE .active_cart LDA.w SprMiscF, X : BNE .active_cart
LDA $F4 : AND.b #$80 : BEQ .not_ready ; Check for B button LDA $F4 : AND.b #$80 : BEQ .not_ready ; Check for B button
.active_cart .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 #$02 : STA $02F5 ; Somaria platform and moving
LDA $0FDA : SEC : SBC #$0B : STA $20 ; Adjust player pos LDA $0FDA : SEC : SBC #$0B : STA $20 ; Adjust player pos
LDA #$01 : STA !LinkInCart ; Set Link in cart flag LDA #$01 : STA !LinkInCart ; Set Link in cart flag
@@ -375,7 +375,7 @@ Sprite_Minecart_Main:
LDA.b #!MinecartSpeed : STA.w SprYSpeed, X LDA.b #!MinecartSpeed : STA.w SprYSpeed, X
JMP .continue JMP .continue
.fast_speed .fast_speed
LDA.b #!DoubleSpeed : STA.w SprYSpeed, X LDA.b #!DoubleSpeed : STA.w SprYSpeed, X
.continue .continue
JSL Sprite_MoveVert JSL Sprite_MoveVert
@@ -396,8 +396,8 @@ Sprite_Minecart_Main:
%InitMovement() %InitMovement()
LDA $36 : BNE .fast_speed LDA $36 : BNE .fast_speed
LDA.b #-!MinecartSpeed : STA.w SprXSpeed, X LDA.b #-!MinecartSpeed : STA.w SprXSpeed, X
JMP .continue JMP .continue
.fast_speed .fast_speed
LDA.b #-!DoubleSpeed : STA.w SprXSpeed, X LDA.b #-!DoubleSpeed : STA.w SprXSpeed, X
.continue .continue