diff --git a/.run/backlog.jsonl b/.run/backlog.jsonl index 6e0b558e5..d5d2883dc 100644 --- a/.run/backlog.jsonl +++ b/.run/backlog.jsonl @@ -1683,7 +1683,6 @@ {"ts": "2026-07-21 13:37:27", "addr": null, "name": "func_8017E230", "reach": null, "klass": null, "nins": null, "status": "near", "closeness": 37, "where_stuck": "residual: 37 mismatch", "best_draft": ".run/backlog_drafts/func_8017E230.c", "binary": "ov_SC04_015", "source": "grinder", "residual": [[0, "27bdffe0 addiu\tsp,sp,-32", "27bdffe8 addiu $sp, $sp, -0x18"], [1, "afb00018 sw\ts0,24(sp)", "afb00010 sw $s0, 0x10($sp)"], [2, "00808021 move\ts0,a0", "afbf0014 sw $ra, 0x14($sp)"], [3, "afbf001c sw\tra,28(sp)", "0c04b06e jal func_8012C1B8"], [5, "260500a0 addiu\ta1,s0,160", "14400003 bnez $v0, .L8017E254"], [7, "02002021 move\ta0,s0", "0c04b2b9 jal func_8012CAE4"], [8, "8fbf001c lw\tra,28(sp)", "02002021 addu $a0, $s0, $zero"], [9, "8fb00018 lw\ts0,24(sp)", "8e040020 lw $a0, 0x20($s0)"], [10, "27bd0020 addiu\tsp,sp,32", "3c05801c lui $a1, %hi(D_801C30A4)"], [11, "03e00008 jr\tra", "24a530a4 addiu $a1, $a1, %lo(D_801C30A4)"], [12, "00000000 nop", "0c007085 jal func_8001C214"], [13, "--", "00000000 nop"], [14, "--", "0c0603ff jal func_80180FFC"], [15, "--", "02002021 addu $a0, $s0, $zero"], [16, "--", "02002021 addu $a0, $s0, $zero"], [17, "--", "3c058019 lui $a1, %hi(D_80188324)"], [18, "--", "24a58324 addiu $a1, $a1, %lo(D_80188324)"], [19, "--", "8e030068 lw $v1, 0x68($s0)"], [20, "--", "24020001 addiu $v0, $zero, 0x1"], [21, "--", "a6020002 sh $v0, 0x2($s0)"], [22, "--", "24027fff addiu $v0, $zero, 0x7FFF"], [23, "--", "a6000034 sh $zero, 0x34($s0)"], [24, "--", "0c04ba38 jal func_8012E8E0"], [25, "--", "a462000c sh $v0, 0xC($v1)"]], "passes_tried": null} {"ts": "2026-07-21 19:42:41", "addr": "0x8012aaac", "name": "func_8012AAAC", "reach": 1, "klass": "schedule", "nins": 125, "status": "near", "closeness": 0, "where_stuck": "none \u2014 MATCH (125 ins, relocation-masked)", "best_draft": ".run/backlog_drafts/func_8012AAAC.c", "binary": "ov_SC06_018", "source": "t5wave", "residual": null, "passes_tried": null} {"ts": "2026-07-21 19:42:42", "addr": "0x80135260", "name": "func_80135260", "reach": 1, "klass": "other", "nins": 136, "status": "near", "closeness": 5, "where_stuck": "none \u2014 MATCH", "best_draft": ".run/backlog_drafts/func_80135260.c", "binary": "ov_SC06_018", "source": "t5wave", "residual": [[76, "90840000 lbu\ta0,0(a0)", "8c843b68 lw $a0, %lo(D_80193B68)($a0)"], [78, "90c60000 lbu\ta2,0(a2)", "8cc63b64 lw $a2, %lo(D_80193B64)($a2)"], [82, "90a50000 lbu\ta1,0(a1)", "8ca53b70 lw $a1, %lo(D_80193B70)($a1)"], [102, "90840000 lbu\ta0,0(a0)", "8c843b64 lw $a0, %lo(D_80193B64)($a0)"], [104, "90c60000 lbu\ta2,0(a2)", "8cc63b68 lw $a2, %lo(D_80193B68)($a2)"]], "passes_tried": null} -{"ts": "2026-07-21 19:42:42", "addr": null, "name": "func_80165CA0", "reach": null, "klass": "regalloc-order", "nins": null, "status": "near", "closeness": 0, "where_stuck": "none \u2014 MATCH (99 ins, match_one masked)", "best_draft": ".run/backlog_drafts/func_80165CA0.c", "binary": "ov_SC06_018", "source": "t5wave", "residual": null, "passes_tried": null} {"ts": "2026-07-21 19:42:42", "addr": null, "name": "func_80191C50", "reach": null, "klass": "schedule", "nins": null, "status": "near", "closeness": 9, "where_stuck": "close=9 \u2014 only the case-7 sp20[] setup window (0x80192380..0x801923A4): gcc's list scheduler picks the D_80126B62 lui 2nd (its extra `addiu -0x38` gives that chain +1 priority) where the target picks D_80126B66 2nd (LUID/program order); everything else (710/710 ins, frame 0x40, $s0/$s1, jtbl, 3 entity loops, 8 sync blocks, cross-jumped L4AC tail) is byte-identical.", "best_draft": ".run/backlog_drafts/func_80191C50.c", "binary": "ov_SC06_018", "source": "t5wave", "residual": [[460, "3c030000 lui\tv1,0x0", "3c028012 lui $v0, %hi(D_80126B5E)"], [461, "94630000 lhu\tv1,0(v1)", "94426b5e lhu $v0, %lo(D_80126B5E)($v0)"], [462, "3c020000 lui\tv0,0x0", "3c038012 lui $v1, %hi(D_80126B66)"], [463, "94420000 lhu\tv0,0(v0)", "94636b66 lhu $v1, %lo(D_80126B66)($v1)"], [464, "3c040000 lui\ta0,0x0", "a7a20020 sh $v0, 0x20($sp)"], [465, "94840000 lhu\ta0,0(a0)", "3c028012 lui $v0, %hi(D_80126B62)"], [466, "2442ffc8 addiu\tv0,v0,-56", "94426b62 lhu $v0, %lo(D_80126B62)($v0)"], [467, "a7a30020 sh\tv1,32(sp)", "a7a30024 sh $v1, 0x24($sp)"], [468, "a7a40024 sh\ta0,36(sp)", "2442ffc8 addiu $v0, $v0, -0x38"]], "passes_tried": null} {"ts": "2026-07-22 21:32:38", "addr": null, "name": "func_8018457C", "reach": null, "klass": "regalloc-order", "nins": null, "status": "failed", "closeness": null, "where_stuck": "none \u2014 MATCH (160 ins). case1-tail needed a $a0 pin on the state temp", "best_draft": ".run/backlog_drafts/func_8018457C.c", "binary": "ov_SC06_018", "source": "worker", "residual": null, "passes_tried": null} {"ts": "2026-07-22 21:32:39", "addr": null, "name": "func_8018598C", "reach": null, "klass": "regalloc-order", "nins": null, "status": "near", "closeness": 0, "where_stuck": "none \u2014 MATCH (168/168). $s4/$s5 pins for base+&local28; s32 sVar1 for single lh;", "best_draft": ".run/backlog_drafts/func_8018598C.c", "binary": "ov_SC06_018", "source": "worker", "residual": null, "passes_tried": null} diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 226000b9d..2f9c8f488 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -13304,7 +13304,7 @@ groups: source: src/shared/engine_core.h func: DEFINE_func_80174CB0 vram: 0x80174CB0 - binaries: [ov_SC07_006, ov_SC07_007, ov_SC07_011] + binaries: [ov_SC07_006, ov_SC07_007, ov_SC07_011, ov_SC01_001, ov_SC01_004, ov_SC01_005, ov_SC01_006, ov_SC01_008, ov_SC01_009, ov_SC01_074, ov_SC01_080, ov_SC01_084, ov_SC02_000, ov_SC02_003, ov_SC02_004, ov_SC02_005, ov_SC02_011, ov_SC02_015, ov_SC02_016, ov_SC02_017, ov_SC02_021, ov_SC02_026, ov_SC02_027, ov_SC02_028, ov_SC02_031, ov_SC02_035, ov_SC02_039, ov_SC02_041, ov_SC03_001, ov_SC03_002, ov_SC03_003, ov_SC03_006, ov_SC03_007, ov_SC03_010, ov_SC03_011, ov_SC03_012, ov_SC03_013, ov_SC03_014, ov_SC03_015, ov_SC03_023, ov_SC03_024, ov_SC03_028, ov_SC03_029, ov_SC03_030, ov_SC03_031, ov_SC03_089, ov_SC03_090, ov_SC03_091, ov_SC03_092, ov_SC03_093, ov_SC03_094, ov_SC03_095, ov_SC03_096, ov_SC03_097, ov_SC03_098, ov_SC03_099, ov_SC03_100, ov_SC03_101, ov_SC03_102, ov_SC03_103, ov_SC03_104, ov_SC03_105, ov_SC03_108, ov_SC03_109, ov_SC03_110, ov_SC03_111, ov_SC03_112, ov_SC03_113, ov_SC03_114, ov_SC03_115, ov_SC03_116, ov_SC03_117, ov_SC03_118, ov_SC03_119, ov_SC03_121, ov_SC03_124, ov_SC03_125, ov_SC03_126, ov_SC04_000, ov_SC04_002, ov_SC04_003, ov_SC04_004, ov_SC04_005, ov_SC04_006, ov_SC04_007, ov_SC04_008, ov_SC04_009, ov_SC04_010, ov_SC04_011, ov_SC04_012, ov_SC04_015, ov_SC04_016, ov_SC04_018, ov_SC04_019, ov_SC04_020, ov_SC04_021, ov_SC05_000, ov_SC05_001, ov_SC05_002, ov_SC05_003, ov_SC05_004, ov_SC05_005, ov_SC05_006, ov_SC05_007, ov_SC05_008, ov_SC05_009, ov_SC05_010, ov_SC05_011, ov_SC05_017, ov_SC05_018, ov_SC05_019, ov_SC06_000, ov_SC06_006, ov_SC06_008, ov_SC06_010, ov_SC06_011, ov_SC06_013, ov_SC06_014, ov_SC06_015, ov_SC06_016, ov_SC06_020, ov_SC06_022, ov_SC06_024, ov_SC06_025, ov_SC06_027, ov_SC06_029, ov_SC06_030, ov_SC06_032, ov_SC06_033, ov_SC07_000, ov_SC07_001, ov_SC07_002, ov_SC07_008, ov_SC07_009, ov_SC07_010] - id: E_func_801777BC tier: h_exact hash: 2036236833122745fdc896093a76d6fdd6b4448f diff --git a/docs/matching-cookbook.md b/docs/matching-cookbook.md index 221d4cf18..95a010a9c 100644 --- a/docs/matching-cookbook.md +++ b/docs/matching-cookbook.md @@ -5972,3 +5972,34 @@ before extending. a `static` helper — is silently dropped by extraction and will cap the body's reach at whatever subset happens to supply it. When a group's reach is stuck at a suspiciously small number, diff the source overlay's preamble against what the macro actually carries. + +## §75c — Class-B's remedy is the FULL §17a-1 PAIR (decl **and** call-site cast); a decl-only fix moves the error and looks like a new wall (Phase 29 SESSION-19, `func_8012F14C`) + +§75a's class B is a genuine arity split — the same callee declared with two different arities across +the fleet (`func_8012F14C`: **1,944 `(s32)` vs 968 `(s32,s32,s32)`**). The obvious move is to make the +shared macro's carried decl compatible with both, using the no-prototype `()` form that +`cdecl.compatible()` measures as accepted in either order when no parameter default-promotes. **That +is half a fix, and the half that does not work.** + +**What actually happens.** `()` really does dissolve the *declaration* conflict — the byte-gate's +classifier moved the failure from `PLUMBING` to `CC1-FAIL`, which is the tell that the first wall fell +and a second appeared. Reading real cc1 stderr (hand-splice the macro into one member, build that +object; do **not** trust a bare `make … Error 33`): +``` +ov_SC01_001_jr_801734BC.c:2616: too many arguments to function `func_8012F14C' +``` +C's composite-type rule: after `void f(s32);` then `void f();`, the composite is still **`void +f(s32)`** — the earlier prototype wins. So a 3-argument call is a hard error no declaration spelling +can rescue. + +**The remedy is the pair §17a-1 always specified** (and what `cast_call_sites.py` implements): +```c +extern void func_8012F14C(); /* conflict-free in either order */ +((void (*)(s32, s32, s32))func_8012F14C)((s32)&mtx, (s32)&vec, (s32)&out); /* call bypasses the prototype */ +``` +gcc-2.7.2 folds a cast of a **known function symbol** back to a direct `jal`, so the body's bytes are +unchanged (byte-gated on all 3 existing members: `7ca772be` / `b3b95547` / `9885af74`). + +**Rule:** for class B, change the decl **and** the call together. A decl-only change is not a smaller +version of the fix — it relocates the diagnostic, and a session reading only the failure class will +record a fresh wall where there is none. diff --git a/docs/progress.fleet.md b/docs/progress.fleet.md index 5cb92700c..f5a725371 100644 --- a/docs/progress.fleet.md +++ b/docs/progress.fleet.md @@ -4,16 +4,16 @@ # cross-binary collapsible-byte leverage: docs/duplicates.cross.md. # THREE progress metrics (all matter — see the labels): -FLEET fn-count byte-ident: 315299 / 353717 = 89.14% (REAL+LINKED+empties; FUNCTION-count, ×134-inflated — one crack counts per overlay) -FLEET instr-weighted : 10539723 / 13141652 = 80.2% (shipped .text across main + resident + 138 overlays; the decomp.dev-DISPLAY number) +FLEET fn-count byte-ident: 315431 / 353717 = 89.18% (REAL+LINKED+empties; FUNCTION-count, ×134-inflated — one crack counts per overlay) +FLEET instr-weighted : 10555959 / 13141652 = 80.3% (shipped .text across main + resident + 138 overlays; the decomp.dev-DISPLAY number) FLEET distinct-code(uniq): 3813512 / 5634875 = 67.7% (64879/87459 unique fns; the DISTINCT-RE number) MAIN game-code weighted : 436 / 60201 = 0.7% (INCLUDED in the fleet numbers above since 2026-07-22 — roadmap §1 metrics contract; LINKED-excluding Ghidra sig dated 2026-06-14; caveat is R34: no independent second oracle for a PS-X EXE, NOT drift) - (fleet EXCLUDING main, for continuity with pre-2026-07-22 readings: 10539287 / 13081451 = 80.6%) + (fleet EXCLUDING main, for continuity with pre-2026-07-22 readings: 10555523 / 13081451 = 80.7%) -FLEET REAL substantive : 313444 (of which dedup-shared 239398 via 1886 groups / 239472 instances) +FLEET REAL substantive : 313576 (of which dedup-shared 239530 via 1886 groups / 239604 instances) FLEET LINKED PsyQ objs : 959 FLEET NON_MATCHING : 7 (0 in any default build — G4) -FLEET INCLUDE_ASM stubs : 38411 +FLEET INCLUDE_ASM stubs : 38279 FLEET matchable : 353717 | binary | REAL | shared | LINKED | byte-ident | matchable | byte-ident % | @@ -21,140 +21,140 @@ FLEET matchable : 353717 | main | 54 | 2 | 959 | 1055 | 2096 | 50.3% | | resident | 129 | 0 | 0 | 131 | 145 | 90.3% | | ov_SC01_000 | 2248 | 1742 | 0 | 2248 | 2403 | 93.5% | -| ov_SC01_001 | 2250 | 1742 | 0 | 2252 | 2466 | 91.3% | -| ov_SC01_004 | 2241 | 1733 | 0 | 2242 | 2414 | 92.9% | -| ov_SC01_005 | 2271 | 1756 | 0 | 2271 | 2503 | 90.7% | -| ov_SC01_006 | 2271 | 1756 | 0 | 2271 | 2503 | 90.7% | -| ov_SC01_008 | 2241 | 1733 | 0 | 2243 | 2426 | 92.5% | -| ov_SC01_009 | 2267 | 1734 | 0 | 2268 | 2507 | 90.5% | -| ov_SC01_074 | 2245 | 1734 | 0 | 2247 | 2425 | 92.7% | +| ov_SC01_001 | 2251 | 1743 | 0 | 2253 | 2466 | 91.4% | +| ov_SC01_004 | 2242 | 1734 | 0 | 2243 | 2414 | 92.9% | +| ov_SC01_005 | 2272 | 1757 | 0 | 2272 | 2503 | 90.8% | +| ov_SC01_006 | 2272 | 1757 | 0 | 2272 | 2503 | 90.8% | +| ov_SC01_008 | 2242 | 1734 | 0 | 2244 | 2426 | 92.5% | +| ov_SC01_009 | 2268 | 1735 | 0 | 2269 | 2507 | 90.5% | +| ov_SC01_074 | 2246 | 1735 | 0 | 2248 | 2425 | 92.7% | | ov_SC01_077 | 2428 | 1702 | 0 | 2430 | 2585 | 94.0% | -| ov_SC01_080 | 2283 | 1737 | 0 | 2283 | 2512 | 90.9% | -| ov_SC01_084 | 2290 | 1737 | 0 | 2295 | 2579 | 89.0% | -| ov_SC02_000 | 2343 | 1772 | 0 | 2343 | 2683 | 87.3% | -| ov_SC02_003 | 2343 | 1772 | 0 | 2343 | 2683 | 87.3% | -| ov_SC02_004 | 2249 | 1737 | 0 | 2249 | 2401 | 93.7% | -| ov_SC02_005 | 2357 | 1733 | 0 | 2367 | 2927 | 80.9% | -| ov_SC02_011 | 2369 | 1740 | 0 | 2380 | 2893 | 82.3% | -| ov_SC02_015 | 2250 | 1739 | 0 | 2250 | 2414 | 93.2% | -| ov_SC02_016 | 2283 | 1739 | 0 | 2286 | 2545 | 89.8% | -| ov_SC02_017 | 2327 | 1739 | 0 | 2335 | 2732 | 85.5% | -| ov_SC02_021 | 2256 | 1739 | 0 | 2256 | 2437 | 92.6% | -| ov_SC02_026 | 2272 | 1737 | 0 | 2278 | 2572 | 88.6% | -| ov_SC02_027 | 2295 | 1737 | 0 | 2304 | 2692 | 85.6% | -| ov_SC02_028 | 2297 | 1737 | 0 | 2307 | 2701 | 85.4% | -| ov_SC02_031 | 2282 | 1738 | 0 | 2287 | 2562 | 89.3% | -| ov_SC02_035 | 2258 | 1737 | 0 | 2261 | 2520 | 89.7% | -| ov_SC02_039 | 2242 | 1737 | 0 | 2242 | 2416 | 92.8% | -| ov_SC02_041 | 2279 | 1737 | 0 | 2282 | 2561 | 89.1% | -| ov_SC03_001 | 2378 | 1738 | 0 | 2395 | 2869 | 83.5% | -| ov_SC03_002 | 2304 | 1742 | 0 | 2319 | 2631 | 88.1% | -| ov_SC03_003 | 2252 | 1737 | 0 | 2253 | 2423 | 93.0% | -| ov_SC03_006 | 2317 | 1743 | 0 | 2326 | 2767 | 84.1% | -| ov_SC03_007 | 2297 | 1737 | 0 | 2301 | 2623 | 87.7% | -| ov_SC03_010 | 2258 | 1737 | 0 | 2258 | 2470 | 91.4% | -| ov_SC03_011 | 2266 | 1737 | 0 | 2272 | 2527 | 89.9% | -| ov_SC03_012 | 2244 | 1737 | 0 | 2245 | 2406 | 93.3% | -| ov_SC03_013 | 2263 | 1737 | 0 | 2263 | 2492 | 90.8% | -| ov_SC03_014 | 2323 | 1762 | 0 | 2323 | 2685 | 86.5% | -| ov_SC03_015 | 2323 | 1762 | 0 | 2323 | 2685 | 86.5% | -| ov_SC03_023 | 2251 | 1737 | 0 | 2252 | 2435 | 92.5% | -| ov_SC03_024 | 2311 | 1742 | 0 | 2318 | 2641 | 87.8% | -| ov_SC03_028 | 2291 | 1737 | 0 | 2295 | 2664 | 86.1% | -| ov_SC03_029 | 2292 | 1739 | 0 | 2302 | 2644 | 87.1% | -| ov_SC03_030 | 2265 | 1742 | 0 | 2267 | 2495 | 90.9% | -| ov_SC03_031 | 2262 | 1737 | 0 | 2265 | 2514 | 90.1% | -| ov_SC03_089 | 2278 | 1737 | 0 | 2285 | 2581 | 88.5% | -| ov_SC03_090 | 2279 | 1737 | 0 | 2287 | 2625 | 87.1% | -| ov_SC03_091 | 2282 | 1737 | 0 | 2290 | 2640 | 86.7% | -| ov_SC03_092 | 2293 | 1737 | 0 | 2305 | 2587 | 89.1% | -| ov_SC03_093 | 2269 | 1737 | 0 | 2273 | 2563 | 88.7% | -| ov_SC03_094 | 2264 | 1737 | 0 | 2270 | 2577 | 88.1% | -| ov_SC03_095 | 2254 | 1737 | 0 | 2257 | 2474 | 91.2% | -| ov_SC03_096 | 2254 | 1737 | 0 | 2257 | 2465 | 91.6% | -| ov_SC03_097 | 2284 | 1737 | 0 | 2291 | 2603 | 88.0% | -| ov_SC03_098 | 2262 | 1737 | 0 | 2265 | 2541 | 89.1% | -| ov_SC03_099 | 2255 | 1737 | 0 | 2258 | 2504 | 90.2% | -| ov_SC03_100 | 2265 | 1737 | 0 | 2269 | 2539 | 89.4% | -| ov_SC03_101 | 2265 | 1737 | 0 | 2269 | 2528 | 89.8% | -| ov_SC03_102 | 2257 | 1737 | 0 | 2260 | 2492 | 90.7% | -| ov_SC03_103 | 2260 | 1739 | 0 | 2263 | 2510 | 90.2% | -| ov_SC03_104 | 2286 | 1737 | 0 | 2293 | 2616 | 87.7% | -| ov_SC03_105 | 2279 | 1737 | 0 | 2286 | 2597 | 88.0% | -| ov_SC03_108 | 2246 | 1737 | 0 | 2246 | 2443 | 91.9% | -| ov_SC03_109 | 2249 | 1737 | 0 | 2251 | 2424 | 92.9% | -| ov_SC03_110 | 2253 | 1737 | 0 | 2253 | 2468 | 91.3% | -| ov_SC03_111 | 2264 | 1737 | 0 | 2267 | 2510 | 90.3% | -| ov_SC03_112 | 2258 | 1739 | 0 | 2260 | 2526 | 89.5% | -| ov_SC03_113 | 2251 | 1739 | 0 | 2254 | 2468 | 91.3% | -| ov_SC03_114 | 2241 | 1737 | 0 | 2243 | 2415 | 92.9% | -| ov_SC03_115 | 2258 | 1737 | 0 | 2260 | 2472 | 91.4% | -| ov_SC03_116 | 2248 | 1737 | 0 | 2251 | 2438 | 92.3% | -| ov_SC03_117 | 2276 | 1737 | 0 | 2282 | 2557 | 89.2% | -| ov_SC03_118 | 2322 | 1761 | 0 | 2323 | 2685 | 86.5% | -| ov_SC03_119 | 2321 | 1761 | 0 | 2322 | 2685 | 86.5% | -| ov_SC03_121 | 2256 | 1737 | 0 | 2259 | 2459 | 91.9% | -| ov_SC03_124 | 2335 | 1733 | 0 | 2355 | 2741 | 85.9% | -| ov_SC03_125 | 2291 | 1737 | 0 | 2303 | 2588 | 89.0% | -| ov_SC03_126 | 2253 | 1739 | 0 | 2253 | 2423 | 93.0% | -| ov_SC04_000 | 2269 | 1741 | 0 | 2278 | 2546 | 89.5% | -| ov_SC04_002 | 2287 | 1737 | 0 | 2291 | 2636 | 86.9% | -| ov_SC04_003 | 2264 | 1737 | 0 | 2268 | 2502 | 90.6% | -| ov_SC04_004 | 2273 | 1737 | 0 | 2275 | 2558 | 88.9% | -| ov_SC04_005 | 2282 | 1737 | 0 | 2288 | 2612 | 87.6% | -| ov_SC04_006 | 2253 | 1737 | 0 | 2255 | 2454 | 91.9% | -| ov_SC04_007 | 2276 | 1737 | 0 | 2280 | 2569 | 88.8% | -| ov_SC04_008 | 2245 | 1737 | 0 | 2245 | 2415 | 93.0% | -| ov_SC04_009 | 2260 | 1737 | 0 | 2263 | 2441 | 92.7% | -| ov_SC04_010 | 2250 | 1737 | 0 | 2251 | 2419 | 93.1% | -| ov_SC04_011 | 2308 | 1737 | 0 | 2314 | 2803 | 82.6% | -| ov_SC04_012 | 2247 | 1737 | 0 | 2248 | 2420 | 92.9% | -| ov_SC04_015 | 2313 | 1738 | 0 | 2324 | 2611 | 89.0% | -| ov_SC04_016 | 2250 | 1737 | 0 | 2252 | 2440 | 92.3% | -| ov_SC04_018 | 2361 | 1772 | 0 | 2361 | 2857 | 82.6% | -| ov_SC04_019 | 2367 | 1772 | 0 | 2367 | 2857 | 82.8% | -| ov_SC04_020 | 2278 | 1737 | 0 | 2290 | 2567 | 89.2% | -| ov_SC04_021 | 2254 | 1739 | 0 | 2254 | 2423 | 93.0% | -| ov_SC05_000 | 2251 | 1741 | 0 | 2254 | 2422 | 93.1% | -| ov_SC05_001 | 2273 | 1737 | 0 | 2278 | 2574 | 88.5% | -| ov_SC05_002 | 2256 | 1737 | 0 | 2259 | 2442 | 92.5% | -| ov_SC05_003 | 2253 | 1737 | 0 | 2254 | 2481 | 90.9% | -| ov_SC05_004 | 2249 | 1737 | 0 | 2251 | 2464 | 91.4% | -| ov_SC05_005 | 2254 | 1737 | 0 | 2255 | 2491 | 90.5% | -| ov_SC05_006 | 2247 | 1737 | 0 | 2247 | 2430 | 92.5% | -| ov_SC05_007 | 2257 | 1737 | 0 | 2262 | 2482 | 91.1% | -| ov_SC05_008 | 2274 | 1737 | 0 | 2276 | 2543 | 89.5% | -| ov_SC05_009 | 2253 | 1737 | 0 | 2257 | 2438 | 92.6% | -| ov_SC05_010 | 2280 | 1737 | 0 | 2284 | 2588 | 88.3% | -| ov_SC05_011 | 2249 | 1737 | 0 | 2250 | 2409 | 93.4% | -| ov_SC05_017 | 2357 | 1734 | 0 | 2368 | 2842 | 83.3% | -| ov_SC05_018 | 2304 | 1737 | 0 | 2317 | 2673 | 86.7% | -| ov_SC05_019 | 2254 | 1739 | 0 | 2254 | 2423 | 93.0% | -| ov_SC06_000 | 2318 | 1746 | 0 | 2321 | 2691 | 86.3% | -| ov_SC06_006 | 2270 | 1737 | 0 | 2271 | 2511 | 90.4% | -| ov_SC06_008 | 2287 | 1739 | 0 | 2293 | 2542 | 90.2% | -| ov_SC06_010 | 2269 | 1737 | 0 | 2274 | 2517 | 90.3% | -| ov_SC06_011 | 2259 | 1737 | 0 | 2263 | 2468 | 91.7% | -| ov_SC06_013 | 2252 | 1737 | 0 | 2253 | 2425 | 92.9% | -| ov_SC06_014 | 2258 | 1737 | 0 | 2260 | 2453 | 92.1% | -| ov_SC06_015 | 2255 | 1737 | 0 | 2255 | 2421 | 93.1% | -| ov_SC06_016 | 2273 | 1737 | 0 | 2275 | 2549 | 89.3% | +| ov_SC01_080 | 2284 | 1738 | 0 | 2284 | 2512 | 90.9% | +| ov_SC01_084 | 2291 | 1738 | 0 | 2296 | 2579 | 89.0% | +| ov_SC02_000 | 2344 | 1773 | 0 | 2344 | 2683 | 87.4% | +| ov_SC02_003 | 2344 | 1773 | 0 | 2344 | 2683 | 87.4% | +| ov_SC02_004 | 2250 | 1738 | 0 | 2250 | 2401 | 93.7% | +| ov_SC02_005 | 2358 | 1734 | 0 | 2368 | 2927 | 80.9% | +| ov_SC02_011 | 2370 | 1741 | 0 | 2381 | 2893 | 82.3% | +| ov_SC02_015 | 2251 | 1740 | 0 | 2251 | 2414 | 93.2% | +| ov_SC02_016 | 2284 | 1740 | 0 | 2287 | 2545 | 89.9% | +| ov_SC02_017 | 2328 | 1740 | 0 | 2336 | 2732 | 85.5% | +| ov_SC02_021 | 2257 | 1740 | 0 | 2257 | 2437 | 92.6% | +| ov_SC02_026 | 2273 | 1738 | 0 | 2279 | 2572 | 88.6% | +| ov_SC02_027 | 2296 | 1738 | 0 | 2305 | 2692 | 85.6% | +| ov_SC02_028 | 2298 | 1738 | 0 | 2308 | 2701 | 85.4% | +| ov_SC02_031 | 2283 | 1739 | 0 | 2288 | 2562 | 89.3% | +| ov_SC02_035 | 2259 | 1738 | 0 | 2262 | 2520 | 89.8% | +| ov_SC02_039 | 2243 | 1738 | 0 | 2243 | 2416 | 92.8% | +| ov_SC02_041 | 2280 | 1738 | 0 | 2283 | 2561 | 89.1% | +| ov_SC03_001 | 2379 | 1739 | 0 | 2396 | 2869 | 83.5% | +| ov_SC03_002 | 2305 | 1743 | 0 | 2320 | 2631 | 88.2% | +| ov_SC03_003 | 2253 | 1738 | 0 | 2254 | 2423 | 93.0% | +| ov_SC03_006 | 2318 | 1744 | 0 | 2327 | 2767 | 84.1% | +| ov_SC03_007 | 2298 | 1738 | 0 | 2302 | 2623 | 87.8% | +| ov_SC03_010 | 2259 | 1738 | 0 | 2259 | 2470 | 91.5% | +| ov_SC03_011 | 2267 | 1738 | 0 | 2273 | 2527 | 89.9% | +| ov_SC03_012 | 2245 | 1738 | 0 | 2246 | 2406 | 93.3% | +| ov_SC03_013 | 2264 | 1738 | 0 | 2264 | 2492 | 90.9% | +| ov_SC03_014 | 2324 | 1763 | 0 | 2324 | 2685 | 86.6% | +| ov_SC03_015 | 2324 | 1763 | 0 | 2324 | 2685 | 86.6% | +| ov_SC03_023 | 2252 | 1738 | 0 | 2253 | 2435 | 92.5% | +| ov_SC03_024 | 2312 | 1743 | 0 | 2319 | 2641 | 87.8% | +| ov_SC03_028 | 2292 | 1738 | 0 | 2296 | 2664 | 86.2% | +| ov_SC03_029 | 2293 | 1740 | 0 | 2303 | 2644 | 87.1% | +| ov_SC03_030 | 2266 | 1743 | 0 | 2268 | 2495 | 90.9% | +| ov_SC03_031 | 2263 | 1738 | 0 | 2266 | 2514 | 90.1% | +| ov_SC03_089 | 2279 | 1738 | 0 | 2286 | 2581 | 88.6% | +| ov_SC03_090 | 2280 | 1738 | 0 | 2288 | 2625 | 87.2% | +| ov_SC03_091 | 2283 | 1738 | 0 | 2291 | 2640 | 86.8% | +| ov_SC03_092 | 2294 | 1738 | 0 | 2306 | 2587 | 89.1% | +| ov_SC03_093 | 2270 | 1738 | 0 | 2274 | 2563 | 88.7% | +| ov_SC03_094 | 2265 | 1738 | 0 | 2271 | 2577 | 88.1% | +| ov_SC03_095 | 2255 | 1738 | 0 | 2258 | 2474 | 91.3% | +| ov_SC03_096 | 2255 | 1738 | 0 | 2258 | 2465 | 91.6% | +| ov_SC03_097 | 2285 | 1738 | 0 | 2292 | 2603 | 88.1% | +| ov_SC03_098 | 2263 | 1738 | 0 | 2266 | 2541 | 89.2% | +| ov_SC03_099 | 2256 | 1738 | 0 | 2259 | 2504 | 90.2% | +| ov_SC03_100 | 2266 | 1738 | 0 | 2270 | 2539 | 89.4% | +| ov_SC03_101 | 2266 | 1738 | 0 | 2270 | 2528 | 89.8% | +| ov_SC03_102 | 2258 | 1738 | 0 | 2261 | 2492 | 90.7% | +| ov_SC03_103 | 2261 | 1740 | 0 | 2264 | 2510 | 90.2% | +| ov_SC03_104 | 2287 | 1738 | 0 | 2294 | 2616 | 87.7% | +| ov_SC03_105 | 2280 | 1738 | 0 | 2287 | 2597 | 88.1% | +| ov_SC03_108 | 2247 | 1738 | 0 | 2247 | 2443 | 92.0% | +| ov_SC03_109 | 2250 | 1738 | 0 | 2252 | 2424 | 92.9% | +| ov_SC03_110 | 2254 | 1738 | 0 | 2254 | 2468 | 91.3% | +| ov_SC03_111 | 2265 | 1738 | 0 | 2268 | 2510 | 90.4% | +| ov_SC03_112 | 2259 | 1740 | 0 | 2261 | 2526 | 89.5% | +| ov_SC03_113 | 2252 | 1740 | 0 | 2255 | 2468 | 91.4% | +| ov_SC03_114 | 2242 | 1738 | 0 | 2244 | 2415 | 92.9% | +| ov_SC03_115 | 2259 | 1738 | 0 | 2261 | 2472 | 91.5% | +| ov_SC03_116 | 2249 | 1738 | 0 | 2252 | 2438 | 92.4% | +| ov_SC03_117 | 2277 | 1738 | 0 | 2283 | 2557 | 89.3% | +| ov_SC03_118 | 2323 | 1762 | 0 | 2324 | 2685 | 86.6% | +| ov_SC03_119 | 2322 | 1762 | 0 | 2323 | 2685 | 86.5% | +| ov_SC03_121 | 2257 | 1738 | 0 | 2260 | 2459 | 91.9% | +| ov_SC03_124 | 2336 | 1734 | 0 | 2356 | 2741 | 86.0% | +| ov_SC03_125 | 2292 | 1738 | 0 | 2304 | 2588 | 89.0% | +| ov_SC03_126 | 2254 | 1740 | 0 | 2254 | 2423 | 93.0% | +| ov_SC04_000 | 2270 | 1742 | 0 | 2279 | 2546 | 89.5% | +| ov_SC04_002 | 2288 | 1738 | 0 | 2292 | 2636 | 86.9% | +| ov_SC04_003 | 2265 | 1738 | 0 | 2269 | 2502 | 90.7% | +| ov_SC04_004 | 2274 | 1738 | 0 | 2276 | 2558 | 89.0% | +| ov_SC04_005 | 2283 | 1738 | 0 | 2289 | 2612 | 87.6% | +| ov_SC04_006 | 2254 | 1738 | 0 | 2256 | 2454 | 91.9% | +| ov_SC04_007 | 2277 | 1738 | 0 | 2281 | 2569 | 88.8% | +| ov_SC04_008 | 2246 | 1738 | 0 | 2246 | 2415 | 93.0% | +| ov_SC04_009 | 2261 | 1738 | 0 | 2264 | 2441 | 92.7% | +| ov_SC04_010 | 2251 | 1738 | 0 | 2252 | 2419 | 93.1% | +| ov_SC04_011 | 2309 | 1738 | 0 | 2315 | 2803 | 82.6% | +| ov_SC04_012 | 2248 | 1738 | 0 | 2249 | 2420 | 92.9% | +| ov_SC04_015 | 2314 | 1739 | 0 | 2325 | 2611 | 89.0% | +| ov_SC04_016 | 2251 | 1738 | 0 | 2253 | 2440 | 92.3% | +| ov_SC04_018 | 2362 | 1773 | 0 | 2362 | 2857 | 82.7% | +| ov_SC04_019 | 2368 | 1773 | 0 | 2368 | 2857 | 82.9% | +| ov_SC04_020 | 2279 | 1738 | 0 | 2291 | 2567 | 89.2% | +| ov_SC04_021 | 2255 | 1740 | 0 | 2255 | 2423 | 93.1% | +| ov_SC05_000 | 2252 | 1742 | 0 | 2255 | 2422 | 93.1% | +| ov_SC05_001 | 2274 | 1738 | 0 | 2279 | 2574 | 88.5% | +| ov_SC05_002 | 2257 | 1738 | 0 | 2260 | 2442 | 92.5% | +| ov_SC05_003 | 2254 | 1738 | 0 | 2255 | 2481 | 90.9% | +| ov_SC05_004 | 2250 | 1738 | 0 | 2252 | 2464 | 91.4% | +| ov_SC05_005 | 2255 | 1738 | 0 | 2256 | 2491 | 90.6% | +| ov_SC05_006 | 2248 | 1738 | 0 | 2248 | 2430 | 92.5% | +| ov_SC05_007 | 2258 | 1738 | 0 | 2263 | 2482 | 91.2% | +| ov_SC05_008 | 2275 | 1738 | 0 | 2277 | 2543 | 89.5% | +| ov_SC05_009 | 2254 | 1738 | 0 | 2258 | 2438 | 92.6% | +| ov_SC05_010 | 2281 | 1738 | 0 | 2285 | 2588 | 88.3% | +| ov_SC05_011 | 2250 | 1738 | 0 | 2251 | 2409 | 93.4% | +| ov_SC05_017 | 2358 | 1735 | 0 | 2369 | 2842 | 83.4% | +| ov_SC05_018 | 2305 | 1738 | 0 | 2318 | 2673 | 86.7% | +| ov_SC05_019 | 2255 | 1740 | 0 | 2255 | 2423 | 93.1% | +| ov_SC06_000 | 2319 | 1747 | 0 | 2322 | 2691 | 86.3% | +| ov_SC06_006 | 2271 | 1738 | 0 | 2272 | 2511 | 90.5% | +| ov_SC06_008 | 2288 | 1740 | 0 | 2294 | 2542 | 90.2% | +| ov_SC06_010 | 2270 | 1738 | 0 | 2275 | 2517 | 90.4% | +| ov_SC06_011 | 2260 | 1738 | 0 | 2264 | 2468 | 91.7% | +| ov_SC06_013 | 2253 | 1738 | 0 | 2254 | 2425 | 92.9% | +| ov_SC06_014 | 2259 | 1738 | 0 | 2261 | 2453 | 92.2% | +| ov_SC06_015 | 2256 | 1738 | 0 | 2256 | 2421 | 93.2% | +| ov_SC06_016 | 2274 | 1738 | 0 | 2276 | 2549 | 89.3% | | ov_SC06_018 | 2286 | 1740 | 0 | 2293 | 2665 | 86.0% | -| ov_SC06_020 | 2262 | 1739 | 0 | 2263 | 2518 | 89.9% | -| ov_SC06_022 | 2281 | 1737 | 0 | 2289 | 2642 | 86.6% | -| ov_SC06_024 | 2290 | 1737 | 0 | 2296 | 2667 | 86.1% | -| ov_SC06_025 | 2274 | 1737 | 0 | 2279 | 2572 | 88.6% | -| ov_SC06_027 | 2240 | 1737 | 0 | 2241 | 2408 | 93.1% | -| ov_SC06_029 | 2299 | 1737 | 0 | 2311 | 2662 | 86.8% | -| ov_SC06_030 | 2254 | 1737 | 0 | 2254 | 2456 | 91.8% | -| ov_SC06_032 | 2274 | 1738 | 0 | 2281 | 2658 | 85.8% | -| ov_SC06_033 | 2276 | 1738 | 0 | 2283 | 2631 | 86.8% | -| ov_SC07_000 | 2270 | 1741 | 0 | 2272 | 2521 | 90.1% | -| ov_SC07_001 | 2253 | 1737 | 0 | 2255 | 2454 | 91.9% | -| ov_SC07_002 | 2281 | 1737 | 0 | 2285 | 2579 | 88.6% | +| ov_SC06_020 | 2263 | 1740 | 0 | 2264 | 2518 | 89.9% | +| ov_SC06_022 | 2282 | 1738 | 0 | 2290 | 2642 | 86.7% | +| ov_SC06_024 | 2291 | 1738 | 0 | 2297 | 2667 | 86.1% | +| ov_SC06_025 | 2275 | 1738 | 0 | 2280 | 2572 | 88.6% | +| ov_SC06_027 | 2241 | 1738 | 0 | 2242 | 2408 | 93.1% | +| ov_SC06_029 | 2300 | 1738 | 0 | 2312 | 2662 | 86.9% | +| ov_SC06_030 | 2255 | 1738 | 0 | 2255 | 2456 | 91.8% | +| ov_SC06_032 | 2275 | 1739 | 0 | 2282 | 2658 | 85.9% | +| ov_SC06_033 | 2277 | 1739 | 0 | 2284 | 2631 | 86.8% | +| ov_SC07_000 | 2271 | 1742 | 0 | 2273 | 2521 | 90.2% | +| ov_SC07_001 | 2254 | 1738 | 0 | 2256 | 2454 | 91.9% | +| ov_SC07_002 | 2282 | 1738 | 0 | 2286 | 2579 | 88.6% | | ov_SC07_006 | 2050 | 1555 | 0 | 2130 | 2455 | 86.8% | | ov_SC07_007 | 2042 | 1586 | 0 | 2126 | 2613 | 81.4% | -| ov_SC07_008 | 2238 | 1737 | 0 | 2238 | 2386 | 93.8% | -| ov_SC07_009 | 2247 | 1737 | 0 | 2249 | 2430 | 92.6% | -| ov_SC07_010 | 2072 | 1607 | 0 | 2155 | 2524 | 85.4% | +| ov_SC07_008 | 2239 | 1738 | 0 | 2239 | 2386 | 93.8% | +| ov_SC07_009 | 2248 | 1738 | 0 | 2250 | 2430 | 92.6% | +| ov_SC07_010 | 2073 | 1608 | 0 | 2156 | 2524 | 85.4% | | ov_SC07_011 | 2041 | 1585 | 0 | 2121 | 2449 | 86.6% | diff --git a/phase-ends/CURRENT_PHASE.md b/phase-ends/CURRENT_PHASE.md index 473d1245b..b218a7650 100644 --- a/phase-ends/CURRENT_PHASE.md +++ b/phase-ends/CURRENT_PHASE.md @@ -3685,6 +3685,16 @@ conditional) · main-EXE/B9 + GLM/B6 + resident's 14 walls (P30) · behemoths B7 citizenship gate is exactly the detector for this class**, then restored. `make tools-health` → **OK** (sigs fresh; corpus+resident, cdecl, binaries, report/lint/dedup all green). +- **✅ 2026-07-25 (SESSION-19) — `func_80174CB0` ×3 → ×135, and the census predicted the residual + EXACTLY.** With the §75c pair in place, `dedup_extend` banked **132 / 179 planned across 135 + binaries** — `func_80174CB0` VERIFIED in **132**, failed in **3**. The class-A census + (`func_80012ABC`: **73 `s32` vs 7 `s16`**) had predicted the class-B fix would leave exactly the + class-A overlays behind, and it left **3** — the same 3 the original sweep's blocker breakdown + named (131 class-B / 3 class-A). **A measurement that predicts its own residual to the overlay is + the strongest evidence this session produced that the classes are real and not a story fitted to + the failures.** 123 ins × 132 ≈ **+0.12pp**. The remaining 3 are worth 3 overlays; normalize the 7 + `s16` decls only if trivially cheap. + > **🛑 SESSION-19 CLOSING CHECKPOINT (2026-07-25, Opus 5 @ High) — REFRESHED mid-session; supersedes > both the SESSION-18 block and the earlier SESSION-19 block (which was written before the > ENGINE_SHB / class-B / dedup_extend-bug work and went stale). Fresh session safe here.** diff --git a/src/ov_SC01_001/ov_SC01_001_jr_801734BC.c b/src/ov_SC01_001/ov_SC01_001_jr_801734BC.c index bae0f3eb1..379e42380 100644 --- a/src/ov_SC01_001/ov_SC01_001_jr_801734BC.c +++ b/src/ov_SC01_001/ov_SC01_001_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC01_004/ov_SC01_004_jr_801734BC.c b/src/ov_SC01_004/ov_SC01_004_jr_801734BC.c index 4ec6e579b..69d33b743 100644 --- a/src/ov_SC01_004/ov_SC01_004_jr_801734BC.c +++ b/src/ov_SC01_004/ov_SC01_004_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC01_005/ov_SC01_005_jr_801734BC.c b/src/ov_SC01_005/ov_SC01_005_jr_801734BC.c index a896b4687..f871bb8eb 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_801734BC.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC01_006/ov_SC01_006_jr_801734BC.c b/src/ov_SC01_006/ov_SC01_006_jr_801734BC.c index db1be4d28..33a4b2759 100644 --- a/src/ov_SC01_006/ov_SC01_006_jr_801734BC.c +++ b/src/ov_SC01_006/ov_SC01_006_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC01_008/ov_SC01_008_jr_801734BC.c b/src/ov_SC01_008/ov_SC01_008_jr_801734BC.c index dbf002cab..6c925b9db 100644 --- a/src/ov_SC01_008/ov_SC01_008_jr_801734BC.c +++ b/src/ov_SC01_008/ov_SC01_008_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC01_009/ov_SC01_009_jr_801734BC.c b/src/ov_SC01_009/ov_SC01_009_jr_801734BC.c index 14854eff4..48deec99d 100644 --- a/src/ov_SC01_009/ov_SC01_009_jr_801734BC.c +++ b/src/ov_SC01_009/ov_SC01_009_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC01_074/ov_SC01_074_jr_801734BC.c b/src/ov_SC01_074/ov_SC01_074_jr_801734BC.c index bac5176da..5c87e46d9 100644 --- a/src/ov_SC01_074/ov_SC01_074_jr_801734BC.c +++ b/src/ov_SC01_074/ov_SC01_074_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC01_080/ov_SC01_080_jr_801734BC.c b/src/ov_SC01_080/ov_SC01_080_jr_801734BC.c index 81b0cd191..a27cb7cb2 100644 --- a/src/ov_SC01_080/ov_SC01_080_jr_801734BC.c +++ b/src/ov_SC01_080/ov_SC01_080_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC01_084/ov_SC01_084_jr_801734BC.c b/src/ov_SC01_084/ov_SC01_084_jr_801734BC.c index 480b4c3d9..2639bc617 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_801734BC.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC02_000/ov_SC02_000_jr_801734BC.c b/src/ov_SC02_000/ov_SC02_000_jr_801734BC.c index a7afe7467..cb58e3e6d 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_801734BC.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_801734BC.c @@ -2611,7 +2611,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC02_003/ov_SC02_003_jr_801734BC.c b/src/ov_SC02_003/ov_SC02_003_jr_801734BC.c index 2bb7d90b1..e247b9397 100644 --- a/src/ov_SC02_003/ov_SC02_003_jr_801734BC.c +++ b/src/ov_SC02_003/ov_SC02_003_jr_801734BC.c @@ -2611,7 +2611,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC02_004/ov_SC02_004_jr_801734BC.c b/src/ov_SC02_004/ov_SC02_004_jr_801734BC.c index f042060c6..1be89aaf8 100644 --- a/src/ov_SC02_004/ov_SC02_004_jr_801734BC.c +++ b/src/ov_SC02_004/ov_SC02_004_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC02_005/ov_SC02_005_jr_801734BC.c b/src/ov_SC02_005/ov_SC02_005_jr_801734BC.c index 36686647c..b21a8769b 100644 --- a/src/ov_SC02_005/ov_SC02_005_jr_801734BC.c +++ b/src/ov_SC02_005/ov_SC02_005_jr_801734BC.c @@ -2615,7 +2615,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC02_011/ov_SC02_011_jr_801734BC.c b/src/ov_SC02_011/ov_SC02_011_jr_801734BC.c index e104718e6..52a0bab61 100644 --- a/src/ov_SC02_011/ov_SC02_011_jr_801734BC.c +++ b/src/ov_SC02_011/ov_SC02_011_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC02_015/ov_SC02_015_jr_801734BC.c b/src/ov_SC02_015/ov_SC02_015_jr_801734BC.c index 33927df95..ed63cb7f9 100644 --- a/src/ov_SC02_015/ov_SC02_015_jr_801734BC.c +++ b/src/ov_SC02_015/ov_SC02_015_jr_801734BC.c @@ -2611,7 +2611,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC02_016/ov_SC02_016_jr_801734BC.c b/src/ov_SC02_016/ov_SC02_016_jr_801734BC.c index 13412711e..fc41cb581 100644 --- a/src/ov_SC02_016/ov_SC02_016_jr_801734BC.c +++ b/src/ov_SC02_016/ov_SC02_016_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC02_017/ov_SC02_017_jr_801734BC.c b/src/ov_SC02_017/ov_SC02_017_jr_801734BC.c index 2e686dd81..27b203b3e 100644 --- a/src/ov_SC02_017/ov_SC02_017_jr_801734BC.c +++ b/src/ov_SC02_017/ov_SC02_017_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC02_021/ov_SC02_021_jr_801734BC.c b/src/ov_SC02_021/ov_SC02_021_jr_801734BC.c index 8297afb59..5269e0737 100644 --- a/src/ov_SC02_021/ov_SC02_021_jr_801734BC.c +++ b/src/ov_SC02_021/ov_SC02_021_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC02_026/ov_SC02_026_jr_801734BC.c b/src/ov_SC02_026/ov_SC02_026_jr_801734BC.c index c3c22b4cd..ad8c0c3b5 100644 --- a/src/ov_SC02_026/ov_SC02_026_jr_801734BC.c +++ b/src/ov_SC02_026/ov_SC02_026_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC02_027/ov_SC02_027_jr_801734BC.c b/src/ov_SC02_027/ov_SC02_027_jr_801734BC.c index bbfeb706e..714ef9c2b 100644 --- a/src/ov_SC02_027/ov_SC02_027_jr_801734BC.c +++ b/src/ov_SC02_027/ov_SC02_027_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC02_028/ov_SC02_028_jr_801734BC.c b/src/ov_SC02_028/ov_SC02_028_jr_801734BC.c index e2dba8af3..1bb168550 100644 --- a/src/ov_SC02_028/ov_SC02_028_jr_801734BC.c +++ b/src/ov_SC02_028/ov_SC02_028_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC02_031/ov_SC02_031_jr_801734BC.c b/src/ov_SC02_031/ov_SC02_031_jr_801734BC.c index a6f433c09..36f45ba34 100644 --- a/src/ov_SC02_031/ov_SC02_031_jr_801734BC.c +++ b/src/ov_SC02_031/ov_SC02_031_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC02_035/ov_SC02_035_jr_801734BC.c b/src/ov_SC02_035/ov_SC02_035_jr_801734BC.c index 69d4497c5..50d0abec1 100644 --- a/src/ov_SC02_035/ov_SC02_035_jr_801734BC.c +++ b/src/ov_SC02_035/ov_SC02_035_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC02_039/ov_SC02_039_jr_801734BC.c b/src/ov_SC02_039/ov_SC02_039_jr_801734BC.c index 9cbed1cd7..3b0e3e9e2 100644 --- a/src/ov_SC02_039/ov_SC02_039_jr_801734BC.c +++ b/src/ov_SC02_039/ov_SC02_039_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC02_041/ov_SC02_041_jr_801734BC.c b/src/ov_SC02_041/ov_SC02_041_jr_801734BC.c index f31e878f2..5aaa33b79 100644 --- a/src/ov_SC02_041/ov_SC02_041_jr_801734BC.c +++ b/src/ov_SC02_041/ov_SC02_041_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_001/ov_SC03_001_jr_801734BC.c b/src/ov_SC03_001/ov_SC03_001_jr_801734BC.c index 30e9c8cec..fb71e193f 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_801734BC.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_002/ov_SC03_002_jr_801734BC.c b/src/ov_SC03_002/ov_SC03_002_jr_801734BC.c index b75e2b235..76757e09a 100644 --- a/src/ov_SC03_002/ov_SC03_002_jr_801734BC.c +++ b/src/ov_SC03_002/ov_SC03_002_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_003/ov_SC03_003_jr_801734BC.c b/src/ov_SC03_003/ov_SC03_003_jr_801734BC.c index a72be769c..bb8c27cd1 100644 --- a/src/ov_SC03_003/ov_SC03_003_jr_801734BC.c +++ b/src/ov_SC03_003/ov_SC03_003_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_006/ov_SC03_006_jr_801734BC.c b/src/ov_SC03_006/ov_SC03_006_jr_801734BC.c index a627c91b6..538d0b92a 100644 --- a/src/ov_SC03_006/ov_SC03_006_jr_801734BC.c +++ b/src/ov_SC03_006/ov_SC03_006_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_007/ov_SC03_007_jr_801734BC.c b/src/ov_SC03_007/ov_SC03_007_jr_801734BC.c index 857ae9e0b..fe1a80e14 100644 --- a/src/ov_SC03_007/ov_SC03_007_jr_801734BC.c +++ b/src/ov_SC03_007/ov_SC03_007_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_010/ov_SC03_010_jr_801734BC.c b/src/ov_SC03_010/ov_SC03_010_jr_801734BC.c index 5b8157c3d..3fac8c31d 100644 --- a/src/ov_SC03_010/ov_SC03_010_jr_801734BC.c +++ b/src/ov_SC03_010/ov_SC03_010_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_011/ov_SC03_011_jr_801734BC.c b/src/ov_SC03_011/ov_SC03_011_jr_801734BC.c index 8db2de75b..b48bbd6de 100644 --- a/src/ov_SC03_011/ov_SC03_011_jr_801734BC.c +++ b/src/ov_SC03_011/ov_SC03_011_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_012/ov_SC03_012_jr_801734BC.c b/src/ov_SC03_012/ov_SC03_012_jr_801734BC.c index 59bf2e934..ac910a75a 100644 --- a/src/ov_SC03_012/ov_SC03_012_jr_801734BC.c +++ b/src/ov_SC03_012/ov_SC03_012_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_013/ov_SC03_013_jr_801734BC.c b/src/ov_SC03_013/ov_SC03_013_jr_801734BC.c index a695dd4aa..c7de0add6 100644 --- a/src/ov_SC03_013/ov_SC03_013_jr_801734BC.c +++ b/src/ov_SC03_013/ov_SC03_013_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_014/ov_SC03_014_jr_801734BC.c b/src/ov_SC03_014/ov_SC03_014_jr_801734BC.c index 8f0653206..5d83f8cf2 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_801734BC.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_015/ov_SC03_015_jr_801734BC.c b/src/ov_SC03_015/ov_SC03_015_jr_801734BC.c index 9733b1af8..31cf18378 100644 --- a/src/ov_SC03_015/ov_SC03_015_jr_801734BC.c +++ b/src/ov_SC03_015/ov_SC03_015_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_023/ov_SC03_023_jr_801734BC.c b/src/ov_SC03_023/ov_SC03_023_jr_801734BC.c index 2c0a49ffb..167b65231 100644 --- a/src/ov_SC03_023/ov_SC03_023_jr_801734BC.c +++ b/src/ov_SC03_023/ov_SC03_023_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_024/ov_SC03_024_jr_801734BC.c b/src/ov_SC03_024/ov_SC03_024_jr_801734BC.c index fa1a52c1c..d6be0cc7e 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_801734BC.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_028/ov_SC03_028_jr_801734BC.c b/src/ov_SC03_028/ov_SC03_028_jr_801734BC.c index 871f2654a..f268007d7 100644 --- a/src/ov_SC03_028/ov_SC03_028_jr_801734BC.c +++ b/src/ov_SC03_028/ov_SC03_028_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_029/ov_SC03_029_jr_801734BC.c b/src/ov_SC03_029/ov_SC03_029_jr_801734BC.c index f5cef73a4..678a459a6 100644 --- a/src/ov_SC03_029/ov_SC03_029_jr_801734BC.c +++ b/src/ov_SC03_029/ov_SC03_029_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_030/ov_SC03_030_jr_801734BC.c b/src/ov_SC03_030/ov_SC03_030_jr_801734BC.c index 1d25e9a46..8d4d41cb5 100644 --- a/src/ov_SC03_030/ov_SC03_030_jr_801734BC.c +++ b/src/ov_SC03_030/ov_SC03_030_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_031/ov_SC03_031_jr_801734BC.c b/src/ov_SC03_031/ov_SC03_031_jr_801734BC.c index 5a035c117..10749dfb3 100644 --- a/src/ov_SC03_031/ov_SC03_031_jr_801734BC.c +++ b/src/ov_SC03_031/ov_SC03_031_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_089/ov_SC03_089_jr_801734BC.c b/src/ov_SC03_089/ov_SC03_089_jr_801734BC.c index 57bb8ad0e..4f61bcad1 100644 --- a/src/ov_SC03_089/ov_SC03_089_jr_801734BC.c +++ b/src/ov_SC03_089/ov_SC03_089_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_090/ov_SC03_090_jr_801734BC.c b/src/ov_SC03_090/ov_SC03_090_jr_801734BC.c index 8ae84a7af..58afe3fff 100644 --- a/src/ov_SC03_090/ov_SC03_090_jr_801734BC.c +++ b/src/ov_SC03_090/ov_SC03_090_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_091/ov_SC03_091_jr_801734BC.c b/src/ov_SC03_091/ov_SC03_091_jr_801734BC.c index 176ce0a57..ded54b9fd 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_801734BC.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_092/ov_SC03_092_jr_801734BC.c b/src/ov_SC03_092/ov_SC03_092_jr_801734BC.c index 5c2f64db2..7770dee98 100644 --- a/src/ov_SC03_092/ov_SC03_092_jr_801734BC.c +++ b/src/ov_SC03_092/ov_SC03_092_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_093/ov_SC03_093_jr_801734BC.c b/src/ov_SC03_093/ov_SC03_093_jr_801734BC.c index 8095957ce..50e73a847 100644 --- a/src/ov_SC03_093/ov_SC03_093_jr_801734BC.c +++ b/src/ov_SC03_093/ov_SC03_093_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_094/ov_SC03_094_jr_801734BC.c b/src/ov_SC03_094/ov_SC03_094_jr_801734BC.c index 8052dd6a9..1999e87e6 100644 --- a/src/ov_SC03_094/ov_SC03_094_jr_801734BC.c +++ b/src/ov_SC03_094/ov_SC03_094_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_095/ov_SC03_095_jr_801734BC.c b/src/ov_SC03_095/ov_SC03_095_jr_801734BC.c index 8dabb1df2..2bd549d14 100644 --- a/src/ov_SC03_095/ov_SC03_095_jr_801734BC.c +++ b/src/ov_SC03_095/ov_SC03_095_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_096/ov_SC03_096_jr_801734BC.c b/src/ov_SC03_096/ov_SC03_096_jr_801734BC.c index 919481368..e17533b6e 100644 --- a/src/ov_SC03_096/ov_SC03_096_jr_801734BC.c +++ b/src/ov_SC03_096/ov_SC03_096_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_097/ov_SC03_097_jr_801734BC.c b/src/ov_SC03_097/ov_SC03_097_jr_801734BC.c index bef728d6f..a59d4e6bc 100644 --- a/src/ov_SC03_097/ov_SC03_097_jr_801734BC.c +++ b/src/ov_SC03_097/ov_SC03_097_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_098/ov_SC03_098_jr_801734BC.c b/src/ov_SC03_098/ov_SC03_098_jr_801734BC.c index ad625c9d8..39d222633 100644 --- a/src/ov_SC03_098/ov_SC03_098_jr_801734BC.c +++ b/src/ov_SC03_098/ov_SC03_098_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_099/ov_SC03_099_jr_801734BC.c b/src/ov_SC03_099/ov_SC03_099_jr_801734BC.c index 20defd22f..700fcbc5b 100644 --- a/src/ov_SC03_099/ov_SC03_099_jr_801734BC.c +++ b/src/ov_SC03_099/ov_SC03_099_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_100/ov_SC03_100_jr_801734BC.c b/src/ov_SC03_100/ov_SC03_100_jr_801734BC.c index 90b605194..401fc2aec 100644 --- a/src/ov_SC03_100/ov_SC03_100_jr_801734BC.c +++ b/src/ov_SC03_100/ov_SC03_100_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_101/ov_SC03_101_jr_801734BC.c b/src/ov_SC03_101/ov_SC03_101_jr_801734BC.c index 8b645dd00..2cd2260a3 100644 --- a/src/ov_SC03_101/ov_SC03_101_jr_801734BC.c +++ b/src/ov_SC03_101/ov_SC03_101_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_102/ov_SC03_102_jr_801734BC.c b/src/ov_SC03_102/ov_SC03_102_jr_801734BC.c index 578dce3ae..9e599ab88 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_801734BC.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_103/ov_SC03_103_jr_801734BC.c b/src/ov_SC03_103/ov_SC03_103_jr_801734BC.c index b2fc01833..4fd6d8622 100644 --- a/src/ov_SC03_103/ov_SC03_103_jr_801734BC.c +++ b/src/ov_SC03_103/ov_SC03_103_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_104/ov_SC03_104_jr_801734BC.c b/src/ov_SC03_104/ov_SC03_104_jr_801734BC.c index bfababca1..168ceec87 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_801734BC.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_105/ov_SC03_105_jr_801734BC.c b/src/ov_SC03_105/ov_SC03_105_jr_801734BC.c index a2a60d3c1..724647d27 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_801734BC.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_108/ov_SC03_108_jr_801734BC.c b/src/ov_SC03_108/ov_SC03_108_jr_801734BC.c index 59bbefab6..b74e1ae37 100644 --- a/src/ov_SC03_108/ov_SC03_108_jr_801734BC.c +++ b/src/ov_SC03_108/ov_SC03_108_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_109/ov_SC03_109_jr_801734BC.c b/src/ov_SC03_109/ov_SC03_109_jr_801734BC.c index c01c3876c..aeddcf77a 100644 --- a/src/ov_SC03_109/ov_SC03_109_jr_801734BC.c +++ b/src/ov_SC03_109/ov_SC03_109_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_110/ov_SC03_110_jr_801734BC.c b/src/ov_SC03_110/ov_SC03_110_jr_801734BC.c index f5d6ff977..0bf79df09 100644 --- a/src/ov_SC03_110/ov_SC03_110_jr_801734BC.c +++ b/src/ov_SC03_110/ov_SC03_110_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_111/ov_SC03_111_jr_801734BC.c b/src/ov_SC03_111/ov_SC03_111_jr_801734BC.c index 8bcd74578..9ece97a74 100644 --- a/src/ov_SC03_111/ov_SC03_111_jr_801734BC.c +++ b/src/ov_SC03_111/ov_SC03_111_jr_801734BC.c @@ -2614,7 +2614,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_112/ov_SC03_112_jr_801734BC.c b/src/ov_SC03_112/ov_SC03_112_jr_801734BC.c index ba9d63c24..00062b9ca 100644 --- a/src/ov_SC03_112/ov_SC03_112_jr_801734BC.c +++ b/src/ov_SC03_112/ov_SC03_112_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_113/ov_SC03_113_jr_801734BC.c b/src/ov_SC03_113/ov_SC03_113_jr_801734BC.c index 60b006962..5016a669e 100644 --- a/src/ov_SC03_113/ov_SC03_113_jr_801734BC.c +++ b/src/ov_SC03_113/ov_SC03_113_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_114/ov_SC03_114_jr_801734BC.c b/src/ov_SC03_114/ov_SC03_114_jr_801734BC.c index 6bbf49618..645f55cf8 100644 --- a/src/ov_SC03_114/ov_SC03_114_jr_801734BC.c +++ b/src/ov_SC03_114/ov_SC03_114_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_115/ov_SC03_115_jr_801734BC.c b/src/ov_SC03_115/ov_SC03_115_jr_801734BC.c index 36a5d8e09..bcff36f82 100644 --- a/src/ov_SC03_115/ov_SC03_115_jr_801734BC.c +++ b/src/ov_SC03_115/ov_SC03_115_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_116/ov_SC03_116_jr_801734BC.c b/src/ov_SC03_116/ov_SC03_116_jr_801734BC.c index 65312df6b..4edefa7d1 100644 --- a/src/ov_SC03_116/ov_SC03_116_jr_801734BC.c +++ b/src/ov_SC03_116/ov_SC03_116_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_117/ov_SC03_117_jr_801734BC.c b/src/ov_SC03_117/ov_SC03_117_jr_801734BC.c index 0a2461ba7..a23d357a1 100644 --- a/src/ov_SC03_117/ov_SC03_117_jr_801734BC.c +++ b/src/ov_SC03_117/ov_SC03_117_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_118/ov_SC03_118_jr_801734BC.c b/src/ov_SC03_118/ov_SC03_118_jr_801734BC.c index 155707b98..157c25d9b 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_801734BC.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_119/ov_SC03_119_jr_801734BC.c b/src/ov_SC03_119/ov_SC03_119_jr_801734BC.c index 08749c6e2..16532b000 100644 --- a/src/ov_SC03_119/ov_SC03_119_jr_801734BC.c +++ b/src/ov_SC03_119/ov_SC03_119_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_121/ov_SC03_121_jr_801734BC.c b/src/ov_SC03_121/ov_SC03_121_jr_801734BC.c index 6498fc31a..31d7a632a 100644 --- a/src/ov_SC03_121/ov_SC03_121_jr_801734BC.c +++ b/src/ov_SC03_121/ov_SC03_121_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_124/ov_SC03_124_jr_801734BC.c b/src/ov_SC03_124/ov_SC03_124_jr_801734BC.c index 1d0a54d40..d51e04a09 100644 --- a/src/ov_SC03_124/ov_SC03_124_jr_801734BC.c +++ b/src/ov_SC03_124/ov_SC03_124_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_125/ov_SC03_125_jr_801734BC.c b/src/ov_SC03_125/ov_SC03_125_jr_801734BC.c index 2c6ef8175..a2f74b776 100644 --- a/src/ov_SC03_125/ov_SC03_125_jr_801734BC.c +++ b/src/ov_SC03_125/ov_SC03_125_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC03_126/ov_SC03_126_jr_801734BC.c b/src/ov_SC03_126/ov_SC03_126_jr_801734BC.c index 0e75b9780..745175815 100644 --- a/src/ov_SC03_126/ov_SC03_126_jr_801734BC.c +++ b/src/ov_SC03_126/ov_SC03_126_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC04_000/ov_SC04_000_jr_801734BC.c b/src/ov_SC04_000/ov_SC04_000_jr_801734BC.c index e8bf3ed88..66400b563 100644 --- a/src/ov_SC04_000/ov_SC04_000_jr_801734BC.c +++ b/src/ov_SC04_000/ov_SC04_000_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC04_002/ov_SC04_002_jr_801734BC.c b/src/ov_SC04_002/ov_SC04_002_jr_801734BC.c index 527de29d6..124f92ae5 100644 --- a/src/ov_SC04_002/ov_SC04_002_jr_801734BC.c +++ b/src/ov_SC04_002/ov_SC04_002_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC04_003/ov_SC04_003_jr_801734BC.c b/src/ov_SC04_003/ov_SC04_003_jr_801734BC.c index 2699eb1dd..6846acb6a 100644 --- a/src/ov_SC04_003/ov_SC04_003_jr_801734BC.c +++ b/src/ov_SC04_003/ov_SC04_003_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC04_004/ov_SC04_004_jr_801734BC.c b/src/ov_SC04_004/ov_SC04_004_jr_801734BC.c index 402841d20..b297c9249 100644 --- a/src/ov_SC04_004/ov_SC04_004_jr_801734BC.c +++ b/src/ov_SC04_004/ov_SC04_004_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC04_005/ov_SC04_005_jr_801734BC.c b/src/ov_SC04_005/ov_SC04_005_jr_801734BC.c index 698c9420d..9a323693f 100644 --- a/src/ov_SC04_005/ov_SC04_005_jr_801734BC.c +++ b/src/ov_SC04_005/ov_SC04_005_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC04_006/ov_SC04_006_jr_801734BC.c b/src/ov_SC04_006/ov_SC04_006_jr_801734BC.c index 374db5c0d..732fc2583 100644 --- a/src/ov_SC04_006/ov_SC04_006_jr_801734BC.c +++ b/src/ov_SC04_006/ov_SC04_006_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC04_007/ov_SC04_007_jr_801734BC.c b/src/ov_SC04_007/ov_SC04_007_jr_801734BC.c index deda7a087..cc228f91f 100644 --- a/src/ov_SC04_007/ov_SC04_007_jr_801734BC.c +++ b/src/ov_SC04_007/ov_SC04_007_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC04_008/ov_SC04_008_jr_801734BC.c b/src/ov_SC04_008/ov_SC04_008_jr_801734BC.c index 6b71e94ba..f8568c62f 100644 --- a/src/ov_SC04_008/ov_SC04_008_jr_801734BC.c +++ b/src/ov_SC04_008/ov_SC04_008_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC04_009/ov_SC04_009_jr_801734BC.c b/src/ov_SC04_009/ov_SC04_009_jr_801734BC.c index b37b8f6eb..2ee184258 100644 --- a/src/ov_SC04_009/ov_SC04_009_jr_801734BC.c +++ b/src/ov_SC04_009/ov_SC04_009_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC04_010/ov_SC04_010_jr_801734BC.c b/src/ov_SC04_010/ov_SC04_010_jr_801734BC.c index a3e2eeb09..a6e7fe355 100644 --- a/src/ov_SC04_010/ov_SC04_010_jr_801734BC.c +++ b/src/ov_SC04_010/ov_SC04_010_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC04_011/ov_SC04_011_jr_801734BC.c b/src/ov_SC04_011/ov_SC04_011_jr_801734BC.c index 04b1a533b..1bfab0e94 100644 --- a/src/ov_SC04_011/ov_SC04_011_jr_801734BC.c +++ b/src/ov_SC04_011/ov_SC04_011_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC04_012/ov_SC04_012_jr_801734BC.c b/src/ov_SC04_012/ov_SC04_012_jr_801734BC.c index 851728fcb..78943c8e8 100644 --- a/src/ov_SC04_012/ov_SC04_012_jr_801734BC.c +++ b/src/ov_SC04_012/ov_SC04_012_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC04_015/ov_SC04_015_jr_801734BC.c b/src/ov_SC04_015/ov_SC04_015_jr_801734BC.c index 577240aeb..364092d4b 100644 --- a/src/ov_SC04_015/ov_SC04_015_jr_801734BC.c +++ b/src/ov_SC04_015/ov_SC04_015_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC04_016/ov_SC04_016_jr_801734BC.c b/src/ov_SC04_016/ov_SC04_016_jr_801734BC.c index cfb3e6962..11e3f412a 100644 --- a/src/ov_SC04_016/ov_SC04_016_jr_801734BC.c +++ b/src/ov_SC04_016/ov_SC04_016_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC04_018/ov_SC04_018_jr_801734BC.c b/src/ov_SC04_018/ov_SC04_018_jr_801734BC.c index b894e929b..704a58a9c 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_801734BC.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC04_019/ov_SC04_019_jr_801734BC.c b/src/ov_SC04_019/ov_SC04_019_jr_801734BC.c index 9f9f51aee..4337d3f2e 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_801734BC.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC04_020/ov_SC04_020_jr_801734BC.c b/src/ov_SC04_020/ov_SC04_020_jr_801734BC.c index 5e7dc0fbc..4e44057ca 100644 --- a/src/ov_SC04_020/ov_SC04_020_jr_801734BC.c +++ b/src/ov_SC04_020/ov_SC04_020_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC04_021/ov_SC04_021_jr_801734BC.c b/src/ov_SC04_021/ov_SC04_021_jr_801734BC.c index 6e48ac064..e54254df2 100644 --- a/src/ov_SC04_021/ov_SC04_021_jr_801734BC.c +++ b/src/ov_SC04_021/ov_SC04_021_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC05_000/ov_SC05_000_jr_801734BC.c b/src/ov_SC05_000/ov_SC05_000_jr_801734BC.c index e3f6be62e..30735c9ac 100644 --- a/src/ov_SC05_000/ov_SC05_000_jr_801734BC.c +++ b/src/ov_SC05_000/ov_SC05_000_jr_801734BC.c @@ -2611,7 +2611,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC05_001/ov_SC05_001_jr_801734BC.c b/src/ov_SC05_001/ov_SC05_001_jr_801734BC.c index 02090db32..dbc0186f4 100644 --- a/src/ov_SC05_001/ov_SC05_001_jr_801734BC.c +++ b/src/ov_SC05_001/ov_SC05_001_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC05_002/ov_SC05_002_jr_801734BC.c b/src/ov_SC05_002/ov_SC05_002_jr_801734BC.c index 5d0d96d3d..9be31f765 100644 --- a/src/ov_SC05_002/ov_SC05_002_jr_801734BC.c +++ b/src/ov_SC05_002/ov_SC05_002_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC05_003/ov_SC05_003_jr_801734BC.c b/src/ov_SC05_003/ov_SC05_003_jr_801734BC.c index 6b7503c9d..25a308923 100644 --- a/src/ov_SC05_003/ov_SC05_003_jr_801734BC.c +++ b/src/ov_SC05_003/ov_SC05_003_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC05_004/ov_SC05_004_jr_801734BC.c b/src/ov_SC05_004/ov_SC05_004_jr_801734BC.c index ab73ec508..41482357b 100644 --- a/src/ov_SC05_004/ov_SC05_004_jr_801734BC.c +++ b/src/ov_SC05_004/ov_SC05_004_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC05_005/ov_SC05_005_jr_801734BC.c b/src/ov_SC05_005/ov_SC05_005_jr_801734BC.c index e1f6ceaf8..52b73f49b 100644 --- a/src/ov_SC05_005/ov_SC05_005_jr_801734BC.c +++ b/src/ov_SC05_005/ov_SC05_005_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC05_006/ov_SC05_006_jr_801734BC.c b/src/ov_SC05_006/ov_SC05_006_jr_801734BC.c index 0792c8cfe..a21acaa6c 100644 --- a/src/ov_SC05_006/ov_SC05_006_jr_801734BC.c +++ b/src/ov_SC05_006/ov_SC05_006_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC05_007/ov_SC05_007_jr_801734BC.c b/src/ov_SC05_007/ov_SC05_007_jr_801734BC.c index e26909616..3ecd66fa0 100644 --- a/src/ov_SC05_007/ov_SC05_007_jr_801734BC.c +++ b/src/ov_SC05_007/ov_SC05_007_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC05_008/ov_SC05_008_jr_801734BC.c b/src/ov_SC05_008/ov_SC05_008_jr_801734BC.c index ca96c86f0..41d4c6d4b 100644 --- a/src/ov_SC05_008/ov_SC05_008_jr_801734BC.c +++ b/src/ov_SC05_008/ov_SC05_008_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC05_009/ov_SC05_009_jr_801734BC.c b/src/ov_SC05_009/ov_SC05_009_jr_801734BC.c index fb8d8e48c..dbe85e1e1 100644 --- a/src/ov_SC05_009/ov_SC05_009_jr_801734BC.c +++ b/src/ov_SC05_009/ov_SC05_009_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC05_010/ov_SC05_010_jr_801734BC.c b/src/ov_SC05_010/ov_SC05_010_jr_801734BC.c index 225c0cb31..712b648e3 100644 --- a/src/ov_SC05_010/ov_SC05_010_jr_801734BC.c +++ b/src/ov_SC05_010/ov_SC05_010_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC05_011/ov_SC05_011_jr_801734BC.c b/src/ov_SC05_011/ov_SC05_011_jr_801734BC.c index b1b7ad3e4..6193580f8 100644 --- a/src/ov_SC05_011/ov_SC05_011_jr_801734BC.c +++ b/src/ov_SC05_011/ov_SC05_011_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC05_017/ov_SC05_017_jr_801734BC.c b/src/ov_SC05_017/ov_SC05_017_jr_801734BC.c index 2dccbd402..aa85c84ad 100644 --- a/src/ov_SC05_017/ov_SC05_017_jr_801734BC.c +++ b/src/ov_SC05_017/ov_SC05_017_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC05_018/ov_SC05_018_jr_801734BC.c b/src/ov_SC05_018/ov_SC05_018_jr_801734BC.c index 40015c006..331d892b5 100644 --- a/src/ov_SC05_018/ov_SC05_018_jr_801734BC.c +++ b/src/ov_SC05_018/ov_SC05_018_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC05_019/ov_SC05_019_jr_801734BC.c b/src/ov_SC05_019/ov_SC05_019_jr_801734BC.c index 790ec8f9e..40e31715d 100644 --- a/src/ov_SC05_019/ov_SC05_019_jr_801734BC.c +++ b/src/ov_SC05_019/ov_SC05_019_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC06_000/ov_SC06_000_jr_801734BC.c b/src/ov_SC06_000/ov_SC06_000_jr_801734BC.c index 03a2e2d11..a4a5e4fd9 100644 --- a/src/ov_SC06_000/ov_SC06_000_jr_801734BC.c +++ b/src/ov_SC06_000/ov_SC06_000_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC06_006/ov_SC06_006_jr_801734BC.c b/src/ov_SC06_006/ov_SC06_006_jr_801734BC.c index 089e8180f..04669530c 100644 --- a/src/ov_SC06_006/ov_SC06_006_jr_801734BC.c +++ b/src/ov_SC06_006/ov_SC06_006_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC06_008/ov_SC06_008_jr_801734BC.c b/src/ov_SC06_008/ov_SC06_008_jr_801734BC.c index 9e609b3ea..acfdbaf89 100644 --- a/src/ov_SC06_008/ov_SC06_008_jr_801734BC.c +++ b/src/ov_SC06_008/ov_SC06_008_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC06_010/ov_SC06_010_jr_801734BC.c b/src/ov_SC06_010/ov_SC06_010_jr_801734BC.c index 004e3d479..8954c10e6 100644 --- a/src/ov_SC06_010/ov_SC06_010_jr_801734BC.c +++ b/src/ov_SC06_010/ov_SC06_010_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC06_011/ov_SC06_011_jr_801734BC.c b/src/ov_SC06_011/ov_SC06_011_jr_801734BC.c index 8d107bc8f..a6555e9e6 100644 --- a/src/ov_SC06_011/ov_SC06_011_jr_801734BC.c +++ b/src/ov_SC06_011/ov_SC06_011_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC06_013/ov_SC06_013_jr_801734BC.c b/src/ov_SC06_013/ov_SC06_013_jr_801734BC.c index e39c7c568..2632392d2 100644 --- a/src/ov_SC06_013/ov_SC06_013_jr_801734BC.c +++ b/src/ov_SC06_013/ov_SC06_013_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC06_014/ov_SC06_014_jr_801734BC.c b/src/ov_SC06_014/ov_SC06_014_jr_801734BC.c index 9387ed7c6..804538a76 100644 --- a/src/ov_SC06_014/ov_SC06_014_jr_801734BC.c +++ b/src/ov_SC06_014/ov_SC06_014_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC06_015/ov_SC06_015_jr_801734BC.c b/src/ov_SC06_015/ov_SC06_015_jr_801734BC.c index 39335ae77..83ff5bb8c 100644 --- a/src/ov_SC06_015/ov_SC06_015_jr_801734BC.c +++ b/src/ov_SC06_015/ov_SC06_015_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC06_016/ov_SC06_016_jr_801734BC.c b/src/ov_SC06_016/ov_SC06_016_jr_801734BC.c index ce3f5c982..cf2063ef7 100644 --- a/src/ov_SC06_016/ov_SC06_016_jr_801734BC.c +++ b/src/ov_SC06_016/ov_SC06_016_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC06_020/ov_SC06_020_jr_801734BC.c b/src/ov_SC06_020/ov_SC06_020_jr_801734BC.c index 0b6913a4a..8356b1f72 100644 --- a/src/ov_SC06_020/ov_SC06_020_jr_801734BC.c +++ b/src/ov_SC06_020/ov_SC06_020_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC06_022/ov_SC06_022_jr_801734BC.c b/src/ov_SC06_022/ov_SC06_022_jr_801734BC.c index 5e8c1cfc6..cd119b397 100644 --- a/src/ov_SC06_022/ov_SC06_022_jr_801734BC.c +++ b/src/ov_SC06_022/ov_SC06_022_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC06_024/ov_SC06_024_jr_801734BC.c b/src/ov_SC06_024/ov_SC06_024_jr_801734BC.c index a0bce9742..09c1907d0 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_801734BC.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC06_025/ov_SC06_025_jr_801734BC.c b/src/ov_SC06_025/ov_SC06_025_jr_801734BC.c index 5050d045a..0a3e3d74c 100644 --- a/src/ov_SC06_025/ov_SC06_025_jr_801734BC.c +++ b/src/ov_SC06_025/ov_SC06_025_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC06_027/ov_SC06_027_jr_801734BC.c b/src/ov_SC06_027/ov_SC06_027_jr_801734BC.c index 30eb3a10a..546e2b3e3 100644 --- a/src/ov_SC06_027/ov_SC06_027_jr_801734BC.c +++ b/src/ov_SC06_027/ov_SC06_027_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC06_029/ov_SC06_029_jr_801734BC.c b/src/ov_SC06_029/ov_SC06_029_jr_801734BC.c index 33f6fac4c..c4b516c80 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_801734BC.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC06_030/ov_SC06_030_jr_801734BC.c b/src/ov_SC06_030/ov_SC06_030_jr_801734BC.c index dfd69f56d..fae6ab0c4 100644 --- a/src/ov_SC06_030/ov_SC06_030_jr_801734BC.c +++ b/src/ov_SC06_030/ov_SC06_030_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC06_032/ov_SC06_032_jr_801734BC.c b/src/ov_SC06_032/ov_SC06_032_jr_801734BC.c index a1383ca6a..156f6a971 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_801734BC.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC06_033/ov_SC06_033_jr_801734BC.c b/src/ov_SC06_033/ov_SC06_033_jr_801734BC.c index cd910aa88..fa463a6f9 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_801734BC.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC07_000/ov_SC07_000_jr_801734BC.c b/src/ov_SC07_000/ov_SC07_000_jr_801734BC.c index 72102527c..689ee032c 100644 --- a/src/ov_SC07_000/ov_SC07_000_jr_801734BC.c +++ b/src/ov_SC07_000/ov_SC07_000_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC07_001/ov_SC07_001_jr_801734BC.c b/src/ov_SC07_001/ov_SC07_001_jr_801734BC.c index 414617795..fc69fe2c2 100644 --- a/src/ov_SC07_001/ov_SC07_001_jr_801734BC.c +++ b/src/ov_SC07_001/ov_SC07_001_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC07_002/ov_SC07_002_jr_801734BC.c b/src/ov_SC07_002/ov_SC07_002_jr_801734BC.c index 5aefe9c31..ecd493714 100644 --- a/src/ov_SC07_002/ov_SC07_002_jr_801734BC.c +++ b/src/ov_SC07_002/ov_SC07_002_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC07_008/ov_SC07_008_jr_801734BC.c b/src/ov_SC07_008/ov_SC07_008_jr_801734BC.c index f5e0a6a9c..239b8eaef 100644 --- a/src/ov_SC07_008/ov_SC07_008_jr_801734BC.c +++ b/src/ov_SC07_008/ov_SC07_008_jr_801734BC.c @@ -2612,7 +2612,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC07_009/ov_SC07_009_jr_801734BC.c b/src/ov_SC07_009/ov_SC07_009_jr_801734BC.c index 9d621bcee..28b23365c 100644 --- a/src/ov_SC07_009/ov_SC07_009_jr_801734BC.c +++ b/src/ov_SC07_009/ov_SC07_009_jr_801734BC.c @@ -2613,7 +2613,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174C60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174C80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009_jr_801734BC", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174E9C (src/shared) */ diff --git a/src/ov_SC07_010/ov_SC07_010_jr_8015C32C.c b/src/ov_SC07_010/ov_SC07_010_jr_8015C32C.c index 838e0bc23..a4f45befb 100644 --- a/src/ov_SC07_010/ov_SC07_010_jr_8015C32C.c +++ b/src/ov_SC07_010/ov_SC07_010_jr_8015C32C.c @@ -7980,7 +7980,8 @@ DEFINE_func_80174C60() /* dedup: shared engine-core @0x80174c60 (src/shared) */ DEFINE_func_80174C80() /* dedup: shared engine-core @0x80174c80 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_010/nonmatchings/ov_SC07_010_jr_8015C32C", func_80174CB0); +DEFINE_func_80174CB0() /* dedup: shared engine-core @0x80174cb0 (src/shared) */ + DEFINE_func_80174E9C() /* dedup: shared engine-core @0x80174e9c (src/shared) */