diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 2b8f4b7fd..feda0f03f 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -13074,3 +13074,10 @@ groups: func: DEFINE_func_80165CA0 vram: 0x80165CA0 binaries: [ov_SC01_077, ov_SC01_000, ov_SC07_006] + - id: E_func_8014CD80 + tier: h_exact + hash: 4da9c2dae868d565a3124e247b0b51e38b3bb264 + source: src/shared/engine_core.h + func: DEFINE_func_8014CD80 + vram: 0x8014CD80 + binaries: [ov_SC01_077, ov_SC01_005, ov_SC01_006, ov_SC03_001, ov_SC01_000, ov_SC01_001, ov_SC02_000, ov_SC02_003, ov_SC03_002, ov_SC03_006, ov_SC04_000, ov_SC04_018, ov_SC04_019, ov_SC05_000, ov_SC06_000, ov_SC07_000, ov_SC01_004, ov_SC01_008, ov_SC01_009, ov_SC01_074, ov_SC01_080, ov_SC01_084, 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_003, 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_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_020, ov_SC04_021, 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_006, ov_SC06_008, ov_SC06_010, ov_SC06_011, ov_SC06_013, ov_SC06_014, ov_SC06_015, ov_SC06_016, ov_SC06_018, 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_001, ov_SC07_002, ov_SC07_008, ov_SC07_009, ov_SC07_006, ov_SC07_007, ov_SC07_010, ov_SC07_011] diff --git a/docs/decision-log.md b/docs/decision-log.md index ecf519964..e6ef0b692 100644 --- a/docs/decision-log.md +++ b/docs/decision-log.md @@ -1667,3 +1667,24 @@ the DIFFs, §54 `--fix-def-sig` on the def-side-plumbing failures) or a differen ROI-gated close arithmetic now has a third low-yield data point: ov_SC06_018 non-jtbl tail ≈0.1pp, this ≈9 functions). **Do NOT close P29 on ROI — the burn-down floor is still undetermined (needs 3 session-close deltas).** + +**UPDATE (same session, R35 — the probe REVERSED this verdict).** Rather than defer the header-decl reconcile +as future work, I ran the bounded probe on `func_8014CD80` (138 live, 0 matched, NO DEFINE macro; a clean MATCH +draft with a **universal body** — only universal callees + param offsets, zero overlay-local `D_*` refs). The +def-side blocker was engine_core.h `DEFINE_func_8014CD0C()` forward-declaring it `void func_8014CD80(s32,void*, +void*)` while the byte-true def is `int func_8014CD80(s32,u16*,u16*)`. **One byte-neutral header edit** +(`void`→`int`, `void*`→`u16*`; the call site passes `u16[3]` arrays and ignores the return, so codegen is +unchanged) → `harvest_verify` banked ×1 BYTE-IDENTICAL → **`dedup_propagate --addr` propagated 138/138 overlays +byte-identical (live 138→0)** → R22 clean-fleet **140/140**. **So the fresh-138 families ARE recoverable ×138 — +the blocker was purely the def-side header decl, NOT a wall.** (func_80165CA0's 0/135 was a non-universal +*body*, a different failure mode; h_exact=1 does not distinguish them — the BODY's universality does.) +**Quantified market:** of the 75 fresh (≥100-live) families, **46 carry an engine_core.h caller forward-decl, +38 SIMPLIFIED (`void`/`void*`) = the func_8014CD80 pattern** — each a candidate ×138 (≈+1.5–2.8pp instr if +half-to-most bank, gated by whether each draft's body is universal + byte-correct). **DECISION: build a +`fix_header_decl` tool** — parse the byte-true def sig (from the banked def or a MATCH draft), rewrite every +engine_core.h forward-decl of that fn to match, then hand off to the existing bank→dedup_propagate→R22 chain. +It edits fleet-shared engine_core.h → INHERITS the §61 snapshot-undo constraint (undo = restore, never an +inverse; validate FLEET-WIDE via R22). Pair it with a fresh-family wave (`--rank live --min-live 100`): the tool +is the INTEGRATION half, the wave supplies the byte-true draft. **This reopens option (b) as the campaign's best +lever — the "low-ROI, spent" read above was measured on the WRONG 24 (leverage-ranked → onboarded-tail) and is +superseded for the FRESH pool. The onboarded-tail read stands.** diff --git a/docs/progress.fleet.md b/docs/progress.fleet.md index aab045f69..cbc2c2eec 100644 --- a/docs/progress.fleet.md +++ b/docs/progress.fleet.md @@ -4,157 +4,157 @@ # cross-binary collapsible-byte leverage: docs/duplicates.cross.md. # THREE progress metrics (all matter — see the labels): -FLEET fn-count byte-ident: 312042 / 353717 = 88.22% (REAL+LINKED+empties; FUNCTION-count, ×134-inflated — one crack counts per overlay) -FLEET instr-weighted : 10336630 / 13141652 = 78.7% (shipped .text across main + resident + 138 overlays; the decomp.dev-DISPLAY number) -FLEET distinct-code(uniq): 3810787 / 5634875 = 67.6% (64824/87459 unique fns; the DISTINCT-RE number) +FLEET fn-count byte-ident: 312180 / 353717 = 88.26% (REAL+LINKED+empties; FUNCTION-count, ×134-inflated — one crack counts per overlay) +FLEET instr-weighted : 10350016 / 13141652 = 78.8% (shipped .text across main + resident + 138 overlays; the decomp.dev-DISPLAY number) +FLEET distinct-code(uniq): 3810884 / 5634875 = 67.6% (64825/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: 10336194 / 13081451 = 79.0%) + (fleet EXCLUDING main, for continuity with pre-2026-07-22 readings: 10349580 / 13081451 = 79.1%) -FLEET REAL substantive : 310187 (of which dedup-shared 234574 via 1850 groups / 234618 instances) +FLEET REAL substantive : 310325 (of which dedup-shared 234712 via 1851 groups / 234756 instances) FLEET LINKED PsyQ objs : 959 FLEET NON_MATCHING : 7 (0 in any default build — G4) -FLEET INCLUDE_ASM stubs : 41668 +FLEET INCLUDE_ASM stubs : 41530 FLEET matchable : 353717 | binary | REAL | shared | LINKED | byte-ident | matchable | byte-ident % | |---|---:|---:|---:|---:|---:|---:| | main | 54 | 2 | 959 | 1055 | 2096 | 50.3% | | resident | 129 | 0 | 0 | 131 | 145 | 90.3% | -| ov_SC01_000 | 2227 | 1708 | 0 | 2227 | 2403 | 92.7% | -| ov_SC01_001 | 2227 | 1707 | 0 | 2229 | 2466 | 90.4% | -| ov_SC01_004 | 2218 | 1698 | 0 | 2219 | 2414 | 91.9% | -| ov_SC01_005 | 2247 | 1720 | 0 | 2247 | 2503 | 89.8% | -| ov_SC01_006 | 2247 | 1720 | 0 | 2247 | 2503 | 89.8% | -| ov_SC01_008 | 2218 | 1698 | 0 | 2220 | 2426 | 91.5% | -| ov_SC01_009 | 2243 | 1699 | 0 | 2244 | 2507 | 89.5% | -| ov_SC01_074 | 2222 | 1699 | 0 | 2224 | 2425 | 91.7% | -| ov_SC01_077 | 2411 | 1668 | 0 | 2413 | 2585 | 93.3% | -| ov_SC01_080 | 2260 | 1702 | 0 | 2260 | 2512 | 90.0% | -| ov_SC01_084 | 2267 | 1702 | 0 | 2272 | 2579 | 88.1% | -| ov_SC02_000 | 2320 | 1737 | 0 | 2320 | 2683 | 86.5% | -| ov_SC02_003 | 2320 | 1737 | 0 | 2320 | 2683 | 86.5% | -| ov_SC02_004 | 2226 | 1702 | 0 | 2226 | 2401 | 92.7% | -| ov_SC02_005 | 2333 | 1698 | 0 | 2343 | 2927 | 80.0% | -| ov_SC02_011 | 2344 | 1705 | 0 | 2355 | 2893 | 81.4% | -| ov_SC02_015 | 2227 | 1704 | 0 | 2227 | 2414 | 92.3% | -| ov_SC02_016 | 2260 | 1704 | 0 | 2263 | 2545 | 88.9% | -| ov_SC02_017 | 2304 | 1704 | 0 | 2312 | 2732 | 84.6% | -| ov_SC02_021 | 2233 | 1704 | 0 | 2233 | 2437 | 91.6% | -| ov_SC02_026 | 2249 | 1702 | 0 | 2255 | 2572 | 87.7% | -| ov_SC02_027 | 2272 | 1702 | 0 | 2281 | 2692 | 84.7% | -| ov_SC02_028 | 2273 | 1702 | 0 | 2283 | 2701 | 84.5% | -| ov_SC02_031 | 2258 | 1703 | 0 | 2263 | 2562 | 88.3% | -| ov_SC02_035 | 2235 | 1702 | 0 | 2238 | 2520 | 88.8% | -| ov_SC02_039 | 2219 | 1702 | 0 | 2219 | 2416 | 91.8% | -| ov_SC02_041 | 2256 | 1702 | 0 | 2259 | 2561 | 88.2% | -| ov_SC03_001 | 2355 | 1703 | 0 | 2372 | 2869 | 82.7% | -| ov_SC03_002 | 2281 | 1707 | 0 | 2296 | 2631 | 87.3% | -| ov_SC03_003 | 2229 | 1702 | 0 | 2230 | 2423 | 92.0% | -| ov_SC03_006 | 2294 | 1708 | 0 | 2303 | 2767 | 83.2% | -| ov_SC03_007 | 2274 | 1702 | 0 | 2278 | 2623 | 86.8% | -| ov_SC03_010 | 2235 | 1702 | 0 | 2235 | 2470 | 90.5% | -| ov_SC03_011 | 2243 | 1702 | 0 | 2249 | 2527 | 89.0% | -| ov_SC03_012 | 2221 | 1702 | 0 | 2222 | 2406 | 92.4% | -| ov_SC03_013 | 2240 | 1702 | 0 | 2240 | 2492 | 89.9% | -| ov_SC03_014 | 2300 | 1727 | 0 | 2300 | 2685 | 85.7% | -| ov_SC03_015 | 2300 | 1727 | 0 | 2300 | 2685 | 85.7% | -| ov_SC03_023 | 2227 | 1702 | 0 | 2228 | 2435 | 91.5% | -| ov_SC03_024 | 2287 | 1707 | 0 | 2294 | 2641 | 86.9% | -| ov_SC03_028 | 2268 | 1702 | 0 | 2272 | 2664 | 85.3% | -| ov_SC03_029 | 2269 | 1704 | 0 | 2279 | 2644 | 86.2% | -| ov_SC03_030 | 2242 | 1707 | 0 | 2244 | 2495 | 89.9% | -| ov_SC03_031 | 2239 | 1702 | 0 | 2242 | 2514 | 89.2% | -| ov_SC03_089 | 2254 | 1702 | 0 | 2261 | 2581 | 87.6% | -| ov_SC03_090 | 2256 | 1702 | 0 | 2264 | 2625 | 86.2% | -| ov_SC03_091 | 2259 | 1702 | 0 | 2267 | 2640 | 85.9% | -| ov_SC03_092 | 2269 | 1702 | 0 | 2281 | 2587 | 88.2% | -| ov_SC03_093 | 2246 | 1702 | 0 | 2250 | 2563 | 87.8% | -| ov_SC03_094 | 2241 | 1702 | 0 | 2247 | 2577 | 87.2% | -| ov_SC03_095 | 2231 | 1702 | 0 | 2234 | 2474 | 90.3% | -| ov_SC03_096 | 2231 | 1702 | 0 | 2234 | 2465 | 90.6% | -| ov_SC03_097 | 2260 | 1702 | 0 | 2267 | 2603 | 87.1% | -| ov_SC03_098 | 2239 | 1702 | 0 | 2242 | 2541 | 88.2% | -| ov_SC03_099 | 2232 | 1702 | 0 | 2235 | 2504 | 89.3% | -| ov_SC03_100 | 2242 | 1702 | 0 | 2246 | 2539 | 88.5% | -| ov_SC03_101 | 2242 | 1702 | 0 | 2246 | 2528 | 88.8% | -| ov_SC03_102 | 2234 | 1702 | 0 | 2237 | 2492 | 89.8% | -| ov_SC03_103 | 2237 | 1704 | 0 | 2240 | 2510 | 89.2% | -| ov_SC03_104 | 2262 | 1702 | 0 | 2269 | 2616 | 86.7% | -| ov_SC03_105 | 2256 | 1702 | 0 | 2263 | 2597 | 87.1% | -| ov_SC03_108 | 2223 | 1702 | 0 | 2223 | 2443 | 91.0% | -| ov_SC03_109 | 2225 | 1702 | 0 | 2227 | 2424 | 91.9% | -| ov_SC03_110 | 2230 | 1702 | 0 | 2230 | 2468 | 90.4% | -| ov_SC03_111 | 2241 | 1702 | 0 | 2244 | 2510 | 89.4% | -| ov_SC03_112 | 2234 | 1704 | 0 | 2236 | 2526 | 88.5% | -| ov_SC03_113 | 2228 | 1704 | 0 | 2231 | 2468 | 90.4% | -| ov_SC03_114 | 2218 | 1702 | 0 | 2220 | 2415 | 91.9% | -| ov_SC03_115 | 2235 | 1702 | 0 | 2237 | 2472 | 90.5% | -| ov_SC03_116 | 2225 | 1702 | 0 | 2228 | 2438 | 91.4% | -| ov_SC03_117 | 2253 | 1702 | 0 | 2259 | 2557 | 88.3% | -| ov_SC03_118 | 2299 | 1726 | 0 | 2300 | 2685 | 85.7% | -| ov_SC03_119 | 2298 | 1726 | 0 | 2299 | 2685 | 85.6% | -| ov_SC03_121 | 2232 | 1702 | 0 | 2235 | 2459 | 90.9% | -| ov_SC03_124 | 2311 | 1698 | 0 | 2331 | 2741 | 85.0% | -| ov_SC03_125 | 2268 | 1702 | 0 | 2280 | 2588 | 88.1% | -| ov_SC03_126 | 2230 | 1704 | 0 | 2230 | 2423 | 92.0% | -| ov_SC04_000 | 2246 | 1706 | 0 | 2255 | 2546 | 88.6% | -| ov_SC04_002 | 2264 | 1702 | 0 | 2268 | 2636 | 86.0% | -| ov_SC04_003 | 2241 | 1702 | 0 | 2245 | 2502 | 89.7% | -| ov_SC04_004 | 2250 | 1702 | 0 | 2252 | 2558 | 88.0% | -| ov_SC04_005 | 2259 | 1702 | 0 | 2265 | 2612 | 86.7% | -| ov_SC04_006 | 2230 | 1702 | 0 | 2232 | 2454 | 91.0% | -| ov_SC04_007 | 2252 | 1702 | 0 | 2256 | 2569 | 87.8% | -| ov_SC04_008 | 2221 | 1702 | 0 | 2221 | 2415 | 92.0% | -| ov_SC04_009 | 2237 | 1702 | 0 | 2240 | 2441 | 91.8% | -| ov_SC04_010 | 2227 | 1702 | 0 | 2228 | 2419 | 92.1% | -| ov_SC04_011 | 2284 | 1702 | 0 | 2290 | 2803 | 81.7% | -| ov_SC04_012 | 2224 | 1702 | 0 | 2225 | 2420 | 91.9% | -| ov_SC04_015 | 2288 | 1703 | 0 | 2299 | 2611 | 88.1% | -| ov_SC04_016 | 2227 | 1702 | 0 | 2229 | 2440 | 91.4% | -| ov_SC04_018 | 2338 | 1737 | 0 | 2338 | 2857 | 81.8% | -| ov_SC04_019 | 2344 | 1737 | 0 | 2344 | 2857 | 82.0% | -| ov_SC04_020 | 2255 | 1702 | 0 | 2267 | 2567 | 88.3% | -| ov_SC04_021 | 2231 | 1704 | 0 | 2231 | 2423 | 92.1% | -| ov_SC05_000 | 2228 | 1706 | 0 | 2231 | 2422 | 92.1% | -| ov_SC05_001 | 2250 | 1702 | 0 | 2255 | 2574 | 87.6% | -| ov_SC05_002 | 2233 | 1702 | 0 | 2236 | 2442 | 91.6% | -| ov_SC05_003 | 2230 | 1702 | 0 | 2231 | 2481 | 89.9% | -| ov_SC05_004 | 2225 | 1702 | 0 | 2227 | 2464 | 90.4% | -| ov_SC05_005 | 2231 | 1702 | 0 | 2232 | 2491 | 89.6% | -| ov_SC05_006 | 2224 | 1702 | 0 | 2224 | 2430 | 91.5% | -| ov_SC05_007 | 2234 | 1702 | 0 | 2239 | 2482 | 90.2% | -| ov_SC05_008 | 2251 | 1702 | 0 | 2253 | 2543 | 88.6% | -| ov_SC05_009 | 2229 | 1702 | 0 | 2233 | 2438 | 91.6% | -| ov_SC05_010 | 2255 | 1702 | 0 | 2259 | 2588 | 87.3% | -| ov_SC05_011 | 2226 | 1702 | 0 | 2227 | 2409 | 92.4% | -| ov_SC05_017 | 2334 | 1699 | 0 | 2345 | 2842 | 82.5% | -| ov_SC05_018 | 2281 | 1702 | 0 | 2294 | 2673 | 85.8% | -| ov_SC05_019 | 2231 | 1704 | 0 | 2231 | 2423 | 92.1% | -| ov_SC06_000 | 2294 | 1711 | 0 | 2297 | 2691 | 85.4% | -| ov_SC06_006 | 2247 | 1702 | 0 | 2248 | 2511 | 89.5% | -| ov_SC06_008 | 2263 | 1704 | 0 | 2269 | 2542 | 89.3% | -| ov_SC06_010 | 2246 | 1702 | 0 | 2251 | 2517 | 89.4% | -| ov_SC06_011 | 2236 | 1702 | 0 | 2240 | 2468 | 90.8% | -| ov_SC06_013 | 2229 | 1702 | 0 | 2230 | 2425 | 92.0% | -| ov_SC06_014 | 2235 | 1702 | 0 | 2237 | 2453 | 91.2% | -| ov_SC06_015 | 2232 | 1702 | 0 | 2232 | 2421 | 92.2% | -| ov_SC06_016 | 2250 | 1702 | 0 | 2252 | 2549 | 88.3% | -| ov_SC06_018 | 2263 | 1705 | 0 | 2270 | 2665 | 85.2% | -| ov_SC06_020 | 2239 | 1704 | 0 | 2240 | 2518 | 89.0% | -| ov_SC06_022 | 2258 | 1702 | 0 | 2266 | 2642 | 85.8% | -| ov_SC06_024 | 2266 | 1702 | 0 | 2272 | 2667 | 85.2% | -| ov_SC06_025 | 2251 | 1702 | 0 | 2256 | 2572 | 87.7% | -| ov_SC06_027 | 2217 | 1702 | 0 | 2218 | 2408 | 92.1% | -| ov_SC06_029 | 2276 | 1702 | 0 | 2288 | 2662 | 86.0% | -| ov_SC06_030 | 2231 | 1702 | 0 | 2231 | 2456 | 90.8% | -| ov_SC06_032 | 2251 | 1703 | 0 | 2258 | 2658 | 85.0% | -| ov_SC06_033 | 2253 | 1703 | 0 | 2260 | 2631 | 85.9% | -| ov_SC07_000 | 2246 | 1706 | 0 | 2248 | 2521 | 89.2% | -| ov_SC07_001 | 2230 | 1702 | 0 | 2232 | 2454 | 91.0% | -| ov_SC07_002 | 2257 | 1702 | 0 | 2261 | 2579 | 87.7% | -| ov_SC07_006 | 2002 | 1550 | 0 | 2082 | 2455 | 84.8% | -| ov_SC07_007 | 2014 | 1550 | 0 | 2098 | 2613 | 80.3% | -| ov_SC07_008 | 2215 | 1702 | 0 | 2215 | 2386 | 92.8% | -| ov_SC07_009 | 2224 | 1702 | 0 | 2226 | 2430 | 91.6% | -| ov_SC07_010 | 2025 | 1550 | 0 | 2108 | 2524 | 83.5% | -| ov_SC07_011 | 2013 | 1549 | 0 | 2093 | 2449 | 85.5% | +| ov_SC01_000 | 2228 | 1709 | 0 | 2228 | 2403 | 92.7% | +| ov_SC01_001 | 2228 | 1708 | 0 | 2230 | 2466 | 90.4% | +| ov_SC01_004 | 2219 | 1699 | 0 | 2220 | 2414 | 92.0% | +| ov_SC01_005 | 2248 | 1721 | 0 | 2248 | 2503 | 89.8% | +| ov_SC01_006 | 2248 | 1721 | 0 | 2248 | 2503 | 89.8% | +| ov_SC01_008 | 2219 | 1699 | 0 | 2221 | 2426 | 91.5% | +| ov_SC01_009 | 2244 | 1700 | 0 | 2245 | 2507 | 89.5% | +| ov_SC01_074 | 2223 | 1700 | 0 | 2225 | 2425 | 91.8% | +| ov_SC01_077 | 2412 | 1669 | 0 | 2414 | 2585 | 93.4% | +| ov_SC01_080 | 2261 | 1703 | 0 | 2261 | 2512 | 90.0% | +| ov_SC01_084 | 2268 | 1703 | 0 | 2273 | 2579 | 88.1% | +| ov_SC02_000 | 2321 | 1738 | 0 | 2321 | 2683 | 86.5% | +| ov_SC02_003 | 2321 | 1738 | 0 | 2321 | 2683 | 86.5% | +| ov_SC02_004 | 2227 | 1703 | 0 | 2227 | 2401 | 92.8% | +| ov_SC02_005 | 2334 | 1699 | 0 | 2344 | 2927 | 80.1% | +| ov_SC02_011 | 2345 | 1706 | 0 | 2356 | 2893 | 81.4% | +| ov_SC02_015 | 2228 | 1705 | 0 | 2228 | 2414 | 92.3% | +| ov_SC02_016 | 2261 | 1705 | 0 | 2264 | 2545 | 89.0% | +| ov_SC02_017 | 2305 | 1705 | 0 | 2313 | 2732 | 84.7% | +| ov_SC02_021 | 2234 | 1705 | 0 | 2234 | 2437 | 91.7% | +| ov_SC02_026 | 2250 | 1703 | 0 | 2256 | 2572 | 87.7% | +| ov_SC02_027 | 2273 | 1703 | 0 | 2282 | 2692 | 84.8% | +| ov_SC02_028 | 2274 | 1703 | 0 | 2284 | 2701 | 84.6% | +| ov_SC02_031 | 2259 | 1704 | 0 | 2264 | 2562 | 88.4% | +| ov_SC02_035 | 2236 | 1703 | 0 | 2239 | 2520 | 88.8% | +| ov_SC02_039 | 2220 | 1703 | 0 | 2220 | 2416 | 91.9% | +| ov_SC02_041 | 2257 | 1703 | 0 | 2260 | 2561 | 88.2% | +| ov_SC03_001 | 2356 | 1704 | 0 | 2373 | 2869 | 82.7% | +| ov_SC03_002 | 2282 | 1708 | 0 | 2297 | 2631 | 87.3% | +| ov_SC03_003 | 2230 | 1703 | 0 | 2231 | 2423 | 92.1% | +| ov_SC03_006 | 2295 | 1709 | 0 | 2304 | 2767 | 83.3% | +| ov_SC03_007 | 2275 | 1703 | 0 | 2279 | 2623 | 86.9% | +| ov_SC03_010 | 2236 | 1703 | 0 | 2236 | 2470 | 90.5% | +| ov_SC03_011 | 2244 | 1703 | 0 | 2250 | 2527 | 89.0% | +| ov_SC03_012 | 2222 | 1703 | 0 | 2223 | 2406 | 92.4% | +| ov_SC03_013 | 2241 | 1703 | 0 | 2241 | 2492 | 89.9% | +| ov_SC03_014 | 2301 | 1728 | 0 | 2301 | 2685 | 85.7% | +| ov_SC03_015 | 2301 | 1728 | 0 | 2301 | 2685 | 85.7% | +| ov_SC03_023 | 2228 | 1703 | 0 | 2229 | 2435 | 91.5% | +| ov_SC03_024 | 2288 | 1708 | 0 | 2295 | 2641 | 86.9% | +| ov_SC03_028 | 2269 | 1703 | 0 | 2273 | 2664 | 85.3% | +| ov_SC03_029 | 2270 | 1705 | 0 | 2280 | 2644 | 86.2% | +| ov_SC03_030 | 2243 | 1708 | 0 | 2245 | 2495 | 90.0% | +| ov_SC03_031 | 2240 | 1703 | 0 | 2243 | 2514 | 89.2% | +| ov_SC03_089 | 2255 | 1703 | 0 | 2262 | 2581 | 87.6% | +| ov_SC03_090 | 2257 | 1703 | 0 | 2265 | 2625 | 86.3% | +| ov_SC03_091 | 2260 | 1703 | 0 | 2268 | 2640 | 85.9% | +| ov_SC03_092 | 2270 | 1703 | 0 | 2282 | 2587 | 88.2% | +| ov_SC03_093 | 2247 | 1703 | 0 | 2251 | 2563 | 87.8% | +| ov_SC03_094 | 2242 | 1703 | 0 | 2248 | 2577 | 87.2% | +| ov_SC03_095 | 2232 | 1703 | 0 | 2235 | 2474 | 90.3% | +| ov_SC03_096 | 2232 | 1703 | 0 | 2235 | 2465 | 90.7% | +| ov_SC03_097 | 2261 | 1703 | 0 | 2268 | 2603 | 87.1% | +| ov_SC03_098 | 2240 | 1703 | 0 | 2243 | 2541 | 88.3% | +| ov_SC03_099 | 2233 | 1703 | 0 | 2236 | 2504 | 89.3% | +| ov_SC03_100 | 2243 | 1703 | 0 | 2247 | 2539 | 88.5% | +| ov_SC03_101 | 2243 | 1703 | 0 | 2247 | 2528 | 88.9% | +| ov_SC03_102 | 2235 | 1703 | 0 | 2238 | 2492 | 89.8% | +| ov_SC03_103 | 2238 | 1705 | 0 | 2241 | 2510 | 89.3% | +| ov_SC03_104 | 2263 | 1703 | 0 | 2270 | 2616 | 86.8% | +| ov_SC03_105 | 2257 | 1703 | 0 | 2264 | 2597 | 87.2% | +| ov_SC03_108 | 2224 | 1703 | 0 | 2224 | 2443 | 91.0% | +| ov_SC03_109 | 2226 | 1703 | 0 | 2228 | 2424 | 91.9% | +| ov_SC03_110 | 2231 | 1703 | 0 | 2231 | 2468 | 90.4% | +| ov_SC03_111 | 2242 | 1703 | 0 | 2245 | 2510 | 89.4% | +| ov_SC03_112 | 2235 | 1705 | 0 | 2237 | 2526 | 88.6% | +| ov_SC03_113 | 2229 | 1705 | 0 | 2232 | 2468 | 90.4% | +| ov_SC03_114 | 2219 | 1703 | 0 | 2221 | 2415 | 92.0% | +| ov_SC03_115 | 2236 | 1703 | 0 | 2238 | 2472 | 90.5% | +| ov_SC03_116 | 2226 | 1703 | 0 | 2229 | 2438 | 91.4% | +| ov_SC03_117 | 2254 | 1703 | 0 | 2260 | 2557 | 88.4% | +| ov_SC03_118 | 2300 | 1727 | 0 | 2301 | 2685 | 85.7% | +| ov_SC03_119 | 2299 | 1727 | 0 | 2300 | 2685 | 85.7% | +| ov_SC03_121 | 2233 | 1703 | 0 | 2236 | 2459 | 90.9% | +| ov_SC03_124 | 2312 | 1699 | 0 | 2332 | 2741 | 85.1% | +| ov_SC03_125 | 2269 | 1703 | 0 | 2281 | 2588 | 88.1% | +| ov_SC03_126 | 2231 | 1705 | 0 | 2231 | 2423 | 92.1% | +| ov_SC04_000 | 2247 | 1707 | 0 | 2256 | 2546 | 88.6% | +| ov_SC04_002 | 2265 | 1703 | 0 | 2269 | 2636 | 86.1% | +| ov_SC04_003 | 2242 | 1703 | 0 | 2246 | 2502 | 89.8% | +| ov_SC04_004 | 2251 | 1703 | 0 | 2253 | 2558 | 88.1% | +| ov_SC04_005 | 2260 | 1703 | 0 | 2266 | 2612 | 86.8% | +| ov_SC04_006 | 2231 | 1703 | 0 | 2233 | 2454 | 91.0% | +| ov_SC04_007 | 2253 | 1703 | 0 | 2257 | 2569 | 87.9% | +| ov_SC04_008 | 2222 | 1703 | 0 | 2222 | 2415 | 92.0% | +| ov_SC04_009 | 2238 | 1703 | 0 | 2241 | 2441 | 91.8% | +| ov_SC04_010 | 2228 | 1703 | 0 | 2229 | 2419 | 92.1% | +| ov_SC04_011 | 2285 | 1703 | 0 | 2291 | 2803 | 81.7% | +| ov_SC04_012 | 2225 | 1703 | 0 | 2226 | 2420 | 92.0% | +| ov_SC04_015 | 2289 | 1704 | 0 | 2300 | 2611 | 88.1% | +| ov_SC04_016 | 2228 | 1703 | 0 | 2230 | 2440 | 91.4% | +| ov_SC04_018 | 2339 | 1738 | 0 | 2339 | 2857 | 81.9% | +| ov_SC04_019 | 2345 | 1738 | 0 | 2345 | 2857 | 82.1% | +| ov_SC04_020 | 2256 | 1703 | 0 | 2268 | 2567 | 88.4% | +| ov_SC04_021 | 2232 | 1705 | 0 | 2232 | 2423 | 92.1% | +| ov_SC05_000 | 2229 | 1707 | 0 | 2232 | 2422 | 92.2% | +| ov_SC05_001 | 2251 | 1703 | 0 | 2256 | 2574 | 87.6% | +| ov_SC05_002 | 2234 | 1703 | 0 | 2237 | 2442 | 91.6% | +| ov_SC05_003 | 2231 | 1703 | 0 | 2232 | 2481 | 90.0% | +| ov_SC05_004 | 2226 | 1703 | 0 | 2228 | 2464 | 90.4% | +| ov_SC05_005 | 2232 | 1703 | 0 | 2233 | 2491 | 89.6% | +| ov_SC05_006 | 2225 | 1703 | 0 | 2225 | 2430 | 91.6% | +| ov_SC05_007 | 2235 | 1703 | 0 | 2240 | 2482 | 90.2% | +| ov_SC05_008 | 2252 | 1703 | 0 | 2254 | 2543 | 88.6% | +| ov_SC05_009 | 2230 | 1703 | 0 | 2234 | 2438 | 91.6% | +| ov_SC05_010 | 2256 | 1703 | 0 | 2260 | 2588 | 87.3% | +| ov_SC05_011 | 2227 | 1703 | 0 | 2228 | 2409 | 92.5% | +| ov_SC05_017 | 2335 | 1700 | 0 | 2346 | 2842 | 82.5% | +| ov_SC05_018 | 2282 | 1703 | 0 | 2295 | 2673 | 85.9% | +| ov_SC05_019 | 2232 | 1705 | 0 | 2232 | 2423 | 92.1% | +| ov_SC06_000 | 2295 | 1712 | 0 | 2298 | 2691 | 85.4% | +| ov_SC06_006 | 2248 | 1703 | 0 | 2249 | 2511 | 89.6% | +| ov_SC06_008 | 2264 | 1705 | 0 | 2270 | 2542 | 89.3% | +| ov_SC06_010 | 2247 | 1703 | 0 | 2252 | 2517 | 89.5% | +| ov_SC06_011 | 2237 | 1703 | 0 | 2241 | 2468 | 90.8% | +| ov_SC06_013 | 2230 | 1703 | 0 | 2231 | 2425 | 92.0% | +| ov_SC06_014 | 2236 | 1703 | 0 | 2238 | 2453 | 91.2% | +| ov_SC06_015 | 2233 | 1703 | 0 | 2233 | 2421 | 92.2% | +| ov_SC06_016 | 2251 | 1703 | 0 | 2253 | 2549 | 88.4% | +| ov_SC06_018 | 2264 | 1706 | 0 | 2271 | 2665 | 85.2% | +| ov_SC06_020 | 2240 | 1705 | 0 | 2241 | 2518 | 89.0% | +| ov_SC06_022 | 2259 | 1703 | 0 | 2267 | 2642 | 85.8% | +| ov_SC06_024 | 2267 | 1703 | 0 | 2273 | 2667 | 85.2% | +| ov_SC06_025 | 2252 | 1703 | 0 | 2257 | 2572 | 87.8% | +| ov_SC06_027 | 2218 | 1703 | 0 | 2219 | 2408 | 92.2% | +| ov_SC06_029 | 2277 | 1703 | 0 | 2289 | 2662 | 86.0% | +| ov_SC06_030 | 2232 | 1703 | 0 | 2232 | 2456 | 90.9% | +| ov_SC06_032 | 2252 | 1704 | 0 | 2259 | 2658 | 85.0% | +| ov_SC06_033 | 2254 | 1704 | 0 | 2261 | 2631 | 85.9% | +| ov_SC07_000 | 2247 | 1707 | 0 | 2249 | 2521 | 89.2% | +| ov_SC07_001 | 2231 | 1703 | 0 | 2233 | 2454 | 91.0% | +| ov_SC07_002 | 2258 | 1703 | 0 | 2262 | 2579 | 87.7% | +| ov_SC07_006 | 2003 | 1551 | 0 | 2083 | 2455 | 84.8% | +| ov_SC07_007 | 2015 | 1551 | 0 | 2099 | 2613 | 80.3% | +| ov_SC07_008 | 2216 | 1703 | 0 | 2216 | 2386 | 92.9% | +| ov_SC07_009 | 2225 | 1703 | 0 | 2227 | 2430 | 91.6% | +| ov_SC07_010 | 2026 | 1551 | 0 | 2109 | 2524 | 83.6% | +| ov_SC07_011 | 2014 | 1550 | 0 | 2094 | 2449 | 85.5% | diff --git a/phase-ends/CURRENT_PHASE.md b/phase-ends/CURRENT_PHASE.md index 0041b5066..ba1be2de0 100644 --- a/phase-ends/CURRENT_PHASE.md +++ b/phase-ends/CURRENT_PHASE.md @@ -1537,3 +1537,23 @@ conditional) · main-EXE/B9 + GLM/B6 + resident's 14 walls (P30) · behemoths B7 > - **DO NOT close P29 on ROI** — burn-down floor still undetermined (needs 3 session-close deltas; this is one). > **CARRIED:** the 8 session-limit-unfinished drafts (redraft when the limit resets); `func_80165CA0`/the > diverging tail families are documented walls — do NOT re-sweep. + +> **🔥 SESSION-13 LATE UPDATE (R35 — the probe REVERSED the "low-ROI/spent" verdict). Commit ``.** +> Ran the bounded header-decl probe on **func_8014CD80** (138 live, 0 matched, universal body, clean MATCH +> draft). Blocker = engine_core.h `DEFINE_func_8014CD0C()` declares it `void(s32,void*,void*)` vs byte-true +> `int(s32,u16*,u16*)`. **One byte-neutral header edit → harvest_verify ×1 BYTE-IDENTICAL → `dedup_propagate +> --addr` 138/138 byte-identical (live 138→0) → R22 140/140.** **THE FRESH-138 FAMILIES ARE RECOVERABLE ×138** +> — the def-side header decl was the ONLY blocker (func_80165CA0's 0/135 was a non-universal *body*, a +> different failure mode). Fleet **78.7→78.8% instr · 88.22→88.26% fn-count** from this ONE family. +> **Quantified market: 38 of the 75 fresh (≥100-live) families carry the exact pattern** (engine_core.h caller +> forward-decl, simplified `void`/`void*`) → each a candidate ×138 ≈ **+1.5–2.8pp instr**. → decision-log. +> +> **▶ THE SINGLE NEXT TASK (supersedes the options above for the FRESH pool):** build **`tools/fix_header_decl.py`** +> — given a fn with a MATCH draft (or banked def), parse the byte-true sig, rewrite EVERY engine_core.h +> forward-decl of that fn to match (byte-neutral: ptr-width-compatible + return-ignored callers), then hand to +> the existing `harvest_verify → dedup_propagate --addr → R22` chain. It edits fleet-shared engine_core.h → MUST +> use the §61 snapshot-undo (restore, never inverse) + validate FLEET-WIDE (R22, not the per-binary gate). +> Then run a **fresh-family wave** (`build_wave_args.py --rank live --min-live 100`, needs agent budget — reset +> ~1:40am Denver) over the 38, gate each through fix_header_decl. Expected: ~half-to-most bank ×138 (each +> draft's BODY must be universal + byte-correct — that's the residual risk, not the header). This is option (b) +> reopened as the campaign's best lever. **The onboarded-tail low-ROI read still stands; only the FRESH read flipped.** diff --git a/src/ov_SC01_000/ov_SC01_000_after.c b/src/ov_SC01_000/ov_SC01_000_after.c index 5176e3e15..a46a54bbd 100644 --- a/src/ov_SC01_000/ov_SC01_000_after.c +++ b/src/ov_SC01_000/ov_SC01_000_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000_after", func_8014CF04); diff --git a/src/ov_SC01_001/ov_SC01_001_after.c b/src/ov_SC01_001/ov_SC01_001_after.c index 5c61e3e23..0930f9090 100644 --- a/src/ov_SC01_001/ov_SC01_001_after.c +++ b/src/ov_SC01_001/ov_SC01_001_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001_after", func_8014CF04); diff --git a/src/ov_SC01_004/ov_SC01_004_after.c b/src/ov_SC01_004/ov_SC01_004_after.c index 9a407f246..55edda366 100644 --- a/src/ov_SC01_004/ov_SC01_004_after.c +++ b/src/ov_SC01_004/ov_SC01_004_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004_after", func_8014CF04); diff --git a/src/ov_SC01_005/ov_SC01_005_after.c b/src/ov_SC01_005/ov_SC01_005_after.c index e42644b9d..1b6389f24 100644 --- a/src/ov_SC01_005/ov_SC01_005_after.c +++ b/src/ov_SC01_005/ov_SC01_005_after.c @@ -1299,7 +1299,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005_after", func_8014CF04); diff --git a/src/ov_SC01_006/ov_SC01_006_after.c b/src/ov_SC01_006/ov_SC01_006_after.c index 77e372f48..958ce76d1 100644 --- a/src/ov_SC01_006/ov_SC01_006_after.c +++ b/src/ov_SC01_006/ov_SC01_006_after.c @@ -1299,7 +1299,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006_after", func_8014CF04); diff --git a/src/ov_SC01_008/ov_SC01_008_after.c b/src/ov_SC01_008/ov_SC01_008_after.c index 97b31a39a..b5b3312b2 100644 --- a/src/ov_SC01_008/ov_SC01_008_after.c +++ b/src/ov_SC01_008/ov_SC01_008_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008_after", func_8014CF04); diff --git a/src/ov_SC01_009/ov_SC01_009_after.c b/src/ov_SC01_009/ov_SC01_009_after.c index fc4eecd9b..88e871279 100644 --- a/src/ov_SC01_009/ov_SC01_009_after.c +++ b/src/ov_SC01_009/ov_SC01_009_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009_after", func_8014CF04); diff --git a/src/ov_SC01_074/ov_SC01_074_after.c b/src/ov_SC01_074/ov_SC01_074_after.c index 3cdc6bef1..9caf996f8 100644 --- a/src/ov_SC01_074/ov_SC01_074_after.c +++ b/src/ov_SC01_074/ov_SC01_074_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074_after", func_8014CF04); diff --git a/src/ov_SC01_077/ov_SC01_077_after.c b/src/ov_SC01_077/ov_SC01_077_after.c index bbb6126b4..c0f9a25fc 100644 --- a/src/ov_SC01_077/ov_SC01_077_after.c +++ b/src/ov_SC01_077/ov_SC01_077_after.c @@ -1487,7 +1487,7 @@ void func_8014CCB4(void) /* func_8014CD0C — overlay ov_SC01_077 shared core */ DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077_after", func_8014CF04); diff --git a/src/ov_SC01_080/ov_SC01_080_after.c b/src/ov_SC01_080/ov_SC01_080_after.c index fbbed9bce..41eb62f29 100644 --- a/src/ov_SC01_080/ov_SC01_080_after.c +++ b/src/ov_SC01_080/ov_SC01_080_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080_after", func_8014CF04); diff --git a/src/ov_SC01_084/ov_SC01_084_after.c b/src/ov_SC01_084/ov_SC01_084_after.c index f4c5dc000..19118338f 100644 --- a/src/ov_SC01_084/ov_SC01_084_after.c +++ b/src/ov_SC01_084/ov_SC01_084_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084_after", func_8014CF04); diff --git a/src/ov_SC02_000/ov_SC02_000_after.c b/src/ov_SC02_000/ov_SC02_000_after.c index f6a10e8e3..1f35791d1 100644 --- a/src/ov_SC02_000/ov_SC02_000_after.c +++ b/src/ov_SC02_000/ov_SC02_000_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000_after", func_8014CF04); diff --git a/src/ov_SC02_003/ov_SC02_003_after.c b/src/ov_SC02_003/ov_SC02_003_after.c index fa60a70ab..577e9321a 100644 --- a/src/ov_SC02_003/ov_SC02_003_after.c +++ b/src/ov_SC02_003/ov_SC02_003_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_after", func_8014CF04); diff --git a/src/ov_SC02_004/ov_SC02_004_after.c b/src/ov_SC02_004/ov_SC02_004_after.c index f996f8256..a52c4ff36 100644 --- a/src/ov_SC02_004/ov_SC02_004_after.c +++ b/src/ov_SC02_004/ov_SC02_004_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004_after", func_8014CF04); diff --git a/src/ov_SC02_005/ov_SC02_005_after.c b/src/ov_SC02_005/ov_SC02_005_after.c index e859a3ea6..d91c9ac17 100644 --- a/src/ov_SC02_005/ov_SC02_005_after.c +++ b/src/ov_SC02_005/ov_SC02_005_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005_after", func_8014CF04); diff --git a/src/ov_SC02_011/ov_SC02_011_after.c b/src/ov_SC02_011/ov_SC02_011_after.c index e7f690f61..de5213654 100644 --- a/src/ov_SC02_011/ov_SC02_011_after.c +++ b/src/ov_SC02_011/ov_SC02_011_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_after", func_8014CF04); diff --git a/src/ov_SC02_015/ov_SC02_015_after.c b/src/ov_SC02_015/ov_SC02_015_after.c index 329090bd8..3448e291d 100644 --- a/src/ov_SC02_015/ov_SC02_015_after.c +++ b/src/ov_SC02_015/ov_SC02_015_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015_after", func_8014CF04); diff --git a/src/ov_SC02_016/ov_SC02_016_after.c b/src/ov_SC02_016/ov_SC02_016_after.c index 1bfcbc1d2..4892d1cda 100644 --- a/src/ov_SC02_016/ov_SC02_016_after.c +++ b/src/ov_SC02_016/ov_SC02_016_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016_after", func_8014CF04); diff --git a/src/ov_SC02_017/ov_SC02_017_after.c b/src/ov_SC02_017/ov_SC02_017_after.c index fef21c0c7..add351acb 100644 --- a/src/ov_SC02_017/ov_SC02_017_after.c +++ b/src/ov_SC02_017/ov_SC02_017_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017_after", func_8014CF04); diff --git a/src/ov_SC02_021/ov_SC02_021_after.c b/src/ov_SC02_021/ov_SC02_021_after.c index a0c1ced58..99fcec05e 100644 --- a/src/ov_SC02_021/ov_SC02_021_after.c +++ b/src/ov_SC02_021/ov_SC02_021_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021_after", func_8014CF04); diff --git a/src/ov_SC02_026/ov_SC02_026_after.c b/src/ov_SC02_026/ov_SC02_026_after.c index cc4ffde27..67bdfc452 100644 --- a/src/ov_SC02_026/ov_SC02_026_after.c +++ b/src/ov_SC02_026/ov_SC02_026_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026_after", func_8014CF04); diff --git a/src/ov_SC02_027/ov_SC02_027_after.c b/src/ov_SC02_027/ov_SC02_027_after.c index da627bf1a..150b9ae27 100644 --- a/src/ov_SC02_027/ov_SC02_027_after.c +++ b/src/ov_SC02_027/ov_SC02_027_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027_after", func_8014CF04); diff --git a/src/ov_SC02_028/ov_SC02_028_after.c b/src/ov_SC02_028/ov_SC02_028_after.c index 255d97f3f..e4beb74e1 100644 --- a/src/ov_SC02_028/ov_SC02_028_after.c +++ b/src/ov_SC02_028/ov_SC02_028_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028_after", func_8014CF04); diff --git a/src/ov_SC02_031/ov_SC02_031_after.c b/src/ov_SC02_031/ov_SC02_031_after.c index 31868ab21..3d8dc1150 100644 --- a/src/ov_SC02_031/ov_SC02_031_after.c +++ b/src/ov_SC02_031/ov_SC02_031_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031_after", func_8014CF04); diff --git a/src/ov_SC02_035/ov_SC02_035_after.c b/src/ov_SC02_035/ov_SC02_035_after.c index 1a4e76e59..5bc51c231 100644 --- a/src/ov_SC02_035/ov_SC02_035_after.c +++ b/src/ov_SC02_035/ov_SC02_035_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035_after", func_8014CF04); diff --git a/src/ov_SC02_039/ov_SC02_039_after.c b/src/ov_SC02_039/ov_SC02_039_after.c index 041f91575..95bf3350e 100644 --- a/src/ov_SC02_039/ov_SC02_039_after.c +++ b/src/ov_SC02_039/ov_SC02_039_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039_after", func_8014CF04); diff --git a/src/ov_SC02_041/ov_SC02_041_after.c b/src/ov_SC02_041/ov_SC02_041_after.c index 4efa2da08..6c2c51dae 100644 --- a/src/ov_SC02_041/ov_SC02_041_after.c +++ b/src/ov_SC02_041/ov_SC02_041_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041_after", func_8014CF04); diff --git a/src/ov_SC03_001/ov_SC03_001_after.c b/src/ov_SC03_001/ov_SC03_001_after.c index 9e7eb9326..6c7ae79c6 100644 --- a/src/ov_SC03_001/ov_SC03_001_after.c +++ b/src/ov_SC03_001/ov_SC03_001_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001_after", func_8014CF04); diff --git a/src/ov_SC03_002/ov_SC03_002_after.c b/src/ov_SC03_002/ov_SC03_002_after.c index f40db30db..aac1cb969 100644 --- a/src/ov_SC03_002/ov_SC03_002_after.c +++ b/src/ov_SC03_002/ov_SC03_002_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002_after", func_8014CF04); diff --git a/src/ov_SC03_003/ov_SC03_003_after.c b/src/ov_SC03_003/ov_SC03_003_after.c index 80a0cc119..79be9f298 100644 --- a/src/ov_SC03_003/ov_SC03_003_after.c +++ b/src/ov_SC03_003/ov_SC03_003_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003_after", func_8014CF04); diff --git a/src/ov_SC03_006/ov_SC03_006_after.c b/src/ov_SC03_006/ov_SC03_006_after.c index 62c097758..a3175fd49 100644 --- a/src/ov_SC03_006/ov_SC03_006_after.c +++ b/src/ov_SC03_006/ov_SC03_006_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006_after", func_8014CF04); diff --git a/src/ov_SC03_007/ov_SC03_007_after.c b/src/ov_SC03_007/ov_SC03_007_after.c index f00a2c286..5a345da97 100644 --- a/src/ov_SC03_007/ov_SC03_007_after.c +++ b/src/ov_SC03_007/ov_SC03_007_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007_after", func_8014CF04); diff --git a/src/ov_SC03_010/ov_SC03_010_after.c b/src/ov_SC03_010/ov_SC03_010_after.c index e8090cf37..29a9f0b6c 100644 --- a/src/ov_SC03_010/ov_SC03_010_after.c +++ b/src/ov_SC03_010/ov_SC03_010_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010_after", func_8014CF04); diff --git a/src/ov_SC03_011/ov_SC03_011_after.c b/src/ov_SC03_011/ov_SC03_011_after.c index 33790d3c5..6a9ee5abb 100644 --- a/src/ov_SC03_011/ov_SC03_011_after.c +++ b/src/ov_SC03_011/ov_SC03_011_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011_after", func_8014CF04); diff --git a/src/ov_SC03_012/ov_SC03_012_after.c b/src/ov_SC03_012/ov_SC03_012_after.c index dab41e048..2b503873e 100644 --- a/src/ov_SC03_012/ov_SC03_012_after.c +++ b/src/ov_SC03_012/ov_SC03_012_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012_after", func_8014CF04); diff --git a/src/ov_SC03_013/ov_SC03_013_after.c b/src/ov_SC03_013/ov_SC03_013_after.c index 6ec68ecbf..ca993656b 100644 --- a/src/ov_SC03_013/ov_SC03_013_after.c +++ b/src/ov_SC03_013/ov_SC03_013_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013_after", func_8014CF04); diff --git a/src/ov_SC03_014/ov_SC03_014_after.c b/src/ov_SC03_014/ov_SC03_014_after.c index d3cc39c63..2efdc19a0 100644 --- a/src/ov_SC03_014/ov_SC03_014_after.c +++ b/src/ov_SC03_014/ov_SC03_014_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014_after", func_8014CF04); diff --git a/src/ov_SC03_015/ov_SC03_015_after.c b/src/ov_SC03_015/ov_SC03_015_after.c index 6de065454..abdb198b8 100644 --- a/src/ov_SC03_015/ov_SC03_015_after.c +++ b/src/ov_SC03_015/ov_SC03_015_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015_after", func_8014CF04); diff --git a/src/ov_SC03_023/ov_SC03_023_after.c b/src/ov_SC03_023/ov_SC03_023_after.c index 3f3e0ded6..9d4929265 100644 --- a/src/ov_SC03_023/ov_SC03_023_after.c +++ b/src/ov_SC03_023/ov_SC03_023_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023_after", func_8014CF04); diff --git a/src/ov_SC03_024/ov_SC03_024_after.c b/src/ov_SC03_024/ov_SC03_024_after.c index c19e59d9a..df8a25565 100644 --- a/src/ov_SC03_024/ov_SC03_024_after.c +++ b/src/ov_SC03_024/ov_SC03_024_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024_after", func_8014CF04); diff --git a/src/ov_SC03_028/ov_SC03_028_after.c b/src/ov_SC03_028/ov_SC03_028_after.c index 604c271d2..6fe53c4d7 100644 --- a/src/ov_SC03_028/ov_SC03_028_after.c +++ b/src/ov_SC03_028/ov_SC03_028_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028_after", func_8014CF04); diff --git a/src/ov_SC03_029/ov_SC03_029_after.c b/src/ov_SC03_029/ov_SC03_029_after.c index dcef20005..7bf231d30 100644 --- a/src/ov_SC03_029/ov_SC03_029_after.c +++ b/src/ov_SC03_029/ov_SC03_029_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029_after", func_8014CF04); diff --git a/src/ov_SC03_030/ov_SC03_030_after.c b/src/ov_SC03_030/ov_SC03_030_after.c index 7de537fbf..a4b4d0ca2 100644 --- a/src/ov_SC03_030/ov_SC03_030_after.c +++ b/src/ov_SC03_030/ov_SC03_030_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030_after", func_8014CF04); diff --git a/src/ov_SC03_031/ov_SC03_031_after.c b/src/ov_SC03_031/ov_SC03_031_after.c index c7feed844..aeb2e1451 100644 --- a/src/ov_SC03_031/ov_SC03_031_after.c +++ b/src/ov_SC03_031/ov_SC03_031_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031_after", func_8014CF04); diff --git a/src/ov_SC03_089/ov_SC03_089_after.c b/src/ov_SC03_089/ov_SC03_089_after.c index 02104fa91..11c76ffa4 100644 --- a/src/ov_SC03_089/ov_SC03_089_after.c +++ b/src/ov_SC03_089/ov_SC03_089_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089_after", func_8014CF04); diff --git a/src/ov_SC03_090/ov_SC03_090_after.c b/src/ov_SC03_090/ov_SC03_090_after.c index bdeaa355a..a79b9c60d 100644 --- a/src/ov_SC03_090/ov_SC03_090_after.c +++ b/src/ov_SC03_090/ov_SC03_090_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090_after", func_8014CF04); diff --git a/src/ov_SC03_091/ov_SC03_091_after.c b/src/ov_SC03_091/ov_SC03_091_after.c index 8a0340e79..f46ba0453 100644 --- a/src/ov_SC03_091/ov_SC03_091_after.c +++ b/src/ov_SC03_091/ov_SC03_091_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091_after", func_8014CF04); diff --git a/src/ov_SC03_092/ov_SC03_092_after.c b/src/ov_SC03_092/ov_SC03_092_after.c index 7241d3357..9fd36dbd4 100644 --- a/src/ov_SC03_092/ov_SC03_092_after.c +++ b/src/ov_SC03_092/ov_SC03_092_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092_after", func_8014CF04); diff --git a/src/ov_SC03_093/ov_SC03_093_after.c b/src/ov_SC03_093/ov_SC03_093_after.c index 7ab760005..0fddba6f4 100644 --- a/src/ov_SC03_093/ov_SC03_093_after.c +++ b/src/ov_SC03_093/ov_SC03_093_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093_after", func_8014CF04); diff --git a/src/ov_SC03_094/ov_SC03_094_after.c b/src/ov_SC03_094/ov_SC03_094_after.c index 292e22558..fbb2283c3 100644 --- a/src/ov_SC03_094/ov_SC03_094_after.c +++ b/src/ov_SC03_094/ov_SC03_094_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094_after", func_8014CF04); diff --git a/src/ov_SC03_095/ov_SC03_095_after.c b/src/ov_SC03_095/ov_SC03_095_after.c index 8f2373fc3..fb34632a9 100644 --- a/src/ov_SC03_095/ov_SC03_095_after.c +++ b/src/ov_SC03_095/ov_SC03_095_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095_after", func_8014CF04); diff --git a/src/ov_SC03_096/ov_SC03_096_after.c b/src/ov_SC03_096/ov_SC03_096_after.c index 1445db28e..aa2ae515c 100644 --- a/src/ov_SC03_096/ov_SC03_096_after.c +++ b/src/ov_SC03_096/ov_SC03_096_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096_after", func_8014CF04); diff --git a/src/ov_SC03_097/ov_SC03_097_after.c b/src/ov_SC03_097/ov_SC03_097_after.c index cd661940c..15caf2a89 100644 --- a/src/ov_SC03_097/ov_SC03_097_after.c +++ b/src/ov_SC03_097/ov_SC03_097_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097_after", func_8014CF04); diff --git a/src/ov_SC03_098/ov_SC03_098_after.c b/src/ov_SC03_098/ov_SC03_098_after.c index dd9c63864..6444739ea 100644 --- a/src/ov_SC03_098/ov_SC03_098_after.c +++ b/src/ov_SC03_098/ov_SC03_098_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098_after", func_8014CF04); diff --git a/src/ov_SC03_099/ov_SC03_099_after.c b/src/ov_SC03_099/ov_SC03_099_after.c index 3fc3950bf..e1b6e777e 100644 --- a/src/ov_SC03_099/ov_SC03_099_after.c +++ b/src/ov_SC03_099/ov_SC03_099_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099_after", func_8014CF04); diff --git a/src/ov_SC03_100/ov_SC03_100_after.c b/src/ov_SC03_100/ov_SC03_100_after.c index e8caf27b9..8699976d2 100644 --- a/src/ov_SC03_100/ov_SC03_100_after.c +++ b/src/ov_SC03_100/ov_SC03_100_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100_after", func_8014CF04); diff --git a/src/ov_SC03_101/ov_SC03_101_after.c b/src/ov_SC03_101/ov_SC03_101_after.c index 0e2486478..aeb347850 100644 --- a/src/ov_SC03_101/ov_SC03_101_after.c +++ b/src/ov_SC03_101/ov_SC03_101_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101_after", func_8014CF04); diff --git a/src/ov_SC03_102/ov_SC03_102_after.c b/src/ov_SC03_102/ov_SC03_102_after.c index be512dd6e..1fce6293c 100644 --- a/src/ov_SC03_102/ov_SC03_102_after.c +++ b/src/ov_SC03_102/ov_SC03_102_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102_after", func_8014CF04); diff --git a/src/ov_SC03_103/ov_SC03_103_after.c b/src/ov_SC03_103/ov_SC03_103_after.c index 18c00c525..2343145b6 100644 --- a/src/ov_SC03_103/ov_SC03_103_after.c +++ b/src/ov_SC03_103/ov_SC03_103_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103_after", func_8014CF04); diff --git a/src/ov_SC03_104/ov_SC03_104_after.c b/src/ov_SC03_104/ov_SC03_104_after.c index 90252e689..66504a59e 100644 --- a/src/ov_SC03_104/ov_SC03_104_after.c +++ b/src/ov_SC03_104/ov_SC03_104_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104_after", func_8014CF04); diff --git a/src/ov_SC03_105/ov_SC03_105_after.c b/src/ov_SC03_105/ov_SC03_105_after.c index 0cb313759..7d5c0a072 100644 --- a/src/ov_SC03_105/ov_SC03_105_after.c +++ b/src/ov_SC03_105/ov_SC03_105_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105_after", func_8014CF04); diff --git a/src/ov_SC03_108/ov_SC03_108_after.c b/src/ov_SC03_108/ov_SC03_108_after.c index 5eba81093..0951fb776 100644 --- a/src/ov_SC03_108/ov_SC03_108_after.c +++ b/src/ov_SC03_108/ov_SC03_108_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108_after", func_8014CF04); diff --git a/src/ov_SC03_109/ov_SC03_109_after.c b/src/ov_SC03_109/ov_SC03_109_after.c index 4d9c74f40..02462f626 100644 --- a/src/ov_SC03_109/ov_SC03_109_after.c +++ b/src/ov_SC03_109/ov_SC03_109_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109_after", func_8014CF04); diff --git a/src/ov_SC03_110/ov_SC03_110_after.c b/src/ov_SC03_110/ov_SC03_110_after.c index ed37e63ed..48ebc736c 100644 --- a/src/ov_SC03_110/ov_SC03_110_after.c +++ b/src/ov_SC03_110/ov_SC03_110_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110_after", func_8014CF04); diff --git a/src/ov_SC03_111/ov_SC03_111_after.c b/src/ov_SC03_111/ov_SC03_111_after.c index 55fd6e7ae..20dd07f76 100644 --- a/src/ov_SC03_111/ov_SC03_111_after.c +++ b/src/ov_SC03_111/ov_SC03_111_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111_after", func_8014CF04); diff --git a/src/ov_SC03_112/ov_SC03_112_after.c b/src/ov_SC03_112/ov_SC03_112_after.c index c5387a005..0efe7a772 100644 --- a/src/ov_SC03_112/ov_SC03_112_after.c +++ b/src/ov_SC03_112/ov_SC03_112_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112_after", func_8014CF04); diff --git a/src/ov_SC03_113/ov_SC03_113_after.c b/src/ov_SC03_113/ov_SC03_113_after.c index e4ad6908a..4c5f6bb3e 100644 --- a/src/ov_SC03_113/ov_SC03_113_after.c +++ b/src/ov_SC03_113/ov_SC03_113_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113_after", func_8014CF04); diff --git a/src/ov_SC03_114/ov_SC03_114_after.c b/src/ov_SC03_114/ov_SC03_114_after.c index d0a4b49da..360d93c98 100644 --- a/src/ov_SC03_114/ov_SC03_114_after.c +++ b/src/ov_SC03_114/ov_SC03_114_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114_after", func_8014CF04); diff --git a/src/ov_SC03_115/ov_SC03_115_after.c b/src/ov_SC03_115/ov_SC03_115_after.c index 9e26c39b4..b2410ad48 100644 --- a/src/ov_SC03_115/ov_SC03_115_after.c +++ b/src/ov_SC03_115/ov_SC03_115_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115_after", func_8014CF04); diff --git a/src/ov_SC03_116/ov_SC03_116_after.c b/src/ov_SC03_116/ov_SC03_116_after.c index 7c50a8890..7ef5c37a5 100644 --- a/src/ov_SC03_116/ov_SC03_116_after.c +++ b/src/ov_SC03_116/ov_SC03_116_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116_after", func_8014CF04); diff --git a/src/ov_SC03_117/ov_SC03_117_after.c b/src/ov_SC03_117/ov_SC03_117_after.c index 8b21eea7a..008b6c235 100644 --- a/src/ov_SC03_117/ov_SC03_117_after.c +++ b/src/ov_SC03_117/ov_SC03_117_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117_after", func_8014CF04); diff --git a/src/ov_SC03_118/ov_SC03_118_after.c b/src/ov_SC03_118/ov_SC03_118_after.c index e6b135edf..b7a063244 100644 --- a/src/ov_SC03_118/ov_SC03_118_after.c +++ b/src/ov_SC03_118/ov_SC03_118_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118_after", func_8014CF04); diff --git a/src/ov_SC03_119/ov_SC03_119_after.c b/src/ov_SC03_119/ov_SC03_119_after.c index ae7cc1e01..0948a8870 100644 --- a/src/ov_SC03_119/ov_SC03_119_after.c +++ b/src/ov_SC03_119/ov_SC03_119_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119_after", func_8014CF04); diff --git a/src/ov_SC03_121/ov_SC03_121_after.c b/src/ov_SC03_121/ov_SC03_121_after.c index 90f97920a..037e1451b 100644 --- a/src/ov_SC03_121/ov_SC03_121_after.c +++ b/src/ov_SC03_121/ov_SC03_121_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121_after", func_8014CF04); diff --git a/src/ov_SC03_124/ov_SC03_124_after.c b/src/ov_SC03_124/ov_SC03_124_after.c index d7f582ef6..fe7ecad3b 100644 --- a/src/ov_SC03_124/ov_SC03_124_after.c +++ b/src/ov_SC03_124/ov_SC03_124_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124_after", func_8014CF04); diff --git a/src/ov_SC03_125/ov_SC03_125_after.c b/src/ov_SC03_125/ov_SC03_125_after.c index 5a93aa5dd..e0fb8c743 100644 --- a/src/ov_SC03_125/ov_SC03_125_after.c +++ b/src/ov_SC03_125/ov_SC03_125_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125_after", func_8014CF04); diff --git a/src/ov_SC03_126/ov_SC03_126_after.c b/src/ov_SC03_126/ov_SC03_126_after.c index c836ca47f..783622e40 100644 --- a/src/ov_SC03_126/ov_SC03_126_after.c +++ b/src/ov_SC03_126/ov_SC03_126_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126_after", func_8014CF04); diff --git a/src/ov_SC04_000/ov_SC04_000_after.c b/src/ov_SC04_000/ov_SC04_000_after.c index 96fc3ef22..f3902679e 100644 --- a/src/ov_SC04_000/ov_SC04_000_after.c +++ b/src/ov_SC04_000/ov_SC04_000_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000_after", func_8014CF04); diff --git a/src/ov_SC04_002/ov_SC04_002_after.c b/src/ov_SC04_002/ov_SC04_002_after.c index 32c0ff328..7982eb604 100644 --- a/src/ov_SC04_002/ov_SC04_002_after.c +++ b/src/ov_SC04_002/ov_SC04_002_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002_after", func_8014CF04); diff --git a/src/ov_SC04_003/ov_SC04_003_after.c b/src/ov_SC04_003/ov_SC04_003_after.c index 483861fc1..dd4ff01b5 100644 --- a/src/ov_SC04_003/ov_SC04_003_after.c +++ b/src/ov_SC04_003/ov_SC04_003_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003_after", func_8014CF04); diff --git a/src/ov_SC04_004/ov_SC04_004_after.c b/src/ov_SC04_004/ov_SC04_004_after.c index 29a4bbac0..b32ac204e 100644 --- a/src/ov_SC04_004/ov_SC04_004_after.c +++ b/src/ov_SC04_004/ov_SC04_004_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004_after", func_8014CF04); diff --git a/src/ov_SC04_005/ov_SC04_005_after.c b/src/ov_SC04_005/ov_SC04_005_after.c index cf0565c06..d132e5bf5 100644 --- a/src/ov_SC04_005/ov_SC04_005_after.c +++ b/src/ov_SC04_005/ov_SC04_005_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005_after", func_8014CF04); diff --git a/src/ov_SC04_006/ov_SC04_006_after.c b/src/ov_SC04_006/ov_SC04_006_after.c index d4acdbd28..54554204b 100644 --- a/src/ov_SC04_006/ov_SC04_006_after.c +++ b/src/ov_SC04_006/ov_SC04_006_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006_after", func_8014CF04); diff --git a/src/ov_SC04_007/ov_SC04_007_after.c b/src/ov_SC04_007/ov_SC04_007_after.c index e02afb6b9..211e9e4a2 100644 --- a/src/ov_SC04_007/ov_SC04_007_after.c +++ b/src/ov_SC04_007/ov_SC04_007_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007_after", func_8014CF04); diff --git a/src/ov_SC04_008/ov_SC04_008_after.c b/src/ov_SC04_008/ov_SC04_008_after.c index c854ed803..29742d2a0 100644 --- a/src/ov_SC04_008/ov_SC04_008_after.c +++ b/src/ov_SC04_008/ov_SC04_008_after.c @@ -1292,7 +1292,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008_after", func_8014CF04); diff --git a/src/ov_SC04_009/ov_SC04_009_after.c b/src/ov_SC04_009/ov_SC04_009_after.c index efcca458a..9df3292f7 100644 --- a/src/ov_SC04_009/ov_SC04_009_after.c +++ b/src/ov_SC04_009/ov_SC04_009_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009_after", func_8014CF04); diff --git a/src/ov_SC04_010/ov_SC04_010_after.c b/src/ov_SC04_010/ov_SC04_010_after.c index e0d0164ea..488172e74 100644 --- a/src/ov_SC04_010/ov_SC04_010_after.c +++ b/src/ov_SC04_010/ov_SC04_010_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010_after", func_8014CF04); diff --git a/src/ov_SC04_011/ov_SC04_011_after.c b/src/ov_SC04_011/ov_SC04_011_after.c index 908d26134..f1c2a66b9 100644 --- a/src/ov_SC04_011/ov_SC04_011_after.c +++ b/src/ov_SC04_011/ov_SC04_011_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011_after", func_8014CF04); diff --git a/src/ov_SC04_012/ov_SC04_012_after.c b/src/ov_SC04_012/ov_SC04_012_after.c index 666447498..b2a0f57b7 100644 --- a/src/ov_SC04_012/ov_SC04_012_after.c +++ b/src/ov_SC04_012/ov_SC04_012_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012_after", func_8014CF04); diff --git a/src/ov_SC04_015/ov_SC04_015_after.c b/src/ov_SC04_015/ov_SC04_015_after.c index cf10d6e82..6aaf5eddd 100644 --- a/src/ov_SC04_015/ov_SC04_015_after.c +++ b/src/ov_SC04_015/ov_SC04_015_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015_after", func_8014CF04); diff --git a/src/ov_SC04_016/ov_SC04_016_after.c b/src/ov_SC04_016/ov_SC04_016_after.c index 10a2c4877..8ccb56027 100644 --- a/src/ov_SC04_016/ov_SC04_016_after.c +++ b/src/ov_SC04_016/ov_SC04_016_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016_after", func_8014CF04); diff --git a/src/ov_SC04_018/ov_SC04_018_after.c b/src/ov_SC04_018/ov_SC04_018_after.c index c21bb6bd9..bd36d15e2 100644 --- a/src/ov_SC04_018/ov_SC04_018_after.c +++ b/src/ov_SC04_018/ov_SC04_018_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_after", func_8014CF04); diff --git a/src/ov_SC04_019/ov_SC04_019_after.c b/src/ov_SC04_019/ov_SC04_019_after.c index a7e106c89..7c48b581d 100644 --- a/src/ov_SC04_019/ov_SC04_019_after.c +++ b/src/ov_SC04_019/ov_SC04_019_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_after", func_8014CF04); diff --git a/src/ov_SC04_020/ov_SC04_020_after.c b/src/ov_SC04_020/ov_SC04_020_after.c index e96d5a265..774a9e274 100644 --- a/src/ov_SC04_020/ov_SC04_020_after.c +++ b/src/ov_SC04_020/ov_SC04_020_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020_after", func_8014CF04); diff --git a/src/ov_SC04_021/ov_SC04_021_after.c b/src/ov_SC04_021/ov_SC04_021_after.c index 850ff9053..4bfd47838 100644 --- a/src/ov_SC04_021/ov_SC04_021_after.c +++ b/src/ov_SC04_021/ov_SC04_021_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021_after", func_8014CF04); diff --git a/src/ov_SC05_000/ov_SC05_000_after.c b/src/ov_SC05_000/ov_SC05_000_after.c index 1522ea37c..85ddba297 100644 --- a/src/ov_SC05_000/ov_SC05_000_after.c +++ b/src/ov_SC05_000/ov_SC05_000_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000_after", func_8014CF04); diff --git a/src/ov_SC05_001/ov_SC05_001_after.c b/src/ov_SC05_001/ov_SC05_001_after.c index c4639af11..4c64616ec 100644 --- a/src/ov_SC05_001/ov_SC05_001_after.c +++ b/src/ov_SC05_001/ov_SC05_001_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001_after", func_8014CF04); diff --git a/src/ov_SC05_002/ov_SC05_002_after.c b/src/ov_SC05_002/ov_SC05_002_after.c index b9e224707..c2210744e 100644 --- a/src/ov_SC05_002/ov_SC05_002_after.c +++ b/src/ov_SC05_002/ov_SC05_002_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002_after", func_8014CF04); diff --git a/src/ov_SC05_003/ov_SC05_003_after.c b/src/ov_SC05_003/ov_SC05_003_after.c index a7fda79bd..ad80c76ee 100644 --- a/src/ov_SC05_003/ov_SC05_003_after.c +++ b/src/ov_SC05_003/ov_SC05_003_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003_after", func_8014CF04); diff --git a/src/ov_SC05_004/ov_SC05_004_after.c b/src/ov_SC05_004/ov_SC05_004_after.c index f00e0ac05..25508e7e3 100644 --- a/src/ov_SC05_004/ov_SC05_004_after.c +++ b/src/ov_SC05_004/ov_SC05_004_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004_after", func_8014CF04); diff --git a/src/ov_SC05_005/ov_SC05_005_after.c b/src/ov_SC05_005/ov_SC05_005_after.c index a1f328c29..ec995d014 100644 --- a/src/ov_SC05_005/ov_SC05_005_after.c +++ b/src/ov_SC05_005/ov_SC05_005_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005_after", func_8014CF04); diff --git a/src/ov_SC05_006/ov_SC05_006_after.c b/src/ov_SC05_006/ov_SC05_006_after.c index 3f2b1e324..a772db938 100644 --- a/src/ov_SC05_006/ov_SC05_006_after.c +++ b/src/ov_SC05_006/ov_SC05_006_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006_after", func_8014CF04); diff --git a/src/ov_SC05_007/ov_SC05_007_after.c b/src/ov_SC05_007/ov_SC05_007_after.c index 5d0005c39..92dc30377 100644 --- a/src/ov_SC05_007/ov_SC05_007_after.c +++ b/src/ov_SC05_007/ov_SC05_007_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007_after", func_8014CF04); diff --git a/src/ov_SC05_008/ov_SC05_008_after.c b/src/ov_SC05_008/ov_SC05_008_after.c index 0193ff05e..719982286 100644 --- a/src/ov_SC05_008/ov_SC05_008_after.c +++ b/src/ov_SC05_008/ov_SC05_008_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008_after", func_8014CF04); diff --git a/src/ov_SC05_009/ov_SC05_009_after.c b/src/ov_SC05_009/ov_SC05_009_after.c index 0bc458ab8..7230890c9 100644 --- a/src/ov_SC05_009/ov_SC05_009_after.c +++ b/src/ov_SC05_009/ov_SC05_009_after.c @@ -1292,7 +1292,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009_after", func_8014CF04); diff --git a/src/ov_SC05_010/ov_SC05_010_after.c b/src/ov_SC05_010/ov_SC05_010_after.c index 419f76417..e5bd9a09a 100644 --- a/src/ov_SC05_010/ov_SC05_010_after.c +++ b/src/ov_SC05_010/ov_SC05_010_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010_after", func_8014CF04); diff --git a/src/ov_SC05_011/ov_SC05_011_after.c b/src/ov_SC05_011/ov_SC05_011_after.c index 4c63fbcfa..e2d38ac80 100644 --- a/src/ov_SC05_011/ov_SC05_011_after.c +++ b/src/ov_SC05_011/ov_SC05_011_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011_after", func_8014CF04); diff --git a/src/ov_SC05_017/ov_SC05_017_after.c b/src/ov_SC05_017/ov_SC05_017_after.c index 8e4fc50c9..0a97a63a8 100644 --- a/src/ov_SC05_017/ov_SC05_017_after.c +++ b/src/ov_SC05_017/ov_SC05_017_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_after", func_8014CF04); diff --git a/src/ov_SC05_018/ov_SC05_018_after.c b/src/ov_SC05_018/ov_SC05_018_after.c index 9bc86b82d..211f210a8 100644 --- a/src/ov_SC05_018/ov_SC05_018_after.c +++ b/src/ov_SC05_018/ov_SC05_018_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018_after", func_8014CF04); diff --git a/src/ov_SC05_019/ov_SC05_019_after.c b/src/ov_SC05_019/ov_SC05_019_after.c index 2a367e45c..3c241ff0c 100644 --- a/src/ov_SC05_019/ov_SC05_019_after.c +++ b/src/ov_SC05_019/ov_SC05_019_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019_after", func_8014CF04); diff --git a/src/ov_SC06_000/ov_SC06_000_after.c b/src/ov_SC06_000/ov_SC06_000_after.c index 8e819c9f7..35743fd15 100644 --- a/src/ov_SC06_000/ov_SC06_000_after.c +++ b/src/ov_SC06_000/ov_SC06_000_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000_after", func_8014CF04); diff --git a/src/ov_SC06_006/ov_SC06_006_after.c b/src/ov_SC06_006/ov_SC06_006_after.c index 4ba908e6e..fdb827add 100644 --- a/src/ov_SC06_006/ov_SC06_006_after.c +++ b/src/ov_SC06_006/ov_SC06_006_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006_after", func_8014CF04); diff --git a/src/ov_SC06_008/ov_SC06_008_after.c b/src/ov_SC06_008/ov_SC06_008_after.c index a9542d2c3..f322c5f91 100644 --- a/src/ov_SC06_008/ov_SC06_008_after.c +++ b/src/ov_SC06_008/ov_SC06_008_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008_after", func_8014CF04); diff --git a/src/ov_SC06_010/ov_SC06_010_after.c b/src/ov_SC06_010/ov_SC06_010_after.c index 346fee9f8..061768fec 100644 --- a/src/ov_SC06_010/ov_SC06_010_after.c +++ b/src/ov_SC06_010/ov_SC06_010_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010_after", func_8014CF04); diff --git a/src/ov_SC06_011/ov_SC06_011_after.c b/src/ov_SC06_011/ov_SC06_011_after.c index cb6c70c55..d80eb2802 100644 --- a/src/ov_SC06_011/ov_SC06_011_after.c +++ b/src/ov_SC06_011/ov_SC06_011_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011_after", func_8014CF04); diff --git a/src/ov_SC06_013/ov_SC06_013_after.c b/src/ov_SC06_013/ov_SC06_013_after.c index 702de11c7..d3c58c9b1 100644 --- a/src/ov_SC06_013/ov_SC06_013_after.c +++ b/src/ov_SC06_013/ov_SC06_013_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013_after", func_8014CF04); diff --git a/src/ov_SC06_014/ov_SC06_014_after.c b/src/ov_SC06_014/ov_SC06_014_after.c index 17659b630..c4ec64aad 100644 --- a/src/ov_SC06_014/ov_SC06_014_after.c +++ b/src/ov_SC06_014/ov_SC06_014_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014_after", func_8014CF04); diff --git a/src/ov_SC06_015/ov_SC06_015_after.c b/src/ov_SC06_015/ov_SC06_015_after.c index d935c40b2..604f88656 100644 --- a/src/ov_SC06_015/ov_SC06_015_after.c +++ b/src/ov_SC06_015/ov_SC06_015_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015_after", func_8014CF04); diff --git a/src/ov_SC06_016/ov_SC06_016_after.c b/src/ov_SC06_016/ov_SC06_016_after.c index 6064c2063..8fd8403ad 100644 --- a/src/ov_SC06_016/ov_SC06_016_after.c +++ b/src/ov_SC06_016/ov_SC06_016_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016_after", func_8014CF04); diff --git a/src/ov_SC06_018/ov_SC06_018_after.c b/src/ov_SC06_018/ov_SC06_018_after.c index 8f130c185..73e5cffbf 100644 --- a/src/ov_SC06_018/ov_SC06_018_after.c +++ b/src/ov_SC06_018/ov_SC06_018_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018_after", func_8014CF04); diff --git a/src/ov_SC06_020/ov_SC06_020_after.c b/src/ov_SC06_020/ov_SC06_020_after.c index 77bd9e806..a4b61a457 100644 --- a/src/ov_SC06_020/ov_SC06_020_after.c +++ b/src/ov_SC06_020/ov_SC06_020_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020_after", func_8014CF04); diff --git a/src/ov_SC06_022/ov_SC06_022_after.c b/src/ov_SC06_022/ov_SC06_022_after.c index 76f6a01b6..a903a02f3 100644 --- a/src/ov_SC06_022/ov_SC06_022_after.c +++ b/src/ov_SC06_022/ov_SC06_022_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022_after", func_8014CF04); diff --git a/src/ov_SC06_024/ov_SC06_024_after.c b/src/ov_SC06_024/ov_SC06_024_after.c index 760fa2eea..b6f009bb6 100644 --- a/src/ov_SC06_024/ov_SC06_024_after.c +++ b/src/ov_SC06_024/ov_SC06_024_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024_after", func_8014CF04); diff --git a/src/ov_SC06_025/ov_SC06_025_after.c b/src/ov_SC06_025/ov_SC06_025_after.c index 8241bd1bb..48f416347 100644 --- a/src/ov_SC06_025/ov_SC06_025_after.c +++ b/src/ov_SC06_025/ov_SC06_025_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025_after", func_8014CF04); diff --git a/src/ov_SC06_027/ov_SC06_027_after.c b/src/ov_SC06_027/ov_SC06_027_after.c index 2c0abeb4e..8b40ed91b 100644 --- a/src/ov_SC06_027/ov_SC06_027_after.c +++ b/src/ov_SC06_027/ov_SC06_027_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027_after", func_8014CF04); diff --git a/src/ov_SC06_029/ov_SC06_029_after.c b/src/ov_SC06_029/ov_SC06_029_after.c index 2d23d9b2b..17b09a9ea 100644 --- a/src/ov_SC06_029/ov_SC06_029_after.c +++ b/src/ov_SC06_029/ov_SC06_029_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029_after", func_8014CF04); diff --git a/src/ov_SC06_030/ov_SC06_030_after.c b/src/ov_SC06_030/ov_SC06_030_after.c index 1c427eeb9..229d2919b 100644 --- a/src/ov_SC06_030/ov_SC06_030_after.c +++ b/src/ov_SC06_030/ov_SC06_030_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030_after", func_8014CF04); diff --git a/src/ov_SC06_032/ov_SC06_032_after.c b/src/ov_SC06_032/ov_SC06_032_after.c index 317e59502..8d440160a 100644 --- a/src/ov_SC06_032/ov_SC06_032_after.c +++ b/src/ov_SC06_032/ov_SC06_032_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032_after", func_8014CF04); diff --git a/src/ov_SC06_033/ov_SC06_033_after.c b/src/ov_SC06_033/ov_SC06_033_after.c index b3c034f73..a59e5186c 100644 --- a/src/ov_SC06_033/ov_SC06_033_after.c +++ b/src/ov_SC06_033/ov_SC06_033_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033_after", func_8014CF04); diff --git a/src/ov_SC07_000/ov_SC07_000_after.c b/src/ov_SC07_000/ov_SC07_000_after.c index f72b682fa..44275fd7f 100644 --- a/src/ov_SC07_000/ov_SC07_000_after.c +++ b/src/ov_SC07_000/ov_SC07_000_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000_after", func_8014CF04); diff --git a/src/ov_SC07_001/ov_SC07_001_after.c b/src/ov_SC07_001/ov_SC07_001_after.c index 2963ebf59..3f59842b3 100644 --- a/src/ov_SC07_001/ov_SC07_001_after.c +++ b/src/ov_SC07_001/ov_SC07_001_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001_after", func_8014CF04); diff --git a/src/ov_SC07_002/ov_SC07_002_after.c b/src/ov_SC07_002/ov_SC07_002_after.c index a2906f935..f067e7fd0 100644 --- a/src/ov_SC07_002/ov_SC07_002_after.c +++ b/src/ov_SC07_002/ov_SC07_002_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002_after", func_8014CF04); diff --git a/src/ov_SC07_006/ov_SC07_006_jr_80140608.c b/src/ov_SC07_006/ov_SC07_006_jr_80140608.c index f6c937403..9b0c47958 100644 --- a/src/ov_SC07_006/ov_SC07_006_jr_80140608.c +++ b/src/ov_SC07_006/ov_SC07_006_jr_80140608.c @@ -3600,7 +3600,16 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014cd0c (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_006/nonmatchings/ov_SC07_006_jr_80140608", func_8014CD80); +// @class: regalloc-order +// @stuck: none — MATCH (97 ins). Levers: (1) goto-into-if to place the early-return +// CE00 block between the CDEC block and the main body; (2) swap if/else so the +// &8!=0 (80135A4C) path is fall-through; (3) reorder tail so the cleanup(cec4) is +// fall-through and the return-1 block (ced0) is the forward bnez target; +// (4) pin iVar3 to $3 (v1) so call-returns move to v1 and store-temp stays v0; +// (5) split store-temp (uVar1->v0) from tail-temp (uVar2->v1). + +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ + INCLUDE_ASM("asm/ov_SC07_006/nonmatchings/ov_SC07_006_jr_80140608", func_8014CF04); diff --git a/src/ov_SC07_007/ov_SC07_007_jr_80140608.c b/src/ov_SC07_007/ov_SC07_007_jr_80140608.c index 9a74c9e86..f52562efd 100644 --- a/src/ov_SC07_007/ov_SC07_007_jr_80140608.c +++ b/src/ov_SC07_007/ov_SC07_007_jr_80140608.c @@ -3540,7 +3540,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014cd0c (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_007/nonmatchings/ov_SC07_007_jr_80140608", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_007/nonmatchings/ov_SC07_007_jr_80140608", func_8014CF04); diff --git a/src/ov_SC07_008/ov_SC07_008_after.c b/src/ov_SC07_008/ov_SC07_008_after.c index c052a2339..fb8f52bcc 100644 --- a/src/ov_SC07_008/ov_SC07_008_after.c +++ b/src/ov_SC07_008/ov_SC07_008_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008_after", func_8014CF04); diff --git a/src/ov_SC07_009/ov_SC07_009_after.c b/src/ov_SC07_009/ov_SC07_009_after.c index 1275d660f..c83b91388 100644 --- a/src/ov_SC07_009/ov_SC07_009_after.c +++ b/src/ov_SC07_009/ov_SC07_009_after.c @@ -1298,7 +1298,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014CD0C (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009_after", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009_after", func_8014CF04); diff --git a/src/ov_SC07_010/ov_SC07_010_jr_80140608.c b/src/ov_SC07_010/ov_SC07_010_jr_80140608.c index 869b07aa7..84181ed1b 100644 --- a/src/ov_SC07_010/ov_SC07_010_jr_80140608.c +++ b/src/ov_SC07_010/ov_SC07_010_jr_80140608.c @@ -3025,7 +3025,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014cd0c (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_010/nonmatchings/ov_SC07_010_jr_80140608", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_010/nonmatchings/ov_SC07_010_jr_80140608", func_8014CF04); diff --git a/src/ov_SC07_011/ov_SC07_011_jr_80140608.c b/src/ov_SC07_011/ov_SC07_011_jr_80140608.c index 72a96eb02..20290abd0 100644 --- a/src/ov_SC07_011/ov_SC07_011_jr_80140608.c +++ b/src/ov_SC07_011/ov_SC07_011_jr_80140608.c @@ -3542,7 +3542,7 @@ void func_8014CCB4(void) DEFINE_func_8014CD0C() /* dedup: shared engine-core @0x8014cd0c (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_011/nonmatchings/ov_SC07_011_jr_80140608", func_8014CD80); +DEFINE_func_8014CD80() /* dedup: shared engine-core @0x8014CD80 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_011/nonmatchings/ov_SC07_011_jr_80140608", func_8014CF04); diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index f6d0da68d..2c8c0e4cf 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -8963,7 +8963,7 @@ #define DEFINE_func_8014CD0C() \ extern void func_8014CF04(s32 a0, void *a1, void *a2); \ - extern void func_8014CD80(s32 a0, void *a1, void *a2); \ + extern int func_8014CD80(s32 a0, u16 *a1, u16 *a2); \ void func_8014CD0C(u8 *a0) { \ u16 sp10[3]; \ u16 sp18[3]; \ @@ -28082,4 +28082,58 @@ } while (i < 0x1e); \ } +#define DEFINE_func_8014CD80() \ + extern int func_80135A4C(); \ + extern int func_80135888(); \ + extern int func_8014C918(); \ + int func_8014CD80(int param_1, unsigned short *param_2, unsigned short *param_3) \ + { \ + short *psVar4; \ + register int iVar3 __asm__("$3"); \ + unsigned short uVar1; \ + unsigned short uVar2; \ + psVar4 = *(short **)(param_1 + 0x174); \ + if (*(unsigned short *)psVar4 == 0) goto LAB_ce00; \ + if (((*(unsigned short *)((int)psVar4 + 0x5c) & 0x400) == 0) || \ + (*(int *)((int)psVar4 + 0x58) == 0) || \ + (*(short *)((int)psVar4 + 0xa) < *(short *)(param_1 + 0xa))) { \ + if (*(unsigned short *)psVar4 != 0) { \ + *(char *)((int)psVar4 + 0x74) = 0; \ + } \ + LAB_ce00: \ + *(int *)(param_1 + 0x174) = 0; \ + return 0; \ + } \ + *param_2 = *(unsigned short *)(param_1 + 0x98); \ + param_2[1] = *(unsigned short *)(param_1 + 0x9a) - 3; \ + param_2[2] = *(unsigned short *)(param_1 + 0x9c); \ + if ((*(unsigned short *)((int)psVar4 + 0x5c) & 8) != 0) { \ + param_3[1] = param_2[1] + 0xc; \ + iVar3 = func_80135A4C(*(int *)((int)psVar4 + 0x20), \ + *(int *)((int)psVar4 + 0x58), param_2, param_3); \ + if (iVar3 == 0) goto LAB_cec4; \ + uVar1 = param_3[0]; \ + *(unsigned short *)(param_1 + 0x78) = uVar1; \ + *(unsigned short *)(param_1 + 6) = uVar1; \ + uVar1 = param_3[1]; \ + *(unsigned short *)(param_1 + 0x7a) = uVar1; \ + *(unsigned short *)(param_1 + 0xa) = uVar1; \ + uVar1 = param_3[2]; \ + *(unsigned short *)(param_1 + 0x7c) = uVar1; \ + *(unsigned short *)(param_1 + 0xe) = uVar1; \ + } else { \ + iVar3 = func_80135888(*(int *)((int)psVar4 + 0x20), \ + *(int *)((int)psVar4 + 0x58), param_2, param_3); \ + } \ + if (iVar3 != 0) goto LAB_ced0; \ + LAB_cec4: \ + *(char *)((int)psVar4 + 0x74) = 0; \ + *(int *)(param_1 + 0x174) = 0; \ + return 0; \ + LAB_ced0: \ + uVar2 = func_8014C918(param_1, *(unsigned char *)((int)psVar4 + 0x75)) & 0xff; \ + *(unsigned short *)(param_1 + 0x16e) = uVar2; \ + return 1; \ + } + #endif