diff --git a/config/overlays.mk b/config/overlays.mk index f42f77c36..a583841cd 100644 --- a/config/overlays.mk +++ b/config/overlays.mk @@ -4734,6 +4734,7 @@ build/src/ov_SC07_006/ov_SC07_006_jr_80154C24.o: JTBL_PADS := 0,0 # §8e pads ( build/src/ov_SC07_006/ov_SC07_006_jr_801588CC.o: JTBL_PADS := 0,4,0 # §8e pads (jtbl_carve.py) tables=+0x0,+0x28,+0x48 build/src/ov_SC07_006/ov_SC07_006_jr_80159C84.o: JTBL_PADS := 0,4 # §8e pads (jtbl_carve.py) tables=+0x0,+0x20 build/src/ov_SC07_006/ov_SC07_006_jr_8015A3C8.o: JTBL_PADS := 0,4 # §8e pads (jtbl_carve.py) tables=+0x0,+0x20 +build/src/ov_SC07_006/ov_SC07_006_jr_80171B4C.o: JTBL_PADS := 0,0 # §8e pads (jtbl_carve.py) tables=+0x0,+0x20 build/src/ov_SC07_006/ov_SC07_006_jr_801789AC.o: JTBL_PADS := 0,0 # §8e pads (jtbl_carve.py) tables=+0x0,+0x18 build/src/ov_SC07_006/ov_SC07_006_jr_80179B74.o: JTBL_PADS := 0,4 # §8e pads (jtbl_carve.py) tables=+0x0,+0x90 build/src/ov_SC07_006/ov_SC07_006_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_006.yaml b/config/splat.ov_SC07_006.yaml index ffc4af5f9..7fffa6580 100644 --- a/config/splat.ov_SC07_006.yaml +++ b/config/splat.ov_SC07_006.yaml @@ -150,7 +150,7 @@ segments: - [0xcc66c, .rodata, ov_SC07_006_jr_8016AE5C] # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py) - [0xcc68c, data, tail15] - [0xcc6cc, .rodata, ov_SC07_006_jr_80171B4C] # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py) - - [0xcc6ec, data, tail16] + - [0xcc700, data, tail16] - [0xcc890, .rodata, ov_SC07_006_jr_801789AC] # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py) - [0xcca20, .rodata, ov_SC07_006_jr_80179B74] # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py) - [0xccb3c, data, tail17] diff --git a/src/ov_SC07_006/ov_SC07_006_jr_80171B4C.c b/src/ov_SC07_006/ov_SC07_006_jr_80171B4C.c index 8159668dc..37db9237c 100644 --- a/src/ov_SC07_006/ov_SC07_006_jr_80171B4C.c +++ b/src/ov_SC07_006/ov_SC07_006_jr_80171B4C.c @@ -3336,7 +3336,29 @@ void func_801733FC(s32 a0, s32 a1) { DEFINE_func_80173460() /* dedup: shared engine-core @0x80173460 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_006/nonmatchings/ov_SC07_006_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); +}