Skip to content

Ladder cutscene fix without ra manipulation #2586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fenhl merged 1 commit into from
May 27, 2026
Merged

Ladder cutscene fix without ra manipulation #2586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ASM/src/build.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ RANDO_CONTEXT:
.include "en_dns.asm"
.include "bg_gate_shutter.asm"
.include "big_poe.asm"
.include "player_ladder_cutscene.asm"
.include "player_laddercutscenefix.asm"

.align 0x10
.importobj "../build/bundle.o"
Expand Down
12 changes: 8 additions & 4 deletions ASM/src/hacks/z_player.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
.headersize(0x808301c0 - 0xbcdb70)
.headersize (0x808301c0 - 0xbcdb70)

;================================================================================
; Fixes softlock when starting cutscene while dismounting a ladder.
;================================================================================
; Replaces lw t8,1644(s0)
; lui at,0xffdf
; Replaces lw t8,1644(s0)
; lui at,0xffdf
; ori at,at,0xffff
; and t9,t8,at
.org 0x8084a6c4 ; in Player_Action_DismountLadder (0x803a3064)
jal player_ladder_cutscene
jal Player_LadderCutsceneFix
lw t8,1644(s0) ; displaced
bnez v0,0x8084a6e0 ; branch to load LinkAnimation argument if in CS/using CS item
nop
11 changes: 0 additions & 11 deletions ASM/src/player_ladder_cutscene.asm
View file
Open in desktop

This file was deleted.

11 changes: 11 additions & 0 deletions ASM/src/player_laddercutscenefix.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Player_LadderCutsceneFix:
lbu t4,1693(s0) ; player->unk_6AD
addi t3,t4,-3 ; Cutscene = 3, CS item = 4
bltzl t3,@@Return ; If not CS/CS item, continue as usual
li v0,0 ; 0 for no branching
li v0,1 ; Otherwise, 1 for branching
@@Return:
lui at,0xffdf ; displaced
ori at,at,0xffff ; displaced
jr ra
and t9,t8,at ; displaced
Loading