Fix drawing ice encasing when using Bunny Hood/hovering

ASM/ootSymbols.ld

@@ -19,6 +19,8 @@ Flags_SetCollectible = 0x8002071C;
 Actor_SetColorFilter = 0x80027090;
 CutsceneFlags_Get = 0x8005991C;
 z64_Gfx_SetupDL_42Opa = 0x8007E868;
+Matrix_Push = 0x800aa6ec;
+Matrix_Pop = 0x800aa724;
 Audio_StopCurrentMusic = 0x800C7684;
 sprintf = 0x800CE7b4;
 Message_OpenText = 0x800DC838;

ASM/src/build.asm

@@ -133,6 +133,7 @@ RANDO_CONTEXT:
 .include "en_dns.asm"
 .include "bg_gate_shutter.asm"
 .include "big_poe.asm"
+.include "player_bunny_hover_matrix.asm"
 
 .align 0x10
 .importobj "../build/bundle.o"

ASM/src/hacks.asm

@@ -4161,3 +4161,4 @@ DemoEffect_DrawJewel_AfterHook:
 .include "hacks/ovl_en_ssh.asm"
 .include "hacks/ovl_en_okarina_tag.asm"
 .include "hacks/sound.asm"
+.include "hacks/z_player.asm"

ASM/src/hacks/z_player.asm

@@ -0,0 +1,28 @@
+.headersize (0x808301c0 - 0xbcdb70)
+
+;================================================================================
+; Call Matrix_Push() and Matrix_Pop() when drawing Bunny Hood and Hover Boots
+; hover effect, to avoid very big frozen drawing if frozen
+;================================================================================
+; Replaces lw      v0,704(s1)
+;          lui     t8,0xdb06
+.org 0x808482f8
+    jal     Player_BunnyMatrixPush
+    nop
+
+; Replaces lw      v0,704(s1)
+.org 0x808483b4
+    jal     Player_BunnyMatrixPop
+    ;lui    t3,0xde00          ; Needs to be here because it's a branch target address
+
+; Replaces lwc1    $f12,36(s0)
+;          lw      a2,44(s0)
+.org 0x8084852c
+    jal     Player_HoverMatrixPush
+    nop
+
+; Replaces sw      v0,4(s0)
+;          lw      v1,720(s1)
+.org 0x80848578
+    jal     Player_HoverMatrixPop
+    sw      v0,4(s0)

ASM/src/player_bunny_hover_matrix.asm

@@ -0,0 +1,47 @@
+Player_BunnyMatrixPush:
+    addiu   sp,sp,-24
+    sw      ra,16(sp)
+    sw      a0,20(sp)    ; Matrix_Push uses a0, a1, need to save them
+    jal     Matrix_Push
+    sw      a1,24(sp)
+    lw      ra,16(sp)
+    lw      a0,20(sp)
+    lw      a1,24(sp)
+    lui     t8,0xdb06   ; Displaced
+    lw      v0,704(s1)  ; Displaced
+    jr      ra
+    addiu   sp,sp,24
+
+Player_BunnyMatrixPop:
+    addiu   sp,sp,-24
+    sw      ra,16(sp)    ; No need to save registers here
+    jal     Matrix_Pop
+    nop
+    lw      ra,16(sp)
+    lw      v0,704(s1)  ; Displaced
+    jr      ra
+    addiu   sp,sp,24
+
+Player_HoverMatrixPush:
+    addiu   sp,sp,-24
+    sw      ra,16(sp)
+    sw      a0,20(sp)    ; Matrix_Push uses a0, a1, need to save them
+    jal     Matrix_Push
+    sw      a1,24(sp)
+    lw      ra,16(sp)
+    lw      a0,20(sp)
+    lw      a1,24(sp)
+    lwc1    $f12,36(s0) ; Displaced
+    lw      a2,44(s0)   ; Displaced
+    jr      ra
+    addiu   sp,sp,24
+
+Player_HoverMatrixPop:
+    addiu   sp,sp,-24
+    sw      ra,16(sp)    ; No need to save registers here
+    jal     Matrix_Pop
+    nop
+    lw      ra,16(sp)
+    lw      v1,720(s1)  ; Displaced
+    jr      ra
+    addiu   sp,sp,24