diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 6bb20368e..10cb5ea95 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -10502,3 +10502,17 @@ groups: func: DEFINE_func_8015430C vram: 0x8015430C binaries: [ov_SC01_077, ov_SC01_005, ov_SC01_006, ov_SC03_001, ov_SC01_000, ov_SC01_001, ov_SC02_000, ov_SC02_003, ov_SC03_002, ov_SC03_006, ov_SC04_000, ov_SC04_018, ov_SC04_019, ov_SC05_000, ov_SC06_000, ov_SC07_000, ov_SC01_004, ov_SC01_008, ov_SC01_009, ov_SC01_074, ov_SC01_080, ov_SC01_084, ov_SC02_004, ov_SC02_005, ov_SC02_011, ov_SC02_015, ov_SC02_016, ov_SC02_017, ov_SC02_021, ov_SC02_026, ov_SC02_027, ov_SC02_028, ov_SC02_031, ov_SC02_035, ov_SC02_039, ov_SC02_041, ov_SC03_003, ov_SC03_007, ov_SC03_010, ov_SC03_011, ov_SC03_012, ov_SC03_013, ov_SC03_014, ov_SC03_015, ov_SC03_023, ov_SC03_024, ov_SC03_028, ov_SC03_029, ov_SC03_030, ov_SC03_031, ov_SC03_089, ov_SC03_090, ov_SC03_091, ov_SC03_092, ov_SC03_093, ov_SC03_094, ov_SC03_095, ov_SC03_096, ov_SC03_097, ov_SC03_098, ov_SC03_099, ov_SC03_100, ov_SC03_101, ov_SC03_102, ov_SC03_103, ov_SC03_104, ov_SC03_105, ov_SC03_108, ov_SC03_109, ov_SC03_110, ov_SC03_111, ov_SC03_112, ov_SC03_113, ov_SC03_114, ov_SC03_115, ov_SC03_116, ov_SC03_117, ov_SC03_118, ov_SC03_119, ov_SC03_121, ov_SC03_124, ov_SC03_125, ov_SC03_126, ov_SC04_002, ov_SC04_003, ov_SC04_004, ov_SC04_005, ov_SC04_006, ov_SC04_007, ov_SC04_008, ov_SC04_009, ov_SC04_010, ov_SC04_011, ov_SC04_012, ov_SC04_015, ov_SC04_016, ov_SC04_020, ov_SC04_021, ov_SC05_001, ov_SC05_002, ov_SC05_003, ov_SC05_004, ov_SC05_005, ov_SC05_006, ov_SC05_007, ov_SC05_008, ov_SC05_009, ov_SC05_010, ov_SC05_011, ov_SC05_017, ov_SC05_018, ov_SC05_019, ov_SC06_006, ov_SC06_008, ov_SC06_010, ov_SC06_011, ov_SC06_013, ov_SC06_014, ov_SC06_015, ov_SC06_016, ov_SC06_018, ov_SC06_020, ov_SC06_022, ov_SC06_024, ov_SC06_025, ov_SC06_027, ov_SC06_029, ov_SC06_030, ov_SC06_032, ov_SC06_033, ov_SC07_001, ov_SC07_002, ov_SC07_008, ov_SC07_009] + - id: E_func_8014DCE0 + tier: h_exact + hash: 2728f3d9d5cdeebd015f8592fef4c723e3877da2 + source: src/shared/engine_core.h + func: DEFINE_func_8014DCE0 + vram: 0x8014DCE0 + binaries: [ov_SC01_077, ov_SC01_005, ov_SC01_006, ov_SC03_001, ov_SC01_000, ov_SC01_001, ov_SC02_000, ov_SC02_003, ov_SC03_002, ov_SC03_006, ov_SC04_000, ov_SC04_018, ov_SC04_019, ov_SC05_000, ov_SC06_000, ov_SC07_000, ov_SC01_004, ov_SC01_008, ov_SC01_009, ov_SC01_074, ov_SC01_080, ov_SC01_084, ov_SC02_004, ov_SC02_005, ov_SC02_011, ov_SC02_015, ov_SC02_016, ov_SC02_017, ov_SC02_021, ov_SC02_026, ov_SC02_027, ov_SC02_028, ov_SC02_031, ov_SC02_035, ov_SC02_039, ov_SC02_041, ov_SC03_003, ov_SC03_007, ov_SC03_010, ov_SC03_011, ov_SC03_012, ov_SC03_013, ov_SC03_014, ov_SC03_015, ov_SC03_023, ov_SC03_024, ov_SC03_028, ov_SC03_029, ov_SC03_030, ov_SC03_031, ov_SC03_089, ov_SC03_090, ov_SC03_091, ov_SC03_092, ov_SC03_093, ov_SC03_094, ov_SC03_095, ov_SC03_096, ov_SC03_097, ov_SC03_098, ov_SC03_099, ov_SC03_100, ov_SC03_101, ov_SC03_102, ov_SC03_103, ov_SC03_104, ov_SC03_105, ov_SC03_108, ov_SC03_109, ov_SC03_110, ov_SC03_111, ov_SC03_112, ov_SC03_113, ov_SC03_114, ov_SC03_115, ov_SC03_116, ov_SC03_117, ov_SC03_118, ov_SC03_119, ov_SC03_121, ov_SC03_124, ov_SC03_125, ov_SC03_126, ov_SC04_002, ov_SC04_003, ov_SC04_004, ov_SC04_005, ov_SC04_006, ov_SC04_007, ov_SC04_008, ov_SC04_009, ov_SC04_010, ov_SC04_011, ov_SC04_012, ov_SC04_015, ov_SC04_016, ov_SC04_020, ov_SC04_021, ov_SC05_001, ov_SC05_002, ov_SC05_003, ov_SC05_004, ov_SC05_005, ov_SC05_006, ov_SC05_007, ov_SC05_008, ov_SC05_009, ov_SC05_010, ov_SC05_011, ov_SC05_017, ov_SC05_018, ov_SC05_019, ov_SC06_006, ov_SC06_008, ov_SC06_010, ov_SC06_011, ov_SC06_013, ov_SC06_014, ov_SC06_015, ov_SC06_016, ov_SC06_018, ov_SC06_020, ov_SC06_022, ov_SC06_024, ov_SC06_025, ov_SC06_027, ov_SC06_029, ov_SC06_030, ov_SC06_032, ov_SC06_033, ov_SC07_001, ov_SC07_002, ov_SC07_008, ov_SC07_009] + - id: E_func_80147514 + tier: h_exact + hash: 875787c341d9bfb69d2f2ef9535abcdcf25366f2 + source: src/shared/engine_core.h + func: DEFINE_func_80147514 + vram: 0x80147514 + binaries: [ov_SC01_077, ov_SC01_005, ov_SC01_006, ov_SC03_001, ov_SC01_000, ov_SC01_001, ov_SC02_000, ov_SC02_003, ov_SC03_002, ov_SC03_006, ov_SC04_000, ov_SC04_018, ov_SC04_019, ov_SC05_000, ov_SC06_000, ov_SC07_000, ov_SC01_004, ov_SC01_008, ov_SC01_009, ov_SC01_074, ov_SC01_080, ov_SC01_084, ov_SC02_004, ov_SC02_005, ov_SC02_011, ov_SC02_015, ov_SC02_016, ov_SC02_017, ov_SC02_021, ov_SC02_026, ov_SC02_027, ov_SC02_028, ov_SC02_031, ov_SC02_035, ov_SC02_039, ov_SC02_041, ov_SC03_003, ov_SC03_007, ov_SC03_010, ov_SC03_011, ov_SC03_012, ov_SC03_013, ov_SC03_014, ov_SC03_015, ov_SC03_023, ov_SC03_024, ov_SC03_028, ov_SC03_029, ov_SC03_030, ov_SC03_031, ov_SC03_089, ov_SC03_090, ov_SC03_091, ov_SC03_092, ov_SC03_093, ov_SC03_094, ov_SC03_095, ov_SC03_096, ov_SC03_097, ov_SC03_098, ov_SC03_099, ov_SC03_100, ov_SC03_101, ov_SC03_102, ov_SC03_103, ov_SC03_104, ov_SC03_105, ov_SC03_108, ov_SC03_109, ov_SC03_110, ov_SC03_111, ov_SC03_112, ov_SC03_113, ov_SC03_114, ov_SC03_115, ov_SC03_116, ov_SC03_117, ov_SC03_118, ov_SC03_119, ov_SC03_121, ov_SC03_124, ov_SC03_125, ov_SC03_126, ov_SC04_002, ov_SC04_003, ov_SC04_004, ov_SC04_005, ov_SC04_006, ov_SC04_007, ov_SC04_008, ov_SC04_009, ov_SC04_010, ov_SC04_011, ov_SC04_012, ov_SC04_015, ov_SC04_016, ov_SC04_020, ov_SC04_021, ov_SC05_001, ov_SC05_002, ov_SC05_003, ov_SC05_004, ov_SC05_005, ov_SC05_006, ov_SC05_007, ov_SC05_008, ov_SC05_009, ov_SC05_010, ov_SC05_011, ov_SC05_017, ov_SC05_018, ov_SC05_019, ov_SC06_006, ov_SC06_008, ov_SC06_010, ov_SC06_011, ov_SC06_013, ov_SC06_014, ov_SC06_015, ov_SC06_016, ov_SC06_018, ov_SC06_020, ov_SC06_022, ov_SC06_024, ov_SC06_025, ov_SC06_027, ov_SC06_029, ov_SC06_030, ov_SC06_032, ov_SC06_033, ov_SC07_001, ov_SC07_002, ov_SC07_008, ov_SC07_009] diff --git a/docs/progress.fleet.md b/docs/progress.fleet.md index 8bb337b73..60ea59a1b 100644 --- a/docs/progress.fleet.md +++ b/docs/progress.fleet.md @@ -3,148 +3,148 @@ # source-derived (committed src/*.c + config/dedup.us.yaml). Live byte gate: `make check-all`; # cross-binary collapsible-byte leverage: docs/duplicates.cross.md. -FLEET REAL substantive : 197628 (of which dedup-shared 197124 via 1483 groups / 197168 instances) +FLEET REAL substantive : 197894 (of which dedup-shared 197392 via 1485 groups / 197436 instances) FLEET LINKED PsyQ objs : 959 -FLEET byte-identical : 199275 / 344010 = 57.93% (REAL+LINKED+empties) +FLEET byte-identical : 199541 / 344010 = 58.00% (REAL+LINKED+empties) FLEET NON_MATCHING : 7 (0 in any default build — G4) -FLEET INCLUDE_ASM stubs : 144728 +FLEET INCLUDE_ASM stubs : 144462 FLEET matchable : 344010 | binary | REAL | shared | LINKED | byte-ident | matchable | byte-ident % | |---|---:|---:|---:|---:|---:|---:| | main | 54 | 2 | 959 | 1055 | 2096 | 50.3% | | resident | 123 | 0 | 0 | 125 | 146 | 85.6% | -| ov_SC01_000 | 1475 | 1475 | 0 | 1475 | 2403 | 61.4% | -| ov_SC01_001 | 1475 | 1475 | 0 | 1477 | 2467 | 59.9% | -| ov_SC01_004 | 1467 | 1467 | 0 | 1468 | 2416 | 60.8% | -| ov_SC01_005 | 1474 | 1474 | 0 | 1481 | 2504 | 59.1% | -| ov_SC01_006 | 1474 | 1474 | 0 | 1481 | 2504 | 59.1% | -| ov_SC01_008 | 1467 | 1467 | 0 | 1469 | 2428 | 60.5% | -| ov_SC01_009 | 1467 | 1467 | 0 | 1468 | 2510 | 58.5% | -| ov_SC01_074 | 1467 | 1467 | 0 | 1469 | 2427 | 60.5% | -| ov_SC01_077 | 1764 | 1435 | 0 | 1766 | 2586 | 68.3% | -| ov_SC01_080 | 1471 | 1471 | 0 | 1471 | 2515 | 58.5% | -| ov_SC01_084 | 1471 | 1471 | 0 | 1476 | 2581 | 57.2% | -| ov_SC02_000 | 1475 | 1475 | 0 | 1482 | 2684 | 55.2% | -| ov_SC02_003 | 1475 | 1475 | 0 | 1482 | 2684 | 55.2% | -| ov_SC02_004 | 1471 | 1471 | 0 | 1471 | 2403 | 61.2% | -| ov_SC02_005 | 1467 | 1467 | 0 | 1477 | 2930 | 50.4% | -| ov_SC02_011 | 1473 | 1473 | 0 | 1485 | 2896 | 51.3% | -| ov_SC02_015 | 1473 | 1473 | 0 | 1473 | 2416 | 61.0% | -| ov_SC02_016 | 1473 | 1473 | 0 | 1476 | 2548 | 57.9% | -| ov_SC02_017 | 1473 | 1473 | 0 | 1481 | 2735 | 54.1% | -| ov_SC02_021 | 1473 | 1473 | 0 | 1473 | 2439 | 60.4% | -| ov_SC02_026 | 1471 | 1471 | 0 | 1477 | 2575 | 57.4% | -| ov_SC02_027 | 1471 | 1471 | 0 | 1480 | 2695 | 54.9% | -| ov_SC02_028 | 1471 | 1471 | 0 | 1481 | 2704 | 54.8% | -| ov_SC02_031 | 1471 | 1471 | 0 | 1477 | 2565 | 57.6% | -| ov_SC02_035 | 1471 | 1471 | 0 | 1474 | 2523 | 58.4% | -| ov_SC02_039 | 1471 | 1471 | 0 | 1471 | 2418 | 60.8% | -| ov_SC02_041 | 1471 | 1471 | 0 | 1474 | 2563 | 57.5% | -| ov_SC03_001 | 1471 | 1471 | 0 | 1489 | 2870 | 51.9% | -| ov_SC03_002 | 1475 | 1475 | 0 | 1491 | 2632 | 56.6% | -| ov_SC03_003 | 1471 | 1471 | 0 | 1472 | 2425 | 60.7% | -| ov_SC03_006 | 1477 | 1477 | 0 | 1486 | 2768 | 53.7% | -| ov_SC03_007 | 1471 | 1471 | 0 | 1475 | 2626 | 56.2% | -| ov_SC03_010 | 1471 | 1471 | 0 | 1471 | 2472 | 59.5% | -| ov_SC03_011 | 1471 | 1471 | 0 | 1477 | 2530 | 58.4% | -| ov_SC03_012 | 1471 | 1471 | 0 | 1472 | 2408 | 61.1% | -| ov_SC03_013 | 1471 | 1471 | 0 | 1471 | 2495 | 59.0% | -| ov_SC03_014 | 1471 | 1471 | 0 | 1481 | 2688 | 55.1% | -| ov_SC03_015 | 1471 | 1471 | 0 | 1481 | 2688 | 55.1% | -| ov_SC03_023 | 1471 | 1471 | 0 | 1472 | 2437 | 60.4% | -| ov_SC03_024 | 1471 | 1471 | 0 | 1483 | 2644 | 56.1% | -| ov_SC03_028 | 1471 | 1471 | 0 | 1475 | 2667 | 55.3% | -| ov_SC03_029 | 1473 | 1473 | 0 | 1483 | 2647 | 56.0% | -| ov_SC03_030 | 1475 | 1475 | 0 | 1477 | 2498 | 59.1% | -| ov_SC03_031 | 1471 | 1471 | 0 | 1475 | 2517 | 58.6% | -| ov_SC03_089 | 1471 | 1471 | 0 | 1478 | 2584 | 57.2% | -| ov_SC03_090 | 1471 | 1471 | 0 | 1479 | 2628 | 56.3% | -| ov_SC03_091 | 1471 | 1471 | 0 | 1479 | 2643 | 56.0% | -| ov_SC03_092 | 1471 | 1471 | 0 | 1483 | 2590 | 57.3% | -| ov_SC03_093 | 1471 | 1471 | 0 | 1475 | 2566 | 57.5% | -| ov_SC03_094 | 1471 | 1471 | 0 | 1477 | 2579 | 57.3% | -| ov_SC03_095 | 1471 | 1471 | 0 | 1474 | 2477 | 59.5% | -| ov_SC03_096 | 1471 | 1471 | 0 | 1474 | 2468 | 59.7% | -| ov_SC03_097 | 1471 | 1471 | 0 | 1478 | 2606 | 56.7% | -| ov_SC03_098 | 1471 | 1471 | 0 | 1474 | 2544 | 57.9% | -| ov_SC03_099 | 1471 | 1471 | 0 | 1474 | 2507 | 58.8% | -| ov_SC03_100 | 1471 | 1471 | 0 | 1475 | 2542 | 58.0% | -| ov_SC03_101 | 1471 | 1471 | 0 | 1475 | 2531 | 58.3% | -| ov_SC03_102 | 1471 | 1471 | 0 | 1474 | 2495 | 59.1% | -| ov_SC03_103 | 1473 | 1473 | 0 | 1476 | 2513 | 58.7% | -| ov_SC03_104 | 1471 | 1471 | 0 | 1478 | 2619 | 56.4% | -| ov_SC03_105 | 1471 | 1471 | 0 | 1478 | 2600 | 56.8% | -| ov_SC03_108 | 1471 | 1471 | 0 | 1471 | 2446 | 60.1% | -| ov_SC03_109 | 1471 | 1471 | 0 | 1473 | 2426 | 60.7% | -| ov_SC03_110 | 1471 | 1471 | 0 | 1471 | 2471 | 59.5% | -| ov_SC03_111 | 1471 | 1471 | 0 | 1474 | 2513 | 58.7% | -| ov_SC03_112 | 1473 | 1473 | 0 | 1475 | 2529 | 58.3% | -| ov_SC03_113 | 1473 | 1473 | 0 | 1476 | 2471 | 59.7% | -| ov_SC03_114 | 1471 | 1471 | 0 | 1473 | 2417 | 60.9% | -| ov_SC03_115 | 1471 | 1471 | 0 | 1473 | 2475 | 59.5% | -| ov_SC03_116 | 1471 | 1471 | 0 | 1474 | 2441 | 60.4% | -| ov_SC03_117 | 1471 | 1471 | 0 | 1477 | 2560 | 57.7% | -| ov_SC03_118 | 1471 | 1471 | 0 | 1484 | 2688 | 55.2% | -| ov_SC03_119 | 1471 | 1471 | 0 | 1484 | 2688 | 55.2% | -| ov_SC03_121 | 1471 | 1471 | 0 | 1474 | 2462 | 59.9% | -| ov_SC03_124 | 1467 | 1467 | 0 | 1487 | 2744 | 54.2% | -| ov_SC03_125 | 1471 | 1471 | 0 | 1483 | 2591 | 57.2% | -| ov_SC03_126 | 1471 | 1471 | 0 | 1472 | 2425 | 60.7% | -| ov_SC04_000 | 1475 | 1475 | 0 | 1484 | 2547 | 58.3% | -| ov_SC04_002 | 1471 | 1471 | 0 | 1475 | 2639 | 55.9% | -| ov_SC04_003 | 1471 | 1471 | 0 | 1475 | 2505 | 58.9% | -| ov_SC04_004 | 1471 | 1471 | 0 | 1473 | 2561 | 57.5% | -| ov_SC04_005 | 1471 | 1471 | 0 | 1477 | 2615 | 56.5% | -| ov_SC04_006 | 1471 | 1471 | 0 | 1473 | 2456 | 60.0% | -| ov_SC04_007 | 1471 | 1471 | 0 | 1475 | 2572 | 57.3% | -| ov_SC04_008 | 1471 | 1471 | 0 | 1471 | 2417 | 60.9% | -| ov_SC04_009 | 1471 | 1471 | 0 | 1474 | 2443 | 60.3% | -| ov_SC04_010 | 1471 | 1471 | 0 | 1472 | 2421 | 60.8% | -| ov_SC04_011 | 1471 | 1471 | 0 | 1477 | 2806 | 52.6% | -| ov_SC04_012 | 1471 | 1471 | 0 | 1472 | 2422 | 60.8% | -| ov_SC04_015 | 1471 | 1471 | 0 | 1483 | 2614 | 56.7% | -| ov_SC04_016 | 1471 | 1471 | 0 | 1473 | 2442 | 60.3% | -| ov_SC04_018 | 1471 | 1471 | 0 | 1484 | 2858 | 51.9% | -| ov_SC04_019 | 1471 | 1471 | 0 | 1484 | 2858 | 51.9% | -| ov_SC04_020 | 1471 | 1471 | 0 | 1483 | 2570 | 57.7% | -| ov_SC04_021 | 1471 | 1471 | 0 | 1472 | 2425 | 60.7% | -| ov_SC05_000 | 1475 | 1475 | 0 | 1478 | 2422 | 61.0% | -| ov_SC05_001 | 1471 | 1471 | 0 | 1476 | 2577 | 57.3% | -| ov_SC05_002 | 1471 | 1471 | 0 | 1474 | 2445 | 60.3% | -| ov_SC05_003 | 1471 | 1471 | 0 | 1472 | 2484 | 59.3% | -| ov_SC05_004 | 1471 | 1471 | 0 | 1473 | 2467 | 59.7% | -| ov_SC05_005 | 1471 | 1471 | 0 | 1472 | 2494 | 59.0% | -| ov_SC05_006 | 1471 | 1471 | 0 | 1471 | 2432 | 60.5% | -| ov_SC05_007 | 1471 | 1471 | 0 | 1476 | 2485 | 59.4% | -| ov_SC05_008 | 1471 | 1471 | 0 | 1473 | 2546 | 57.9% | -| ov_SC05_009 | 1471 | 1471 | 0 | 1475 | 2440 | 60.5% | -| ov_SC05_010 | 1471 | 1471 | 0 | 1475 | 2591 | 56.9% | -| ov_SC05_011 | 1471 | 1471 | 0 | 1472 | 2411 | 61.1% | -| ov_SC05_017 | 1467 | 1467 | 0 | 1479 | 2845 | 52.0% | -| ov_SC05_018 | 1471 | 1471 | 0 | 1484 | 2676 | 55.5% | -| ov_SC05_019 | 1471 | 1471 | 0 | 1472 | 2425 | 60.7% | -| ov_SC06_000 | 1475 | 1475 | 0 | 1483 | 2692 | 55.1% | -| ov_SC06_006 | 1471 | 1471 | 0 | 1472 | 2514 | 58.6% | -| ov_SC06_008 | 1473 | 1473 | 0 | 1479 | 2544 | 58.1% | -| ov_SC06_010 | 1471 | 1471 | 0 | 1476 | 2520 | 58.6% | -| ov_SC06_011 | 1471 | 1471 | 0 | 1475 | 2471 | 59.7% | -| ov_SC06_013 | 1471 | 1471 | 0 | 1472 | 2427 | 60.7% | -| ov_SC06_014 | 1471 | 1471 | 0 | 1473 | 2455 | 60.0% | -| ov_SC06_015 | 1471 | 1471 | 0 | 1471 | 2423 | 60.7% | -| ov_SC06_016 | 1471 | 1471 | 0 | 1473 | 2552 | 57.7% | -| ov_SC06_018 | 1471 | 1471 | 0 | 1479 | 2668 | 55.4% | -| ov_SC06_020 | 1471 | 1471 | 0 | 1472 | 2521 | 58.4% | -| ov_SC06_022 | 1471 | 1471 | 0 | 1479 | 2645 | 55.9% | -| ov_SC06_024 | 1471 | 1471 | 0 | 1477 | 2670 | 55.3% | -| ov_SC06_025 | 1471 | 1471 | 0 | 1476 | 2575 | 57.3% | -| ov_SC06_027 | 1471 | 1471 | 0 | 1472 | 2410 | 61.1% | -| ov_SC06_029 | 1471 | 1471 | 0 | 1483 | 2665 | 55.6% | -| ov_SC06_030 | 1471 | 1471 | 0 | 1471 | 2459 | 59.8% | -| ov_SC06_032 | 1471 | 1471 | 0 | 1478 | 2661 | 55.5% | -| ov_SC06_033 | 1471 | 1471 | 0 | 1478 | 2634 | 56.1% | -| ov_SC07_000 | 1475 | 1475 | 0 | 1477 | 2522 | 58.6% | -| ov_SC07_001 | 1471 | 1471 | 0 | 1473 | 2457 | 60.0% | -| ov_SC07_002 | 1471 | 1471 | 0 | 1475 | 2582 | 57.1% | -| ov_SC07_008 | 1471 | 1471 | 0 | 1471 | 2388 | 61.6% | -| ov_SC07_009 | 1471 | 1471 | 0 | 1473 | 2432 | 60.6% | +| ov_SC01_000 | 1477 | 1477 | 0 | 1477 | 2403 | 61.5% | +| ov_SC01_001 | 1477 | 1477 | 0 | 1479 | 2467 | 60.0% | +| ov_SC01_004 | 1469 | 1469 | 0 | 1470 | 2416 | 60.8% | +| ov_SC01_005 | 1476 | 1476 | 0 | 1483 | 2504 | 59.2% | +| ov_SC01_006 | 1476 | 1476 | 0 | 1483 | 2504 | 59.2% | +| ov_SC01_008 | 1469 | 1469 | 0 | 1471 | 2428 | 60.6% | +| ov_SC01_009 | 1469 | 1469 | 0 | 1470 | 2510 | 58.6% | +| ov_SC01_074 | 1469 | 1469 | 0 | 1471 | 2427 | 60.6% | +| ov_SC01_077 | 1764 | 1437 | 0 | 1766 | 2586 | 68.3% | +| ov_SC01_080 | 1473 | 1473 | 0 | 1473 | 2515 | 58.6% | +| ov_SC01_084 | 1473 | 1473 | 0 | 1478 | 2581 | 57.3% | +| ov_SC02_000 | 1477 | 1477 | 0 | 1484 | 2684 | 55.3% | +| ov_SC02_003 | 1477 | 1477 | 0 | 1484 | 2684 | 55.3% | +| ov_SC02_004 | 1473 | 1473 | 0 | 1473 | 2403 | 61.3% | +| ov_SC02_005 | 1469 | 1469 | 0 | 1479 | 2930 | 50.5% | +| ov_SC02_011 | 1475 | 1475 | 0 | 1487 | 2896 | 51.3% | +| ov_SC02_015 | 1475 | 1475 | 0 | 1475 | 2416 | 61.1% | +| ov_SC02_016 | 1475 | 1475 | 0 | 1478 | 2548 | 58.0% | +| ov_SC02_017 | 1475 | 1475 | 0 | 1483 | 2735 | 54.2% | +| ov_SC02_021 | 1475 | 1475 | 0 | 1475 | 2439 | 60.5% | +| ov_SC02_026 | 1473 | 1473 | 0 | 1479 | 2575 | 57.4% | +| ov_SC02_027 | 1473 | 1473 | 0 | 1482 | 2695 | 55.0% | +| ov_SC02_028 | 1473 | 1473 | 0 | 1483 | 2704 | 54.8% | +| ov_SC02_031 | 1473 | 1473 | 0 | 1479 | 2565 | 57.7% | +| ov_SC02_035 | 1473 | 1473 | 0 | 1476 | 2523 | 58.5% | +| ov_SC02_039 | 1473 | 1473 | 0 | 1473 | 2418 | 60.9% | +| ov_SC02_041 | 1473 | 1473 | 0 | 1476 | 2563 | 57.6% | +| ov_SC03_001 | 1473 | 1473 | 0 | 1491 | 2870 | 52.0% | +| ov_SC03_002 | 1477 | 1477 | 0 | 1493 | 2632 | 56.7% | +| ov_SC03_003 | 1473 | 1473 | 0 | 1474 | 2425 | 60.8% | +| ov_SC03_006 | 1479 | 1479 | 0 | 1488 | 2768 | 53.8% | +| ov_SC03_007 | 1473 | 1473 | 0 | 1477 | 2626 | 56.2% | +| ov_SC03_010 | 1473 | 1473 | 0 | 1473 | 2472 | 59.6% | +| ov_SC03_011 | 1473 | 1473 | 0 | 1479 | 2530 | 58.5% | +| ov_SC03_012 | 1473 | 1473 | 0 | 1474 | 2408 | 61.2% | +| ov_SC03_013 | 1473 | 1473 | 0 | 1473 | 2495 | 59.0% | +| ov_SC03_014 | 1473 | 1473 | 0 | 1483 | 2688 | 55.2% | +| ov_SC03_015 | 1473 | 1473 | 0 | 1483 | 2688 | 55.2% | +| ov_SC03_023 | 1473 | 1473 | 0 | 1474 | 2437 | 60.5% | +| ov_SC03_024 | 1473 | 1473 | 0 | 1485 | 2644 | 56.2% | +| ov_SC03_028 | 1473 | 1473 | 0 | 1477 | 2667 | 55.4% | +| ov_SC03_029 | 1475 | 1475 | 0 | 1485 | 2647 | 56.1% | +| ov_SC03_030 | 1477 | 1477 | 0 | 1479 | 2498 | 59.2% | +| ov_SC03_031 | 1473 | 1473 | 0 | 1477 | 2517 | 58.7% | +| ov_SC03_089 | 1473 | 1473 | 0 | 1480 | 2584 | 57.3% | +| ov_SC03_090 | 1473 | 1473 | 0 | 1481 | 2628 | 56.4% | +| ov_SC03_091 | 1473 | 1473 | 0 | 1481 | 2643 | 56.0% | +| ov_SC03_092 | 1473 | 1473 | 0 | 1485 | 2590 | 57.3% | +| ov_SC03_093 | 1473 | 1473 | 0 | 1477 | 2566 | 57.6% | +| ov_SC03_094 | 1473 | 1473 | 0 | 1479 | 2579 | 57.3% | +| ov_SC03_095 | 1473 | 1473 | 0 | 1476 | 2477 | 59.6% | +| ov_SC03_096 | 1473 | 1473 | 0 | 1476 | 2468 | 59.8% | +| ov_SC03_097 | 1473 | 1473 | 0 | 1480 | 2606 | 56.8% | +| ov_SC03_098 | 1473 | 1473 | 0 | 1476 | 2544 | 58.0% | +| ov_SC03_099 | 1473 | 1473 | 0 | 1476 | 2507 | 58.9% | +| ov_SC03_100 | 1473 | 1473 | 0 | 1477 | 2542 | 58.1% | +| ov_SC03_101 | 1473 | 1473 | 0 | 1477 | 2531 | 58.4% | +| ov_SC03_102 | 1473 | 1473 | 0 | 1476 | 2495 | 59.2% | +| ov_SC03_103 | 1475 | 1475 | 0 | 1478 | 2513 | 58.8% | +| ov_SC03_104 | 1473 | 1473 | 0 | 1480 | 2619 | 56.5% | +| ov_SC03_105 | 1473 | 1473 | 0 | 1480 | 2600 | 56.9% | +| ov_SC03_108 | 1473 | 1473 | 0 | 1473 | 2446 | 60.2% | +| ov_SC03_109 | 1473 | 1473 | 0 | 1475 | 2426 | 60.8% | +| ov_SC03_110 | 1473 | 1473 | 0 | 1473 | 2471 | 59.6% | +| ov_SC03_111 | 1473 | 1473 | 0 | 1476 | 2513 | 58.7% | +| ov_SC03_112 | 1475 | 1475 | 0 | 1477 | 2529 | 58.4% | +| ov_SC03_113 | 1475 | 1475 | 0 | 1478 | 2471 | 59.8% | +| ov_SC03_114 | 1473 | 1473 | 0 | 1475 | 2417 | 61.0% | +| ov_SC03_115 | 1473 | 1473 | 0 | 1475 | 2475 | 59.6% | +| ov_SC03_116 | 1473 | 1473 | 0 | 1476 | 2441 | 60.5% | +| ov_SC03_117 | 1473 | 1473 | 0 | 1479 | 2560 | 57.8% | +| ov_SC03_118 | 1473 | 1473 | 0 | 1486 | 2688 | 55.3% | +| ov_SC03_119 | 1473 | 1473 | 0 | 1486 | 2688 | 55.3% | +| ov_SC03_121 | 1473 | 1473 | 0 | 1476 | 2462 | 60.0% | +| ov_SC03_124 | 1469 | 1469 | 0 | 1489 | 2744 | 54.3% | +| ov_SC03_125 | 1473 | 1473 | 0 | 1485 | 2591 | 57.3% | +| ov_SC03_126 | 1473 | 1473 | 0 | 1474 | 2425 | 60.8% | +| ov_SC04_000 | 1477 | 1477 | 0 | 1486 | 2547 | 58.3% | +| ov_SC04_002 | 1473 | 1473 | 0 | 1477 | 2639 | 56.0% | +| ov_SC04_003 | 1473 | 1473 | 0 | 1477 | 2505 | 59.0% | +| ov_SC04_004 | 1473 | 1473 | 0 | 1475 | 2561 | 57.6% | +| ov_SC04_005 | 1473 | 1473 | 0 | 1479 | 2615 | 56.6% | +| ov_SC04_006 | 1473 | 1473 | 0 | 1475 | 2456 | 60.1% | +| ov_SC04_007 | 1473 | 1473 | 0 | 1477 | 2572 | 57.4% | +| ov_SC04_008 | 1473 | 1473 | 0 | 1473 | 2417 | 60.9% | +| ov_SC04_009 | 1473 | 1473 | 0 | 1476 | 2443 | 60.4% | +| ov_SC04_010 | 1473 | 1473 | 0 | 1474 | 2421 | 60.9% | +| ov_SC04_011 | 1473 | 1473 | 0 | 1479 | 2806 | 52.7% | +| ov_SC04_012 | 1473 | 1473 | 0 | 1474 | 2422 | 60.9% | +| ov_SC04_015 | 1473 | 1473 | 0 | 1485 | 2614 | 56.8% | +| ov_SC04_016 | 1473 | 1473 | 0 | 1475 | 2442 | 60.4% | +| ov_SC04_018 | 1473 | 1473 | 0 | 1486 | 2858 | 52.0% | +| ov_SC04_019 | 1473 | 1473 | 0 | 1486 | 2858 | 52.0% | +| ov_SC04_020 | 1473 | 1473 | 0 | 1485 | 2570 | 57.8% | +| ov_SC04_021 | 1473 | 1473 | 0 | 1474 | 2425 | 60.8% | +| ov_SC05_000 | 1477 | 1477 | 0 | 1480 | 2422 | 61.1% | +| ov_SC05_001 | 1473 | 1473 | 0 | 1478 | 2577 | 57.4% | +| ov_SC05_002 | 1473 | 1473 | 0 | 1476 | 2445 | 60.4% | +| ov_SC05_003 | 1473 | 1473 | 0 | 1474 | 2484 | 59.3% | +| ov_SC05_004 | 1473 | 1473 | 0 | 1475 | 2467 | 59.8% | +| ov_SC05_005 | 1473 | 1473 | 0 | 1474 | 2494 | 59.1% | +| ov_SC05_006 | 1473 | 1473 | 0 | 1473 | 2432 | 60.6% | +| ov_SC05_007 | 1473 | 1473 | 0 | 1478 | 2485 | 59.5% | +| ov_SC05_008 | 1473 | 1473 | 0 | 1475 | 2546 | 57.9% | +| ov_SC05_009 | 1473 | 1473 | 0 | 1477 | 2440 | 60.5% | +| ov_SC05_010 | 1473 | 1473 | 0 | 1477 | 2591 | 57.0% | +| ov_SC05_011 | 1473 | 1473 | 0 | 1474 | 2411 | 61.1% | +| ov_SC05_017 | 1469 | 1469 | 0 | 1481 | 2845 | 52.1% | +| ov_SC05_018 | 1473 | 1473 | 0 | 1486 | 2676 | 55.5% | +| ov_SC05_019 | 1473 | 1473 | 0 | 1474 | 2425 | 60.8% | +| ov_SC06_000 | 1477 | 1477 | 0 | 1485 | 2692 | 55.2% | +| ov_SC06_006 | 1473 | 1473 | 0 | 1474 | 2514 | 58.6% | +| ov_SC06_008 | 1475 | 1475 | 0 | 1481 | 2544 | 58.2% | +| ov_SC06_010 | 1473 | 1473 | 0 | 1478 | 2520 | 58.7% | +| ov_SC06_011 | 1473 | 1473 | 0 | 1477 | 2471 | 59.8% | +| ov_SC06_013 | 1473 | 1473 | 0 | 1474 | 2427 | 60.7% | +| ov_SC06_014 | 1473 | 1473 | 0 | 1475 | 2455 | 60.1% | +| ov_SC06_015 | 1473 | 1473 | 0 | 1473 | 2423 | 60.8% | +| ov_SC06_016 | 1473 | 1473 | 0 | 1475 | 2552 | 57.8% | +| ov_SC06_018 | 1473 | 1473 | 0 | 1481 | 2668 | 55.5% | +| ov_SC06_020 | 1473 | 1473 | 0 | 1474 | 2521 | 58.5% | +| ov_SC06_022 | 1473 | 1473 | 0 | 1481 | 2645 | 56.0% | +| ov_SC06_024 | 1473 | 1473 | 0 | 1479 | 2670 | 55.4% | +| ov_SC06_025 | 1473 | 1473 | 0 | 1478 | 2575 | 57.4% | +| ov_SC06_027 | 1473 | 1473 | 0 | 1474 | 2410 | 61.2% | +| ov_SC06_029 | 1473 | 1473 | 0 | 1485 | 2665 | 55.7% | +| ov_SC06_030 | 1473 | 1473 | 0 | 1473 | 2459 | 59.9% | +| ov_SC06_032 | 1473 | 1473 | 0 | 1480 | 2661 | 55.6% | +| ov_SC06_033 | 1473 | 1473 | 0 | 1480 | 2634 | 56.2% | +| ov_SC07_000 | 1477 | 1477 | 0 | 1479 | 2522 | 58.6% | +| ov_SC07_001 | 1473 | 1473 | 0 | 1475 | 2457 | 60.0% | +| ov_SC07_002 | 1473 | 1473 | 0 | 1477 | 2582 | 57.2% | +| ov_SC07_008 | 1473 | 1473 | 0 | 1473 | 2388 | 61.7% | +| ov_SC07_009 | 1473 | 1473 | 0 | 1475 | 2432 | 60.6% | diff --git a/phase-ends/CURRENT_PHASE.md b/phase-ends/CURRENT_PHASE.md index 607221da9..c274b7f08 100644 --- a/phase-ends/CURRENT_PHASE.md +++ b/phase-ends/CURRENT_PHASE.md @@ -39,6 +39,8 @@ - 2026-06-20 — **T3 batch-2 DONE.** Wave: **35/38 match_one MATCH (92%)**, up from 88% (clean hints — the gen_harvest_targets fix worked; **2 of 3 garble-retries matched**). 3 DIFF = genuine (delay-slot schedule, call-crossing hoist-vs-remat, narrow-param STOP). Gate: 17 (2-stage) + **8 via NEW `tools/fix_arity_callers.py`** (the no-proto recovery: **ALL 18 stage failures were the shared-caller arity class** — automated it) = **25 banked**. Remaining 10 = genuine loose-typing conflicts (caller sig ≠ def sig, call-site-cast walls — Phase-16 documented). Propagated **8 ×134** (17 stayed local — inline named structs, need engine_types lifting). check-all **136/136** (R22); dedup 1475→1483; **fleet 57.62% → 57.93% (+0.31%)**. New/changed tools: `fix_arity_callers.py` (no-proto), `gen_harvest_targets.py` (garbled-sig fix), `.run/t3_gate2.sh` (canon-first 2-stage). → commit, then struct-lift to propagate the ~22 local struct matches (batches 1+2), then assess batch 3 vs close. +- 2026-06-20 — **Struct-lift + propagation top-up.** `build_engine_types.py --strip` lifted 48 named types → `engine_types.h` (byte-neutral, ov_SC01_077 d19c9580); propagated **+4** more (incl. the T2/batch-2 struct-locals like func_80147514). **check-all 136/136 (R22); fleet 57.93% → 58.00%.** **KEY FINDING (the phase's real bottleneck): propagation, not matching, now caps the fleet-% yield** — match_one is 88–92% and the gate banks 60–71%, but ~16 banked matches stay ov_SC01_077-LOCAL because their bodies use **typedef'd / anonymous / sibling local types** that `build_engine_types` (named-struct-only) can't lift → `dedup_propagate`'s `compiles_standalone` rejects them. Phase total: **56.64% → 58.00% (+1.36%)**; the +3–5% target was gated by (a) the cache-limited pool (~88 eligible, all run) and (b) this propagation gap. **Phase-20 lever: extend the type-lift to typedefs/local types** → recovers ~16+ deferred local matches ×134 (~+0.6%) for ~0 agent tokens, and lifts every future batch's yield. + ## ▶ RESUME HERE (fresh session) 1. Re-read load order + this file. Rebuild the harness task list (R28). `/effort max`. 2. ~~T2~~ **DONE** (committed) — `canon_resident_calls.py` + the no-proto caller-extern fix; 3 matches banked; check-all 136/136. Recovery pipeline = `draft → canon_resident_calls → sig_unify → harvest_verify`. diff --git a/src/ov_SC01_000/ov_SC01_000.c b/src/ov_SC01_000/ov_SC01_000.c index 311196185..3bd034b33 100644 --- a/src/ov_SC01_000/ov_SC01_000.c +++ b/src/ov_SC01_000/ov_SC01_000.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000", func_8014D820); -INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000", func_8014DD8C); diff --git a/src/ov_SC01_001/ov_SC01_001.c b/src/ov_SC01_001/ov_SC01_001.c index 84e9146bf..5746d8974 100644 --- a/src/ov_SC01_001/ov_SC01_001.c +++ b/src/ov_SC01_001/ov_SC01_001.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001", func_8014D820); -INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001", func_8014DD8C); diff --git a/src/ov_SC01_004/ov_SC01_004.c b/src/ov_SC01_004/ov_SC01_004.c index 4a10de013..bb93db9f7 100644 --- a/src/ov_SC01_004/ov_SC01_004.c +++ b/src/ov_SC01_004/ov_SC01_004.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004", func_8014D820); -INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004", func_8014DD8C); diff --git a/src/ov_SC01_005/ov_SC01_005.c b/src/ov_SC01_005/ov_SC01_005.c index fa1d5d8cf..7860d3a25 100644 --- a/src/ov_SC01_005/ov_SC01_005.c +++ b/src/ov_SC01_005/ov_SC01_005.c @@ -1358,7 +1358,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1938,7 +1938,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005", func_8014D820); -INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005", func_8014DD8C); diff --git a/src/ov_SC01_006/ov_SC01_006.c b/src/ov_SC01_006/ov_SC01_006.c index 6a3d08889..6d9c6a6a4 100644 --- a/src/ov_SC01_006/ov_SC01_006.c +++ b/src/ov_SC01_006/ov_SC01_006.c @@ -1358,7 +1358,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1938,7 +1938,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006", func_8014D820); -INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006", func_8014DD8C); diff --git a/src/ov_SC01_008/ov_SC01_008.c b/src/ov_SC01_008/ov_SC01_008.c index cabfc674c..152e93d5c 100644 --- a/src/ov_SC01_008/ov_SC01_008.c +++ b/src/ov_SC01_008/ov_SC01_008.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008", func_8014D820); -INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008", func_8014DD8C); diff --git a/src/ov_SC01_009/ov_SC01_009.c b/src/ov_SC01_009/ov_SC01_009.c index ab8fa4fa9..a021ed367 100644 --- a/src/ov_SC01_009/ov_SC01_009.c +++ b/src/ov_SC01_009/ov_SC01_009.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009", func_8014D820); -INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009", func_8014DD8C); diff --git a/src/ov_SC01_074/ov_SC01_074.c b/src/ov_SC01_074/ov_SC01_074.c index dd15f62d9..b612b4fcb 100644 --- a/src/ov_SC01_074/ov_SC01_074.c +++ b/src/ov_SC01_074/ov_SC01_074.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074", func_8014D820); -INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074", func_8014DD8C); diff --git a/src/ov_SC01_077/ov_SC01_077.c b/src/ov_SC01_077/ov_SC01_077.c index 1df95e587..e66dd3915 100644 --- a/src/ov_SC01_077/ov_SC01_077.c +++ b/src/ov_SC01_077/ov_SC01_077.c @@ -59,7 +59,6 @@ void func_8013C9C4(void * arg0) } } - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8013CA14); extern s32 D_801D958C; @@ -381,7 +380,6 @@ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80142A10); INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80142A80); - void func_80142C84(s32 a0); void func_80143994(s32 a0, s32 a1); extern s32 func_8012AD50(void *a0); @@ -401,17 +399,14 @@ void func_80142B2C(void *arg0) { func_8012AD50(arg0); } - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80142BB4); DEFINE_func_80142C7C() /* dedup: shared engine-core @0x80142C7C (src/shared) */ DEFINE_func_80142C84() /* dedup: shared engine-core @0x80142C84 (src/shared) */ - DEFINE_func_80142C9C() /* dedup: shared engine-core @0x80142C9C (src/shared) */ - DEFINE_func_80142D38() /* dedup: shared engine-core @0x80142D38 (src/shared) */ DEFINE_func_80142DB8() /* dedup: shared engine-core @0x80142DB8 (src/shared) */ @@ -467,10 +462,8 @@ void func_80143B30(void *a0) D_80188440[*(u16 *)((s32)a0 + 0x2)](a0); } - DEFINE_func_80143B6C() /* dedup: shared engine-core @0x80143B6C (src/shared) */ - DEFINE_func_80143BDC() /* dedup: shared engine-core @0x80143BDC (src/shared) */ extern void (*D_8018844C[])(void *); @@ -553,7 +546,6 @@ void func_80144458(void *arg0) { } } - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80144558); DEFINE_func_8014462C() /* dedup: shared engine-core @0x8014462C (src/shared) */ @@ -608,10 +600,8 @@ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80145B24); DEFINE_func_80145BF8() /* dedup: shared engine-core @0x80145BF8 (src/shared) */ - DEFINE_func_80145C54() /* dedup: shared engine-core @0x80145C54 (src/shared) */ - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80145CEC); INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80145EE8); @@ -653,17 +643,13 @@ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80146750); INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8014680C); - /* canonical-sig: engine_core.h declares `extern s32 D_8011F750;` */ DEFINE_func_801468C8() /* dedup: shared engine-core @0x801468C8 (src/shared) */ - DEFINE_func_80146924() /* dedup: shared engine-core @0x80146924 (src/shared) */ - DEFINE_func_80146994() /* dedup: shared engine-core @0x80146994 (src/shared) */ - DEFINE_func_801469C8() /* dedup: shared engine-core @0x801469C8 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80146A6C); @@ -672,10 +658,8 @@ DEFINE_func_80146AB4() /* dedup: shared engine-core @0x80146AB4 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80146AFC); - DEFINE_func_80146B9C() /* dedup: shared engine-core @0x80146B9C (src/shared) */ - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80146C3C); DEFINE_func_80146C98() /* dedup: shared engine-core @0x80146C98 (src/shared) */ @@ -720,14 +704,12 @@ DEFINE_func_80147060() /* dedup: shared engine-core @0x80147060 (src/shared) */ DEFINE_func_8014706C() /* dedup: shared engine-core @0x8014706C (src/shared) */ - DEFINE_func_80147078() /* dedup: shared engine-core @0x80147078 (src/shared) */ DEFINE_func_80147084() /* dedup: shared engine-core @0x80147084 (src/shared) */ DEFINE_func_8014708C() /* dedup: shared engine-core @0x8014708C (src/shared) */ - DEFINE_func_80147098() /* dedup: shared engine-core @0x80147098 (src/shared) */ DEFINE_func_801470A0() /* dedup: shared engine-core @0x801470A0 (src/shared) */ @@ -736,7 +718,6 @@ DEFINE_func_801470AC() /* dedup: shared engine-core @0x801470AC (src/shared) */ DEFINE_func_801470B4() /* dedup: shared engine-core @0x801470B4 (src/shared) */ - DEFINE_func_801470C0() /* dedup: shared engine-core @0x801470C0 (src/shared) */ DEFINE_func_80147118() /* dedup: shared engine-core @0x80147118 (src/shared) */ @@ -759,7 +740,6 @@ DEFINE_func_80147300() /* dedup: shared engine-core @0x80147300 (src/shared) */ DEFINE_func_80147324() /* dedup: shared engine-core @0x80147324 (src/shared) */ - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80147364); DEFINE_func_801473DC() /* dedup: shared engine-core @0x801473DC (src/shared) */ @@ -776,32 +756,7 @@ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ #include "common.h" -struct V4s80147514 { s16 a, b, c, d; }; - -extern s32 func_80012C6C(s32 a0, s32 a1, s32 a2); -extern s32 func_800129CC(s32 a0, s32 a1); - -void func_80147514(s32 arg0) { - s16 buf[8]; - - *(struct V4s80147514 *)buf = *(struct V4s80147514 *)(arg0 + 0x120); - if (((u16)buf[0] | (u16)buf[1] | (u16)buf[2]) == 0) { - buf[1] = -0xFFF; - } - if (*(s16 *)(arg0 + 0x12E) != 0) { - buf[0] = (u16)buf[0] + *(u16 *)(arg0 + 0x128); - buf[1] = (u16)buf[1] + *(u16 *)(arg0 + 0x12A); - buf[2] = (u16)buf[2] + *(u16 *)(arg0 + 0x12C); - } - *(s16 *)(arg0 + 0x118) = func_80012C6C(*(s16 *)(arg0 + 0x118), buf[0], 8); - *(s16 *)(arg0 + 0x11A) = func_80012C6C(*(s16 *)(arg0 + 0x11A), buf[1], 8); - *(s16 *)(arg0 + 0x11C) = func_80012C6C(*(s16 *)(arg0 + 0x11C), buf[2], 8); - buf[0] = *(u16 *)(arg0 + 0x118); - buf[1] = *(u16 *)(arg0 + 0x11A); - buf[2] = *(u16 *)(arg0 + 0x11C); - func_800129CC((s32)buf, arg0 + 0x100); -} - +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -851,7 +806,6 @@ DEFINE_func_80147B18() /* dedup: shared engine-core @0x80147B18 (src/shared) */ DEFINE_func_80147B5C() /* dedup: shared engine-core @0x80147B5C (src/shared) */ - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80147C30); DEFINE_func_80147CC8() /* dedup: shared engine-core @0x80147CC8 (src/shared) */ @@ -882,7 +836,6 @@ DEFINE_func_8014856C() /* dedup: shared engine-core @0x8014856C (src/shared) */ DEFINE_func_801485B8() /* dedup: shared engine-core @0x801485B8 (src/shared) */ - /* func_80148634: ori v0,0x8080; sh 0 @0xAA; sh 0 @0xAC; sh 0x8080 @0xAE * 0x8080 loaded via ori (positive 16-bit imm) => store an unsigned 16-bit value. */ DEFINE_func_80148634() /* dedup: shared engine-core @0x80148634 (src/shared) */ @@ -899,7 +852,6 @@ DEFINE_func_80148818() /* dedup: shared engine-core @0x80148818 (src/shared) */ DEFINE_func_80148824() /* dedup: shared engine-core @0x80148824 (src/shared) */ - DEFINE_func_801488A8() /* dedup: shared engine-core @0x801488A8 (src/shared) */ DEFINE_func_8014891C() /* dedup: shared engine-core @0x8014891C (src/shared) */ @@ -1039,18 +991,14 @@ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80149450); INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_801494CC); - DEFINE_func_80149544() /* dedup: shared engine-core @0x80149544 (src/shared) */ - - /* arg-forwarding wrapper: stack buffer passed to two callees. * §17 array-decay — buf declared as a local array and passed bare so gcc * rematerializes addiu $sp,0x10 per use instead of hoisting into a * callee-saved reg (frame 0x20, only $s0 saved — matches target). */ DEFINE_func_80149584() /* dedup: shared engine-core @0x80149584 (src/shared) */ - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_801495C4); INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8014964C); @@ -1086,10 +1034,8 @@ DEFINE_func_80149AD4() /* dedup: shared engine-core @0x80149AD4 (src/shared) */ DEFINE_func_80149B14() /* dedup: shared engine-core @0x80149B14 (src/shared) */ - DEFINE_func_80149B54() /* dedup: shared engine-core @0x80149B54 (src/shared) */ - DEFINE_func_80149BAC() /* dedup: shared engine-core @0x80149BAC (src/shared) */ DEFINE_func_80149BEC() /* dedup: shared engine-core @0x80149BEC (src/shared) */ @@ -1098,7 +1044,6 @@ DEFINE_func_80149BEC() /* dedup: shared engine-core @0x80149BEC (src/shared) */ DEFINE_func_80149C08() /* dedup: shared engine-core @0x80149C08 (src/shared) */ - DEFINE_func_80149C94() /* dedup: shared engine-core @0x80149C94 (src/shared) */ DEFINE_func_80149CB4() /* dedup: shared engine-core @0x80149CB4 (src/shared) */ @@ -1111,10 +1056,8 @@ DEFINE_func_80149D9C() /* dedup: shared engine-core @0x80149D9C (src/shared) */ DEFINE_func_80149DD8() /* dedup: shared engine-core @0x80149DD8 (src/shared) */ - DEFINE_func_80149E94() /* dedup: shared engine-core @0x80149E94 (src/shared) */ - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80149F2C); DEFINE_func_80149FA8() /* dedup: shared engine-core @0x80149FA8 (src/shared) */ @@ -1127,7 +1070,6 @@ DEFINE_func_8014A1B0() /* dedup: shared engine-core @0x8014A1B0 (src/shared) */ DEFINE_func_8014A218() /* dedup: shared engine-core @0x8014A218 (src/shared) */ - extern s32 func_8014C278(s32 a0, s32 a1, s32 a2); extern s32 func_8014C2B0(void *a0, void *a1, s32 a2); @@ -1155,11 +1097,8 @@ s32 func_8014A238(s32 arg0) { return 0; } - - DEFINE_func_8014A2E4() /* dedup: shared engine-core @0x8014A2E4 (src/shared) */ - DEFINE_func_8014A380() /* dedup: shared engine-core @0x8014A380 (src/shared) */ DEFINE_func_8014A3E0() /* dedup: shared engine-core @0x8014A3E0 (src/shared) */ @@ -1200,16 +1139,12 @@ DEFINE_func_8014AA28() /* dedup: shared engine-core @0x8014AA28 (src/shared) */ DEFINE_func_8014AB5C() /* dedup: shared engine-core @0x8014AB5C (src/shared) */ - DEFINE_func_8014AB7C() /* dedup: shared engine-core @0x8014AB7C (src/shared) */ - DEFINE_func_8014ABF0() /* dedup: shared engine-core @0x8014ABF0 (src/shared) */ - DEFINE_func_8014AC10() /* dedup: shared engine-core @0x8014AC10 (src/shared) */ - DEFINE_func_8014ACC0() /* dedup: shared engine-core @0x8014ACC0 (src/shared) */ DEFINE_func_8014ACE8() /* dedup: shared engine-core @0x8014ACE8 (src/shared) */ @@ -1384,7 +1319,6 @@ s32 func_8014C2B0(void *a0, void *a1, s32 a2) { DEFINE_func_8014C308() /* dedup: shared engine-core @0x8014C308 (src/shared) */ - DEFINE_func_8014C3A4() /* dedup: shared engine-core @0x8014C3A4 (src/shared) */ DEFINE_func_8014C3D0() /* dedup: shared engine-core @0x8014C3D0 (src/shared) */ @@ -1516,31 +1450,7 @@ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8014D820); #include "common.h" -extern s32 func_80135888(s32 a0, s32 a1, s32 a2, s32 a3); - -struct Quad { s32 a, b, c, d; }; - -s32 func_8014DCE0(s32 arg0, s32 arg1, s32 arg2) { - struct Quad buf; - register s32 i __asm__("$17"); - register s32 s0 __asm__("$16"); - - buf = *(struct Quad *)(*(u32 *)(arg0 + 0x58) & 0xFFFFFFF); - i = 0; - s0 = arg2; - do { - s32 r; - r = func_80135888(*(s32 *)(arg0 + 0x20), (s32)&buf, arg1, s0); - i += 1; - if (r == 0) { - s0 += 8; - } else { - return 1; - } - } while (i < 3); - return 0; -} - +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8014DD8C); @@ -1550,7 +1460,6 @@ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8014DF3C); DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8014E048); INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8014E284); @@ -1571,11 +1480,8 @@ s32 func_80135888(s32, s32, M2C_UNK, M2C_UNK); /* extern */ DEFINE_func_8014E790() /* dedup: shared engine-core @0x8014E790 (src/shared) */ - - DEFINE_func_8014E83C() /* dedup: shared engine-core @0x8014E83C (src/shared) */ - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8014E934); DEFINE_func_8014E98C() /* dedup: shared engine-core @0x8014E98C (src/shared) */ @@ -1732,7 +1638,6 @@ DEFINE_func_8015115C() /* dedup: shared engine-core @0x8015115C (src/shared) */ DEFINE_func_80151164() /* dedup: shared engine-core @0x80151164 (src/shared) */ - DEFINE_func_80151184() /* dedup: shared engine-core @0x80151184 (src/shared) */ DEFINE_func_801511A8() /* dedup: shared engine-core @0x801511A8 (src/shared) */ @@ -1833,7 +1738,6 @@ void func_801520DC(s32 arg0) func_80146CA0(arg0); } - DEFINE_func_80152194() /* dedup: shared engine-core @0x80152194 (src/shared) */ DEFINE_func_8015220C() /* dedup: shared engine-core @0x8015220C (src/shared) */ @@ -1908,7 +1812,6 @@ void func_801528B0(s32 arg0) func_80146CA0(arg0); } - DEFINE_func_8015294C() /* dedup: shared engine-core @0x8015294C (src/shared) */ DEFINE_func_80152A08() /* dedup: shared engine-core @0x80152A08 (src/shared) */ @@ -1971,7 +1874,6 @@ void func_80152DA8(s32 arg0) func_80146CA0(arg0); } - DEFINE_func_80152E4C() /* dedup: shared engine-core @0x80152E4C (src/shared) */ DEFINE_func_80152EFC() /* dedup: shared engine-core @0x80152EFC (src/shared) */ @@ -1991,7 +1893,6 @@ DEFINE_func_8015309C() /* dedup: shared engine-core @0x8015309C (src/shared) */ DEFINE_func_801530E4() /* dedup: shared engine-core @0x801530E4 (src/shared) */ - DEFINE_func_80153150() /* dedup: shared engine-core @0x80153150 (src/shared) */ DEFINE_func_801531BC() /* dedup: shared engine-core @0x801531BC (src/shared) */ @@ -2059,7 +1960,6 @@ s32 func_801535F4(void *arg0) { return ret; } - DEFINE_func_8015369C() /* dedup: shared engine-core @0x8015369C (src/shared) */ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_801536DC); @@ -2143,12 +2043,10 @@ DEFINE_func_801542DC() /* dedup: shared engine-core @0x801542DC (src/shared) */ DEFINE_func_8015430C() /* dedup: shared engine-core @0x8015430C (src/shared) */ - #include "common.h" DEFINE_func_80154358() /* dedup: shared engine-core @0x80154358 (src/shared) */ - DEFINE_func_80154418() /* dedup: shared engine-core @0x80154418 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8015444C); @@ -2203,7 +2101,6 @@ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80155458); s32 func_800D02D0(u8); /* extern */ DEFINE_func_801554B8() /* dedup: shared engine-core @0x801554B8 (src/shared) */ - DEFINE_func_80155518() /* dedup: shared engine-core @0x80155518 (src/shared) */ DEFINE_func_8015554C() /* dedup: shared engine-core @0x8015554C (src/shared) */ @@ -2337,7 +2234,6 @@ void func_80157544(void *a0) D_80188E00[*(u16 *)((s32)a0 + 0x2)](a0); } - /* Canonical callee signatures (shared set; call-site casts where the byte-match * needs the $v0 return of a void-canonical callee). */ extern void func_8014CC28(s32 a0); /* defined */ @@ -2358,10 +2254,8 @@ void func_80157580(s32 arg0) { func_801575E4((void *)arg0); } - DEFINE_func_801575E4() /* dedup: shared engine-core @0x801575E4 (src/shared) */ - extern void func_801599A4(void *a0); /* canonical: void(*)(void *) */ extern void func_80159B3C(void *a0); /* canonical: void(*)(void *) */ extern s32 func_80161208(void); /* canonical: s32(*)(void) — call-site cast to pass arg0 */ @@ -2378,12 +2272,10 @@ void func_801576A8(void *arg0) { } } - DEFINE_func_8015771C() /* dedup: shared engine-core @0x8015771C (src/shared) */ DEFINE_func_8015773C() /* dedup: shared engine-core @0x8015773C (src/shared) */ - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80157788); INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_801577C8); @@ -2510,7 +2402,6 @@ void func_80158BB0(void *arg0) { func_80146CA0(arg0); } - DEFINE_func_80158C40() /* dedup: shared engine-core @0x80158C40 (src/shared) */ DEFINE_func_80158CD8() /* dedup: shared engine-core @0x80158CD8 (src/shared) */ @@ -2550,7 +2441,6 @@ void func_8015934C(void *arg0) { M2C_FIELD(temp_v1, u16 *, 0x12) = (u16) ((M2C_FIELD(temp_v1, u16 *, 0x12) + 0x16) & 0xFFF); } - typedef struct { u8 pad[0x12]; u16 field12; @@ -2658,14 +2548,10 @@ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8015AC48); DEFINE_func_8015AC90() /* dedup: shared engine-core @0x8015AC90 (src/shared) */ - DEFINE_func_8015ACC4() /* dedup: shared engine-core @0x8015ACC4 (src/shared) */ - - DEFINE_func_8015AD08() /* dedup: shared engine-core @0x8015AD08 (src/shared) */ - extern void (*D_80189310[])(void *); void func_8015AD3C(void *a0) @@ -2810,10 +2696,8 @@ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8015D414); DEFINE_func_8015D480() /* dedup: shared engine-core @0x8015D480 (src/shared) */ - DEFINE_func_8015D4B4() /* dedup: shared engine-core @0x8015D4B4 (src/shared) */ - extern s32 (*D_801893F0[])(); s32 func_8015D4E8(s16 *a0) { @@ -2848,13 +2732,11 @@ DEFINE_func_8015DC84() /* dedup: shared engine-core @0x8015DC84 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8015DCB8); - extern void func_8014C1A0(s32 arg0, s32 arg1); extern void func_80015978(s32 a0, s32 *a1); s32 func_80029AAC(); DEFINE_func_8015DD74() /* dedup: shared engine-core @0x8015DD74 (src/shared) */ - DEFINE_func_8015DDF0() /* dedup: shared engine-core @0x8015DDF0 (src/shared) */ DEFINE_func_8015DE24() /* dedup: shared engine-core @0x8015DE24 (src/shared) */ @@ -2880,10 +2762,8 @@ DEFINE_func_8015E0D4() /* dedup: shared engine-core @0x8015E0D4 (src/shared) */ DEFINE_func_8015E150() /* dedup: shared engine-core @0x8015E150 (src/shared) */ - DEFINE_func_8015E184() /* dedup: shared engine-core @0x8015E184 (src/shared) */ - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8015E1B8); DEFINE_func_8015E1F4() /* dedup: shared engine-core @0x8015E1F4 (src/shared) */ @@ -2931,10 +2811,8 @@ DEFINE_func_8015ED6C() /* dedup: shared engine-core @0x8015ED6C (src/shared) */ DEFINE_func_8015EDA0() /* dedup: shared engine-core @0x8015EDA0 (src/shared) */ - DEFINE_func_8015EDD4() /* dedup: shared engine-core @0x8015EDD4 (src/shared) */ - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8015EE08); DEFINE_func_8015EE44() /* dedup: shared engine-core @0x8015EE44 (src/shared) */ @@ -2993,10 +2871,8 @@ void func_8015F76C(s32 *a0) { func_8015F848(a0); } - DEFINE_func_8015F7A0() /* dedup: shared engine-core @0x8015F7A0 (src/shared) */ - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8015F7D4); DEFINE_func_8015F810() /* dedup: shared engine-core @0x8015F810 (src/shared) */ @@ -3024,7 +2900,6 @@ void func_8015F89C(void *arg0) { ((s32 (*)(void *))func_80161208)(arg0); } - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8015F948); extern void (*D_801891B8[])(void *); @@ -3042,7 +2917,6 @@ void func_8015F9A4(void *arg0) { } } - DEFINE_func_8015FA24() /* dedup: shared engine-core @0x8015FA24 (src/shared) */ extern void func_80147078(s32 *a0, s16 a1); @@ -3181,20 +3055,16 @@ void func_80160ACC(s32 *a0) { func_80160BB4(a0); } - DEFINE_func_80160B00() /* dedup: shared engine-core @0x80160B00 (src/shared) */ - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80160B34); DEFINE_func_80160B70() /* dedup: shared engine-core @0x80160B70 (src/shared) */ DEFINE_func_80160BB4() /* dedup: shared engine-core @0x80160BB4 (src/shared) */ - DEFINE_func_80160C28() /* dedup: shared engine-core @0x80160C28 (src/shared) */ - DEFINE_func_80160CB4() /* dedup: shared engine-core @0x80160CB4 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80160D10); @@ -3251,10 +3121,8 @@ DEFINE_func_80161554() /* dedup: shared engine-core @0x80161554 (src/shared) */ DEFINE_func_8016158C() /* dedup: shared engine-core @0x8016158C (src/shared) */ - DEFINE_func_801615C4() /* dedup: shared engine-core @0x801615C4 (src/shared) */ - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8016163C); INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80161774); @@ -3461,10 +3329,8 @@ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80164BDC); DEFINE_func_80164CD4() /* dedup: shared engine-core @0x80164CD4 (src/shared) */ - DEFINE_func_80164D4C() /* dedup: shared engine-core @0x80164D4C (src/shared) */ - DEFINE_func_80164DB0() /* dedup: shared engine-core @0x80164DB0 (src/shared) */ DEFINE_func_80164DD0() /* dedup: shared engine-core @0x80164DD0 (src/shared) */ @@ -3479,10 +3345,8 @@ s32 func_80164EA4(s16 *a0) { INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80164EE0); - DEFINE_func_80164F44() /* dedup: shared engine-core @0x80164F44 (src/shared) */ - DEFINE_func_80165024() /* dedup: shared engine-core @0x80165024 (src/shared) */ DEFINE_func_80165064() /* dedup: shared engine-core @0x80165064 (src/shared) */ @@ -3594,7 +3458,6 @@ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80165A50); DEFINE_func_80165A78() /* dedup: shared engine-core @0x80165A78 (src/shared) */ - extern u8 D_80078EC1; extern void (*D_80189974[])(void); @@ -3651,14 +3514,12 @@ void func_80165E2C(u16 *arg0) { func_800153CC(1, *arg0, 0xA8, 0x80, 0x40, 0); } - DEFINE_func_80165E90() /* dedup: shared engine-core @0x80165E90 (src/shared) */ #include "common.h" DEFINE_func_80165FA4() /* dedup: shared engine-core @0x80165FA4 (src/shared) */ - extern s32 (*D_801899FC[])(); s32 func_80166018(s16 *a0) { @@ -3741,10 +3602,8 @@ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_801681FC); DEFINE_func_8016829C() /* dedup: shared engine-core @0x8016829C (src/shared) */ - DEFINE_func_80168328() /* dedup: shared engine-core @0x80168328 (src/shared) */ - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_801683D8); INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80168430); @@ -3753,12 +3612,10 @@ DEFINE_func_801684B4() /* dedup: shared engine-core @0x801684B4 (src/shared) */ DEFINE_func_80168540() /* dedup: shared engine-core @0x80168540 (src/shared) */ - DEFINE_func_801685EC() /* dedup: shared engine-core @0x801685EC (src/shared) */ DEFINE_func_80168640() /* dedup: shared engine-core @0x80168640 (src/shared) */ - typedef struct { s32 w[8]; } Blk20; extern Blk20 D_800AE620; @@ -3784,7 +3641,6 @@ void func_80168664(void *arg0) { *(s16 *)((u8 *)arg0 + 2) = *(s16 *)((u8 *)arg0 + 2) + 1; } - extern s32 (*D_80189B10[])(); s32 func_80168744(s16 *a0) { @@ -3836,22 +3692,9 @@ extern Blk20 D_800AE620; /* First stack record: sp+0x10 .. sp+0x28 (struct-relative offsets). Mixed widths; * offsets 0x06/0x0E/0x13/0x17 are never written (alignment gaps). */ -struct A { - u16 unk00; u16 unk02; u16 unk04; /* 0x10 0x12 0x14 */ - u16 unk06; /* 0x16 (gap) */ - u16 unk08; u16 unk0A; u16 unk0C; /* 0x18 0x1A 0x1C */ - u16 unk0E; /* 0x1E (gap) */ - u8 unk10; u8 unk11; u8 unk12; /* 0x20 0x21 0x22 */ - u8 unk13; /* 0x23 (gap) */ - u8 unk14; u8 unk15; u8 unk16; /* 0x24 0x25 0x26 */ - u8 unk17; /* 0x27 (gap) */ - s32 unk18; /* 0x28 */ -}; /* Second stack record at sp+0x30. 40 bytes reserved (the frame is 0x60); only the * leading 8 words (0x30..0x4C) are populated from D_800AE620 via the Bv view. */ -struct B { s32 w[8]; s32 tail[2]; }; -struct Bv { s32 w[8]; }; void func_80168F40(void *arg0) { struct A a; @@ -3874,7 +3717,6 @@ void func_80168F40(void *arg0) { func_80016A5C(&a, &b); } - typedef int (*DispatchFn)(); extern DispatchFn D_80189B30[]; @@ -3901,10 +3743,8 @@ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8016951C); INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80169584); - DEFINE_func_801696D8() /* dedup: shared engine-core @0x801696D8 (src/shared) */ - extern void (*D_80189B40[])(void); void func_80169830(void *a0) { @@ -3917,11 +3757,8 @@ DEFINE_func_8016986C() /* dedup: shared engine-core @0x8016986C (src/shared) */ DEFINE_func_801699D0() /* dedup: shared engine-core @0x801699D0 (src/shared) */ - - DEFINE_func_80169A4C() /* dedup: shared engine-core @0x80169A4C (src/shared) */ - extern void (*D_80189BF4[])(void); void func_80169B80(void *a0) { @@ -3964,10 +3801,8 @@ void func_8016A700(void *a0) { INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8016A73C); - DEFINE_func_8016A890() /* dedup: shared engine-core @0x8016A890 (src/shared) */ - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8016A8FC); INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8016AA50); @@ -3988,7 +3823,6 @@ DEFINE_func_8016AFB0() /* dedup: shared engine-core @0x8016AFB0 (src/shared) */ DEFINE_func_8016B114() /* dedup: shared engine-core @0x8016B114 (src/shared) */ - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8016B234); DEFINE_func_8016B3F4() /* dedup: shared engine-core @0x8016B3F4 (src/shared) */ @@ -3997,7 +3831,6 @@ DEFINE_func_8016B428() /* dedup: shared engine-core @0x8016B428 (src/shared) */ DEFINE_func_8016B448() /* dedup: shared engine-core @0x8016B448 (src/shared) */ - extern void (*D_80189D04[])(void); void func_8016B4BC(void *a0) { @@ -4080,7 +3913,6 @@ void func_8016BCC0(void *arg0) { } } - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8016BD78); INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8016BEA0); @@ -4114,7 +3946,6 @@ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8016C49C); DEFINE_func_8016C74C() /* dedup: shared engine-core @0x8016C74C (src/shared) */ - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8016C83C); INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8016C998); @@ -4198,20 +4029,16 @@ DEFINE_func_8016E358() /* dedup: shared engine-core @0x8016E358 (src/shared) */ DEFINE_func_8016E3CC() /* dedup: shared engine-core @0x8016E3CC (src/shared) */ - DEFINE_func_8016E460() /* dedup: shared engine-core @0x8016E460 (src/shared) */ - extern void (*D_80189EA8[])(void); void func_8016E5B8(void *a0) { D_80189EA8[*(u16 *)((s32)a0 + 0x2)](); } - DEFINE_func_8016E5F4() /* dedup: shared engine-core @0x8016E5F4 (src/shared) */ - extern void func_8016E778(void); void func_8016E688(void *a0) { @@ -4855,23 +4682,17 @@ DEFINE_func_80171D1C() /* dedup: shared engine-core @0x80171D1C (src/shared) */ DEFINE_func_80171D78() /* dedup: shared engine-core @0x80171D78 (src/shared) */ - DEFINE_func_80171E08() /* dedup: shared engine-core @0x80171E08 (src/shared) */ - - DEFINE_func_80171EC8() /* dedup: shared engine-core @0x80171EC8 (src/shared) */ - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80171FFC); - extern s32 func_8017248C(s32 a0, s32 a1); extern void func_80146D90(s32 a0); extern s32 ratan2(s32 a0, s32 a1); /* ratan2 */ DEFINE_func_8017209C() /* dedup: shared engine-core @0x8017209C (src/shared) */ - DEFINE_func_80172170() /* dedup: shared engine-core @0x80172170 (src/shared) */ DEFINE_func_801722CC() /* dedup: shared engine-core @0x801722CC (src/shared) */ @@ -5093,7 +4914,6 @@ void func_80173220(void * arg0) } } - DEFINE_func_80173294() /* dedup: shared engine-core @0x80173294 (src/shared) */ DEFINE_func_8017329C() /* dedup: shared engine-core @0x8017329C (src/shared) */ @@ -5439,20 +5259,16 @@ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_801754A8); INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8017553C); - DEFINE_func_80175590() /* dedup: shared engine-core @0x80175590 (src/shared) */ - DEFINE_func_80175624() /* dedup: shared engine-core @0x80175624 (src/shared) */ DEFINE_func_80175668() /* dedup: shared engine-core @0x80175668 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80175690); - DEFINE_func_801756E4() /* dedup: shared engine-core @0x801756E4 (src/shared) */ - DEFINE_func_80175798() /* dedup: shared engine-core @0x80175798 (src/shared) */ DEFINE_func_801757A0() /* dedup: shared engine-core @0x801757A0 (src/shared) */ @@ -5524,7 +5340,6 @@ void func_80178438(u16 *arg0) { func_800153CC(3, *arg0, 0xA8, 0x88, 0x40, 0); } - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8017849C); DEFINE_func_80178608() /* dedup: shared engine-core @0x80178608 (src/shared) */ @@ -5541,7 +5356,6 @@ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80178840); DEFINE_func_801788B8() /* dedup: shared engine-core @0x801788B8 (src/shared) */ - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80178970); INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_801789AC); @@ -5568,7 +5382,6 @@ void func_80178CBC(s32 arg0, s32 arg1) { } while (D_801DAB2C == 3); } - extern short D_801DAB2C; extern void func_80174714(void); @@ -5646,7 +5459,6 @@ void func_8017A094(s32 arg0) { func_80179B74(&sp10); } - extern void func_80179B74(s16 *a0); extern s32 D_801DA734; @@ -5658,7 +5470,6 @@ void func_8017A0C4(s32 arg0) { func_80179B74(&sp10); } - DEFINE_func_8017A0F4() /* dedup: shared engine-core @0x8017A0F4 (src/shared) */ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ @@ -5718,7 +5529,6 @@ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8017A3D8); INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8017A4AC); - typedef struct { s16 x; s16 y; @@ -5762,7 +5572,6 @@ s32 func_8017AD0C(s32 arg0) MoveImage(&rect, 0x1C8, 0x190); } - DEFINE_func_8017ADE8() /* dedup: shared engine-core @0x8017ADE8 (src/shared) */ DEFINE_func_8017AE08() /* dedup: shared engine-core @0x8017AE08 (src/shared) */ @@ -5790,7 +5599,6 @@ void func_8017B1D8(void) { D_801DA7A0 = D_80126B66; } - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8017B238); INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8017B368); @@ -5818,7 +5626,6 @@ void func_8017B824(void) { D_801DA7B8 = (s16) M2C_FIELD(D_801151D4, s32 *, 0x44); } - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8017B880); INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8017B8E8); @@ -5908,7 +5715,6 @@ void func_8017D840(void) { func_8012A094(&D_80126948); } - extern u8 D_8012694C; void func_8017D8DC(void) { @@ -5953,7 +5759,6 @@ void func_8017DA44(void *arg0) { func_8017DAEC(arg0); } - extern s32 func_8017DAEC(s32); s32 func_8017DACC(s32 a0) { @@ -6022,7 +5827,6 @@ void func_8017DEC0(void *arg0) { func_8017D900(); } - extern void func_80171B44(s32 *a0); M2C_UNK func_8017D98C(); /* extern */ extern u16 D_80126980; @@ -6039,7 +5843,6 @@ void func_8017DEFC(void *arg0) { } } - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8017DF5C); INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8017DFD8); @@ -6104,7 +5907,6 @@ void func_8017E350(void *arg0) { M2C_FIELD(arg0, u8 *, 0x214) = (u8) (M2C_FIELD(arg0, u8 *, 0x214) + 1); } - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8017E3EC); M2C_UNK func_8017F240(); /* extern */ @@ -6121,7 +5923,6 @@ void func_8017E460(void *arg0) { } } - extern s32 func_8013767C(s32 a0); extern M2C_UNK D_801B17F0; @@ -6138,7 +5939,6 @@ void func_8017E4B4(void *arg0) { } } - extern s32 func_80012B04(s32 a0, s32 a1, s32 a2); extern u16 D_80126970; extern u16 D_80126974; @@ -6164,7 +5964,6 @@ void func_8017E51C(void *arg0) { } } - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8017E604); extern s32 func_801399F0(s32 a0); @@ -6201,7 +6000,6 @@ void func_8017E784(void *arg0) { M2C_FIELD(arg0, u8 *, 0x214) = (u8) (M2C_FIELD(arg0, u8 *, 0x214) + 1); } - extern s32 func_801399F0(s32 a0); extern void func_80139914(s32 a0); @@ -6240,7 +6038,6 @@ void func_8017E9C0(void *arg0) { } } - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_8017EA2C); extern s32 (*D_8018A7B0[])(); @@ -6282,7 +6079,6 @@ void func_8017ED88(void *arg0) { M2C_FIELD(arg0, s32 *, 0x18) = (s32) (((rand() & 0x3FFF) * 2) - 0x4000); } - extern s32 (*D_8018A7F8[])(); s32 func_8017EDE4(s16 *a0) { @@ -6348,7 +6144,6 @@ void func_8017F694(void *arg0) { func_8012C588(0x25, 0); } - extern s32 (*D_8018A904[])(); s32 func_8017F6D8(s16 *a0) { @@ -6432,7 +6227,6 @@ void func_80180898(void *arg0) { } } - extern void func_8002D4C8(s32 a0, s32 a1); void func_801808DC(void *a0) { @@ -6631,7 +6425,6 @@ void func_801844F4(void *arg0) { func_8002D4C8(var_a0_2, 0); } - extern void func_8012A828(s32 a0, void *a1); extern u8 D_801973C4; @@ -6788,7 +6581,6 @@ void func_80186330(void *arg0) { M2C_FIELD(arg0, s32 *, 0x1C) = 0; } - INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_801863B4); INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077", func_80186434); diff --git a/src/ov_SC01_080/ov_SC01_080.c b/src/ov_SC01_080/ov_SC01_080.c index f55940cd2..0a8a7a654 100644 --- a/src/ov_SC01_080/ov_SC01_080.c +++ b/src/ov_SC01_080/ov_SC01_080.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080", func_8014D820); -INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080", func_8014DD8C); diff --git a/src/ov_SC01_084/ov_SC01_084.c b/src/ov_SC01_084/ov_SC01_084.c index c286e9303..8afd8da07 100644 --- a/src/ov_SC01_084/ov_SC01_084.c +++ b/src/ov_SC01_084/ov_SC01_084.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084", func_8014D820); -INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084", func_8014DD8C); diff --git a/src/ov_SC02_000/ov_SC02_000.c b/src/ov_SC02_000/ov_SC02_000.c index 780d21dd9..ecd801526 100644 --- a/src/ov_SC02_000/ov_SC02_000.c +++ b/src/ov_SC02_000/ov_SC02_000.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000", func_8014D820); -INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000", func_8014DD8C); diff --git a/src/ov_SC02_003/ov_SC02_003.c b/src/ov_SC02_003/ov_SC02_003.c index fb4821775..5d6f3a243 100644 --- a/src/ov_SC02_003/ov_SC02_003.c +++ b/src/ov_SC02_003/ov_SC02_003.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003", func_8014D820); -INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003", func_8014DD8C); diff --git a/src/ov_SC02_004/ov_SC02_004.c b/src/ov_SC02_004/ov_SC02_004.c index 7b4805005..5a1ba5672 100644 --- a/src/ov_SC02_004/ov_SC02_004.c +++ b/src/ov_SC02_004/ov_SC02_004.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004", func_8014D820); -INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004", func_8014DD8C); diff --git a/src/ov_SC02_005/ov_SC02_005.c b/src/ov_SC02_005/ov_SC02_005.c index df15a6a34..8d7eefbd9 100644 --- a/src/ov_SC02_005/ov_SC02_005.c +++ b/src/ov_SC02_005/ov_SC02_005.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005", func_8014D820); -INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005", func_8014DD8C); diff --git a/src/ov_SC02_011/ov_SC02_011.c b/src/ov_SC02_011/ov_SC02_011.c index 3c42d42d6..4f12600ad 100644 --- a/src/ov_SC02_011/ov_SC02_011.c +++ b/src/ov_SC02_011/ov_SC02_011.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011", func_8014D820); -INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011", func_8014DD8C); diff --git a/src/ov_SC02_015/ov_SC02_015.c b/src/ov_SC02_015/ov_SC02_015.c index 8076e2b0a..c65665bd8 100644 --- a/src/ov_SC02_015/ov_SC02_015.c +++ b/src/ov_SC02_015/ov_SC02_015.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015", func_8014D820); -INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015", func_8014DD8C); diff --git a/src/ov_SC02_016/ov_SC02_016.c b/src/ov_SC02_016/ov_SC02_016.c index 1fdc76f19..62bb1c374 100644 --- a/src/ov_SC02_016/ov_SC02_016.c +++ b/src/ov_SC02_016/ov_SC02_016.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8014D820); -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8014DD8C); diff --git a/src/ov_SC02_017/ov_SC02_017.c b/src/ov_SC02_017/ov_SC02_017.c index 5a9b8a007..862024074 100644 --- a/src/ov_SC02_017/ov_SC02_017.c +++ b/src/ov_SC02_017/ov_SC02_017.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017", func_8014D820); -INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017", func_8014DD8C); diff --git a/src/ov_SC02_021/ov_SC02_021.c b/src/ov_SC02_021/ov_SC02_021.c index 56e5d197e..2462449af 100644 --- a/src/ov_SC02_021/ov_SC02_021.c +++ b/src/ov_SC02_021/ov_SC02_021.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8014D820); -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8014DD8C); diff --git a/src/ov_SC02_026/ov_SC02_026.c b/src/ov_SC02_026/ov_SC02_026.c index 1468f3983..355106a46 100644 --- a/src/ov_SC02_026/ov_SC02_026.c +++ b/src/ov_SC02_026/ov_SC02_026.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026", func_8014D820); -INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026", func_8014DD8C); diff --git a/src/ov_SC02_027/ov_SC02_027.c b/src/ov_SC02_027/ov_SC02_027.c index fa40d117a..cc3a26540 100644 --- a/src/ov_SC02_027/ov_SC02_027.c +++ b/src/ov_SC02_027/ov_SC02_027.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027", func_8014D820); -INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027", func_8014DD8C); diff --git a/src/ov_SC02_028/ov_SC02_028.c b/src/ov_SC02_028/ov_SC02_028.c index e8f22dd82..eed15b137 100644 --- a/src/ov_SC02_028/ov_SC02_028.c +++ b/src/ov_SC02_028/ov_SC02_028.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028", func_8014D820); -INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028", func_8014DD8C); diff --git a/src/ov_SC02_031/ov_SC02_031.c b/src/ov_SC02_031/ov_SC02_031.c index f2fe88014..f2621ed23 100644 --- a/src/ov_SC02_031/ov_SC02_031.c +++ b/src/ov_SC02_031/ov_SC02_031.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031", func_8014D820); -INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031", func_8014DD8C); diff --git a/src/ov_SC02_035/ov_SC02_035.c b/src/ov_SC02_035/ov_SC02_035.c index 2a9f1a7ab..b9660c1ac 100644 --- a/src/ov_SC02_035/ov_SC02_035.c +++ b/src/ov_SC02_035/ov_SC02_035.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035", func_8014D820); -INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035", func_8014DD8C); diff --git a/src/ov_SC02_039/ov_SC02_039.c b/src/ov_SC02_039/ov_SC02_039.c index cbe655eef..6863d42c1 100644 --- a/src/ov_SC02_039/ov_SC02_039.c +++ b/src/ov_SC02_039/ov_SC02_039.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039", func_8014D820); -INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039", func_8014DD8C); diff --git a/src/ov_SC02_041/ov_SC02_041.c b/src/ov_SC02_041/ov_SC02_041.c index c6ef856c5..aa46d0ff4 100644 --- a/src/ov_SC02_041/ov_SC02_041.c +++ b/src/ov_SC02_041/ov_SC02_041.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041", func_8014D820); -INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041", func_8014DD8C); diff --git a/src/ov_SC03_001/ov_SC03_001.c b/src/ov_SC03_001/ov_SC03_001.c index ac785a0fa..dd8400f09 100644 --- a/src/ov_SC03_001/ov_SC03_001.c +++ b/src/ov_SC03_001/ov_SC03_001.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001", func_8014DD8C); diff --git a/src/ov_SC03_002/ov_SC03_002.c b/src/ov_SC03_002/ov_SC03_002.c index 7e0920b5c..d9412b24f 100644 --- a/src/ov_SC03_002/ov_SC03_002.c +++ b/src/ov_SC03_002/ov_SC03_002.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002", func_8014DD8C); diff --git a/src/ov_SC03_003/ov_SC03_003.c b/src/ov_SC03_003/ov_SC03_003.c index e92c45c5e..b068a0532 100644 --- a/src/ov_SC03_003/ov_SC03_003.c +++ b/src/ov_SC03_003/ov_SC03_003.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003", func_8014DD8C); diff --git a/src/ov_SC03_006/ov_SC03_006.c b/src/ov_SC03_006/ov_SC03_006.c index a7533e961..ca5bf4c1a 100644 --- a/src/ov_SC03_006/ov_SC03_006.c +++ b/src/ov_SC03_006/ov_SC03_006.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006", func_8014DD8C); diff --git a/src/ov_SC03_007/ov_SC03_007.c b/src/ov_SC03_007/ov_SC03_007.c index 0990ea7e2..b5a8431d2 100644 --- a/src/ov_SC03_007/ov_SC03_007.c +++ b/src/ov_SC03_007/ov_SC03_007.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007", func_8014DD8C); diff --git a/src/ov_SC03_010/ov_SC03_010.c b/src/ov_SC03_010/ov_SC03_010.c index 86d70fa15..335f32367 100644 --- a/src/ov_SC03_010/ov_SC03_010.c +++ b/src/ov_SC03_010/ov_SC03_010.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010", func_8014DD8C); diff --git a/src/ov_SC03_011/ov_SC03_011.c b/src/ov_SC03_011/ov_SC03_011.c index 10a3769e3..510d55292 100644 --- a/src/ov_SC03_011/ov_SC03_011.c +++ b/src/ov_SC03_011/ov_SC03_011.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011", func_8014DD8C); diff --git a/src/ov_SC03_012/ov_SC03_012.c b/src/ov_SC03_012/ov_SC03_012.c index 4a89f7615..8481bcd04 100644 --- a/src/ov_SC03_012/ov_SC03_012.c +++ b/src/ov_SC03_012/ov_SC03_012.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012", func_8014DD8C); diff --git a/src/ov_SC03_013/ov_SC03_013.c b/src/ov_SC03_013/ov_SC03_013.c index c43a26bb6..90e2feb26 100644 --- a/src/ov_SC03_013/ov_SC03_013.c +++ b/src/ov_SC03_013/ov_SC03_013.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013", func_8014DD8C); diff --git a/src/ov_SC03_014/ov_SC03_014.c b/src/ov_SC03_014/ov_SC03_014.c index 57d14e152..c1820d140 100644 --- a/src/ov_SC03_014/ov_SC03_014.c +++ b/src/ov_SC03_014/ov_SC03_014.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014", func_8014DD8C); diff --git a/src/ov_SC03_015/ov_SC03_015.c b/src/ov_SC03_015/ov_SC03_015.c index 78e8be864..68534b698 100644 --- a/src/ov_SC03_015/ov_SC03_015.c +++ b/src/ov_SC03_015/ov_SC03_015.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015", func_8014DD8C); diff --git a/src/ov_SC03_023/ov_SC03_023.c b/src/ov_SC03_023/ov_SC03_023.c index 99dd2efdd..6b74f6049 100644 --- a/src/ov_SC03_023/ov_SC03_023.c +++ b/src/ov_SC03_023/ov_SC03_023.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023", func_8014DD8C); diff --git a/src/ov_SC03_024/ov_SC03_024.c b/src/ov_SC03_024/ov_SC03_024.c index d1b37cfc9..dee59f8d1 100644 --- a/src/ov_SC03_024/ov_SC03_024.c +++ b/src/ov_SC03_024/ov_SC03_024.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024", func_8014DD8C); diff --git a/src/ov_SC03_028/ov_SC03_028.c b/src/ov_SC03_028/ov_SC03_028.c index b0dafa203..b35eb21b0 100644 --- a/src/ov_SC03_028/ov_SC03_028.c +++ b/src/ov_SC03_028/ov_SC03_028.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028", func_8014DD8C); diff --git a/src/ov_SC03_029/ov_SC03_029.c b/src/ov_SC03_029/ov_SC03_029.c index a092862c8..8390e9a35 100644 --- a/src/ov_SC03_029/ov_SC03_029.c +++ b/src/ov_SC03_029/ov_SC03_029.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029", func_8014DD8C); diff --git a/src/ov_SC03_030/ov_SC03_030.c b/src/ov_SC03_030/ov_SC03_030.c index 4f399acd8..f940e9fd3 100644 --- a/src/ov_SC03_030/ov_SC03_030.c +++ b/src/ov_SC03_030/ov_SC03_030.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030", func_8014DD8C); diff --git a/src/ov_SC03_031/ov_SC03_031.c b/src/ov_SC03_031/ov_SC03_031.c index 0a6549c36..5d689ae17 100644 --- a/src/ov_SC03_031/ov_SC03_031.c +++ b/src/ov_SC03_031/ov_SC03_031.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031", func_8014DD8C); diff --git a/src/ov_SC03_089/ov_SC03_089.c b/src/ov_SC03_089/ov_SC03_089.c index e774f9dda..689bcceee 100644 --- a/src/ov_SC03_089/ov_SC03_089.c +++ b/src/ov_SC03_089/ov_SC03_089.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089", func_8014DD8C); diff --git a/src/ov_SC03_090/ov_SC03_090.c b/src/ov_SC03_090/ov_SC03_090.c index 8262fa0a1..4bdbaf61b 100644 --- a/src/ov_SC03_090/ov_SC03_090.c +++ b/src/ov_SC03_090/ov_SC03_090.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090", func_8014DD8C); diff --git a/src/ov_SC03_091/ov_SC03_091.c b/src/ov_SC03_091/ov_SC03_091.c index 02cbae3c3..640856d04 100644 --- a/src/ov_SC03_091/ov_SC03_091.c +++ b/src/ov_SC03_091/ov_SC03_091.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091", func_8014DD8C); diff --git a/src/ov_SC03_092/ov_SC03_092.c b/src/ov_SC03_092/ov_SC03_092.c index c88a62c2b..4bce6dd85 100644 --- a/src/ov_SC03_092/ov_SC03_092.c +++ b/src/ov_SC03_092/ov_SC03_092.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092", func_8014DD8C); diff --git a/src/ov_SC03_093/ov_SC03_093.c b/src/ov_SC03_093/ov_SC03_093.c index 74ea009dd..8576b49e1 100644 --- a/src/ov_SC03_093/ov_SC03_093.c +++ b/src/ov_SC03_093/ov_SC03_093.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093", func_8014DD8C); diff --git a/src/ov_SC03_094/ov_SC03_094.c b/src/ov_SC03_094/ov_SC03_094.c index f6f021057..2fa8e26b6 100644 --- a/src/ov_SC03_094/ov_SC03_094.c +++ b/src/ov_SC03_094/ov_SC03_094.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094", func_8014DD8C); diff --git a/src/ov_SC03_095/ov_SC03_095.c b/src/ov_SC03_095/ov_SC03_095.c index d2a34f02d..a829f476d 100644 --- a/src/ov_SC03_095/ov_SC03_095.c +++ b/src/ov_SC03_095/ov_SC03_095.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095", func_8014DD8C); diff --git a/src/ov_SC03_096/ov_SC03_096.c b/src/ov_SC03_096/ov_SC03_096.c index fb6e851a1..9f66f2d21 100644 --- a/src/ov_SC03_096/ov_SC03_096.c +++ b/src/ov_SC03_096/ov_SC03_096.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096", func_8014DD8C); diff --git a/src/ov_SC03_097/ov_SC03_097.c b/src/ov_SC03_097/ov_SC03_097.c index c23538f53..b4c3b204a 100644 --- a/src/ov_SC03_097/ov_SC03_097.c +++ b/src/ov_SC03_097/ov_SC03_097.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097", func_8014DD8C); diff --git a/src/ov_SC03_098/ov_SC03_098.c b/src/ov_SC03_098/ov_SC03_098.c index 0fbe8852f..abb6689bd 100644 --- a/src/ov_SC03_098/ov_SC03_098.c +++ b/src/ov_SC03_098/ov_SC03_098.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098", func_8014DD8C); diff --git a/src/ov_SC03_099/ov_SC03_099.c b/src/ov_SC03_099/ov_SC03_099.c index 2ce9cd101..d08547e91 100644 --- a/src/ov_SC03_099/ov_SC03_099.c +++ b/src/ov_SC03_099/ov_SC03_099.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099", func_8014DD8C); diff --git a/src/ov_SC03_100/ov_SC03_100.c b/src/ov_SC03_100/ov_SC03_100.c index 2e0dde680..01f1d0748 100644 --- a/src/ov_SC03_100/ov_SC03_100.c +++ b/src/ov_SC03_100/ov_SC03_100.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100", func_8014DD8C); diff --git a/src/ov_SC03_101/ov_SC03_101.c b/src/ov_SC03_101/ov_SC03_101.c index 321513afa..4c1f9b714 100644 --- a/src/ov_SC03_101/ov_SC03_101.c +++ b/src/ov_SC03_101/ov_SC03_101.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101", func_8014DD8C); diff --git a/src/ov_SC03_102/ov_SC03_102.c b/src/ov_SC03_102/ov_SC03_102.c index 1522c2860..9aa527f6c 100644 --- a/src/ov_SC03_102/ov_SC03_102.c +++ b/src/ov_SC03_102/ov_SC03_102.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102", func_8014DD8C); diff --git a/src/ov_SC03_103/ov_SC03_103.c b/src/ov_SC03_103/ov_SC03_103.c index 8f81fbb0c..27e31d91f 100644 --- a/src/ov_SC03_103/ov_SC03_103.c +++ b/src/ov_SC03_103/ov_SC03_103.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103", func_8014DD8C); diff --git a/src/ov_SC03_104/ov_SC03_104.c b/src/ov_SC03_104/ov_SC03_104.c index 732e00d57..a6346d83c 100644 --- a/src/ov_SC03_104/ov_SC03_104.c +++ b/src/ov_SC03_104/ov_SC03_104.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104", func_8014DD8C); diff --git a/src/ov_SC03_105/ov_SC03_105.c b/src/ov_SC03_105/ov_SC03_105.c index 166278ae1..e1e2874e1 100644 --- a/src/ov_SC03_105/ov_SC03_105.c +++ b/src/ov_SC03_105/ov_SC03_105.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105", func_8014DD8C); diff --git a/src/ov_SC03_108/ov_SC03_108.c b/src/ov_SC03_108/ov_SC03_108.c index a889aa93c..6433c0f7e 100644 --- a/src/ov_SC03_108/ov_SC03_108.c +++ b/src/ov_SC03_108/ov_SC03_108.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108", func_8014DD8C); diff --git a/src/ov_SC03_109/ov_SC03_109.c b/src/ov_SC03_109/ov_SC03_109.c index e0714094c..84e7420f1 100644 --- a/src/ov_SC03_109/ov_SC03_109.c +++ b/src/ov_SC03_109/ov_SC03_109.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109", func_8014DD8C); diff --git a/src/ov_SC03_110/ov_SC03_110.c b/src/ov_SC03_110/ov_SC03_110.c index a903d5566..a98210958 100644 --- a/src/ov_SC03_110/ov_SC03_110.c +++ b/src/ov_SC03_110/ov_SC03_110.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110", func_8014DD8C); diff --git a/src/ov_SC03_111/ov_SC03_111.c b/src/ov_SC03_111/ov_SC03_111.c index cb4f3934a..3c90905d4 100644 --- a/src/ov_SC03_111/ov_SC03_111.c +++ b/src/ov_SC03_111/ov_SC03_111.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111", func_8014DD8C); diff --git a/src/ov_SC03_112/ov_SC03_112.c b/src/ov_SC03_112/ov_SC03_112.c index e0a760b03..869f0e6bd 100644 --- a/src/ov_SC03_112/ov_SC03_112.c +++ b/src/ov_SC03_112/ov_SC03_112.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112", func_8014DD8C); diff --git a/src/ov_SC03_113/ov_SC03_113.c b/src/ov_SC03_113/ov_SC03_113.c index e28dc7586..d28a6bf7b 100644 --- a/src/ov_SC03_113/ov_SC03_113.c +++ b/src/ov_SC03_113/ov_SC03_113.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113", func_8014DD8C); diff --git a/src/ov_SC03_114/ov_SC03_114.c b/src/ov_SC03_114/ov_SC03_114.c index 8b937d242..99ca1eec2 100644 --- a/src/ov_SC03_114/ov_SC03_114.c +++ b/src/ov_SC03_114/ov_SC03_114.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114", func_8014DD8C); diff --git a/src/ov_SC03_115/ov_SC03_115.c b/src/ov_SC03_115/ov_SC03_115.c index 317feaede..45280a9b5 100644 --- a/src/ov_SC03_115/ov_SC03_115.c +++ b/src/ov_SC03_115/ov_SC03_115.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115", func_8014DD8C); diff --git a/src/ov_SC03_116/ov_SC03_116.c b/src/ov_SC03_116/ov_SC03_116.c index 600e86de1..8e66525ab 100644 --- a/src/ov_SC03_116/ov_SC03_116.c +++ b/src/ov_SC03_116/ov_SC03_116.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116", func_8014DD8C); diff --git a/src/ov_SC03_117/ov_SC03_117.c b/src/ov_SC03_117/ov_SC03_117.c index d29105e57..f28c81958 100644 --- a/src/ov_SC03_117/ov_SC03_117.c +++ b/src/ov_SC03_117/ov_SC03_117.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117", func_8014DD8C); diff --git a/src/ov_SC03_118/ov_SC03_118.c b/src/ov_SC03_118/ov_SC03_118.c index d86d7dd4b..b9a3f429c 100644 --- a/src/ov_SC03_118/ov_SC03_118.c +++ b/src/ov_SC03_118/ov_SC03_118.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118", func_8014DD8C); diff --git a/src/ov_SC03_119/ov_SC03_119.c b/src/ov_SC03_119/ov_SC03_119.c index ceb017076..2cff8909d 100644 --- a/src/ov_SC03_119/ov_SC03_119.c +++ b/src/ov_SC03_119/ov_SC03_119.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119", func_8014DD8C); diff --git a/src/ov_SC03_121/ov_SC03_121.c b/src/ov_SC03_121/ov_SC03_121.c index 46b1a1780..b80c2b998 100644 --- a/src/ov_SC03_121/ov_SC03_121.c +++ b/src/ov_SC03_121/ov_SC03_121.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121", func_8014DD8C); diff --git a/src/ov_SC03_124/ov_SC03_124.c b/src/ov_SC03_124/ov_SC03_124.c index 4e6ec9498..73157ab32 100644 --- a/src/ov_SC03_124/ov_SC03_124.c +++ b/src/ov_SC03_124/ov_SC03_124.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124", func_8014DD8C); diff --git a/src/ov_SC03_125/ov_SC03_125.c b/src/ov_SC03_125/ov_SC03_125.c index 7327a8635..0104f8910 100644 --- a/src/ov_SC03_125/ov_SC03_125.c +++ b/src/ov_SC03_125/ov_SC03_125.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125", func_8014DD8C); diff --git a/src/ov_SC03_126/ov_SC03_126.c b/src/ov_SC03_126/ov_SC03_126.c index 0e7cbf209..139aeb43a 100644 --- a/src/ov_SC03_126/ov_SC03_126.c +++ b/src/ov_SC03_126/ov_SC03_126.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126", func_8014D820); -INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126", func_8014DD8C); diff --git a/src/ov_SC04_000/ov_SC04_000.c b/src/ov_SC04_000/ov_SC04_000.c index c19e4728c..e6e361192 100644 --- a/src/ov_SC04_000/ov_SC04_000.c +++ b/src/ov_SC04_000/ov_SC04_000.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000", func_8014D820); -INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000", func_8014DD8C); diff --git a/src/ov_SC04_002/ov_SC04_002.c b/src/ov_SC04_002/ov_SC04_002.c index acdcc00f1..485606d25 100644 --- a/src/ov_SC04_002/ov_SC04_002.c +++ b/src/ov_SC04_002/ov_SC04_002.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002", func_8014D820); -INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002", func_8014DD8C); diff --git a/src/ov_SC04_003/ov_SC04_003.c b/src/ov_SC04_003/ov_SC04_003.c index 54376b6c9..621c99ea4 100644 --- a/src/ov_SC04_003/ov_SC04_003.c +++ b/src/ov_SC04_003/ov_SC04_003.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003", func_8014D820); -INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003", func_8014DD8C); diff --git a/src/ov_SC04_004/ov_SC04_004.c b/src/ov_SC04_004/ov_SC04_004.c index 36b1af633..a8f420868 100644 --- a/src/ov_SC04_004/ov_SC04_004.c +++ b/src/ov_SC04_004/ov_SC04_004.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004", func_8014D820); -INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004", func_8014DD8C); diff --git a/src/ov_SC04_005/ov_SC04_005.c b/src/ov_SC04_005/ov_SC04_005.c index a2926efe5..85d11d327 100644 --- a/src/ov_SC04_005/ov_SC04_005.c +++ b/src/ov_SC04_005/ov_SC04_005.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005", func_8014D820); -INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005", func_8014DD8C); diff --git a/src/ov_SC04_006/ov_SC04_006.c b/src/ov_SC04_006/ov_SC04_006.c index 2d4c5448f..a06ce782b 100644 --- a/src/ov_SC04_006/ov_SC04_006.c +++ b/src/ov_SC04_006/ov_SC04_006.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006", func_8014D820); -INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006", func_8014DD8C); diff --git a/src/ov_SC04_007/ov_SC04_007.c b/src/ov_SC04_007/ov_SC04_007.c index 6cfda4022..758f89f73 100644 --- a/src/ov_SC04_007/ov_SC04_007.c +++ b/src/ov_SC04_007/ov_SC04_007.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007", func_8014D820); -INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007", func_8014DD8C); diff --git a/src/ov_SC04_008/ov_SC04_008.c b/src/ov_SC04_008/ov_SC04_008.c index f7563d232..39964f09f 100644 --- a/src/ov_SC04_008/ov_SC04_008.c +++ b/src/ov_SC04_008/ov_SC04_008.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008", func_8014D820); -INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008", func_8014DD8C); diff --git a/src/ov_SC04_009/ov_SC04_009.c b/src/ov_SC04_009/ov_SC04_009.c index 7cdd6456a..871e24c09 100644 --- a/src/ov_SC04_009/ov_SC04_009.c +++ b/src/ov_SC04_009/ov_SC04_009.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009", func_8014D820); -INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009", func_8014DD8C); diff --git a/src/ov_SC04_010/ov_SC04_010.c b/src/ov_SC04_010/ov_SC04_010.c index 0f90cd05e..bd014ee5a 100644 --- a/src/ov_SC04_010/ov_SC04_010.c +++ b/src/ov_SC04_010/ov_SC04_010.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010", func_8014D820); -INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010", func_8014DD8C); diff --git a/src/ov_SC04_011/ov_SC04_011.c b/src/ov_SC04_011/ov_SC04_011.c index 421551e4b..dadcb9a4e 100644 --- a/src/ov_SC04_011/ov_SC04_011.c +++ b/src/ov_SC04_011/ov_SC04_011.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011", func_8014D820); -INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011", func_8014DD8C); diff --git a/src/ov_SC04_012/ov_SC04_012.c b/src/ov_SC04_012/ov_SC04_012.c index 837a94f7a..9b24730f4 100644 --- a/src/ov_SC04_012/ov_SC04_012.c +++ b/src/ov_SC04_012/ov_SC04_012.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012", func_8014D820); -INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012", func_8014DD8C); diff --git a/src/ov_SC04_015/ov_SC04_015.c b/src/ov_SC04_015/ov_SC04_015.c index 059d7fd5b..ae23c11ae 100644 --- a/src/ov_SC04_015/ov_SC04_015.c +++ b/src/ov_SC04_015/ov_SC04_015.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015", func_8014D820); -INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015", func_8014DD8C); diff --git a/src/ov_SC04_016/ov_SC04_016.c b/src/ov_SC04_016/ov_SC04_016.c index 990fec2a7..692d86d30 100644 --- a/src/ov_SC04_016/ov_SC04_016.c +++ b/src/ov_SC04_016/ov_SC04_016.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016", func_8014D820); -INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016", func_8014DD8C); diff --git a/src/ov_SC04_018/ov_SC04_018.c b/src/ov_SC04_018/ov_SC04_018.c index 3502f1ac7..27bd43835 100644 --- a/src/ov_SC04_018/ov_SC04_018.c +++ b/src/ov_SC04_018/ov_SC04_018.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018", func_8014D820); -INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018", func_8014DD8C); diff --git a/src/ov_SC04_019/ov_SC04_019.c b/src/ov_SC04_019/ov_SC04_019.c index dd7db2afd..dd5cf293a 100644 --- a/src/ov_SC04_019/ov_SC04_019.c +++ b/src/ov_SC04_019/ov_SC04_019.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019", func_8014D820); -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019", func_8014DD8C); diff --git a/src/ov_SC04_020/ov_SC04_020.c b/src/ov_SC04_020/ov_SC04_020.c index b2f1e9c8a..a6438c91e 100644 --- a/src/ov_SC04_020/ov_SC04_020.c +++ b/src/ov_SC04_020/ov_SC04_020.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020", func_8014D820); -INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020", func_8014DD8C); diff --git a/src/ov_SC04_021/ov_SC04_021.c b/src/ov_SC04_021/ov_SC04_021.c index 228fe102e..33cc3f1a3 100644 --- a/src/ov_SC04_021/ov_SC04_021.c +++ b/src/ov_SC04_021/ov_SC04_021.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021", func_8014D820); -INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021", func_8014DD8C); diff --git a/src/ov_SC05_000/ov_SC05_000.c b/src/ov_SC05_000/ov_SC05_000.c index fb3cd1a09..b38b2f550 100644 --- a/src/ov_SC05_000/ov_SC05_000.c +++ b/src/ov_SC05_000/ov_SC05_000.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000", func_8014D820); -INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000", func_8014DD8C); diff --git a/src/ov_SC05_001/ov_SC05_001.c b/src/ov_SC05_001/ov_SC05_001.c index 04a8b5b0e..1c9c3befb 100644 --- a/src/ov_SC05_001/ov_SC05_001.c +++ b/src/ov_SC05_001/ov_SC05_001.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001", func_8014D820); -INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001", func_8014DD8C); diff --git a/src/ov_SC05_002/ov_SC05_002.c b/src/ov_SC05_002/ov_SC05_002.c index e7311f8fe..ca1254b58 100644 --- a/src/ov_SC05_002/ov_SC05_002.c +++ b/src/ov_SC05_002/ov_SC05_002.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002", func_8014D820); -INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002", func_8014DD8C); diff --git a/src/ov_SC05_003/ov_SC05_003.c b/src/ov_SC05_003/ov_SC05_003.c index 162f90480..6e6abf8e4 100644 --- a/src/ov_SC05_003/ov_SC05_003.c +++ b/src/ov_SC05_003/ov_SC05_003.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003", func_8014D820); -INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003", func_8014DD8C); diff --git a/src/ov_SC05_004/ov_SC05_004.c b/src/ov_SC05_004/ov_SC05_004.c index e68b8509e..4f54b86ec 100644 --- a/src/ov_SC05_004/ov_SC05_004.c +++ b/src/ov_SC05_004/ov_SC05_004.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004", func_8014D820); -INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004", func_8014DD8C); diff --git a/src/ov_SC05_005/ov_SC05_005.c b/src/ov_SC05_005/ov_SC05_005.c index 39070136c..67ef585c6 100644 --- a/src/ov_SC05_005/ov_SC05_005.c +++ b/src/ov_SC05_005/ov_SC05_005.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005", func_8014D820); -INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005", func_8014DD8C); diff --git a/src/ov_SC05_006/ov_SC05_006.c b/src/ov_SC05_006/ov_SC05_006.c index ba9890632..db70e53f6 100644 --- a/src/ov_SC05_006/ov_SC05_006.c +++ b/src/ov_SC05_006/ov_SC05_006.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006", func_8014D820); -INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006", func_8014DD8C); diff --git a/src/ov_SC05_007/ov_SC05_007.c b/src/ov_SC05_007/ov_SC05_007.c index 0a37729df..09972ba3a 100644 --- a/src/ov_SC05_007/ov_SC05_007.c +++ b/src/ov_SC05_007/ov_SC05_007.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007", func_8014D820); -INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007", func_8014DD8C); diff --git a/src/ov_SC05_008/ov_SC05_008.c b/src/ov_SC05_008/ov_SC05_008.c index 7bbba8560..78c41a43b 100644 --- a/src/ov_SC05_008/ov_SC05_008.c +++ b/src/ov_SC05_008/ov_SC05_008.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008", func_8014D820); -INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008", func_8014DD8C); diff --git a/src/ov_SC05_009/ov_SC05_009.c b/src/ov_SC05_009/ov_SC05_009.c index 3b57fd0f3..f5c689094 100644 --- a/src/ov_SC05_009/ov_SC05_009.c +++ b/src/ov_SC05_009/ov_SC05_009.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009", func_8014D820); -INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009", func_8014DD8C); diff --git a/src/ov_SC05_010/ov_SC05_010.c b/src/ov_SC05_010/ov_SC05_010.c index 72c841e4d..f9a85a27a 100644 --- a/src/ov_SC05_010/ov_SC05_010.c +++ b/src/ov_SC05_010/ov_SC05_010.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010", func_8014D820); -INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010", func_8014DD8C); diff --git a/src/ov_SC05_011/ov_SC05_011.c b/src/ov_SC05_011/ov_SC05_011.c index 59fdda7f6..5868a8bf6 100644 --- a/src/ov_SC05_011/ov_SC05_011.c +++ b/src/ov_SC05_011/ov_SC05_011.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011", func_8014D820); -INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011", func_8014DD8C); diff --git a/src/ov_SC05_017/ov_SC05_017.c b/src/ov_SC05_017/ov_SC05_017.c index 6af97bff6..3af7523b8 100644 --- a/src/ov_SC05_017/ov_SC05_017.c +++ b/src/ov_SC05_017/ov_SC05_017.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017", func_8014D820); -INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017", func_8014DD8C); diff --git a/src/ov_SC05_018/ov_SC05_018.c b/src/ov_SC05_018/ov_SC05_018.c index 96529482b..98e599cca 100644 --- a/src/ov_SC05_018/ov_SC05_018.c +++ b/src/ov_SC05_018/ov_SC05_018.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018", func_8014D820); -INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018", func_8014DD8C); diff --git a/src/ov_SC05_019/ov_SC05_019.c b/src/ov_SC05_019/ov_SC05_019.c index 545507e6f..38d9ad31f 100644 --- a/src/ov_SC05_019/ov_SC05_019.c +++ b/src/ov_SC05_019/ov_SC05_019.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019", func_8014D820); -INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019", func_8014DD8C); diff --git a/src/ov_SC06_000/ov_SC06_000.c b/src/ov_SC06_000/ov_SC06_000.c index 92ee6bdb9..67839396f 100644 --- a/src/ov_SC06_000/ov_SC06_000.c +++ b/src/ov_SC06_000/ov_SC06_000.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000", func_8014D820); -INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000", func_8014DD8C); diff --git a/src/ov_SC06_006/ov_SC06_006.c b/src/ov_SC06_006/ov_SC06_006.c index a2627a203..f81af0074 100644 --- a/src/ov_SC06_006/ov_SC06_006.c +++ b/src/ov_SC06_006/ov_SC06_006.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006", func_8014D820); -INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006", func_8014DD8C); diff --git a/src/ov_SC06_008/ov_SC06_008.c b/src/ov_SC06_008/ov_SC06_008.c index 8f7748a5c..052250cbf 100644 --- a/src/ov_SC06_008/ov_SC06_008.c +++ b/src/ov_SC06_008/ov_SC06_008.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008", func_8014D820); -INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008", func_8014DD8C); diff --git a/src/ov_SC06_010/ov_SC06_010.c b/src/ov_SC06_010/ov_SC06_010.c index afd233dac..c6adccb89 100644 --- a/src/ov_SC06_010/ov_SC06_010.c +++ b/src/ov_SC06_010/ov_SC06_010.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010", func_8014D820); -INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010", func_8014DD8C); diff --git a/src/ov_SC06_011/ov_SC06_011.c b/src/ov_SC06_011/ov_SC06_011.c index 2f75c4e48..009fa2444 100644 --- a/src/ov_SC06_011/ov_SC06_011.c +++ b/src/ov_SC06_011/ov_SC06_011.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011", func_8014D820); -INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011", func_8014DD8C); diff --git a/src/ov_SC06_013/ov_SC06_013.c b/src/ov_SC06_013/ov_SC06_013.c index 1680199a3..88fce02c1 100644 --- a/src/ov_SC06_013/ov_SC06_013.c +++ b/src/ov_SC06_013/ov_SC06_013.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013", func_8014D820); -INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013", func_8014DD8C); diff --git a/src/ov_SC06_014/ov_SC06_014.c b/src/ov_SC06_014/ov_SC06_014.c index e284ebc84..27c3139a5 100644 --- a/src/ov_SC06_014/ov_SC06_014.c +++ b/src/ov_SC06_014/ov_SC06_014.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014", func_8014D820); -INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014", func_8014DD8C); diff --git a/src/ov_SC06_015/ov_SC06_015.c b/src/ov_SC06_015/ov_SC06_015.c index a63a0a0af..b31c026fd 100644 --- a/src/ov_SC06_015/ov_SC06_015.c +++ b/src/ov_SC06_015/ov_SC06_015.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015", func_8014D820); -INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015", func_8014DD8C); diff --git a/src/ov_SC06_016/ov_SC06_016.c b/src/ov_SC06_016/ov_SC06_016.c index f794bc97b..be57ca8ef 100644 --- a/src/ov_SC06_016/ov_SC06_016.c +++ b/src/ov_SC06_016/ov_SC06_016.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016", func_8014D820); -INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016", func_8014DD8C); diff --git a/src/ov_SC06_018/ov_SC06_018.c b/src/ov_SC06_018/ov_SC06_018.c index a7dee73e7..fe4d38b8d 100644 --- a/src/ov_SC06_018/ov_SC06_018.c +++ b/src/ov_SC06_018/ov_SC06_018.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018", func_8014D820); -INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018", func_8014DD8C); diff --git a/src/ov_SC06_020/ov_SC06_020.c b/src/ov_SC06_020/ov_SC06_020.c index 7a390c117..55227353a 100644 --- a/src/ov_SC06_020/ov_SC06_020.c +++ b/src/ov_SC06_020/ov_SC06_020.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020", func_8014D820); -INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020", func_8014DD8C); diff --git a/src/ov_SC06_022/ov_SC06_022.c b/src/ov_SC06_022/ov_SC06_022.c index 2765b4e24..a06cbe604 100644 --- a/src/ov_SC06_022/ov_SC06_022.c +++ b/src/ov_SC06_022/ov_SC06_022.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022", func_8014D820); -INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022", func_8014DD8C); diff --git a/src/ov_SC06_024/ov_SC06_024.c b/src/ov_SC06_024/ov_SC06_024.c index 0005c098f..decd6fad2 100644 --- a/src/ov_SC06_024/ov_SC06_024.c +++ b/src/ov_SC06_024/ov_SC06_024.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024", func_8014D820); -INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024", func_8014DD8C); diff --git a/src/ov_SC06_025/ov_SC06_025.c b/src/ov_SC06_025/ov_SC06_025.c index e2b0b0eb2..9a7a8f6ee 100644 --- a/src/ov_SC06_025/ov_SC06_025.c +++ b/src/ov_SC06_025/ov_SC06_025.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025", func_8014D820); -INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025", func_8014DD8C); diff --git a/src/ov_SC06_027/ov_SC06_027.c b/src/ov_SC06_027/ov_SC06_027.c index 6bd36929d..c41489046 100644 --- a/src/ov_SC06_027/ov_SC06_027.c +++ b/src/ov_SC06_027/ov_SC06_027.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027", func_8014D820); -INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027", func_8014DD8C); diff --git a/src/ov_SC06_029/ov_SC06_029.c b/src/ov_SC06_029/ov_SC06_029.c index 9b123a226..e7730f964 100644 --- a/src/ov_SC06_029/ov_SC06_029.c +++ b/src/ov_SC06_029/ov_SC06_029.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029", func_8014D820); -INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029", func_8014DD8C); diff --git a/src/ov_SC06_030/ov_SC06_030.c b/src/ov_SC06_030/ov_SC06_030.c index 3942f9560..107affaeb 100644 --- a/src/ov_SC06_030/ov_SC06_030.c +++ b/src/ov_SC06_030/ov_SC06_030.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030", func_8014D820); -INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030", func_8014DD8C); diff --git a/src/ov_SC06_032/ov_SC06_032.c b/src/ov_SC06_032/ov_SC06_032.c index 745e4d7b3..10ddac1bc 100644 --- a/src/ov_SC06_032/ov_SC06_032.c +++ b/src/ov_SC06_032/ov_SC06_032.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032", func_8014D820); -INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032", func_8014DD8C); diff --git a/src/ov_SC06_033/ov_SC06_033.c b/src/ov_SC06_033/ov_SC06_033.c index aedf7299c..51ace0abf 100644 --- a/src/ov_SC06_033/ov_SC06_033.c +++ b/src/ov_SC06_033/ov_SC06_033.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033", func_8014D820); -INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033", func_8014DD8C); diff --git a/src/ov_SC07_000/ov_SC07_000.c b/src/ov_SC07_000/ov_SC07_000.c index 2c45bcec0..539aef59f 100644 --- a/src/ov_SC07_000/ov_SC07_000.c +++ b/src/ov_SC07_000/ov_SC07_000.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000", func_8014D820); -INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000", func_8014DD8C); diff --git a/src/ov_SC07_001/ov_SC07_001.c b/src/ov_SC07_001/ov_SC07_001.c index a79706b31..d1ef069a5 100644 --- a/src/ov_SC07_001/ov_SC07_001.c +++ b/src/ov_SC07_001/ov_SC07_001.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001", func_8014D820); -INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001", func_8014DD8C); diff --git a/src/ov_SC07_002/ov_SC07_002.c b/src/ov_SC07_002/ov_SC07_002.c index 68a176af4..933c8a8ee 100644 --- a/src/ov_SC07_002/ov_SC07_002.c +++ b/src/ov_SC07_002/ov_SC07_002.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002", func_8014D820); -INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002", func_8014DD8C); diff --git a/src/ov_SC07_008/ov_SC07_008.c b/src/ov_SC07_008/ov_SC07_008.c index ee60d6b6d..d9dae77b0 100644 --- a/src/ov_SC07_008/ov_SC07_008.c +++ b/src/ov_SC07_008/ov_SC07_008.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008", func_8014D820); -INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008", func_8014DD8C); diff --git a/src/ov_SC07_009/ov_SC07_009.c b/src/ov_SC07_009/ov_SC07_009.c index 6b34cd7ab..30b3a917c 100644 --- a/src/ov_SC07_009/ov_SC07_009.c +++ b/src/ov_SC07_009/ov_SC07_009.c @@ -1357,7 +1357,7 @@ DEFINE_func_801474D8() /* dedup: shared engine-core @0x801474D8 (src/shared) */ DEFINE_func_801474EC() /* dedup: shared engine-core @0x801474EC (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009", func_80147514); +DEFINE_func_80147514() /* dedup: shared engine-core @0x80147514 (src/shared) */ DEFINE_func_80147628() /* dedup: shared engine-core @0x80147628 (src/shared) */ @@ -1937,7 +1937,7 @@ DEFINE_func_8014D790() /* dedup: shared engine-core @0x8014D790 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009", func_8014D820); -INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009", func_8014DCE0); +DEFINE_func_8014DCE0() /* dedup: shared engine-core @0x8014DCE0 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009", func_8014DD8C); diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 77f2e5600..c40e7637e 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -18816,4 +18816,49 @@ func_80154418(arg0); \ } +#define DEFINE_func_8014DCE0() \ + extern s32 func_80135888(s32 a0, s32 a1, s32 a2, s32 a3); \ + s32 func_8014DCE0(s32 arg0, s32 arg1, s32 arg2) { \ + struct Quad buf; \ + register s32 i __asm__("$17"); \ + register s32 s0 __asm__("$16"); \ + buf = *(struct Quad *)(*(u32 *)(arg0 + 0x58) & 0xFFFFFFF); \ + i = 0; \ + s0 = arg2; \ + do { \ + s32 r; \ + r = func_80135888(*(s32 *)(arg0 + 0x20), (s32)&buf, arg1, s0); \ + i += 1; \ + if (r == 0) { \ + s0 += 8; \ + } else { \ + return 1; \ + } \ + } while (i < 3); \ + return 0; \ + } + +#define DEFINE_func_80147514() \ + extern s32 func_80012C6C(s32 a0, s32 a1, s32 a2); \ + extern s32 func_800129CC(s32 a0, s32 a1); \ + void func_80147514(s32 arg0) { \ + s16 buf[8]; \ + *(struct V4s80147514 *)buf = *(struct V4s80147514 *)(arg0 + 0x120); \ + if (((u16)buf[0] | (u16)buf[1] | (u16)buf[2]) == 0) { \ + buf[1] = -0xFFF; \ + } \ + if (*(s16 *)(arg0 + 0x12E) != 0) { \ + buf[0] = (u16)buf[0] + *(u16 *)(arg0 + 0x128); \ + buf[1] = (u16)buf[1] + *(u16 *)(arg0 + 0x12A); \ + buf[2] = (u16)buf[2] + *(u16 *)(arg0 + 0x12C); \ + } \ + *(s16 *)(arg0 + 0x118) = func_80012C6C(*(s16 *)(arg0 + 0x118), buf[0], 8); \ + *(s16 *)(arg0 + 0x11A) = func_80012C6C(*(s16 *)(arg0 + 0x11A), buf[1], 8); \ + *(s16 *)(arg0 + 0x11C) = func_80012C6C(*(s16 *)(arg0 + 0x11C), buf[2], 8); \ + buf[0] = *(u16 *)(arg0 + 0x118); \ + buf[1] = *(u16 *)(arg0 + 0x11A); \ + buf[2] = *(u16 *)(arg0 + 0x11C); \ + func_800129CC((s32)buf, arg0 + 0x100); \ + } + #endif diff --git a/src/shared/engine_types.h b/src/shared/engine_types.h index c510813c5..1ea0ba81e 100644 --- a/src/shared/engine_types.h +++ b/src/shared/engine_types.h @@ -49,6 +49,11 @@ struct B8014; struct copy00; struct Vec4s; struct Src80172E20; +struct V4s80147514; +struct Quad; +struct A; +struct B; +struct Bv; struct vec { s32 unk0; @@ -330,4 +335,24 @@ struct Src80172E20 { u16 _E; }; +struct V4s80147514 { s16 a, b, c, d; }; + +struct Quad { s32 a, b, c, d; }; + +struct A { + u16 unk00; u16 unk02; u16 unk04; /* 0x10 0x12 0x14 */ + u16 unk06; /* 0x16 (gap) */ + u16 unk08; u16 unk0A; u16 unk0C; /* 0x18 0x1A 0x1C */ + u16 unk0E; /* 0x1E (gap) */ + u8 unk10; u8 unk11; u8 unk12; /* 0x20 0x21 0x22 */ + u8 unk13; /* 0x23 (gap) */ + u8 unk14; u8 unk15; u8 unk16; /* 0x24 0x25 0x26 */ + u8 unk17; /* 0x27 (gap) */ + s32 unk18; /* 0x28 */ +}; + +struct B { s32 w[8]; s32 tail[2]; }; + +struct Bv { s32 w[8]; }; + #endif /* BFM_ENGINE_TYPES_H */