diff --git a/config/overlays.mk b/config/overlays.mk
index 4dbfef8af..1452e33f9 100644
--- a/config/overlays.mk
+++ b/config/overlays.mk
@@ -4770,6 +4770,7 @@ build/src/ov_SC07_007/ov_SC07_007_jr_80154C24.o: JTBL_PADS := 0,0  # §8e pads (
 build/src/ov_SC07_007/ov_SC07_007_jr_801588CC.o: JTBL_PADS := 0,4,0  # §8e pads (jtbl_carve.py) tables=+0x0,+0x28,+0x48
 build/src/ov_SC07_007/ov_SC07_007_jr_80159C84.o: JTBL_PADS := 0,4  # §8e pads (jtbl_carve.py) tables=+0x0,+0x20
 build/src/ov_SC07_007/ov_SC07_007_jr_8015A3C8.o: JTBL_PADS := 0,4  # §8e pads (jtbl_carve.py) tables=+0x0,+0x20
+build/src/ov_SC07_007/ov_SC07_007_jr_80171B4C.o: JTBL_PADS := 0,0  # §8e pads (jtbl_carve.py) tables=+0x0,+0x20
 build/src/ov_SC07_007/ov_SC07_007_jr_801789AC.o: JTBL_PADS := 0,0  # §8e pads (jtbl_carve.py) tables=+0x0,+0x18
 build/src/ov_SC07_007/ov_SC07_007_jr_80179B74.o: JTBL_PADS := 0,4  # §8e pads (jtbl_carve.py) tables=+0x0,+0x90
 build/src/ov_SC07_007/ov_SC07_007_o0c.o: JTBL_PADS := 0,4,4,4  # §8e pads (jtbl_carve.py) tables=+0x0,+0x38,+0xa8,+0x118
@@ -4804,6 +4805,7 @@ build/src/ov_SC07_010/ov_SC07_010_jr_80154C24.o: JTBL_PADS := 0,0  # §8e pads (
 build/src/ov_SC07_010/ov_SC07_010_jr_801588CC.o: JTBL_PADS := 0,4,0  # §8e pads (jtbl_carve.py) tables=+0x0,+0x28,+0x48
 build/src/ov_SC07_010/ov_SC07_010_jr_80159C84.o: JTBL_PADS := 0,4  # §8e pads (jtbl_carve.py) tables=+0x0,+0x20
 build/src/ov_SC07_010/ov_SC07_010_jr_8015A3C8.o: JTBL_PADS := 0,4  # §8e pads (jtbl_carve.py) tables=+0x0,+0x20
+build/src/ov_SC07_010/ov_SC07_010_jr_80171B4C.o: JTBL_PADS := 0,0  # §8e pads (jtbl_carve.py) tables=+0x0,+0x20
 build/src/ov_SC07_010/ov_SC07_010_jr_801789AC.o: JTBL_PADS := 0,0  # §8e pads (jtbl_carve.py) tables=+0x0,+0x18
 build/src/ov_SC07_010/ov_SC07_010_jr_80179B74.o: JTBL_PADS := 0,4  # §8e pads (jtbl_carve.py) tables=+0x0,+0x90
 build/src/ov_SC07_010/ov_SC07_010_o0.o: JTBL_PADS := 0,4,4,4  # §8e pads (jtbl_carve.py) tables=+0x0,+0x38,+0xa8,+0x118
@@ -4839,6 +4841,7 @@ build/src/ov_SC07_011/ov_SC07_011_jr_80154C24.o: JTBL_PADS := 0,0  # §8e pads (
 build/src/ov_SC07_011/ov_SC07_011_jr_801588CC.o: JTBL_PADS := 0,4,0  # §8e pads (jtbl_carve.py) tables=+0x0,+0x28,+0x48
 build/src/ov_SC07_011/ov_SC07_011_jr_80159C84.o: JTBL_PADS := 0,4  # §8e pads (jtbl_carve.py) tables=+0x0,+0x20
 build/src/ov_SC07_011/ov_SC07_011_jr_8015A3C8.o: JTBL_PADS := 0,4  # §8e pads (jtbl_carve.py) tables=+0x0,+0x20
