diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 7f946b91b..93a1b98bf 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -13325,4 +13325,4 @@ groups: source: src/shared/engine_core.h func: DEFINE_func_8014F3E8 vram: 0x8014F3E8 - binaries: [ov_SC07_006, ov_SC07_007, ov_SC07_010, ov_SC07_011] + binaries: [ov_SC07_006, ov_SC07_007, ov_SC07_010, ov_SC07_011, ov_SC01_000, ov_SC01_001, ov_SC01_004, ov_SC01_005, ov_SC01_006, ov_SC01_008, ov_SC01_009, ov_SC01_074, ov_SC01_077, ov_SC01_080, ov_SC01_084, ov_SC02_000, ov_SC02_003, ov_SC02_004, ov_SC02_005, ov_SC02_011, ov_SC02_015, ov_SC02_016, ov_SC02_017, ov_SC02_021, ov_SC02_026, ov_SC02_027, ov_SC02_028, ov_SC02_031, ov_SC02_035, ov_SC02_039, ov_SC02_041, ov_SC03_001, ov_SC03_002, ov_SC03_003, ov_SC03_006, ov_SC03_007, ov_SC03_010, ov_SC03_011, ov_SC03_012, ov_SC03_013, ov_SC03_014, ov_SC03_015, ov_SC03_023, ov_SC03_024, ov_SC03_028, ov_SC03_029, ov_SC03_030, ov_SC03_031, ov_SC03_089, ov_SC03_090, ov_SC03_091, ov_SC03_092, ov_SC03_093, ov_SC03_094, ov_SC03_095, ov_SC03_096, ov_SC03_097, ov_SC03_098, ov_SC03_099, ov_SC03_100, ov_SC03_101, ov_SC03_102, ov_SC03_103, ov_SC03_104, ov_SC03_105, ov_SC03_108, ov_SC03_109, ov_SC03_110, ov_SC03_111, ov_SC03_112, ov_SC03_113, ov_SC03_114, ov_SC03_115, ov_SC03_116, ov_SC03_117, ov_SC03_118, ov_SC03_119, ov_SC03_121, ov_SC03_124, ov_SC03_125, ov_SC03_126, ov_SC04_000, ov_SC04_002, ov_SC04_003, ov_SC04_004, ov_SC04_005, ov_SC04_006, ov_SC04_007, ov_SC04_008, ov_SC04_009, ov_SC04_010, ov_SC04_011, ov_SC04_012, ov_SC04_015, ov_SC04_016, ov_SC04_018, ov_SC04_019, ov_SC04_020, ov_SC04_021, ov_SC05_000, ov_SC05_001, ov_SC05_002, ov_SC05_003, ov_SC05_004, ov_SC05_005, ov_SC05_006, ov_SC05_007, ov_SC05_008, ov_SC05_009, ov_SC05_010, ov_SC05_011, ov_SC05_017, ov_SC05_018, ov_SC05_019, ov_SC06_000, ov_SC06_006, ov_SC06_008, ov_SC06_010, ov_SC06_011, ov_SC06_013, ov_SC06_014, ov_SC06_015, ov_SC06_016, ov_SC06_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_000, ov_SC07_001, ov_SC07_002, ov_SC07_008, ov_SC07_009] diff --git a/docs/matching-cookbook.md b/docs/matching-cookbook.md index 0dc0f1b13..580af9aaa 100644 --- a/docs/matching-cookbook.md +++ b/docs/matching-cookbook.md @@ -5900,3 +5900,26 @@ would not have helped, because the conflicting text lives in the shared header, *inline def* and will report "no source overlay has it matched". 4. Re-check any group historically stuck at a small reach for the same cause — `func_80174CB0` (×3 since SESSION-18) was carrying the identical class. + +## §75a — The exclusion classes, enumerated with named causes (Phase 29 SESSION-19, the 134-binary `dedup_extend` sweep) + +After the §75 normalization, one `dedup_extend --binaries <134>` sweep banked **134/400 planned** and +the two residual groups failed in *every* binary — with `harvest_verify`'s classifier naming a +different cause for each. That enumeration is the useful artifact: "propagation-capped" is not one +class, it is at least three, and only the first is cheap. + +| class | cc1/ld says | example | remedy | cost | +|---|---|---|---|---| +| **A — minority spelling** (§75) | `conflicting types for ` where one spelling dominates the census | `func_8014F468`: 1,710 `s32` vs 4 `void` defs | normalize the minority, byte-gate, `dedup_extend` | **cheap, byte-neutral** | +| **B — genuine arity/type split** | same message, but the census shows two real populations | `func_8012F14C`: **1,944 `(s32)` vs 968 `(s32,s32,s32)`** | NOT a typo — two live call conventions. The §29 loose-typing wall. A K&R `()` in the macro may be compatible with both (`compatible()`: `()` first + prototype second is ACCEPTED when no param default-promotes, and `s32` does not) — but it is **order-dependent**, so it only works if the macro's decl precedes the TU's. Measure before moving. | **unknown — probe first** | +| **C — missing carried extern** | `undefined reference to ''` (a LINK error, not a type error) | `func_80165CA0`: `undefined reference to 'SHB'` | the SESSION-18 CARRY-FIXABLE class — the body references a file-scope decl the extraction did not carry | **cheap once carried** | + +**The discriminator is one grep, and it decides the whole remedy:** census every spelling of the +symbol cc1 named. A lopsided count (≥95/5) is class A — normalize. Two substantial populations is +class B — do not normalize on a guess; an arity change is not byte-neutral by inspection (§29's +narrow-param wall is exactly this). A *link* error is class C and has nothing to do with types. + +**Do not generalize from one member's error.** The same blocked function reported *different* callees +in different overlays (`func_80012ABC` at `ov_SC01_000`, `func_8012F14C` at `ov_SC01_001`) — so one +sample names one blocker, not the blocker set. Collect the classifier's line across the whole sweep +before scoping the fix. diff --git a/docs/progress.fleet.md b/docs/progress.fleet.md index bc315595e..c5990fd42 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: 314868 / 353717 = 89.02% (REAL+LINKED+empties; FUNCTION-count, ×134-inflated — one crack counts per overlay) -FLEET instr-weighted : 10509642 / 13141652 = 80.0% (shipped .text across main + resident + 138 overlays; the decomp.dev-DISPLAY number) +FLEET fn-count byte-ident: 315142 / 353717 = 89.09% (REAL+LINKED+empties; FUNCTION-count, ×134-inflated — one crack counts per overlay) +FLEET instr-weighted : 10525534 / 13141652 = 80.1% (shipped .text across main + resident + 138 overlays; the decomp.dev-DISPLAY number) FLEET distinct-code(uniq): 3813512 / 5634875 = 67.7% (64879/87459 unique fns; the DISTINCT-RE number) MAIN game-code weighted : 436 / 60201 = 0.7% (INCLUDED in the fleet numbers above since 2026-07-22 — roadmap §1 metrics contract; LINKED-excluding Ghidra sig dated 2026-06-14; caveat is R34: no independent second oracle for a PS-X EXE, NOT drift) - (fleet EXCLUDING main, for continuity with pre-2026-07-22 readings: 10509206 / 13081451 = 80.3%) + (fleet EXCLUDING main, for continuity with pre-2026-07-22 readings: 10525098 / 13081451 = 80.5%) -FLEET REAL substantive : 313013 (of which dedup-shared 238965 via 1884 groups / 239039 instances) +FLEET REAL substantive : 313287 (of which dedup-shared 239241 via 1886 groups / 239315 instances) FLEET LINKED PsyQ objs : 959 FLEET NON_MATCHING : 7 (0 in any default build — G4) -FLEET INCLUDE_ASM stubs : 38842 +FLEET INCLUDE_ASM stubs : 38568 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 | 2246 | 1740 | 0 | 2246 | 2403 | 93.5% | -| ov_SC01_001 | 2247 | 1739 | 0 | 2249 | 2466 | 91.2% | -| ov_SC01_004 | 2238 | 1730 | 0 | 2239 | 2414 | 92.8% | -| ov_SC01_005 | 2268 | 1753 | 0 | 2268 | 2503 | 90.6% | -| ov_SC01_006 | 2268 | 1753 | 0 | 2268 | 2503 | 90.6% | -| ov_SC01_008 | 2238 | 1730 | 0 | 2240 | 2426 | 92.3% | -| ov_SC01_009 | 2264 | 1731 | 0 | 2265 | 2507 | 90.3% | -| ov_SC01_074 | 2242 | 1731 | 0 | 2244 | 2425 | 92.5% | -| ov_SC01_077 | 2426 | 1700 | 0 | 2428 | 2585 | 93.9% | -| ov_SC01_080 | 2280 | 1734 | 0 | 2280 | 2512 | 90.8% | -| ov_SC01_084 | 2287 | 1734 | 0 | 2292 | 2579 | 88.9% | -| ov_SC02_000 | 2340 | 1769 | 0 | 2340 | 2683 | 87.2% | -| ov_SC02_003 | 2340 | 1769 | 0 | 2340 | 2683 | 87.2% | -| ov_SC02_004 | 2246 | 1734 | 0 | 2246 | 2401 | 93.5% | -| ov_SC02_005 | 2354 | 1730 | 0 | 2364 | 2927 | 80.8% | -| ov_SC02_011 | 2366 | 1737 | 0 | 2377 | 2893 | 82.2% | -| ov_SC02_015 | 2247 | 1736 | 0 | 2247 | 2414 | 93.1% | -| ov_SC02_016 | 2280 | 1736 | 0 | 2283 | 2545 | 89.7% | -| ov_SC02_017 | 2324 | 1736 | 0 | 2332 | 2732 | 85.4% | -| ov_SC02_021 | 2253 | 1736 | 0 | 2253 | 2437 | 92.4% | -| ov_SC02_026 | 2269 | 1734 | 0 | 2275 | 2572 | 88.5% | -| ov_SC02_027 | 2292 | 1734 | 0 | 2301 | 2692 | 85.5% | -| ov_SC02_028 | 2294 | 1734 | 0 | 2304 | 2701 | 85.3% | -| ov_SC02_031 | 2279 | 1735 | 0 | 2284 | 2562 | 89.1% | -| ov_SC02_035 | 2255 | 1734 | 0 | 2258 | 2520 | 89.6% | -| ov_SC02_039 | 2239 | 1734 | 0 | 2239 | 2416 | 92.7% | -| ov_SC02_041 | 2276 | 1734 | 0 | 2279 | 2561 | 89.0% | -| ov_SC03_001 | 2375 | 1735 | 0 | 2392 | 2869 | 83.4% | -| ov_SC03_002 | 2301 | 1739 | 0 | 2316 | 2631 | 88.0% | -| ov_SC03_003 | 2249 | 1734 | 0 | 2250 | 2423 | 92.9% | -| ov_SC03_006 | 2314 | 1740 | 0 | 2323 | 2767 | 84.0% | -| ov_SC03_007 | 2294 | 1734 | 0 | 2298 | 2623 | 87.6% | -| ov_SC03_010 | 2255 | 1734 | 0 | 2255 | 2470 | 91.3% | -| ov_SC03_011 | 2263 | 1734 | 0 | 2269 | 2527 | 89.8% | -| ov_SC03_012 | 2241 | 1734 | 0 | 2242 | 2406 | 93.2% | -| ov_SC03_013 | 2260 | 1734 | 0 | 2260 | 2492 | 90.7% | -| ov_SC03_014 | 2320 | 1759 | 0 | 2320 | 2685 | 86.4% | -| ov_SC03_015 | 2320 | 1759 | 0 | 2320 | 2685 | 86.4% | -| ov_SC03_023 | 2248 | 1734 | 0 | 2249 | 2435 | 92.4% | -| ov_SC03_024 | 2308 | 1739 | 0 | 2315 | 2641 | 87.7% | -| ov_SC03_028 | 2288 | 1734 | 0 | 2292 | 2664 | 86.0% | -| ov_SC03_029 | 2289 | 1736 | 0 | 2299 | 2644 | 87.0% | -| ov_SC03_030 | 2262 | 1739 | 0 | 2264 | 2495 | 90.7% | -| ov_SC03_031 | 2259 | 1734 | 0 | 2262 | 2514 | 90.0% | -| ov_SC03_089 | 2275 | 1734 | 0 | 2282 | 2581 | 88.4% | -| ov_SC03_090 | 2276 | 1734 | 0 | 2284 | 2625 | 87.0% | -| ov_SC03_091 | 2279 | 1734 | 0 | 2287 | 2640 | 86.6% | -| ov_SC03_092 | 2290 | 1734 | 0 | 2302 | 2587 | 89.0% | -| ov_SC03_093 | 2266 | 1734 | 0 | 2270 | 2563 | 88.6% | -| ov_SC03_094 | 2261 | 1734 | 0 | 2267 | 2577 | 88.0% | -| ov_SC03_095 | 2251 | 1734 | 0 | 2254 | 2474 | 91.1% | -| ov_SC03_096 | 2251 | 1734 | 0 | 2254 | 2465 | 91.4% | -| ov_SC03_097 | 2281 | 1734 | 0 | 2288 | 2603 | 87.9% | -| ov_SC03_098 | 2259 | 1734 | 0 | 2262 | 2541 | 89.0% | -| ov_SC03_099 | 2252 | 1734 | 0 | 2255 | 2504 | 90.1% | -| ov_SC03_100 | 2262 | 1734 | 0 | 2266 | 2539 | 89.2% | -| ov_SC03_101 | 2262 | 1734 | 0 | 2266 | 2528 | 89.6% | -| ov_SC03_102 | 2254 | 1734 | 0 | 2257 | 2492 | 90.6% | -| ov_SC03_103 | 2257 | 1736 | 0 | 2260 | 2510 | 90.0% | -| ov_SC03_104 | 2283 | 1734 | 0 | 2290 | 2616 | 87.5% | -| ov_SC03_105 | 2276 | 1734 | 0 | 2283 | 2597 | 87.9% | -| ov_SC03_108 | 2243 | 1734 | 0 | 2243 | 2443 | 91.8% | -| ov_SC03_109 | 2246 | 1734 | 0 | 2248 | 2424 | 92.7% | -| ov_SC03_110 | 2250 | 1734 | 0 | 2250 | 2468 | 91.2% | -| ov_SC03_111 | 2261 | 1734 | 0 | 2264 | 2510 | 90.2% | -| ov_SC03_112 | 2255 | 1736 | 0 | 2257 | 2526 | 89.4% | -| ov_SC03_113 | 2248 | 1736 | 0 | 2251 | 2468 | 91.2% | -| ov_SC03_114 | 2238 | 1734 | 0 | 2240 | 2415 | 92.8% | -| ov_SC03_115 | 2255 | 1734 | 0 | 2257 | 2472 | 91.3% | -| ov_SC03_116 | 2245 | 1734 | 0 | 2248 | 2438 | 92.2% | -| ov_SC03_117 | 2273 | 1734 | 0 | 2279 | 2557 | 89.1% | -| ov_SC03_118 | 2319 | 1758 | 0 | 2320 | 2685 | 86.4% | -| ov_SC03_119 | 2318 | 1758 | 0 | 2319 | 2685 | 86.4% | -| ov_SC03_121 | 2253 | 1734 | 0 | 2256 | 2459 | 91.7% | -| ov_SC03_124 | 2332 | 1730 | 0 | 2352 | 2741 | 85.8% | -| ov_SC03_125 | 2288 | 1734 | 0 | 2300 | 2588 | 88.9% | -| ov_SC03_126 | 2250 | 1736 | 0 | 2250 | 2423 | 92.9% | -| ov_SC04_000 | 2266 | 1738 | 0 | 2275 | 2546 | 89.4% | -| ov_SC04_002 | 2284 | 1734 | 0 | 2288 | 2636 | 86.8% | -| ov_SC04_003 | 2261 | 1734 | 0 | 2265 | 2502 | 90.5% | -| ov_SC04_004 | 2270 | 1734 | 0 | 2272 | 2558 | 88.8% | -| ov_SC04_005 | 2279 | 1734 | 0 | 2285 | 2612 | 87.5% | -| ov_SC04_006 | 2250 | 1734 | 0 | 2252 | 2454 | 91.8% | -| ov_SC04_007 | 2273 | 1734 | 0 | 2277 | 2569 | 88.6% | -| ov_SC04_008 | 2242 | 1734 | 0 | 2242 | 2415 | 92.8% | -| ov_SC04_009 | 2257 | 1734 | 0 | 2260 | 2441 | 92.6% | -| ov_SC04_010 | 2247 | 1734 | 0 | 2248 | 2419 | 92.9% | -| ov_SC04_011 | 2305 | 1734 | 0 | 2311 | 2803 | 82.4% | -| ov_SC04_012 | 2244 | 1734 | 0 | 2245 | 2420 | 92.8% | -| ov_SC04_015 | 2310 | 1735 | 0 | 2321 | 2611 | 88.9% | -| ov_SC04_016 | 2247 | 1734 | 0 | 2249 | 2440 | 92.2% | -| ov_SC04_018 | 2358 | 1769 | 0 | 2358 | 2857 | 82.5% | -| ov_SC04_019 | 2364 | 1769 | 0 | 2364 | 2857 | 82.7% | -| ov_SC04_020 | 2275 | 1734 | 0 | 2287 | 2567 | 89.1% | -| ov_SC04_021 | 2251 | 1736 | 0 | 2251 | 2423 | 92.9% | -| ov_SC05_000 | 2248 | 1738 | 0 | 2251 | 2422 | 92.9% | -| ov_SC05_001 | 2270 | 1734 | 0 | 2275 | 2574 | 88.4% | -| ov_SC05_002 | 2253 | 1734 | 0 | 2256 | 2442 | 92.4% | -| ov_SC05_003 | 2250 | 1734 | 0 | 2251 | 2481 | 90.7% | -| ov_SC05_004 | 2246 | 1734 | 0 | 2248 | 2464 | 91.2% | -| ov_SC05_005 | 2251 | 1734 | 0 | 2252 | 2491 | 90.4% | -| ov_SC05_006 | 2244 | 1734 | 0 | 2244 | 2430 | 92.3% | -| ov_SC05_007 | 2254 | 1734 | 0 | 2259 | 2482 | 91.0% | -| ov_SC05_008 | 2271 | 1734 | 0 | 2273 | 2543 | 89.4% | -| ov_SC05_009 | 2250 | 1734 | 0 | 2254 | 2438 | 92.5% | -| ov_SC05_010 | 2277 | 1734 | 0 | 2281 | 2588 | 88.1% | -| ov_SC05_011 | 2246 | 1734 | 0 | 2247 | 2409 | 93.3% | -| ov_SC05_017 | 2354 | 1731 | 0 | 2365 | 2842 | 83.2% | -| ov_SC05_018 | 2301 | 1734 | 0 | 2314 | 2673 | 86.6% | -| ov_SC05_019 | 2251 | 1736 | 0 | 2251 | 2423 | 92.9% | -| ov_SC06_000 | 2315 | 1743 | 0 | 2318 | 2691 | 86.1% | -| ov_SC06_006 | 2267 | 1734 | 0 | 2268 | 2511 | 90.3% | -| ov_SC06_008 | 2284 | 1736 | 0 | 2290 | 2542 | 90.1% | -| ov_SC06_010 | 2266 | 1734 | 0 | 2271 | 2517 | 90.2% | -| ov_SC06_011 | 2256 | 1734 | 0 | 2260 | 2468 | 91.6% | -| ov_SC06_013 | 2249 | 1734 | 0 | 2250 | 2425 | 92.8% | -| ov_SC06_014 | 2255 | 1734 | 0 | 2257 | 2453 | 92.0% | -| ov_SC06_015 | 2252 | 1734 | 0 | 2252 | 2421 | 93.0% | -| ov_SC06_016 | 2270 | 1734 | 0 | 2272 | 2549 | 89.1% | -| ov_SC06_018 | 2283 | 1737 | 0 | 2290 | 2665 | 85.9% | -| ov_SC06_020 | 2259 | 1736 | 0 | 2260 | 2518 | 89.8% | -| ov_SC06_022 | 2278 | 1734 | 0 | 2286 | 2642 | 86.5% | -| ov_SC06_024 | 2287 | 1734 | 0 | 2293 | 2667 | 86.0% | -| ov_SC06_025 | 2271 | 1734 | 0 | 2276 | 2572 | 88.5% | -| ov_SC06_027 | 2237 | 1734 | 0 | 2238 | 2408 | 92.9% | -| ov_SC06_029 | 2296 | 1734 | 0 | 2308 | 2662 | 86.7% | -| ov_SC06_030 | 2251 | 1734 | 0 | 2251 | 2456 | 91.7% | -| ov_SC06_032 | 2271 | 1735 | 0 | 2278 | 2658 | 85.7% | -| ov_SC06_033 | 2273 | 1735 | 0 | 2280 | 2631 | 86.7% | -| ov_SC07_000 | 2267 | 1738 | 0 | 2269 | 2521 | 90.0% | -| ov_SC07_001 | 2250 | 1734 | 0 | 2252 | 2454 | 91.8% | -| ov_SC07_002 | 2278 | 1734 | 0 | 2282 | 2579 | 88.5% | -| ov_SC07_006 | 2050 | 1553 | 0 | 2130 | 2455 | 86.8% | -| ov_SC07_007 | 2039 | 1583 | 0 | 2123 | 2613 | 81.2% | -| ov_SC07_008 | 2235 | 1734 | 0 | 2235 | 2386 | 93.7% | -| ov_SC07_009 | 2244 | 1734 | 0 | 2246 | 2430 | 92.4% | -| ov_SC07_010 | 2047 | 1582 | 0 | 2130 | 2524 | 84.4% | -| ov_SC07_011 | 2038 | 1582 | 0 | 2118 | 2449 | 86.5% | +| ov_SC01_000 | 2248 | 1742 | 0 | 2248 | 2403 | 93.5% | +| ov_SC01_001 | 2249 | 1741 | 0 | 2251 | 2466 | 91.3% | +| ov_SC01_004 | 2240 | 1732 | 0 | 2241 | 2414 | 92.8% | +| ov_SC01_005 | 2270 | 1755 | 0 | 2270 | 2503 | 90.7% | +| ov_SC01_006 | 2270 | 1755 | 0 | 2270 | 2503 | 90.7% | +| ov_SC01_008 | 2240 | 1732 | 0 | 2242 | 2426 | 92.4% | +| ov_SC01_009 | 2266 | 1733 | 0 | 2267 | 2507 | 90.4% | +| ov_SC01_074 | 2244 | 1733 | 0 | 2246 | 2425 | 92.6% | +| ov_SC01_077 | 2428 | 1702 | 0 | 2430 | 2585 | 94.0% | +| ov_SC01_080 | 2282 | 1736 | 0 | 2282 | 2512 | 90.8% | +| ov_SC01_084 | 2289 | 1736 | 0 | 2294 | 2579 | 88.9% | +| ov_SC02_000 | 2342 | 1771 | 0 | 2342 | 2683 | 87.3% | +| ov_SC02_003 | 2342 | 1771 | 0 | 2342 | 2683 | 87.3% | +| ov_SC02_004 | 2248 | 1736 | 0 | 2248 | 2401 | 93.6% | +| ov_SC02_005 | 2356 | 1732 | 0 | 2366 | 2927 | 80.8% | +| ov_SC02_011 | 2368 | 1739 | 0 | 2379 | 2893 | 82.2% | +| ov_SC02_015 | 2249 | 1738 | 0 | 2249 | 2414 | 93.2% | +| ov_SC02_016 | 2282 | 1738 | 0 | 2285 | 2545 | 89.8% | +| ov_SC02_017 | 2326 | 1738 | 0 | 2334 | 2732 | 85.4% | +| ov_SC02_021 | 2255 | 1738 | 0 | 2255 | 2437 | 92.5% | +| ov_SC02_026 | 2271 | 1736 | 0 | 2277 | 2572 | 88.5% | +| ov_SC02_027 | 2294 | 1736 | 0 | 2303 | 2692 | 85.5% | +| ov_SC02_028 | 2296 | 1736 | 0 | 2306 | 2701 | 85.4% | +| ov_SC02_031 | 2281 | 1737 | 0 | 2286 | 2562 | 89.2% | +| ov_SC02_035 | 2257 | 1736 | 0 | 2260 | 2520 | 89.7% | +| ov_SC02_039 | 2241 | 1736 | 0 | 2241 | 2416 | 92.8% | +| ov_SC02_041 | 2278 | 1736 | 0 | 2281 | 2561 | 89.1% | +| ov_SC03_001 | 2377 | 1737 | 0 | 2394 | 2869 | 83.4% | +| ov_SC03_002 | 2303 | 1741 | 0 | 2318 | 2631 | 88.1% | +| ov_SC03_003 | 2251 | 1736 | 0 | 2252 | 2423 | 92.9% | +| ov_SC03_006 | 2316 | 1742 | 0 | 2325 | 2767 | 84.0% | +| ov_SC03_007 | 2296 | 1736 | 0 | 2300 | 2623 | 87.7% | +| ov_SC03_010 | 2257 | 1736 | 0 | 2257 | 2470 | 91.4% | +| ov_SC03_011 | 2265 | 1736 | 0 | 2271 | 2527 | 89.9% | +| ov_SC03_012 | 2243 | 1736 | 0 | 2244 | 2406 | 93.3% | +| ov_SC03_013 | 2262 | 1736 | 0 | 2262 | 2492 | 90.8% | +| ov_SC03_014 | 2322 | 1761 | 0 | 2322 | 2685 | 86.5% | +| ov_SC03_015 | 2322 | 1761 | 0 | 2322 | 2685 | 86.5% | +| ov_SC03_023 | 2250 | 1736 | 0 | 2251 | 2435 | 92.4% | +| ov_SC03_024 | 2310 | 1741 | 0 | 2317 | 2641 | 87.7% | +| ov_SC03_028 | 2290 | 1736 | 0 | 2294 | 2664 | 86.1% | +| ov_SC03_029 | 2291 | 1738 | 0 | 2301 | 2644 | 87.0% | +| ov_SC03_030 | 2264 | 1741 | 0 | 2266 | 2495 | 90.8% | +| ov_SC03_031 | 2261 | 1736 | 0 | 2264 | 2514 | 90.1% | +| ov_SC03_089 | 2277 | 1736 | 0 | 2284 | 2581 | 88.5% | +| ov_SC03_090 | 2278 | 1736 | 0 | 2286 | 2625 | 87.1% | +| ov_SC03_091 | 2281 | 1736 | 0 | 2289 | 2640 | 86.7% | +| ov_SC03_092 | 2292 | 1736 | 0 | 2304 | 2587 | 89.1% | +| ov_SC03_093 | 2268 | 1736 | 0 | 2272 | 2563 | 88.6% | +| ov_SC03_094 | 2263 | 1736 | 0 | 2269 | 2577 | 88.0% | +| ov_SC03_095 | 2253 | 1736 | 0 | 2256 | 2474 | 91.2% | +| ov_SC03_096 | 2253 | 1736 | 0 | 2256 | 2465 | 91.5% | +| ov_SC03_097 | 2283 | 1736 | 0 | 2290 | 2603 | 88.0% | +| ov_SC03_098 | 2261 | 1736 | 0 | 2264 | 2541 | 89.1% | +| ov_SC03_099 | 2254 | 1736 | 0 | 2257 | 2504 | 90.1% | +| ov_SC03_100 | 2264 | 1736 | 0 | 2268 | 2539 | 89.3% | +| ov_SC03_101 | 2264 | 1736 | 0 | 2268 | 2528 | 89.7% | +| ov_SC03_102 | 2256 | 1736 | 0 | 2259 | 2492 | 90.7% | +| ov_SC03_103 | 2259 | 1738 | 0 | 2262 | 2510 | 90.1% | +| ov_SC03_104 | 2285 | 1736 | 0 | 2292 | 2616 | 87.6% | +| ov_SC03_105 | 2278 | 1736 | 0 | 2285 | 2597 | 88.0% | +| ov_SC03_108 | 2245 | 1736 | 0 | 2245 | 2443 | 91.9% | +| ov_SC03_109 | 2248 | 1736 | 0 | 2250 | 2424 | 92.8% | +| ov_SC03_110 | 2252 | 1736 | 0 | 2252 | 2468 | 91.2% | +| ov_SC03_111 | 2263 | 1736 | 0 | 2266 | 2510 | 90.3% | +| ov_SC03_112 | 2257 | 1738 | 0 | 2259 | 2526 | 89.4% | +| ov_SC03_113 | 2250 | 1738 | 0 | 2253 | 2468 | 91.3% | +| ov_SC03_114 | 2240 | 1736 | 0 | 2242 | 2415 | 92.8% | +| ov_SC03_115 | 2257 | 1736 | 0 | 2259 | 2472 | 91.4% | +| ov_SC03_116 | 2247 | 1736 | 0 | 2250 | 2438 | 92.3% | +| ov_SC03_117 | 2275 | 1736 | 0 | 2281 | 2557 | 89.2% | +| ov_SC03_118 | 2321 | 1760 | 0 | 2322 | 2685 | 86.5% | +| ov_SC03_119 | 2320 | 1760 | 0 | 2321 | 2685 | 86.4% | +| ov_SC03_121 | 2255 | 1736 | 0 | 2258 | 2459 | 91.8% | +| ov_SC03_124 | 2334 | 1732 | 0 | 2354 | 2741 | 85.9% | +| ov_SC03_125 | 2290 | 1736 | 0 | 2302 | 2588 | 88.9% | +| ov_SC03_126 | 2252 | 1738 | 0 | 2252 | 2423 | 92.9% | +| ov_SC04_000 | 2268 | 1740 | 0 | 2277 | 2546 | 89.4% | +| ov_SC04_002 | 2286 | 1736 | 0 | 2290 | 2636 | 86.9% | +| ov_SC04_003 | 2263 | 1736 | 0 | 2267 | 2502 | 90.6% | +| ov_SC04_004 | 2272 | 1736 | 0 | 2274 | 2558 | 88.9% | +| ov_SC04_005 | 2281 | 1736 | 0 | 2287 | 2612 | 87.6% | +| ov_SC04_006 | 2252 | 1736 | 0 | 2254 | 2454 | 91.9% | +| ov_SC04_007 | 2275 | 1736 | 0 | 2279 | 2569 | 88.7% | +| ov_SC04_008 | 2244 | 1736 | 0 | 2244 | 2415 | 92.9% | +| ov_SC04_009 | 2259 | 1736 | 0 | 2262 | 2441 | 92.7% | +| ov_SC04_010 | 2249 | 1736 | 0 | 2250 | 2419 | 93.0% | +| ov_SC04_011 | 2307 | 1736 | 0 | 2313 | 2803 | 82.5% | +| ov_SC04_012 | 2246 | 1736 | 0 | 2247 | 2420 | 92.9% | +| ov_SC04_015 | 2312 | 1737 | 0 | 2323 | 2611 | 89.0% | +| ov_SC04_016 | 2249 | 1736 | 0 | 2251 | 2440 | 92.3% | +| ov_SC04_018 | 2360 | 1771 | 0 | 2360 | 2857 | 82.6% | +| ov_SC04_019 | 2366 | 1771 | 0 | 2366 | 2857 | 82.8% | +| ov_SC04_020 | 2277 | 1736 | 0 | 2289 | 2567 | 89.2% | +| ov_SC04_021 | 2253 | 1738 | 0 | 2253 | 2423 | 93.0% | +| ov_SC05_000 | 2250 | 1740 | 0 | 2253 | 2422 | 93.0% | +| ov_SC05_001 | 2272 | 1736 | 0 | 2277 | 2574 | 88.5% | +| ov_SC05_002 | 2255 | 1736 | 0 | 2258 | 2442 | 92.5% | +| ov_SC05_003 | 2252 | 1736 | 0 | 2253 | 2481 | 90.8% | +| ov_SC05_004 | 2248 | 1736 | 0 | 2250 | 2464 | 91.3% | +| ov_SC05_005 | 2253 | 1736 | 0 | 2254 | 2491 | 90.5% | +| ov_SC05_006 | 2246 | 1736 | 0 | 2246 | 2430 | 92.4% | +| ov_SC05_007 | 2256 | 1736 | 0 | 2261 | 2482 | 91.1% | +| ov_SC05_008 | 2273 | 1736 | 0 | 2275 | 2543 | 89.5% | +| ov_SC05_009 | 2252 | 1736 | 0 | 2256 | 2438 | 92.5% | +| ov_SC05_010 | 2279 | 1736 | 0 | 2283 | 2588 | 88.2% | +| ov_SC05_011 | 2248 | 1736 | 0 | 2249 | 2409 | 93.4% | +| ov_SC05_017 | 2356 | 1733 | 0 | 2367 | 2842 | 83.3% | +| ov_SC05_018 | 2303 | 1736 | 0 | 2316 | 2673 | 86.6% | +| ov_SC05_019 | 2253 | 1738 | 0 | 2253 | 2423 | 93.0% | +| ov_SC06_000 | 2317 | 1745 | 0 | 2320 | 2691 | 86.2% | +| ov_SC06_006 | 2269 | 1736 | 0 | 2270 | 2511 | 90.4% | +| ov_SC06_008 | 2286 | 1738 | 0 | 2292 | 2542 | 90.2% | +| ov_SC06_010 | 2268 | 1736 | 0 | 2273 | 2517 | 90.3% | +| ov_SC06_011 | 2258 | 1736 | 0 | 2262 | 2468 | 91.7% | +| ov_SC06_013 | 2251 | 1736 | 0 | 2252 | 2425 | 92.9% | +| ov_SC06_014 | 2257 | 1736 | 0 | 2259 | 2453 | 92.1% | +| ov_SC06_015 | 2254 | 1736 | 0 | 2254 | 2421 | 93.1% | +| ov_SC06_016 | 2272 | 1736 | 0 | 2274 | 2549 | 89.2% | +| ov_SC06_018 | 2285 | 1739 | 0 | 2292 | 2665 | 86.0% | +| ov_SC06_020 | 2261 | 1738 | 0 | 2262 | 2518 | 89.8% | +| ov_SC06_022 | 2280 | 1736 | 0 | 2288 | 2642 | 86.6% | +| ov_SC06_024 | 2289 | 1736 | 0 | 2295 | 2667 | 86.1% | +| ov_SC06_025 | 2273 | 1736 | 0 | 2278 | 2572 | 88.6% | +| ov_SC06_027 | 2239 | 1736 | 0 | 2240 | 2408 | 93.0% | +| ov_SC06_029 | 2298 | 1736 | 0 | 2310 | 2662 | 86.8% | +| ov_SC06_030 | 2253 | 1736 | 0 | 2253 | 2456 | 91.7% | +| ov_SC06_032 | 2273 | 1737 | 0 | 2280 | 2658 | 85.8% | +| ov_SC06_033 | 2275 | 1737 | 0 | 2282 | 2631 | 86.7% | +| ov_SC07_000 | 2269 | 1740 | 0 | 2271 | 2521 | 90.1% | +| ov_SC07_001 | 2252 | 1736 | 0 | 2254 | 2454 | 91.9% | +| ov_SC07_002 | 2280 | 1736 | 0 | 2284 | 2579 | 88.6% | +| ov_SC07_006 | 2050 | 1555 | 0 | 2130 | 2455 | 86.8% | +| ov_SC07_007 | 2041 | 1585 | 0 | 2125 | 2613 | 81.3% | +| ov_SC07_008 | 2237 | 1736 | 0 | 2237 | 2386 | 93.8% | +| ov_SC07_009 | 2246 | 1736 | 0 | 2248 | 2430 | 92.5% | +| ov_SC07_010 | 2049 | 1584 | 0 | 2132 | 2524 | 84.5% | +| ov_SC07_011 | 2040 | 1584 | 0 | 2120 | 2449 | 86.6% | diff --git a/phase-ends/CURRENT_PHASE.md b/phase-ends/CURRENT_PHASE.md index eeb0d751a..0c34418ac 100644 --- a/phase-ends/CURRENT_PHASE.md +++ b/phase-ends/CURRENT_PHASE.md @@ -3547,6 +3547,70 @@ conditional) · main-EXE/B9 + GLM/B6 + resident's 14 walls (P30) · behemoths B7 any pin whose variable outlives a call; if the target genuinely wants a caller-saved reg across a `jal`, the pin cannot express it — that is a real wall verdict, not a drafting slip. +- **🚨 2026-07-25 (SESSION-19) — THE PROPAGATION CAP IS A MINORITY-SPELLING SOURCE OVERLAY. Measured, + not inferred; and it retires the "build a reconciliation engine" framing of Task 8/open-action-2.** + Propagating the two banked functions: **`func_8014D4C0` → ×138** (all 138 rebuilt byte-identical, + group registered) but **`func_8014F3E8` → dropped**, then on a re-run **×4**. + **TWO SEPARATE CAUSES, and the first was MINE:** + **(1) The drop was a FLAG OMISSION, not a wall.** Without `--recover`, `dedup_propagate` takes the + historical all-or-nothing path on the first culprit overlay — so ONE divergent member costs the + WHOLE group (×0). With `--recover`, Part A excludes just the culprit. **Always pass `--recover` on a + targeted `--addr` run.** (The `[drop]` message even printed *"reach<2 after exclude"* when reach was + **138** and no exclude had been attempted — the no-recover branch jumps straight to `dropped`.) + **(2) The 134 exclusions are a COMPILE conflict, and the message's stated cause is impossible.** + `[exclude] … byte-diverge / irreconcilable` — but members are selected **by `h_exact`**, so all 138 + are byte-identical *by construction* (single hash `2ccf344d`). A byte divergence cannot be what + excluded them. The census names the real cause in 30 seconds: + | spelling of `func_8014F468` (the carried extern) | count | + |---|---| + | `extern s32 func_8014F468(void);` | **1,710** | + | `s32 func_8014F468(void)` (definition) | **134** | + | `extern void func_8014F468(void);` | 20 | + | `void func_8014F468(void)` (definition) | **4 — all `ov_SC07_{006,007,010,011}`** | + `dedup_propagate` carries the SOURCE overlay's file-scope externs into the shared macro **verbatim**, + and the overlay I banked from is one of the four outliers. The macro inherited `extern void`, the + 134 overlays that *define* the symbol `s32` rejected it, and propagation landed on exactly that + 4-overlay island. **Nothing about the code was hard.** + **⇒ THE FIX IS NORMALIZATION, NOT A RECONCILIATION ENGINE — and the engine would not have worked.** + One macro text is instantiated in 138 TUs; it **cannot** carry a per-overlay extern, so if members + genuinely disagree no per-member rewrite of a *shared* body can satisfy them — they must be made to + agree first. (`reconcile_tu.fix()` already does "TU wins + cast at use" for DATA decls and skips + `d.kind == 'func'`; extending it would not have reached this, because the conflicting text lives in + the shared header, not in a draft.) Flipped the 24 minority occurrences to the fleet canon (4 + definitions + 19 overlay externs + the 1 macro line). `func_8014F468` is a pure inline-asm `$sp`-switch + trampoline — no C-level value flow — and 134 overlays had already *proved* `s32` byte-correct for the + identical function. **Blast radius byte-gated in full** (the 4 instantiators): `7ca772be` / `b3b95547` + / `d7b5875d` / `9885af74`, all BYTE-IDENTICAL. Fleet now uniform: 1,730 `extern s32` + 138 defs, **0 + `void`**. → cookbook **§75**. + **THE FOLLOW-UP IS `dedup_extend`, NOT `dedup_propagate`** (§75 #3): once banked, the body IS a macro, + and `--addr` can only author from an *inline def* ("no source overlay has it matched"). `dedup_extend + --check-only` over the 134 excluded overlays planned **400 extensions / 3 groups per binary** — so + this also picks up **`func_80174CB0`**, stuck at ×3 since SESSION-18 on what looks like the identical + class. It also refuses a dirty tree (H4), which is why the normalization commits first. + **R22 clean-fleet after the propagation: 140 passed, 0 failed of 140.** + +- **✅ 2026-07-25 (SESSION-19) — THE EXTEND SWEEP: `func_8014F3E8` reaches ×138, and the residual + exclusions are ENUMERATED with named causes (§75a).** One `dedup_extend --binaries ` run: **banked 134 / 400 planned**, i.e. **`func_8014F3E8` VERIFIED in all 134** (→ ×138 + total, +4,288 ins) — the §75 normalization converted a 4-overlay island into full fleet reach with + no drafting at all. The other two planned groups failed in *every* binary, and + `harvest_verify`'s classifier named a **different cause for each**, which is the real deliverable: + | class | cc1/ld | example | remedy | + |---|---|---|---| + | **A — minority spelling** | `conflicting types` + a lopsided census | `func_8014F468` 1,710 `s32` vs 4 `void` | normalize (done, §75) — cheap, byte-neutral | + | **B — genuine arity split** | same message, TWO real populations | `func_8012F14C` **1,944 `(s32)` vs 968 `(s32,s32,s32)`** | the §29 loose-typing wall; a K&R `()` in the macro MAY satisfy both (order-dependent per `cdecl.compatible`) — **probe, do not normalize on a guess** | + | **C — missing carried extern** | `undefined reference to 'SHB'` (a LINK error) | `func_80165CA0` | the SESSION-18 CARRY-FIXABLE class | + **⚠️ I ALMOST GENERALIZED FROM ONE SAMPLE (R14).** I predicted `func_80174CB0` was "the identical + class" as `func_8014F3E8`. It is class A *in kind* but on **different symbols, and different ones + per overlay** — `func_80012ABC` at ov_SC01_000 (73 `s32` vs 7 `s16` — the minority is on the TARGET + side this time), `func_8012F14C` at ov_SC01_001 (class B). **One member's error names one blocker, + not the blocker set** — collect the classifier's line across the whole sweep before scoping a fix. + **The discriminator is ONE grep and it decides the remedy:** census every spelling of the symbol cc1 + named. ≥95/5 ⇒ class A, normalize. Two substantial populations ⇒ class B, an arity change is **not** + byte-neutral by inspection, measure first. A *link* error ⇒ class C, nothing to do with types. + → cookbook **§75a**. `func_80174CB0` (123 ins, ×3 since SESSION-18) and `func_80165CA0` stay capped, + now with a named cause and a named next probe each — not a wall verdict. + > **🛑 SESSION-18 CLOSING CHECKPOINT (2026-07-25, Opus 5 @ High) — SUPERSEDES the earlier SESSION-18 > block, which was written mid-session and is STALE (it still says "two searches in flight"). > Fresh session safe here.** diff --git a/src/ov_SC01_000/ov_SC01_000_after.c b/src/ov_SC01_000/ov_SC01_000_after.c index e8a16f891..0219638d8 100644 --- a/src/ov_SC01_000/ov_SC01_000_after.c +++ b/src/ov_SC01_000/ov_SC01_000_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC01_001/ov_SC01_001_after.c b/src/ov_SC01_001/ov_SC01_001_after.c index ea2ea4d6c..8b9af6d2b 100644 --- a/src/ov_SC01_001/ov_SC01_001_after.c +++ b/src/ov_SC01_001/ov_SC01_001_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC01_004/ov_SC01_004_after.c b/src/ov_SC01_004/ov_SC01_004_after.c index 5886754f4..fe9420755 100644 --- a/src/ov_SC01_004/ov_SC01_004_after.c +++ b/src/ov_SC01_004/ov_SC01_004_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC01_005/ov_SC01_005_after.c b/src/ov_SC01_005/ov_SC01_005_after.c index fed617ff5..524106323 100644 --- a/src/ov_SC01_005/ov_SC01_005_after.c +++ b/src/ov_SC01_005/ov_SC01_005_after.c @@ -1604,7 +1604,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC01_006/ov_SC01_006_after.c b/src/ov_SC01_006/ov_SC01_006_after.c index 115d931ae..fa9a9ed29 100644 --- a/src/ov_SC01_006/ov_SC01_006_after.c +++ b/src/ov_SC01_006/ov_SC01_006_after.c @@ -1604,7 +1604,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC01_008/ov_SC01_008_after.c b/src/ov_SC01_008/ov_SC01_008_after.c index ffd9bddb2..12b116770 100644 --- a/src/ov_SC01_008/ov_SC01_008_after.c +++ b/src/ov_SC01_008/ov_SC01_008_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC01_009/ov_SC01_009_after.c b/src/ov_SC01_009/ov_SC01_009_after.c index 06eae9b88..78d154885 100644 --- a/src/ov_SC01_009/ov_SC01_009_after.c +++ b/src/ov_SC01_009/ov_SC01_009_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC01_074/ov_SC01_074_after.c b/src/ov_SC01_074/ov_SC01_074_after.c index 7af80c132..2fddde50c 100644 --- a/src/ov_SC01_074/ov_SC01_074_after.c +++ b/src/ov_SC01_074/ov_SC01_074_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC01_077/ov_SC01_077_after.c b/src/ov_SC01_077/ov_SC01_077_after.c index 56cba3742..bae00258b 100644 --- a/src/ov_SC01_077/ov_SC01_077_after.c +++ b/src/ov_SC01_077/ov_SC01_077_after.c @@ -1941,7 +1941,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + // @class: other // @stuck: none — MATCH (handwritten scratchpad-stack-switch sequencer; byte-proven DEFINE_func_8014CCB4 precedent. Do NOT write an explicit nop in the jal delay slot: maspsx 2.56 reorders the following lui %hi into the slot and re-emits the nop, so an explicit one is a redundant +1 ins.) diff --git a/src/ov_SC01_080/ov_SC01_080_after.c b/src/ov_SC01_080/ov_SC01_080_after.c index 9dea1e9f4..4b3ea04e0 100644 --- a/src/ov_SC01_080/ov_SC01_080_after.c +++ b/src/ov_SC01_080/ov_SC01_080_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC01_084/ov_SC01_084_after.c b/src/ov_SC01_084/ov_SC01_084_after.c index 17de8ec78..3c6647579 100644 --- a/src/ov_SC01_084/ov_SC01_084_after.c +++ b/src/ov_SC01_084/ov_SC01_084_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC02_000/ov_SC02_000_after.c b/src/ov_SC02_000/ov_SC02_000_after.c index c182972af..1f853e608 100644 --- a/src/ov_SC02_000/ov_SC02_000_after.c +++ b/src/ov_SC02_000/ov_SC02_000_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC02_003/ov_SC02_003_after.c b/src/ov_SC02_003/ov_SC02_003_after.c index 617725f25..1a585a52b 100644 --- a/src/ov_SC02_003/ov_SC02_003_after.c +++ b/src/ov_SC02_003/ov_SC02_003_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC02_004/ov_SC02_004_after.c b/src/ov_SC02_004/ov_SC02_004_after.c index 6b89d04ae..068ae3e51 100644 --- a/src/ov_SC02_004/ov_SC02_004_after.c +++ b/src/ov_SC02_004/ov_SC02_004_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC02_005/ov_SC02_005_after.c b/src/ov_SC02_005/ov_SC02_005_after.c index dd62f5871..6233573f0 100644 --- a/src/ov_SC02_005/ov_SC02_005_after.c +++ b/src/ov_SC02_005/ov_SC02_005_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC02_011/ov_SC02_011_after.c b/src/ov_SC02_011/ov_SC02_011_after.c index 7b223e119..0cc1b440d 100644 --- a/src/ov_SC02_011/ov_SC02_011_after.c +++ b/src/ov_SC02_011/ov_SC02_011_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC02_015/ov_SC02_015_after.c b/src/ov_SC02_015/ov_SC02_015_after.c index 451a713e3..2be2d7c20 100644 --- a/src/ov_SC02_015/ov_SC02_015_after.c +++ b/src/ov_SC02_015/ov_SC02_015_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC02_016/ov_SC02_016_after.c b/src/ov_SC02_016/ov_SC02_016_after.c index e4652c954..85f06a4ba 100644 --- a/src/ov_SC02_016/ov_SC02_016_after.c +++ b/src/ov_SC02_016/ov_SC02_016_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC02_017/ov_SC02_017_after.c b/src/ov_SC02_017/ov_SC02_017_after.c index dd7243713..d9e3c7360 100644 --- a/src/ov_SC02_017/ov_SC02_017_after.c +++ b/src/ov_SC02_017/ov_SC02_017_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC02_021/ov_SC02_021_after.c b/src/ov_SC02_021/ov_SC02_021_after.c index e69ee5db4..e19937d88 100644 --- a/src/ov_SC02_021/ov_SC02_021_after.c +++ b/src/ov_SC02_021/ov_SC02_021_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC02_026/ov_SC02_026_after.c b/src/ov_SC02_026/ov_SC02_026_after.c index 406049ec2..65d11113f 100644 --- a/src/ov_SC02_026/ov_SC02_026_after.c +++ b/src/ov_SC02_026/ov_SC02_026_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC02_027/ov_SC02_027_after.c b/src/ov_SC02_027/ov_SC02_027_after.c index 7e3b0e3b9..b3a862031 100644 --- a/src/ov_SC02_027/ov_SC02_027_after.c +++ b/src/ov_SC02_027/ov_SC02_027_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC02_028/ov_SC02_028_after.c b/src/ov_SC02_028/ov_SC02_028_after.c index 9191a33a1..c7b5a72b2 100644 --- a/src/ov_SC02_028/ov_SC02_028_after.c +++ b/src/ov_SC02_028/ov_SC02_028_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC02_031/ov_SC02_031_after.c b/src/ov_SC02_031/ov_SC02_031_after.c index 2e5eb9e8f..2d2a50cb9 100644 --- a/src/ov_SC02_031/ov_SC02_031_after.c +++ b/src/ov_SC02_031/ov_SC02_031_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC02_035/ov_SC02_035_after.c b/src/ov_SC02_035/ov_SC02_035_after.c index 96667c346..4338ad03b 100644 --- a/src/ov_SC02_035/ov_SC02_035_after.c +++ b/src/ov_SC02_035/ov_SC02_035_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC02_039/ov_SC02_039_after.c b/src/ov_SC02_039/ov_SC02_039_after.c index be38e471c..b30b1214c 100644 --- a/src/ov_SC02_039/ov_SC02_039_after.c +++ b/src/ov_SC02_039/ov_SC02_039_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC02_041/ov_SC02_041_after.c b/src/ov_SC02_041/ov_SC02_041_after.c index a46dbfbfc..46fb11062 100644 --- a/src/ov_SC02_041/ov_SC02_041_after.c +++ b/src/ov_SC02_041/ov_SC02_041_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_001/ov_SC03_001_after.c b/src/ov_SC03_001/ov_SC03_001_after.c index af46a6a0c..cebd423f1 100644 --- a/src/ov_SC03_001/ov_SC03_001_after.c +++ b/src/ov_SC03_001/ov_SC03_001_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_002/ov_SC03_002_after.c b/src/ov_SC03_002/ov_SC03_002_after.c index b2779cee5..128b2cf25 100644 --- a/src/ov_SC03_002/ov_SC03_002_after.c +++ b/src/ov_SC03_002/ov_SC03_002_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_003/ov_SC03_003_after.c b/src/ov_SC03_003/ov_SC03_003_after.c index e4375302b..e892d3f96 100644 --- a/src/ov_SC03_003/ov_SC03_003_after.c +++ b/src/ov_SC03_003/ov_SC03_003_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_006/ov_SC03_006_after.c b/src/ov_SC03_006/ov_SC03_006_after.c index 10c072d06..fb44ba02e 100644 --- a/src/ov_SC03_006/ov_SC03_006_after.c +++ b/src/ov_SC03_006/ov_SC03_006_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_007/ov_SC03_007_after.c b/src/ov_SC03_007/ov_SC03_007_after.c index 61acaab3e..94b9454af 100644 --- a/src/ov_SC03_007/ov_SC03_007_after.c +++ b/src/ov_SC03_007/ov_SC03_007_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_010/ov_SC03_010_after.c b/src/ov_SC03_010/ov_SC03_010_after.c index f026c42da..85c402286 100644 --- a/src/ov_SC03_010/ov_SC03_010_after.c +++ b/src/ov_SC03_010/ov_SC03_010_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_011/ov_SC03_011_after.c b/src/ov_SC03_011/ov_SC03_011_after.c index 87a1da93c..09398cb02 100644 --- a/src/ov_SC03_011/ov_SC03_011_after.c +++ b/src/ov_SC03_011/ov_SC03_011_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_012/ov_SC03_012_after.c b/src/ov_SC03_012/ov_SC03_012_after.c index 85bff456d..6d207016f 100644 --- a/src/ov_SC03_012/ov_SC03_012_after.c +++ b/src/ov_SC03_012/ov_SC03_012_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_013/ov_SC03_013_after.c b/src/ov_SC03_013/ov_SC03_013_after.c index a0d931843..5cfdbb81e 100644 --- a/src/ov_SC03_013/ov_SC03_013_after.c +++ b/src/ov_SC03_013/ov_SC03_013_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_014/ov_SC03_014_after.c b/src/ov_SC03_014/ov_SC03_014_after.c index 839c2a7db..f920930d1 100644 --- a/src/ov_SC03_014/ov_SC03_014_after.c +++ b/src/ov_SC03_014/ov_SC03_014_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_015/ov_SC03_015_after.c b/src/ov_SC03_015/ov_SC03_015_after.c index c126dd024..29d0b8301 100644 --- a/src/ov_SC03_015/ov_SC03_015_after.c +++ b/src/ov_SC03_015/ov_SC03_015_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_023/ov_SC03_023_after.c b/src/ov_SC03_023/ov_SC03_023_after.c index d8b4c8f62..db2d15917 100644 --- a/src/ov_SC03_023/ov_SC03_023_after.c +++ b/src/ov_SC03_023/ov_SC03_023_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_024/ov_SC03_024_after.c b/src/ov_SC03_024/ov_SC03_024_after.c index 3e22ae43a..5d36f5402 100644 --- a/src/ov_SC03_024/ov_SC03_024_after.c +++ b/src/ov_SC03_024/ov_SC03_024_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_028/ov_SC03_028_after.c b/src/ov_SC03_028/ov_SC03_028_after.c index 6adfcb9eb..63fbb0802 100644 --- a/src/ov_SC03_028/ov_SC03_028_after.c +++ b/src/ov_SC03_028/ov_SC03_028_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_029/ov_SC03_029_after.c b/src/ov_SC03_029/ov_SC03_029_after.c index d2cf74744..d4ad294de 100644 --- a/src/ov_SC03_029/ov_SC03_029_after.c +++ b/src/ov_SC03_029/ov_SC03_029_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_030/ov_SC03_030_after.c b/src/ov_SC03_030/ov_SC03_030_after.c index e0b9d1b1a..0cc59db12 100644 --- a/src/ov_SC03_030/ov_SC03_030_after.c +++ b/src/ov_SC03_030/ov_SC03_030_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_031/ov_SC03_031_after.c b/src/ov_SC03_031/ov_SC03_031_after.c index 91c84146b..69c9b2560 100644 --- a/src/ov_SC03_031/ov_SC03_031_after.c +++ b/src/ov_SC03_031/ov_SC03_031_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_089/ov_SC03_089_after.c b/src/ov_SC03_089/ov_SC03_089_after.c index dee22ccf6..963731d63 100644 --- a/src/ov_SC03_089/ov_SC03_089_after.c +++ b/src/ov_SC03_089/ov_SC03_089_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_090/ov_SC03_090_after.c b/src/ov_SC03_090/ov_SC03_090_after.c index b1a513266..3c95554c3 100644 --- a/src/ov_SC03_090/ov_SC03_090_after.c +++ b/src/ov_SC03_090/ov_SC03_090_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_091/ov_SC03_091_after.c b/src/ov_SC03_091/ov_SC03_091_after.c index 2bc20306c..d84fbccdd 100644 --- a/src/ov_SC03_091/ov_SC03_091_after.c +++ b/src/ov_SC03_091/ov_SC03_091_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_092/ov_SC03_092_after.c b/src/ov_SC03_092/ov_SC03_092_after.c index 1b49ae60e..00daf3e73 100644 --- a/src/ov_SC03_092/ov_SC03_092_after.c +++ b/src/ov_SC03_092/ov_SC03_092_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_093/ov_SC03_093_after.c b/src/ov_SC03_093/ov_SC03_093_after.c index 53a8e1893..0270edb97 100644 --- a/src/ov_SC03_093/ov_SC03_093_after.c +++ b/src/ov_SC03_093/ov_SC03_093_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_094/ov_SC03_094_after.c b/src/ov_SC03_094/ov_SC03_094_after.c index 4eef3e3b8..28f3a8599 100644 --- a/src/ov_SC03_094/ov_SC03_094_after.c +++ b/src/ov_SC03_094/ov_SC03_094_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_095/ov_SC03_095_after.c b/src/ov_SC03_095/ov_SC03_095_after.c index ee3f86337..474722712 100644 --- a/src/ov_SC03_095/ov_SC03_095_after.c +++ b/src/ov_SC03_095/ov_SC03_095_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_096/ov_SC03_096_after.c b/src/ov_SC03_096/ov_SC03_096_after.c index 36990762a..32a331de8 100644 --- a/src/ov_SC03_096/ov_SC03_096_after.c +++ b/src/ov_SC03_096/ov_SC03_096_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_097/ov_SC03_097_after.c b/src/ov_SC03_097/ov_SC03_097_after.c index 37be373be..97ce3df9e 100644 --- a/src/ov_SC03_097/ov_SC03_097_after.c +++ b/src/ov_SC03_097/ov_SC03_097_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_098/ov_SC03_098_after.c b/src/ov_SC03_098/ov_SC03_098_after.c index 38265035f..a16eb97e3 100644 --- a/src/ov_SC03_098/ov_SC03_098_after.c +++ b/src/ov_SC03_098/ov_SC03_098_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_099/ov_SC03_099_after.c b/src/ov_SC03_099/ov_SC03_099_after.c index 71458577c..aba189a6a 100644 --- a/src/ov_SC03_099/ov_SC03_099_after.c +++ b/src/ov_SC03_099/ov_SC03_099_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_100/ov_SC03_100_after.c b/src/ov_SC03_100/ov_SC03_100_after.c index 2debbc172..405e3f24d 100644 --- a/src/ov_SC03_100/ov_SC03_100_after.c +++ b/src/ov_SC03_100/ov_SC03_100_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_101/ov_SC03_101_after.c b/src/ov_SC03_101/ov_SC03_101_after.c index 511d9b153..df028969a 100644 --- a/src/ov_SC03_101/ov_SC03_101_after.c +++ b/src/ov_SC03_101/ov_SC03_101_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_102/ov_SC03_102_after.c b/src/ov_SC03_102/ov_SC03_102_after.c index a68679ebf..21f4d4233 100644 --- a/src/ov_SC03_102/ov_SC03_102_after.c +++ b/src/ov_SC03_102/ov_SC03_102_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_103/ov_SC03_103_after.c b/src/ov_SC03_103/ov_SC03_103_after.c index bb3a44a86..053ca2484 100644 --- a/src/ov_SC03_103/ov_SC03_103_after.c +++ b/src/ov_SC03_103/ov_SC03_103_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_104/ov_SC03_104_after.c b/src/ov_SC03_104/ov_SC03_104_after.c index c10d93ca9..d525fa149 100644 --- a/src/ov_SC03_104/ov_SC03_104_after.c +++ b/src/ov_SC03_104/ov_SC03_104_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_105/ov_SC03_105_after.c b/src/ov_SC03_105/ov_SC03_105_after.c index 3b351dde2..fd02eae3e 100644 --- a/src/ov_SC03_105/ov_SC03_105_after.c +++ b/src/ov_SC03_105/ov_SC03_105_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_108/ov_SC03_108_after.c b/src/ov_SC03_108/ov_SC03_108_after.c index 93ac9bf10..758398a35 100644 --- a/src/ov_SC03_108/ov_SC03_108_after.c +++ b/src/ov_SC03_108/ov_SC03_108_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_109/ov_SC03_109_after.c b/src/ov_SC03_109/ov_SC03_109_after.c index ae20dfc3a..52410ab56 100644 --- a/src/ov_SC03_109/ov_SC03_109_after.c +++ b/src/ov_SC03_109/ov_SC03_109_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_110/ov_SC03_110_after.c b/src/ov_SC03_110/ov_SC03_110_after.c index b17298552..47912dbf8 100644 --- a/src/ov_SC03_110/ov_SC03_110_after.c +++ b/src/ov_SC03_110/ov_SC03_110_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_111/ov_SC03_111_after.c b/src/ov_SC03_111/ov_SC03_111_after.c index 75d9e4d32..e94816189 100644 --- a/src/ov_SC03_111/ov_SC03_111_after.c +++ b/src/ov_SC03_111/ov_SC03_111_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_112/ov_SC03_112_after.c b/src/ov_SC03_112/ov_SC03_112_after.c index efd7ac21c..644985f5e 100644 --- a/src/ov_SC03_112/ov_SC03_112_after.c +++ b/src/ov_SC03_112/ov_SC03_112_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_113/ov_SC03_113_after.c b/src/ov_SC03_113/ov_SC03_113_after.c index c283f54c7..944cf4f9c 100644 --- a/src/ov_SC03_113/ov_SC03_113_after.c +++ b/src/ov_SC03_113/ov_SC03_113_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_114/ov_SC03_114_after.c b/src/ov_SC03_114/ov_SC03_114_after.c index e56bcf4f6..99c2f708b 100644 --- a/src/ov_SC03_114/ov_SC03_114_after.c +++ b/src/ov_SC03_114/ov_SC03_114_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_115/ov_SC03_115_after.c b/src/ov_SC03_115/ov_SC03_115_after.c index 92c878db3..d79c3a287 100644 --- a/src/ov_SC03_115/ov_SC03_115_after.c +++ b/src/ov_SC03_115/ov_SC03_115_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_116/ov_SC03_116_after.c b/src/ov_SC03_116/ov_SC03_116_after.c index f3c6a025f..0d0df8c97 100644 --- a/src/ov_SC03_116/ov_SC03_116_after.c +++ b/src/ov_SC03_116/ov_SC03_116_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_117/ov_SC03_117_after.c b/src/ov_SC03_117/ov_SC03_117_after.c index 89b12d112..d85d572a8 100644 --- a/src/ov_SC03_117/ov_SC03_117_after.c +++ b/src/ov_SC03_117/ov_SC03_117_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_118/ov_SC03_118_after.c b/src/ov_SC03_118/ov_SC03_118_after.c index 594b8234a..96415b342 100644 --- a/src/ov_SC03_118/ov_SC03_118_after.c +++ b/src/ov_SC03_118/ov_SC03_118_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_119/ov_SC03_119_after.c b/src/ov_SC03_119/ov_SC03_119_after.c index 3461fa135..f0e5a1934 100644 --- a/src/ov_SC03_119/ov_SC03_119_after.c +++ b/src/ov_SC03_119/ov_SC03_119_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_121/ov_SC03_121_after.c b/src/ov_SC03_121/ov_SC03_121_after.c index bd9964cb4..b5a71102c 100644 --- a/src/ov_SC03_121/ov_SC03_121_after.c +++ b/src/ov_SC03_121/ov_SC03_121_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_124/ov_SC03_124_after.c b/src/ov_SC03_124/ov_SC03_124_after.c index e6aa30433..1eba53ecd 100644 --- a/src/ov_SC03_124/ov_SC03_124_after.c +++ b/src/ov_SC03_124/ov_SC03_124_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_125/ov_SC03_125_after.c b/src/ov_SC03_125/ov_SC03_125_after.c index 5ab343037..c45d2ba7e 100644 --- a/src/ov_SC03_125/ov_SC03_125_after.c +++ b/src/ov_SC03_125/ov_SC03_125_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC03_126/ov_SC03_126_after.c b/src/ov_SC03_126/ov_SC03_126_after.c index 238d63e57..50f8c94bf 100644 --- a/src/ov_SC03_126/ov_SC03_126_after.c +++ b/src/ov_SC03_126/ov_SC03_126_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC04_000/ov_SC04_000_after.c b/src/ov_SC04_000/ov_SC04_000_after.c index e0863ff73..24b5aa46b 100644 --- a/src/ov_SC04_000/ov_SC04_000_after.c +++ b/src/ov_SC04_000/ov_SC04_000_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC04_002/ov_SC04_002_after.c b/src/ov_SC04_002/ov_SC04_002_after.c index 451208246..c011833ff 100644 --- a/src/ov_SC04_002/ov_SC04_002_after.c +++ b/src/ov_SC04_002/ov_SC04_002_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC04_003/ov_SC04_003_after.c b/src/ov_SC04_003/ov_SC04_003_after.c index 4f86d62bd..80c676647 100644 --- a/src/ov_SC04_003/ov_SC04_003_after.c +++ b/src/ov_SC04_003/ov_SC04_003_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC04_004/ov_SC04_004_after.c b/src/ov_SC04_004/ov_SC04_004_after.c index 8f75f5a9a..e62b1004e 100644 --- a/src/ov_SC04_004/ov_SC04_004_after.c +++ b/src/ov_SC04_004/ov_SC04_004_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC04_005/ov_SC04_005_after.c b/src/ov_SC04_005/ov_SC04_005_after.c index e784ae377..3d0ad1625 100644 --- a/src/ov_SC04_005/ov_SC04_005_after.c +++ b/src/ov_SC04_005/ov_SC04_005_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC04_006/ov_SC04_006_after.c b/src/ov_SC04_006/ov_SC04_006_after.c index ddc93b782..a94807ee8 100644 --- a/src/ov_SC04_006/ov_SC04_006_after.c +++ b/src/ov_SC04_006/ov_SC04_006_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC04_007/ov_SC04_007_after.c b/src/ov_SC04_007/ov_SC04_007_after.c index 00307800c..7c40764ed 100644 --- a/src/ov_SC04_007/ov_SC04_007_after.c +++ b/src/ov_SC04_007/ov_SC04_007_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC04_008/ov_SC04_008_after.c b/src/ov_SC04_008/ov_SC04_008_after.c index 0e9ef206c..3f1ae4b5c 100644 --- a/src/ov_SC04_008/ov_SC04_008_after.c +++ b/src/ov_SC04_008/ov_SC04_008_after.c @@ -1601,7 +1601,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC04_009/ov_SC04_009_after.c b/src/ov_SC04_009/ov_SC04_009_after.c index 35e822c91..c314a9620 100644 --- a/src/ov_SC04_009/ov_SC04_009_after.c +++ b/src/ov_SC04_009/ov_SC04_009_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC04_010/ov_SC04_010_after.c b/src/ov_SC04_010/ov_SC04_010_after.c index 9162ff9f5..a0a4bf94c 100644 --- a/src/ov_SC04_010/ov_SC04_010_after.c +++ b/src/ov_SC04_010/ov_SC04_010_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC04_011/ov_SC04_011_after.c b/src/ov_SC04_011/ov_SC04_011_after.c index 591fbcf54..a08f8f37d 100644 --- a/src/ov_SC04_011/ov_SC04_011_after.c +++ b/src/ov_SC04_011/ov_SC04_011_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC04_012/ov_SC04_012_after.c b/src/ov_SC04_012/ov_SC04_012_after.c index 94ca4bf26..add308107 100644 --- a/src/ov_SC04_012/ov_SC04_012_after.c +++ b/src/ov_SC04_012/ov_SC04_012_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC04_015/ov_SC04_015_after.c b/src/ov_SC04_015/ov_SC04_015_after.c index 4e68b405c..8045d544b 100644 --- a/src/ov_SC04_015/ov_SC04_015_after.c +++ b/src/ov_SC04_015/ov_SC04_015_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC04_016/ov_SC04_016_after.c b/src/ov_SC04_016/ov_SC04_016_after.c index 2d4378184..115c26e77 100644 --- a/src/ov_SC04_016/ov_SC04_016_after.c +++ b/src/ov_SC04_016/ov_SC04_016_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC04_018/ov_SC04_018_after.c b/src/ov_SC04_018/ov_SC04_018_after.c index f29ca28de..223488ccb 100644 --- a/src/ov_SC04_018/ov_SC04_018_after.c +++ b/src/ov_SC04_018/ov_SC04_018_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC04_019/ov_SC04_019_after.c b/src/ov_SC04_019/ov_SC04_019_after.c index e2ac6d6b3..c11eb4ba2 100644 --- a/src/ov_SC04_019/ov_SC04_019_after.c +++ b/src/ov_SC04_019/ov_SC04_019_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC04_020/ov_SC04_020_after.c b/src/ov_SC04_020/ov_SC04_020_after.c index 56b4f3c5e..6b439cf18 100644 --- a/src/ov_SC04_020/ov_SC04_020_after.c +++ b/src/ov_SC04_020/ov_SC04_020_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC04_021/ov_SC04_021_after.c b/src/ov_SC04_021/ov_SC04_021_after.c index 73f11bdd0..246810dc1 100644 --- a/src/ov_SC04_021/ov_SC04_021_after.c +++ b/src/ov_SC04_021/ov_SC04_021_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC05_000/ov_SC05_000_after.c b/src/ov_SC05_000/ov_SC05_000_after.c index f7b7f3dfb..16f1fbaad 100644 --- a/src/ov_SC05_000/ov_SC05_000_after.c +++ b/src/ov_SC05_000/ov_SC05_000_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC05_001/ov_SC05_001_after.c b/src/ov_SC05_001/ov_SC05_001_after.c index 370db832e..6b85003af 100644 --- a/src/ov_SC05_001/ov_SC05_001_after.c +++ b/src/ov_SC05_001/ov_SC05_001_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC05_002/ov_SC05_002_after.c b/src/ov_SC05_002/ov_SC05_002_after.c index 09cba4f8e..a6b838db5 100644 --- a/src/ov_SC05_002/ov_SC05_002_after.c +++ b/src/ov_SC05_002/ov_SC05_002_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC05_003/ov_SC05_003_after.c b/src/ov_SC05_003/ov_SC05_003_after.c index 906fa3790..f59538362 100644 --- a/src/ov_SC05_003/ov_SC05_003_after.c +++ b/src/ov_SC05_003/ov_SC05_003_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC05_004/ov_SC05_004_after.c b/src/ov_SC05_004/ov_SC05_004_after.c index 3b9452a07..6a2fa84f0 100644 --- a/src/ov_SC05_004/ov_SC05_004_after.c +++ b/src/ov_SC05_004/ov_SC05_004_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC05_005/ov_SC05_005_after.c b/src/ov_SC05_005/ov_SC05_005_after.c index 8e18047fb..b93ef1fa7 100644 --- a/src/ov_SC05_005/ov_SC05_005_after.c +++ b/src/ov_SC05_005/ov_SC05_005_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC05_006/ov_SC05_006_after.c b/src/ov_SC05_006/ov_SC05_006_after.c index 6ef9baa36..3b0422fe5 100644 --- a/src/ov_SC05_006/ov_SC05_006_after.c +++ b/src/ov_SC05_006/ov_SC05_006_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC05_007/ov_SC05_007_after.c b/src/ov_SC05_007/ov_SC05_007_after.c index 8b1208a11..11e7cc528 100644 --- a/src/ov_SC05_007/ov_SC05_007_after.c +++ b/src/ov_SC05_007/ov_SC05_007_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC05_008/ov_SC05_008_after.c b/src/ov_SC05_008/ov_SC05_008_after.c index 8367baed1..e82d0c331 100644 --- a/src/ov_SC05_008/ov_SC05_008_after.c +++ b/src/ov_SC05_008/ov_SC05_008_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC05_009/ov_SC05_009_after.c b/src/ov_SC05_009/ov_SC05_009_after.c index 0c8febba0..2f6252349 100644 --- a/src/ov_SC05_009/ov_SC05_009_after.c +++ b/src/ov_SC05_009/ov_SC05_009_after.c @@ -1601,7 +1601,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC05_010/ov_SC05_010_after.c b/src/ov_SC05_010/ov_SC05_010_after.c index 285a68cc7..a5425db8b 100644 --- a/src/ov_SC05_010/ov_SC05_010_after.c +++ b/src/ov_SC05_010/ov_SC05_010_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC05_011/ov_SC05_011_after.c b/src/ov_SC05_011/ov_SC05_011_after.c index 2a28399a1..6f44ca336 100644 --- a/src/ov_SC05_011/ov_SC05_011_after.c +++ b/src/ov_SC05_011/ov_SC05_011_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC05_017/ov_SC05_017_after.c b/src/ov_SC05_017/ov_SC05_017_after.c index 5d8b626ba..604da7cfd 100644 --- a/src/ov_SC05_017/ov_SC05_017_after.c +++ b/src/ov_SC05_017/ov_SC05_017_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC05_018/ov_SC05_018_after.c b/src/ov_SC05_018/ov_SC05_018_after.c index c6c36571d..0311848fa 100644 --- a/src/ov_SC05_018/ov_SC05_018_after.c +++ b/src/ov_SC05_018/ov_SC05_018_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC05_019/ov_SC05_019_after.c b/src/ov_SC05_019/ov_SC05_019_after.c index a4d25e435..e8b66c9e9 100644 --- a/src/ov_SC05_019/ov_SC05_019_after.c +++ b/src/ov_SC05_019/ov_SC05_019_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC06_000/ov_SC06_000_after.c b/src/ov_SC06_000/ov_SC06_000_after.c index a8516e4c9..9e0c3cc7f 100644 --- a/src/ov_SC06_000/ov_SC06_000_after.c +++ b/src/ov_SC06_000/ov_SC06_000_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC06_006/ov_SC06_006_after.c b/src/ov_SC06_006/ov_SC06_006_after.c index b283856a2..a3896c274 100644 --- a/src/ov_SC06_006/ov_SC06_006_after.c +++ b/src/ov_SC06_006/ov_SC06_006_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC06_008/ov_SC06_008_after.c b/src/ov_SC06_008/ov_SC06_008_after.c index ea7623785..c96a75272 100644 --- a/src/ov_SC06_008/ov_SC06_008_after.c +++ b/src/ov_SC06_008/ov_SC06_008_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC06_010/ov_SC06_010_after.c b/src/ov_SC06_010/ov_SC06_010_after.c index c6af37b26..5fce57cfe 100644 --- a/src/ov_SC06_010/ov_SC06_010_after.c +++ b/src/ov_SC06_010/ov_SC06_010_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC06_011/ov_SC06_011_after.c b/src/ov_SC06_011/ov_SC06_011_after.c index 428965b96..646e31024 100644 --- a/src/ov_SC06_011/ov_SC06_011_after.c +++ b/src/ov_SC06_011/ov_SC06_011_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC06_013/ov_SC06_013_after.c b/src/ov_SC06_013/ov_SC06_013_after.c index 5be50da9d..13d58d4a6 100644 --- a/src/ov_SC06_013/ov_SC06_013_after.c +++ b/src/ov_SC06_013/ov_SC06_013_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC06_014/ov_SC06_014_after.c b/src/ov_SC06_014/ov_SC06_014_after.c index 177e8b83c..aedb41e1f 100644 --- a/src/ov_SC06_014/ov_SC06_014_after.c +++ b/src/ov_SC06_014/ov_SC06_014_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC06_015/ov_SC06_015_after.c b/src/ov_SC06_015/ov_SC06_015_after.c index 4e563a3f4..d1fb209b2 100644 --- a/src/ov_SC06_015/ov_SC06_015_after.c +++ b/src/ov_SC06_015/ov_SC06_015_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC06_016/ov_SC06_016_after.c b/src/ov_SC06_016/ov_SC06_016_after.c index b7a43d10d..bae73bbdf 100644 --- a/src/ov_SC06_016/ov_SC06_016_after.c +++ b/src/ov_SC06_016/ov_SC06_016_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC06_018/ov_SC06_018_after.c b/src/ov_SC06_018/ov_SC06_018_after.c index b59d61c51..33da971db 100644 --- a/src/ov_SC06_018/ov_SC06_018_after.c +++ b/src/ov_SC06_018/ov_SC06_018_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC06_020/ov_SC06_020_after.c b/src/ov_SC06_020/ov_SC06_020_after.c index 4816b89ed..b8415fcdb 100644 --- a/src/ov_SC06_020/ov_SC06_020_after.c +++ b/src/ov_SC06_020/ov_SC06_020_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC06_022/ov_SC06_022_after.c b/src/ov_SC06_022/ov_SC06_022_after.c index 3928ac3e4..b2b18c6e3 100644 --- a/src/ov_SC06_022/ov_SC06_022_after.c +++ b/src/ov_SC06_022/ov_SC06_022_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC06_024/ov_SC06_024_after.c b/src/ov_SC06_024/ov_SC06_024_after.c index 03128da2c..0679805f8 100644 --- a/src/ov_SC06_024/ov_SC06_024_after.c +++ b/src/ov_SC06_024/ov_SC06_024_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC06_025/ov_SC06_025_after.c b/src/ov_SC06_025/ov_SC06_025_after.c index 2edd544f0..1c80e3a34 100644 --- a/src/ov_SC06_025/ov_SC06_025_after.c +++ b/src/ov_SC06_025/ov_SC06_025_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC06_027/ov_SC06_027_after.c b/src/ov_SC06_027/ov_SC06_027_after.c index efa01debd..5e8649f2d 100644 --- a/src/ov_SC06_027/ov_SC06_027_after.c +++ b/src/ov_SC06_027/ov_SC06_027_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC06_029/ov_SC06_029_after.c b/src/ov_SC06_029/ov_SC06_029_after.c index 2445cb52c..159e6231a 100644 --- a/src/ov_SC06_029/ov_SC06_029_after.c +++ b/src/ov_SC06_029/ov_SC06_029_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC06_030/ov_SC06_030_after.c b/src/ov_SC06_030/ov_SC06_030_after.c index 1c4b6bde3..723533610 100644 --- a/src/ov_SC06_030/ov_SC06_030_after.c +++ b/src/ov_SC06_030/ov_SC06_030_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC06_032/ov_SC06_032_after.c b/src/ov_SC06_032/ov_SC06_032_after.c index bfef5e742..e4321c4fd 100644 --- a/src/ov_SC06_032/ov_SC06_032_after.c +++ b/src/ov_SC06_032/ov_SC06_032_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC06_033/ov_SC06_033_after.c b/src/ov_SC06_033/ov_SC06_033_after.c index 0785bea92..9cb24f2dd 100644 --- a/src/ov_SC06_033/ov_SC06_033_after.c +++ b/src/ov_SC06_033/ov_SC06_033_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC07_000/ov_SC07_000_after.c b/src/ov_SC07_000/ov_SC07_000_after.c index 6dd578c6c..73fb35f3f 100644 --- a/src/ov_SC07_000/ov_SC07_000_after.c +++ b/src/ov_SC07_000/ov_SC07_000_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC07_001/ov_SC07_001_after.c b/src/ov_SC07_001/ov_SC07_001_after.c index e1cb14bea..114e3b209 100644 --- a/src/ov_SC07_001/ov_SC07_001_after.c +++ b/src/ov_SC07_001/ov_SC07_001_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC07_002/ov_SC07_002_after.c b/src/ov_SC07_002/ov_SC07_002_after.c index 0a9c300aa..57cc2a408 100644 --- a/src/ov_SC07_002/ov_SC07_002_after.c +++ b/src/ov_SC07_002/ov_SC07_002_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC07_008/ov_SC07_008_after.c b/src/ov_SC07_008/ov_SC07_008_after.c index 2219721f2..4e41e05df 100644 --- a/src/ov_SC07_008/ov_SC07_008_after.c +++ b/src/ov_SC07_008/ov_SC07_008_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0(); diff --git a/src/ov_SC07_009/ov_SC07_009_after.c b/src/ov_SC07_009/ov_SC07_009_after.c index 4384854d0..117300604 100644 --- a/src/ov_SC07_009/ov_SC07_009_after.c +++ b/src/ov_SC07_009/ov_SC07_009_after.c @@ -1603,7 +1603,8 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014F24C (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009_after", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ + extern s32 func_8014F4C0();