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

update references to new labels

Browse Source
This commit is contained in:
scawful
2024-07-06 15:58:19 -04:00
parent 2823bd9967
commit a9603984e2
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Items/goldstar.asm
View File

@@ -6,9 +6,6 @@
; $22XXXX - Denotes the source address from all in patch ; $22XXXX - Denotes the source address from all in patch
; ========================================================= ; =========================================================
org $07D576
Hookshot_CheckTileCollision:
pullpc pullpc
TransferGFXinRAM: TransferGFXinRAM:
{ {

8
Masks/mask_routines.asm
View File

@@ -469,14 +469,14 @@ DekuLink_HoverBasedOnInput:
JSR HandleMovement JSR HandleMovement
JSL Link_HandleCardinalCollision_Long JSL Link_HandleCardinalCollision_Long
JSL $07E245 ; Link_HandleVelocity JSL Link_HandleVelocityAndSandDrag
JSL $07E6A6 ; Link_HandleMovingAnimation_FullLongEntry JSL Link_HandleMovingAnimation_FullLongEntry
STZ.w $0302 STZ.w $0302
JSL $07F42F ; HandleIndoorCameraAndDoors_Long JSL HandleIndoorCameraAndDoors
JSL Player_HaltDashAttack JSL Link_CancelDash
; Pos - Cache Pos = difference ; Pos - Cache Pos = difference
LDA $22 : SEC : SBC $3F : STA $31 LDA $22 : SEC : SBC $3F : STA $31

12
Sprites/Objects/minecart.asm
View File

@@ -145,9 +145,9 @@ macro HandlePlayerCamera()
PHX PHX
JSL $07E6A6 ; Link_HandleMovingAnimation_FullLongEntry JSL $07E6A6 ; Link_HandleMovingAnimation_FullLongEntry
JSL $07F42F ; HandleIndoorCameraAndDoors_Long JSL HandleIndoorCameraAndDoors
JSL Player_HaltDashAttack JSL Link_CancelDash
PLX PLX
endmacro endmacro
@@ -270,7 +270,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 Player_HaltDashAttack ; 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
@@ -306,7 +306,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 Player_HaltDashAttack ; 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
@@ -505,7 +505,7 @@ HandleTileDirections:
%SetTimerA($40) %SetTimerA($40)
%StopCart() %StopCart()
%GotoAction(1) ; Minecart_WaitVert %GotoAction(1) ; Minecart_WaitVert
JSL Player_ResetState JSL Link_ResetProperties_A
RTS RTS
.stop_east .stop_east
@@ -524,7 +524,7 @@ HandleTileDirections:
%SetTimerA($40) %SetTimerA($40)
%StopCart() %StopCart()
%GotoAction(0) ; Minecart_WaitHoriz %GotoAction(0) ; Minecart_WaitHoriz
JSL Player_ResetState JSL Link_ResetProperties_A
RTS RTS
; ----------------------------------------------------- ; -----------------------------------------------------