+build/src/ov_SC07_011/ov_SC07_011_jr_80171B4C.o: JTBL_PADS := 0,0  # §8e pads (jtbl_carve.py) tables=+0x0,+0x20
 build/src/ov_SC07_011/ov_SC07_011_jr_801789AC.o: JTBL_PADS := 0,0  # §8e pads (jtbl_carve.py) tables=+0x0,+0x18
 build/src/ov_SC07_011/ov_SC07_011_jr_80179B74.o: JTBL_PADS := 0,4  # §8e pads (jtbl_carve.py) tables=+0x0,+0x90
 build/src/ov_SC07_011/ov_SC07_011_o0c.o: JTBL_PADS := 0,4,4,4  # §8e pads (jtbl_carve.py) tables=+0x0,+0x38,+0xa8,+0x118
diff --git a/config/splat.ov_SC07_007.yaml b/config/splat.ov_SC07_007.yaml
index fbfadd76b..36bccf0c8 100644
--- a/config/splat.ov_SC07_007.yaml
+++ b/config/splat.ov_SC07_007.yaml
@@ -149,7 +149,7 @@ segments:
       - [0x9de48, .rodata, ov_SC07_007_jr_8016AE5C]  # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
       - [0x9de68, data, tail15]
       - [0x9dea8, .rodata, ov_SC07_007_jr_80171B4C]  # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
-      - [0x9dec8, data, tail16]
+      - [0x9dedc, data, tail16]
       - [0x9e06c, .rodata, ov_SC07_007_jr_801789AC]  # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
       - [0x9e1fc, .rodata, ov_SC07_007_jr_80179B74]  # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
       - [0x9e318, data, tail17]
diff --git a/config/splat.ov_SC07_010.yaml b/config/splat.ov_SC07_010.yaml
index 574bb7e63..858135eb5 100644
--- a/config/splat.ov_SC07_010.yaml
+++ b/config/splat.ov_SC07_010.yaml
@@ -148,7 +148,7 @@ segments:
       - [0x7e328, .rodata, ov_SC07_010_jr_8016AE5C]  # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
       - [0x7e348, data, tail15]
       - [0x7e388, .rodata, ov_SC07_010_jr_80171B4C]  # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
-      - [0x7e3a8, data, tail16]
+      - [0x7e3bc, data, tail16]
       - [0x7e54c, .rodata, ov_SC07_010_jr_801789AC]  # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
       - [0x7e6dc, .rodata, ov_SC07_010_jr_80179B74]  # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
       - [0x7e7f8, data, tail17]
diff --git a/config/splat.ov_SC07_011.yaml b/config/splat.ov_SC07_011.yaml
index ea00373a9..ca9067841 100644
--- a/config/splat.ov_SC07_011.yaml
+++ b/config/splat.ov_SC07_011.yaml
@@ -149,7 +149,7 @@ segments:
       - [0x669f0, .rodata, ov_SC07_011_jr_8016AE5C]  # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
       - [0x66a10, data, tail15]
       - [0x66a50, .rodata, ov_SC07_011_jr_80171B4C]  # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
-      - [0x66a70, data, tail16]
+      - [0x66a84, data, tail16]
       - [0x66c14, .rodata, ov_SC07_011_jr_801789AC]  # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
       - [0x66da4, .rodata, ov_SC07_011_jr_80179B74]  # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
       - [0x66ec0, data, tail17]
