z_player Ladder cutscene fix without ra manipulation

Author: djevangelia

ASM/src/build.asm

@@ -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"

ASM/src/hacks/z_player.asm

@@ -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

ASM/src/player_ladder_cutscene.asm

@@ -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