Fix magicFillTarget getting lowered if dying during refill

ASM/src/build.asm

@@ -133,6 +133,7 @@ RANDO_CONTEXT:
 .include "en_dns.asm"
 .include "bg_gate_shutter.asm"
 .include "big_poe.asm"
+.include "kaleido_gameoverfillmagic.asm"
 .include "player_laddercutscenefix.asm"
 
 .align 0x10

ASM/src/hacks.asm

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

ASM/src/hacks/ovl_kaleido_scope.asm

@@ -0,0 +1,13 @@
+.headersize (0x808137c0 - 0x00bb11e0)
+
+; Prevent magicFillTarget from getting overwritten if dying
+; during refill (game over respawn)
+; Replaces: lb  t7,51(t1)
+;           sh  zero,5156(t1)
+;           sh  zero,5104(t1)
+;           sh  zero,5106(t1)
+.org 0x80828890         ; in KaleidoScope_Update
+    jal     Kaleido_GameOverFillMagic
+    lb      t7,51(t1)           ; displaced
+    bnez    v0,0x808288a8       ; skip zero fill target
+    sh      zero,5106(t1)

ASM/src/kaleido_gameoverfillmagic.asm

@@ -0,0 +1,16 @@
+Kaleido_GameOverFillMagic:
+    sh      zero,5156(t1)           ; displaced
+    lh      t6,5104(t1)             ; magic state
+    li      at,9                    ; If current magic state is FILL
+    beq     at,t6,@@PreserveFill
+    li      at,8                    ; or STEP_CAPACITY
+    beq     at,t6,@@PreserveFill    ; preserve current fill target
+    lh      at,50(t1)               ; If current magic level is zero,
+    bnezl   at,@@Return             ; also preserve fill target
+    move    v0,zero                 ; Else - zero fill target in caller
+@@PreserveFill:
+    sh      zero,5108(t1)           ; Preserve fill target: set zero capacity here
+    li      v0,1                    ; and skip zero fill target in caller
+@@Return:
+    jr      ra
+    sh      zero,5104(t1)           ; displaced