diff --git a/src/ov_SC07_007/ov_SC07_007_jr_80171B4C.c b/src/ov_SC07_007/ov_SC07_007_jr_80171B4C.c
index e19d8af0b..e12a9318c 100644
--- a/src/ov_SC07_007/ov_SC07_007_jr_80171B4C.c
+++ b/src/ov_SC07_007/ov_SC07_007_jr_80171B4C.c
@@ -3324,7 +3324,29 @@ void func_801733FC(s32 a0, s32 a1) {
 DEFINE_func_80173460()  /* dedup: shared engine-core @0x80173460 (src/shared) */
 
 
-INCLUDE_ASM("asm/ov_SC07_007/nonmatchings/ov_SC07_007_jr_80171B4C", func_801734BC);
+extern s16 D_80126B32;
+extern s16 D_80126B3E;
+extern void func_80174684(void *);
+
+void func_801734BC(s32 arg0, s32 _unused1) {
+    extern void func_80173544(void);
+    extern s16 D_80126B40;
+
+    s16 temp;
+    switch (((u32)arg0)) {
+    case 0: temp = -0x4; break;
+    case 1: temp = -0x8; break;
+    case 2: temp = -0x12; break;
+    case 3: temp = -0x18; break;
+    case 4: temp = -0x1C; break;
+    default: goto after;
+    }
+    D_80126B32 = temp;
+after:
+    D_80126B3E = 0;
+    D_80126B40 = 0;
+    func_80174684(&func_80173544);
+}
 
 
 
diff --git a/src/ov_SC07_010/ov_SC07_010_jr_80171B4C.c b/src/ov_SC07_010/ov_SC07_010_jr_80171B4C.c
index ed1ff1d8f..2d4b7532d 100644
--- a/src/ov_SC07_010/ov_SC07_010_jr_80171B4C.c
+++ b/src/ov_SC07_010/ov_SC07_010_jr_80171B4C.c
@@ -2767,7 +2767,29 @@ void func_801733FC(s32 a0, s32 a1) {
 DEFINE_func_80173460()  /* dedup: shared engine-core @0x80173460 (src/shared) */
 
 
-INCLUDE_ASM("asm/ov_SC07_010/nonmatchings/ov_SC07_010_jr_80171B4C", func_801734BC);
+extern s16 D_80126B32;
+extern s16 D_80126B3E;
+extern void func_80174684(void *);
+
+void func_801734BC(s32 arg0, s32 _unused1) {
+    extern void func_80173544(void);
+    extern s16 D_80126B40;
+
+    s16 temp;
+    switch (((u32)arg0)) {
+    case 0: temp = -0x4; break;
+    case 1: temp = -0x8; break;
+    case 2: temp = -0x12; break;
+    case 3: temp = -0x18; break;
+    case 4: temp = -0x1C; break;
+    default: goto after;
+    }
+    D_80126B32 = temp;
+after:
+    D_80126B3E = 0;
+    D_80126B40 = 0;
+    func_80174684(&func_80173544);
+}
 
 
 
diff --git a/src/ov_SC07_011/ov_SC07_011_jr_80171B4C.c b/src/ov_SC07_011/ov_SC07_011_jr_80171B4C.c
index dd5e97cba..627bac3e8 100644
--- a/src/ov_SC07_011/ov_SC07_011_jr_80171B4C.c
+++ b/src/ov_SC07_011/ov_SC07_011_jr_80171B4C.c
@@ -3324,7 +3324,29 @@ void func_801733FC(s32 a0, s32 a1) {
 DEFINE_func_80173460()  /* dedup: shared engine-core @0x80173460 (src/shared) */
 
 
-INCLUDE_ASM("asm/ov_SC07_011/nonmatchings/ov_SC07_011_jr_80171B4C", func_801734BC);
+extern s16 D_80126B32;
+extern s16 D_80126B3E;
+extern void func_80174684(void *);
+
+void func_801734BC(s32 arg0, s32 _unused1) {
+    extern void func_80173544(void);
+    extern s16 D_80126B40;
+
+    s16 temp;
+    switch (((u32)arg0)) {
+    case 0: temp = -0x4; break;
+    case 1: temp = -0x8; break;
+    case 2: temp = -0x12; break;
+    case 3: temp = -0x18; break;
+    case 4: temp = -0x1C; break;
+    default: goto after;
+    }
+    D_80126B32 = temp;
+after:
+    D_80126B3E = 0;
+    D_80126B40 = 0;
+    func_80174684(&func_80173544);
+}