From d6db1343b80812f9b915acc2d1f4fdf6156f8a74 Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Fri, 17 Jul 2026 18:37:00 -0600 Subject: [PATCH] feat(phase-29 T4): type-lift + propagate 2 local-type cores x138 (func_8014E284, func_80137DD4) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The 2 Task-3 cores banked x1 but skipped by dedup_propagate ("not self-contained: local types"). Lifted EntSC01077 (func_8014E284) + P_TAG_80137DD4 (func_80137DD4) into src/shared/engine_types.h (fleet-included via engine_core.h), and inlined func_80137DD4's file-local `#define OTE` into the body (byte-neutral macro expansion, re-evaluated per use to preserve codegen). Both now self-contained -> dedup_propagate --recover = 138 overlays byte-identical, 0 stragglers, 2 new dedup groups. ~+32.7k ins (108+129 x138). R22 clean-fleet 140/140 byte-identical; tools-health OK; dedup 1846->1852; C1 coverage 234205. §55c local-type propagation cap lifted for these 2. SESSION-2 close: this session banked ~94k ins across 4 fns x~137 overlays (2 non-jtbl giants fully propagated + this 2-core type-lift); fleet 71.4->72.1% instr (+0.7pp), 140/140 throughout. The 4 jtbl giants remain deferred on the byte-proven 8-align jtbl-carve gap (root cause half-pinned: cc1+maspsx both emit .align 2, so the +4B pad is a downstream as/ld_interleave artifact) -> teed up as the next task. --- .run/giants/p29t3_README.md | 36 +++++++--- config/dedup.us.yaml | 14 ++++ phase-ends/CURRENT_PHASE.md | 21 ++++++ src/ov_SC01_000/ov_SC01_000_after.c | 2 +- src/ov_SC01_000/ov_SC01_000_jr_8012ACE0.c | 2 +- src/ov_SC01_001/ov_SC01_001_after.c | 2 +- src/ov_SC01_001/ov_SC01_001_jr_8012ACE0.c | 2 +- src/ov_SC01_004/ov_SC01_004_after.c | 2 +- src/ov_SC01_004/ov_SC01_004_jr_8012ACE0.c | 2 +- src/ov_SC01_005/ov_SC01_005_after.c | 2 +- src/ov_SC01_005/ov_SC01_005_jr_8012ACE0.c | 2 +- src/ov_SC01_006/ov_SC01_006_after.c | 2 +- src/ov_SC01_006/ov_SC01_006_jr_8012ACE0.c | 2 +- src/ov_SC01_008/ov_SC01_008_after.c | 2 +- src/ov_SC01_008/ov_SC01_008_jr_8012ACE0.c | 2 +- src/ov_SC01_009/ov_SC01_009_after.c | 2 +- src/ov_SC01_009/ov_SC01_009_jr_8012ACE0.c | 2 +- src/ov_SC01_074/ov_SC01_074_after.c | 2 +- src/ov_SC01_074/ov_SC01_074_jr_8012ACE0.c | 2 +- src/ov_SC01_077/ov_SC01_077_after.c | 56 +--------------- src/ov_SC01_077/ov_SC01_077_jr_8012ACE0.c | 50 +------------- src/ov_SC01_080/ov_SC01_080_after.c | 2 +- src/ov_SC01_080/ov_SC01_080_jr_8012ACE0.c | 2 +- src/ov_SC01_084/ov_SC01_084_after.c | 2 +- src/ov_SC01_084/ov_SC01_084_jr_8012ACE0.c | 2 +- src/ov_SC02_000/ov_SC02_000_after.c | 2 +- src/ov_SC02_000/ov_SC02_000_jr_8012ACE0.c | 2 +- src/ov_SC02_003/ov_SC02_003_after.c | 2 +- src/ov_SC02_003/ov_SC02_003_jr_8012ACE0.c | 2 +- src/ov_SC02_004/ov_SC02_004_after.c | 2 +- src/ov_SC02_004/ov_SC02_004_jr_8012ACE0.c | 2 +- src/ov_SC02_005/ov_SC02_005_after.c | 2 +- src/ov_SC02_005/ov_SC02_005_jr_8012ACE0.c | 2 +- src/ov_SC02_011/ov_SC02_011_after.c | 2 +- src/ov_SC02_011/ov_SC02_011_jr_8012ACE0.c | 2 +- src/ov_SC02_015/ov_SC02_015_after.c | 2 +- src/ov_SC02_015/ov_SC02_015_jr_8012ACE0.c | 2 +- src/ov_SC02_016/ov_SC02_016_after.c | 2 +- src/ov_SC02_016/ov_SC02_016_jr_8012ACE0.c | 2 +- src/ov_SC02_017/ov_SC02_017_after.c | 2 +- src/ov_SC02_017/ov_SC02_017_jr_8012ACE0.c | 2 +- src/ov_SC02_021/ov_SC02_021_after.c | 2 +- src/ov_SC02_021/ov_SC02_021_jr_8012ACE0.c | 2 +- src/ov_SC02_026/ov_SC02_026_after.c | 2 +- src/ov_SC02_026/ov_SC02_026_jr_8012ACE0.c | 2 +- src/ov_SC02_027/ov_SC02_027_after.c | 2 +- src/ov_SC02_027/ov_SC02_027_jr_8012ACE0.c | 2 +- src/ov_SC02_028/ov_SC02_028_after.c | 2 +- src/ov_SC02_028/ov_SC02_028_jr_8012ACE0.c | 2 +- src/ov_SC02_031/ov_SC02_031_after.c | 2 +- src/ov_SC02_031/ov_SC02_031_jr_8012ACE0.c | 2 +- src/ov_SC02_035/ov_SC02_035_after.c | 2 +- src/ov_SC02_035/ov_SC02_035_jr_8012ACE0.c | 2 +- src/ov_SC02_039/ov_SC02_039_after.c | 2 +- src/ov_SC02_039/ov_SC02_039_jr_8012ACE0.c | 2 +- src/ov_SC02_041/ov_SC02_041_after.c | 2 +- src/ov_SC02_041/ov_SC02_041_jr_8012ACE0.c | 2 +- src/ov_SC03_001/ov_SC03_001_after.c | 2 +- src/ov_SC03_001/ov_SC03_001_jr_8012ACE0.c | 2 +- src/ov_SC03_002/ov_SC03_002_after.c | 2 +- src/ov_SC03_002/ov_SC03_002_jr_8012ACE0.c | 2 +- src/ov_SC03_003/ov_SC03_003_after.c | 2 +- src/ov_SC03_003/ov_SC03_003_jr_8012ACE0.c | 2 +- src/ov_SC03_006/ov_SC03_006_after.c | 2 +- src/ov_SC03_006/ov_SC03_006_jr_8012ACE0.c | 2 +- src/ov_SC03_007/ov_SC03_007_after.c | 2 +- src/ov_SC03_007/ov_SC03_007_jr_8012ACE0.c | 2 +- src/ov_SC03_010/ov_SC03_010_after.c | 2 +- src/ov_SC03_010/ov_SC03_010_jr_8012ACE0.c | 2 +- src/ov_SC03_011/ov_SC03_011_after.c | 2 +- src/ov_SC03_011/ov_SC03_011_jr_8012ACE0.c | 2 +- src/ov_SC03_012/ov_SC03_012_after.c | 2 +- src/ov_SC03_012/ov_SC03_012_jr_8012ACE0.c | 2 +- src/ov_SC03_013/ov_SC03_013_after.c | 2 +- src/ov_SC03_013/ov_SC03_013_jr_8012ACE0.c | 2 +- src/ov_SC03_014/ov_SC03_014_after.c | 2 +- src/ov_SC03_014/ov_SC03_014_jr_8012ACE0.c | 2 +- src/ov_SC03_015/ov_SC03_015_after.c | 2 +- src/ov_SC03_015/ov_SC03_015_jr_8012ACE0.c | 2 +- src/ov_SC03_023/ov_SC03_023_after.c | 2 +- src/ov_SC03_023/ov_SC03_023_jr_8012ACE0.c | 2 +- src/ov_SC03_024/ov_SC03_024_after.c | 2 +- src/ov_SC03_024/ov_SC03_024_jr_8012ACE0.c | 2 +- src/ov_SC03_028/ov_SC03_028_after.c | 2 +- src/ov_SC03_028/ov_SC03_028_jr_8012ACE0.c | 2 +- src/ov_SC03_029/ov_SC03_029_after.c | 2 +- src/ov_SC03_029/ov_SC03_029_jr_8012ACE0.c | 2 +- src/ov_SC03_030/ov_SC03_030_after.c | 2 +- src/ov_SC03_030/ov_SC03_030_jr_8012ACE0.c | 2 +- src/ov_SC03_031/ov_SC03_031_after.c | 2 +- src/ov_SC03_031/ov_SC03_031_jr_8012ACE0.c | 2 +- src/ov_SC03_089/ov_SC03_089_after.c | 2 +- src/ov_SC03_089/ov_SC03_089_jr_8012ACE0.c | 2 +- src/ov_SC03_090/ov_SC03_090_after.c | 2 +- src/ov_SC03_090/ov_SC03_090_jr_8012ACE0.c | 2 +- src/ov_SC03_091/ov_SC03_091_after.c | 2 +- src/ov_SC03_091/ov_SC03_091_jr_8012ACE0.c | 2 +- src/ov_SC03_092/ov_SC03_092_after.c | 2 +- src/ov_SC03_092/ov_SC03_092_jr_8012ACE0.c | 2 +- src/ov_SC03_093/ov_SC03_093_after.c | 2 +- src/ov_SC03_093/ov_SC03_093_jr_8012ACE0.c | 2 +- src/ov_SC03_094/ov_SC03_094_after.c | 2 +- src/ov_SC03_094/ov_SC03_094_jr_8012ACE0.c | 2 +- src/ov_SC03_095/ov_SC03_095_after.c | 2 +- src/ov_SC03_095/ov_SC03_095_jr_8012ACE0.c | 2 +- src/ov_SC03_096/ov_SC03_096_after.c | 2 +- src/ov_SC03_096/ov_SC03_096_jr_8012ACE0.c | 2 +- src/ov_SC03_097/ov_SC03_097_after.c | 2 +- src/ov_SC03_097/ov_SC03_097_jr_8012ACE0.c | 2 +- src/ov_SC03_098/ov_SC03_098_after.c | 2 +- src/ov_SC03_098/ov_SC03_098_jr_8012ACE0.c | 2 +- src/ov_SC03_099/ov_SC03_099_after.c | 2 +- src/ov_SC03_099/ov_SC03_099_jr_8012ACE0.c | 2 +- src/ov_SC03_100/ov_SC03_100_after.c | 2 +- src/ov_SC03_100/ov_SC03_100_jr_8012ACE0.c | 2 +- src/ov_SC03_101/ov_SC03_101_after.c | 2 +- src/ov_SC03_101/ov_SC03_101_jr_8012ACE0.c | 2 +- src/ov_SC03_102/ov_SC03_102_after.c | 2 +- src/ov_SC03_102/ov_SC03_102_jr_8012ACE0.c | 2 +- src/ov_SC03_103/ov_SC03_103_after.c | 2 +- src/ov_SC03_103/ov_SC03_103_jr_8012ACE0.c | 2 +- src/ov_SC03_104/ov_SC03_104_after.c | 2 +- src/ov_SC03_104/ov_SC03_104_jr_8012ACE0.c | 2 +- src/ov_SC03_105/ov_SC03_105_after.c | 2 +- src/ov_SC03_105/ov_SC03_105_jr_8012ACE0.c | 2 +- src/ov_SC03_108/ov_SC03_108_after.c | 2 +- src/ov_SC03_108/ov_SC03_108_jr_8012ACE0.c | 2 +- src/ov_SC03_109/ov_SC03_109_after.c | 2 +- src/ov_SC03_109/ov_SC03_109_jr_8012ACE0.c | 2 +- src/ov_SC03_110/ov_SC03_110_after.c | 2 +- src/ov_SC03_110/ov_SC03_110_jr_8012ACE0.c | 2 +- src/ov_SC03_111/ov_SC03_111_after.c | 2 +- src/ov_SC03_111/ov_SC03_111_jr_8012ACE0.c | 2 +- src/ov_SC03_112/ov_SC03_112_after.c | 2 +- src/ov_SC03_112/ov_SC03_112_jr_8012ACE0.c | 2 +- src/ov_SC03_113/ov_SC03_113_after.c | 2 +- src/ov_SC03_113/ov_SC03_113_jr_8012ACE0.c | 2 +- src/ov_SC03_114/ov_SC03_114_after.c | 2 +- src/ov_SC03_114/ov_SC03_114_jr_8012ACE0.c | 2 +- src/ov_SC03_115/ov_SC03_115_after.c | 2 +- src/ov_SC03_115/ov_SC03_115_jr_8012ACE0.c | 2 +- src/ov_SC03_116/ov_SC03_116_after.c | 2 +- src/ov_SC03_116/ov_SC03_116_jr_8012ACE0.c | 2 +- src/ov_SC03_117/ov_SC03_117_after.c | 2 +- src/ov_SC03_117/ov_SC03_117_jr_8012ACE0.c | 2 +- src/ov_SC03_118/ov_SC03_118_after.c | 2 +- src/ov_SC03_118/ov_SC03_118_jr_8012ACE0.c | 2 +- src/ov_SC03_119/ov_SC03_119_after.c | 2 +- src/ov_SC03_119/ov_SC03_119_jr_8012ACE0.c | 2 +- src/ov_SC03_121/ov_SC03_121_after.c | 2 +- src/ov_SC03_121/ov_SC03_121_jr_8012ACE0.c | 2 +- src/ov_SC03_124/ov_SC03_124_after.c | 2 +- src/ov_SC03_124/ov_SC03_124_jr_8012ACE0.c | 2 +- src/ov_SC03_125/ov_SC03_125_after.c | 2 +- src/ov_SC03_125/ov_SC03_125_jr_8012ACE0.c | 2 +- src/ov_SC03_126/ov_SC03_126_after.c | 2 +- src/ov_SC03_126/ov_SC03_126_jr_8012ACE0.c | 2 +- src/ov_SC04_000/ov_SC04_000_after.c | 2 +- src/ov_SC04_000/ov_SC04_000_jr_8012ACE0.c | 2 +- src/ov_SC04_002/ov_SC04_002_after.c | 2 +- src/ov_SC04_002/ov_SC04_002_jr_8012ACE0.c | 2 +- src/ov_SC04_003/ov_SC04_003_after.c | 2 +- src/ov_SC04_003/ov_SC04_003_jr_8012ACE0.c | 2 +- src/ov_SC04_004/ov_SC04_004_after.c | 2 +- src/ov_SC04_004/ov_SC04_004_jr_8012ACE0.c | 2 +- src/ov_SC04_005/ov_SC04_005_after.c | 2 +- src/ov_SC04_005/ov_SC04_005_jr_8012ACE0.c | 2 +- src/ov_SC04_006/ov_SC04_006_after.c | 2 +- src/ov_SC04_006/ov_SC04_006_jr_8012ACE0.c | 2 +- src/ov_SC04_007/ov_SC04_007_after.c | 2 +- src/ov_SC04_007/ov_SC04_007_jr_8012ACE0.c | 2 +- src/ov_SC04_008/ov_SC04_008_after.c | 2 +- src/ov_SC04_008/ov_SC04_008_jr_8012ACE0.c | 2 +- src/ov_SC04_009/ov_SC04_009_after.c | 2 +- src/ov_SC04_009/ov_SC04_009_jr_8012ACE0.c | 2 +- src/ov_SC04_010/ov_SC04_010_after.c | 2 +- src/ov_SC04_010/ov_SC04_010_jr_8012ACE0.c | 2 +- src/ov_SC04_011/ov_SC04_011_after.c | 2 +- src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.c | 2 +- src/ov_SC04_012/ov_SC04_012_after.c | 2 +- src/ov_SC04_012/ov_SC04_012_jr_8012ACE0.c | 2 +- src/ov_SC04_015/ov_SC04_015_after.c | 2 +- src/ov_SC04_015/ov_SC04_015_jr_8012ACE0.c | 2 +- src/ov_SC04_016/ov_SC04_016_after.c | 2 +- src/ov_SC04_016/ov_SC04_016_jr_8012ACE0.c | 2 +- src/ov_SC04_018/ov_SC04_018_after.c | 2 +- src/ov_SC04_018/ov_SC04_018_jr_8012ACE0.c | 2 +- src/ov_SC04_019/ov_SC04_019_after.c | 2 +- src/ov_SC04_019/ov_SC04_019_jr_8012ACE0.c | 2 +- src/ov_SC04_020/ov_SC04_020_after.c | 2 +- src/ov_SC04_020/ov_SC04_020_jr_8012ACE0.c | 2 +- src/ov_SC04_021/ov_SC04_021_after.c | 2 +- src/ov_SC04_021/ov_SC04_021_jr_8012ACE0.c | 2 +- src/ov_SC05_000/ov_SC05_000_after.c | 2 +- src/ov_SC05_000/ov_SC05_000_jr_8012ACE0.c | 2 +- src/ov_SC05_001/ov_SC05_001_after.c | 2 +- src/ov_SC05_001/ov_SC05_001_jr_8012ACE0.c | 2 +- src/ov_SC05_002/ov_SC05_002_after.c | 2 +- src/ov_SC05_002/ov_SC05_002_jr_8012ACE0.c | 2 +- src/ov_SC05_003/ov_SC05_003_after.c | 2 +- src/ov_SC05_003/ov_SC05_003_jr_8012ACE0.c | 2 +- src/ov_SC05_004/ov_SC05_004_after.c | 2 +- src/ov_SC05_004/ov_SC05_004_jr_8012ACE0.c | 2 +- src/ov_SC05_005/ov_SC05_005_after.c | 2 +- src/ov_SC05_005/ov_SC05_005_jr_8012ACE0.c | 2 +- src/ov_SC05_006/ov_SC05_006_after.c | 2 +- src/ov_SC05_006/ov_SC05_006_jr_8012ACE0.c | 2 +- src/ov_SC05_007/ov_SC05_007_after.c | 2 +- src/ov_SC05_007/ov_SC05_007_jr_8012ACE0.c | 2 +- src/ov_SC05_008/ov_SC05_008_after.c | 2 +- src/ov_SC05_008/ov_SC05_008_jr_8012ACE0.c | 2 +- src/ov_SC05_009/ov_SC05_009_after.c | 2 +- src/ov_SC05_009/ov_SC05_009_jr_8012ACE0.c | 2 +- src/ov_SC05_010/ov_SC05_010_after.c | 2 +- src/ov_SC05_010/ov_SC05_010_jr_8012ACE0.c | 2 +- src/ov_SC05_011/ov_SC05_011_after.c | 2 +- src/ov_SC05_011/ov_SC05_011_jr_8012ACE0.c | 2 +- src/ov_SC05_017/ov_SC05_017_after.c | 2 +- src/ov_SC05_017/ov_SC05_017_jr_8012ACE0.c | 2 +- src/ov_SC05_018/ov_SC05_018_after.c | 2 +- src/ov_SC05_018/ov_SC05_018_jr_8012ACE0.c | 2 +- src/ov_SC05_019/ov_SC05_019_after.c | 2 +- src/ov_SC05_019/ov_SC05_019_jr_8012ACE0.c | 2 +- src/ov_SC06_000/ov_SC06_000_after.c | 2 +- src/ov_SC06_000/ov_SC06_000_jr_8012ACE0.c | 2 +- src/ov_SC06_006/ov_SC06_006_after.c | 2 +- src/ov_SC06_006/ov_SC06_006_jr_8012ACE0.c | 2 +- src/ov_SC06_008/ov_SC06_008_after.c | 2 +- src/ov_SC06_008/ov_SC06_008_jr_8012ACE0.c | 2 +- src/ov_SC06_010/ov_SC06_010_after.c | 2 +- src/ov_SC06_010/ov_SC06_010_jr_8012ACE0.c | 2 +- src/ov_SC06_011/ov_SC06_011_after.c | 2 +- src/ov_SC06_011/ov_SC06_011_jr_8012ACE0.c | 2 +- src/ov_SC06_013/ov_SC06_013_after.c | 2 +- src/ov_SC06_013/ov_SC06_013_jr_8012ACE0.c | 2 +- src/ov_SC06_014/ov_SC06_014_after.c | 2 +- src/ov_SC06_014/ov_SC06_014_jr_8012ACE0.c | 2 +- src/ov_SC06_015/ov_SC06_015_after.c | 2 +- src/ov_SC06_015/ov_SC06_015_jr_8012ACE0.c | 2 +- src/ov_SC06_016/ov_SC06_016_after.c | 2 +- src/ov_SC06_016/ov_SC06_016_jr_8012ACE0.c | 2 +- src/ov_SC06_018/ov_SC06_018_after.c | 2 +- src/ov_SC06_018/ov_SC06_018_jr_8012ACE0.c | 2 +- src/ov_SC06_020/ov_SC06_020_after.c | 2 +- src/ov_SC06_020/ov_SC06_020_jr_8012ACE0.c | 2 +- src/ov_SC06_022/ov_SC06_022_after.c | 2 +- src/ov_SC06_022/ov_SC06_022_jr_8012ACE0.c | 2 +- src/ov_SC06_024/ov_SC06_024_after.c | 2 +- src/ov_SC06_024/ov_SC06_024_jr_8012ACE0.c | 2 +- src/ov_SC06_025/ov_SC06_025_after.c | 2 +- src/ov_SC06_025/ov_SC06_025_jr_8012ACE0.c | 2 +- src/ov_SC06_027/ov_SC06_027_after.c | 2 +- src/ov_SC06_027/ov_SC06_027_jr_8012ACE0.c | 2 +- src/ov_SC06_029/ov_SC06_029_after.c | 2 +- src/ov_SC06_029/ov_SC06_029_jr_8012ACE0.c | 2 +- src/ov_SC06_030/ov_SC06_030_after.c | 2 +- src/ov_SC06_030/ov_SC06_030_jr_8012ACE0.c | 2 +- src/ov_SC06_032/ov_SC06_032_after.c | 2 +- src/ov_SC06_032/ov_SC06_032_jr_8012ACE0.c | 2 +- src/ov_SC06_033/ov_SC06_033_after.c | 2 +- src/ov_SC06_033/ov_SC06_033_jr_8012ACE0.c | 2 +- src/ov_SC07_000/ov_SC07_000_after.c | 2 +- src/ov_SC07_000/ov_SC07_000_jr_8012ACE0.c | 2 +- src/ov_SC07_001/ov_SC07_001_after.c | 2 +- src/ov_SC07_001/ov_SC07_001_jr_8012ACE0.c | 2 +- src/ov_SC07_002/ov_SC07_002_after.c | 2 +- src/ov_SC07_002/ov_SC07_002_jr_8012ACE0.c | 2 +- src/ov_SC07_006/ov_SC07_006.c | 4 +- src/ov_SC07_007/ov_SC07_007.c | 4 +- src/ov_SC07_008/ov_SC07_008_after.c | 2 +- src/ov_SC07_008/ov_SC07_008_jr_8012ACE0.c | 2 +- src/ov_SC07_009/ov_SC07_009_after.c | 2 +- src/ov_SC07_009/ov_SC07_009_jr_8012ACE0.c | 2 +- src/ov_SC07_010/ov_SC07_010.c | 2 +- src/ov_SC07_010/ov_SC07_010_o2b.c | 2 +- src/ov_SC07_011/ov_SC07_011.c | 4 +- src/shared/engine_core.h | 82 +++++++++++++++++++++++ src/shared/engine_types.h | 20 ++++++ 278 files changed, 441 insertions(+), 386 deletions(-) diff --git a/.run/giants/p29t3_README.md b/.run/giants/p29t3_README.md index 7ef7d57562..ce3b24715d 100644 --- a/.run/giants/p29t3_README.md +++ b/.run/giants/p29t3_README.md @@ -41,14 +41,34 @@ draft STANDALONE, so it is blind to the member TU's conflicting decls. The whole --- -## Suggested order for a fresh session (cheapest → dearest) -1. **`func_8013FAF8` (312)** — pure def-sig plumbing on an already-MATCHing giant. Best value. -2. **`func_80131340` (424)** — in-TU-proven body; just re-read the real gate error. -3. **`func_8013F350` (490)** — §30#2 macro-widen (`void`→`s32`). -4. **`func_8014F4C0`** — one stubborn decl. -5. **`func_8013C414` (329)** — §8a rodata-island carve (config work, self-contained, well-precedented). -6. **`func_80159C84` (337)** — needs a fresh gate diagnosis first. -7. Permuter fuel: `func_80177940` (5), `func_801670E4` (16 — strip pins first), `func_8014D820` (33), `func_80140958` (116). +## STATUS after Phase-29 T4 session (2026-07-17) — the giants split into TWO classes + +**✅ DONE (both NON-jtbl giants, fully banked + propagated fleet-wide):** +- **`func_8013FAF8` (312)** — banked x1 (cookbook §56 multi-symbol reconciliation) + **propagated x137** + via `family_sweep --hseq` (h_seq family; §56b — align the exemplar's callee externs to fleet-canonical + first or it banks 0/137). Commits `commit:0673`, `commit:0675`. ~+42.7k ins. +- **`func_8014F4C0` (141)** — banked x1 (clean; earlier reject was §55b propagate-damage) + **propagated + x134** via `dedup_propagate --recover` (h_exact). Commit `commit:0674`. ~+19k ins. + +**⏸ DEFERRED — the 4 jtbl giants are BLOCKED on ONE tooling gap (the teed-up next-session task):** +`func_80131340` (424), `func_80159C84` (337, +a trivial D_801891B8 (u8*/void*) plumbing fix), +`func_8013C414` (329, -O0), `func_8013F350` (490, +§30#2 macro-widen void→s32). +Each needs a per-overlay jtbl carve (`jtbl_carve` / `jtbl_family_bank`) x~137, and the carve currently +OVERSHOOTS: **byte-proven on func_80131340 —** its `jtbl_801D8144` is a non-first, 4-aligned jtbl in a +shared code object; the carved `.rodata` run comes out **+4 bytes** (an 8-align pad at rodata offset 0xCC +after the 51-entry jtbl_801D8078), shifting the whole data island → all downstream `%lo` relocs break +image-wide (+5B, 3077 diffs from a CLEAN build). +**ROOT CAUSE HALF-PINNED (do NOT re-derive):** it is NOT gcc — **cc1 AND maspsx both emit the jtbl +`.align 2` (4-byte, correct)** (probe: `.run/probe_jtbl_cc1.s` / `probe_jtbl_maspsx.s`). The 8-byte pad +is a downstream build-infra artifact (GNU `as` `.rodata` section-align defaulting to `2**3`, or the +`ld_interleave` placement). **NEXT-SESSION TASK:** pin whether it's `as` section-align vs interleave → +fix `jtbl_carve`/`ld_interleave` to pack the non-first jtbl 4-aligned (or isolate) → prove x137 propagation +on func_80131340 end-to-end BEFORE scaling to all 4. Ceiling ≈ +1 to +1.5pp instr (the biggest lever left). + +**Permuter fuel (separate track):** `func_80177940` (5), `func_801670E4` (16 — strip pins first), +`func_8014D820` (33), `func_80140958` (116). **Gate law (§55b):** `--no-propagate` per group → **commit the banks** → THEN one targeted `dedup_propagate --addr ` (~233s/core on a healthy tree; only `--auto-from` is fleet-slow). +**h_seq giants use `family_sweep --hseq` (per-overlay symbol remap), NOT dedup_propagate (reach<2); +pre-align the exemplar's callee externs to the fleet-canonical (§56b).** diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index da709fbec8..06d54a897e 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -13032,3 +13032,17 @@ groups: func: DEFINE_func_8014F4C0 vram: 0x8014F4C0 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_8014E284 + tier: h_exact + hash: 8425223edca5bda9ea2081a449a4457a56702040 + source: src/shared/engine_core.h + func: DEFINE_func_8014E284 + vram: 0x8014E284 + binaries: [ov_SC01_077, ov_SC01_005, ov_SC01_006, ov_SC03_001, ov_SC01_000, ov_SC01_001, ov_SC02_000, ov_SC02_003, ov_SC03_002, ov_SC03_006, ov_SC04_000, ov_SC04_018, ov_SC04_019, ov_SC05_000, ov_SC06_000, ov_SC07_000, ov_SC01_004, ov_SC01_008, ov_SC01_009, ov_SC01_074, ov_SC01_080, ov_SC01_084, ov_SC02_004, ov_SC02_005, ov_SC02_011, ov_SC02_015, ov_SC02_016, ov_SC02_017, ov_SC02_021, ov_SC02_026, ov_SC02_027, ov_SC02_028, ov_SC02_031, ov_SC02_035, ov_SC02_039, ov_SC02_041, ov_SC03_003, ov_SC03_007, ov_SC03_010, ov_SC03_011, ov_SC03_012, ov_SC03_013, ov_SC03_014, ov_SC03_015, ov_SC03_023, ov_SC03_024, ov_SC03_028, ov_SC03_029, ov_SC03_030, ov_SC03_031, ov_SC03_089, ov_SC03_090, ov_SC03_091, ov_SC03_092, ov_SC03_093, ov_SC03_094, ov_SC03_095, ov_SC03_096, ov_SC03_097, ov_SC03_098, ov_SC03_099, ov_SC03_100, ov_SC03_101, ov_SC03_102, ov_SC03_103, ov_SC03_104, ov_SC03_105, ov_SC03_108, ov_SC03_109, ov_SC03_110, ov_SC03_111, ov_SC03_112, ov_SC03_113, ov_SC03_114, ov_SC03_115, ov_SC03_116, ov_SC03_117, ov_SC03_118, ov_SC03_119, ov_SC03_121, ov_SC03_124, ov_SC03_125, ov_SC03_126, ov_SC04_002, ov_SC04_003, ov_SC04_004, ov_SC04_005, ov_SC04_006, ov_SC04_007, ov_SC04_008, ov_SC04_009, ov_SC04_010, ov_SC04_011, ov_SC04_012, ov_SC04_015, ov_SC04_016, ov_SC04_020, ov_SC04_021, ov_SC05_001, ov_SC05_002, ov_SC05_003, ov_SC05_004, ov_SC05_005, ov_SC05_006, ov_SC05_007, ov_SC05_008, ov_SC05_009, ov_SC05_010, ov_SC05_011, ov_SC05_017, ov_SC05_018, ov_SC05_019, ov_SC06_006, ov_SC06_008, ov_SC06_010, ov_SC06_011, ov_SC06_013, ov_SC06_014, ov_SC06_015, ov_SC06_016, ov_SC06_018, ov_SC06_020, ov_SC06_022, ov_SC06_024, ov_SC06_025, ov_SC06_027, ov_SC06_029, ov_SC06_030, ov_SC06_032, ov_SC06_033, ov_SC07_001, ov_SC07_002, ov_SC07_008, ov_SC07_009, ov_SC07_006, ov_SC07_007, ov_SC07_010, ov_SC07_011] + - id: E_func_80137DD4 + tier: h_exact + hash: 9b03676a7a34169c5e2acf1e7f853ea0a7bf591b + source: src/shared/engine_core.h + func: DEFINE_func_80137DD4 + vram: 0x80137DD4 + binaries: [ov_SC01_077, ov_SC01_005, ov_SC01_006, ov_SC03_001, ov_SC01_000, ov_SC01_001, ov_SC02_000, ov_SC02_003, ov_SC03_002, ov_SC03_006, ov_SC04_000, ov_SC04_018, ov_SC04_019, ov_SC05_000, ov_SC06_000, ov_SC07_000, ov_SC01_004, ov_SC01_008, ov_SC01_009, ov_SC01_074, ov_SC01_080, ov_SC01_084, ov_SC02_004, ov_SC02_005, ov_SC02_011, ov_SC02_015, ov_SC02_016, ov_SC02_017, ov_SC02_021, ov_SC02_026, ov_SC02_027, ov_SC02_028, ov_SC02_031, ov_SC02_035, ov_SC02_039, ov_SC02_041, ov_SC03_003, ov_SC03_007, ov_SC03_010, ov_SC03_011, ov_SC03_012, ov_SC03_013, ov_SC03_014, ov_SC03_015, ov_SC03_023, ov_SC03_024, ov_SC03_028, ov_SC03_029, ov_SC03_030, ov_SC03_031, ov_SC03_089, ov_SC03_090, ov_SC03_091, ov_SC03_092, ov_SC03_093, ov_SC03_094, ov_SC03_095, ov_SC03_096, ov_SC03_097, ov_SC03_098, ov_SC03_099, ov_SC03_100, ov_SC03_101, ov_SC03_102, ov_SC03_103, ov_SC03_104, ov_SC03_105, ov_SC03_108, ov_SC03_109, ov_SC03_110, ov_SC03_111, ov_SC03_112, ov_SC03_113, ov_SC03_114, ov_SC03_115, ov_SC03_116, ov_SC03_117, ov_SC03_118, ov_SC03_119, ov_SC03_121, ov_SC03_124, ov_SC03_125, ov_SC03_126, ov_SC04_002, ov_SC04_003, ov_SC04_004, ov_SC04_005, ov_SC04_006, ov_SC04_007, ov_SC04_008, ov_SC04_009, ov_SC04_010, ov_SC04_011, ov_SC04_012, ov_SC04_015, ov_SC04_016, ov_SC04_020, ov_SC04_021, ov_SC05_001, ov_SC05_002, ov_SC05_003, ov_SC05_004, ov_SC05_005, ov_SC05_006, ov_SC05_007, ov_SC05_008, ov_SC05_009, ov_SC05_010, ov_SC05_011, ov_SC05_017, ov_SC05_018, ov_SC05_019, ov_SC06_006, ov_SC06_008, ov_SC06_010, ov_SC06_011, ov_SC06_013, ov_SC06_014, ov_SC06_015, ov_SC06_016, ov_SC06_018, ov_SC06_020, ov_SC06_022, ov_SC06_024, ov_SC06_025, ov_SC06_027, ov_SC06_029, ov_SC06_030, ov_SC06_032, ov_SC06_033, ov_SC07_001, ov_SC07_002, ov_SC07_008, ov_SC07_009, ov_SC07_006, ov_SC07_007, ov_SC07_010, ov_SC07_011] diff --git a/phase-ends/CURRENT_PHASE.md b/phase-ends/CURRENT_PHASE.md index a58e873076..f86540524e 100644 --- a/phase-ends/CURRENT_PHASE.md +++ b/phase-ends/CURRENT_PHASE.md @@ -197,6 +197,27 @@ conditional) · main-EXE/B9 + GLM/B6 + resident's 14 walls (P30) · behemoths B7 Cookbook §56b (exemplar-externs-must-be-canonical for h_seq; contrast dedup_propagate --recover which auto-reconciles CALLER externs). Both NON-jtbl giants now fully banked+propagated (func_8013FAF8 x137, func_8014F4C0 x134); the 4 jtbl giants stay deferred on the 8-align carve gap. +- **✅ 2026-07-17 — 2-core type-lift + propagate x138 each (func_8014E284 108, func_80137DD4 129).** Both were + banked x1 in Task 3 but `dedup_propagate` skipped them ("not self-contained: local types"). Lifted `EntSC01077` + (func_8014E284) + `P_TAG_80137DD4` (func_80137DD4) into `src/shared/engine_types.h` (fleet-included via + engine_core.h) and **inlined func_80137DD4's file-local `#define OTE`** into the body (byte-neutral macro + expansion, re-evaluated per use to preserve codegen) → both self-contained → `dedup_propagate --recover` = + **138 overlays byte-identical, 0 stragglers, 2 new dedup groups**. ~+32.7k ins. R22 clean-fleet 140/140; + dedup 1846/0; C1 234205. Cheap carried Task-3 win closed (§55c local-type cap lifted for these 2). + +> **🛑 SESSION-2 CHECKPOINT (2026-07-17) — supersedes the checkpoint above; safe to open a FRESH session here.** +> Tree clean, **140/140 byte-identical**, `tools-health` green, dedup **1852/0**, 0 NON_MATCHING. +> Fleet **72.1% instr · 54.0% distinct-code · 86.57% fn-count** (session opened 71.4/53.3/86.42 → **+0.7pp instr**). +> **This session banked ~94k ins across 4 fns ×~137 overlays:** func_8013FAF8 (312) ×137 + func_8014F4C0 (141) ×134 +> (the 2 NON-jtbl giants, fully done) + func_8014E284 (108) ×138 + func_80137DD4 (129) ×138 (the 2-core type-lift). +> Commits `commit:0673`, `commit:0674`, `commit:0675` + the type-lift commit (Drew pushes). Cookbook **§56/§56b** added. +> **THE TEED-UP NEXT TASK (Drew-directed): the jtbl 8-align tooling fix** — unblocks the 4 remaining giants +> (`func_80131340`/`func_80159C84`/`func_8013C414`/`func_8013F350`), ceiling ≈ **+1 to +1.5pp instr** (biggest lever +> left). Root cause HALF-PINNED (do not re-derive): cc1 AND maspsx both emit the jtbl `.align 2` (correct) — the +> +4B 8-align pad is a downstream `as`/`ld_interleave` artifact. **START from `.run/giants/p29t3_README.md`** (the +> STATUS section — full findings, probes at `.run/probe_jtbl_*.s`) + cookbook §8/§8a. Step 1: pin `as` section-align +> vs interleave; Step 2: fix jtbl_carve to pack the non-first jtbl 4-aligned; Step 3: prove x137 on func_80131340 +> before scaling. Also open: Task 6 permuter backlog, Task 5 Ghidra prefetch (needs /mcp), Task 7 ROI-close. - **2026-07-17 — Task 3 core-crack wave: 13 agents → 7 MATCH → 5 BANKED ×1.** Ultracode `worker_wave` (13 xHigh drafters over 6 cores 260–371 ins + 7 B3 near-misses 100–141 ins; all had cached Ghidra-C). Wave hit a usage limit at 2/13, **resumed cleanly** (cached agents replay) → **13/13 done: 7 match / 6 near**. diff --git a/src/ov_SC01_000/ov_SC01_000_after.c b/src/ov_SC01_000/ov_SC01_000_after.c index 56d1c0d177..d6e4a3e57b 100644 --- a/src/ov_SC01_000/ov_SC01_000_after.c +++ b/src/ov_SC01_000/ov_SC01_000_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC01_000/ov_SC01_000_jr_8012ACE0.c b/src/ov_SC01_000/ov_SC01_000_jr_8012ACE0.c index d653076fd0..d76476a356 100644 --- a/src/ov_SC01_000/ov_SC01_000_jr_8012ACE0.c +++ b/src/ov_SC01_000/ov_SC01_000_jr_8012ACE0.c @@ -3060,6 +3060,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC01_001/ov_SC01_001_after.c b/src/ov_SC01_001/ov_SC01_001_after.c index 8e65875083..1cb3bf4d8e 100644 --- a/src/ov_SC01_001/ov_SC01_001_after.c +++ b/src/ov_SC01_001/ov_SC01_001_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC01_001/ov_SC01_001_jr_8012ACE0.c b/src/ov_SC01_001/ov_SC01_001_jr_8012ACE0.c index 661f4063ea..7f1bd4a987 100644 --- a/src/ov_SC01_001/ov_SC01_001_jr_8012ACE0.c +++ b/src/ov_SC01_001/ov_SC01_001_jr_8012ACE0.c @@ -3061,6 +3061,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC01_004/ov_SC01_004_after.c b/src/ov_SC01_004/ov_SC01_004_after.c index 13c434bab2..e132849b2f 100644 --- a/src/ov_SC01_004/ov_SC01_004_after.c +++ b/src/ov_SC01_004/ov_SC01_004_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC01_004/ov_SC01_004_jr_8012ACE0.c b/src/ov_SC01_004/ov_SC01_004_jr_8012ACE0.c index d6db551479..4f3beb2a2a 100644 --- a/src/ov_SC01_004/ov_SC01_004_jr_8012ACE0.c +++ b/src/ov_SC01_004/ov_SC01_004_jr_8012ACE0.c @@ -3062,6 +3062,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC01_005/ov_SC01_005_after.c b/src/ov_SC01_005/ov_SC01_005_after.c index 9522ee93c2..2469745c65 100644 --- a/src/ov_SC01_005/ov_SC01_005_after.c +++ b/src/ov_SC01_005/ov_SC01_005_after.c @@ -1449,7 +1449,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC01_005/ov_SC01_005_jr_8012ACE0.c b/src/ov_SC01_005/ov_SC01_005_jr_8012ACE0.c index ab85dc3ec7..9dc1119ba5 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_8012ACE0.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_8012ACE0.c @@ -3053,6 +3053,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC01_006/ov_SC01_006_after.c b/src/ov_SC01_006/ov_SC01_006_after.c index c75f122a1f..d89604d626 100644 --- a/src/ov_SC01_006/ov_SC01_006_after.c +++ b/src/ov_SC01_006/ov_SC01_006_after.c @@ -1449,7 +1449,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC01_006/ov_SC01_006_jr_8012ACE0.c b/src/ov_SC01_006/ov_SC01_006_jr_8012ACE0.c index 0ba6ee69c2..424bddeba3 100644 --- a/src/ov_SC01_006/ov_SC01_006_jr_8012ACE0.c +++ b/src/ov_SC01_006/ov_SC01_006_jr_8012ACE0.c @@ -3053,6 +3053,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC01_008/ov_SC01_008_after.c b/src/ov_SC01_008/ov_SC01_008_after.c index a365f05a6c..c4fc06cac1 100644 --- a/src/ov_SC01_008/ov_SC01_008_after.c +++ b/src/ov_SC01_008/ov_SC01_008_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC01_008/ov_SC01_008_jr_8012ACE0.c b/src/ov_SC01_008/ov_SC01_008_jr_8012ACE0.c index 1b0482ac04..3864ca31b0 100644 --- a/src/ov_SC01_008/ov_SC01_008_jr_8012ACE0.c +++ b/src/ov_SC01_008/ov_SC01_008_jr_8012ACE0.c @@ -3062,6 +3062,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC01_009/ov_SC01_009_after.c b/src/ov_SC01_009/ov_SC01_009_after.c index 73ab9c0354..1c8e192a4b 100644 --- a/src/ov_SC01_009/ov_SC01_009_after.c +++ b/src/ov_SC01_009/ov_SC01_009_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC01_009/ov_SC01_009_jr_8012ACE0.c b/src/ov_SC01_009/ov_SC01_009_jr_8012ACE0.c index 40e415b42a..ea92e491b0 100644 --- a/src/ov_SC01_009/ov_SC01_009_jr_8012ACE0.c +++ b/src/ov_SC01_009/ov_SC01_009_jr_8012ACE0.c @@ -3062,6 +3062,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC01_074/ov_SC01_074_after.c b/src/ov_SC01_074/ov_SC01_074_after.c index 4b5d6fb3db..526bb62be4 100644 --- a/src/ov_SC01_074/ov_SC01_074_after.c +++ b/src/ov_SC01_074/ov_SC01_074_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC01_074/ov_SC01_074_jr_8012ACE0.c b/src/ov_SC01_074/ov_SC01_074_jr_8012ACE0.c index 74202294dd..883546700f 100644 --- a/src/ov_SC01_074/ov_SC01_074_jr_8012ACE0.c +++ b/src/ov_SC01_074/ov_SC01_074_jr_8012ACE0.c @@ -3062,6 +3062,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC01_077/ov_SC01_077_after.c b/src/ov_SC01_077/ov_SC01_077_after.c index da30e810d8..0235a733e8 100644 --- a/src/ov_SC01_077/ov_SC01_077_after.c +++ b/src/ov_SC01_077/ov_SC01_077_after.c @@ -1689,62 +1689,8 @@ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ /* stride 0x10C == the D_801202A0 entry size; keeps the symbol_ref through gcc's array-index addressing (§18). Named uniquely: the TU-canonical decl of the symbol itself stays `u8 []` (engine_core.h / DEFINE_func_8014A048 already declare it that way at file scope). */ -typedef struct EntSC01077 { - u16 f00; - u8 pad02[4]; - u16 f06; - u8 pad08[2]; - u16 f0A; - u8 pad0C[2]; - u16 f0E; - u8 pad10[0x10]; - s32 f20; - u8 pad24[0x34]; - s32 f58; - u16 f5C; - u8 pad5E[0xAE]; -} EntSC01077; -extern u8 D_801202A0[]; -extern s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3); /* canonical (engine_core.h:11555) */ -extern s32 ratan2(s32 a0, s32 a1); -extern s32 func_80012A60(s32 a0, s32 a1); - -s32 func_8014E284(s32 a0, s16 *arg1, s16 *arg2) { - u16 *a1 = (u16 *)arg1; - u16 *a2 = (u16 *)arg2; - EntSC01077 *p; - s16 dx; - s16 dz; - s16 ax; - s16 az; - s32 r1; - s32 r2; - - dx = a2[0] - a1[0]; - dz = a2[2] - a1[2]; - if ((s16)(dx | dz) != 0) { - for (p = (EntSC01077 *)D_801202A0; p < (EntSC01077 *)D_801202A0 + 96; p++) { - if (p->f00 == 0) continue; - if (p->f58 == 0) continue; - if ((p->f5C & 0x1000) == 0) continue; - /* §17a-1 fn-ptr cast: keep the canonical extern, call with the intended sig. */ - if (((s32 (*)(s32, s32, u16 *, u16 *))func_80135A4C)(p->f20, p->f58, a1, a2) == 0) continue; - ax = p->f06 - *(u16 *)(a0 + 6); - az = p->f0E - *(u16 *)(a0 + 0xE); - r1 = (s16)ratan2(dz, dx); - r2 = (s16)ratan2(az, ax); - if ((s16)func_80012A60(r1, r2) < 0x400) { - *(s32 *)(a0 + 0x170) = (s32)p; - *(u16 *)(a0 + 6) = a2[0]; - *(u16 *)(a0 + 0xA) = a2[1] + 0x10; - *(u16 *)(a0 + 0xE) = a2[2]; - return 1; - } - } - } - return 0; -} +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ // @class: other diff --git a/src/ov_SC01_077/ov_SC01_077_jr_8012ACE0.c b/src/ov_SC01_077/ov_SC01_077_jr_8012ACE0.c index 446c21ef7f..482cd5d7bd 100644 --- a/src/ov_SC01_077/ov_SC01_077_jr_8012ACE0.c +++ b/src/ov_SC01_077/ov_SC01_077_jr_8012ACE0.c @@ -3649,55 +3649,7 @@ int func_80137D08(int arg0, int arg1, short arg2) // orders `subu` before `addiu` to match. #include "common.h" -extern void *func_80010A08(s32); -extern void func_80137FD8(s32 a0, s32 a1, s32 a2, s32 a3); - -typedef struct { u32 addr : 24; u32 len : 8; u8 r0, g0, b0, code; } P_TAG_80137DD4; - -#define OTE ((P_TAG_80137DD4 *)((u32)*(u16 *)(ent + 0x1a) * 4 + *(s32 *)(work + 4))) - -void func_80137DD4(s32 ent, u8 *arg, u8 *work) { - register s32 t __asm__("$4"); - s32 d, c, c1, sub, y; - u32 b; - P_TAG_80137DD4 *q, *r; - - { - register u32 h12 __asm__("$2"), h16 __asm__("$3"); - h12 = *(u16 *)(ent + 0x12); - h16 = *(u16 *)(ent + 0x16); - t = h12 - h16; - } - d = t; - if ((s16)t < 0) { - register s32 e __asm__("$2"); - e = t + 1; - d = (u32)*(u16 *)(ent + 0x2e) + e; - } - b = *(volatile u8 *)(ent + 0x1f); - c = (s8)b; - sub = d - (u32)*(u8 *)(ent + 0x21); - c1 = c + 1; - y = (u32)*(u16 *)(ent + 0x32) + (s16)(sub + c1) * 0xe; - - q = (P_TAG_80137DD4 *)func_80010A08(0x48); - *(u8 *)(arg + 3) = 0; - func_80137FD8(ent, (s32)arg, (s32)q, (s16)y); - q->addr = OTE->addr; - OTE->addr = (u32)q; - - q = (P_TAG_80137DD4 *)((u8 *)q + 0x24); - *(u8 *)(arg + 3) = 1; - func_80137FD8(ent, (s32)arg, (s32)q, (s16)y); - q->addr = OTE->addr; - OTE->addr = (u32)q; - - r = (P_TAG_80137DD4 *)func_80010A08(8); - r->len = 1; - *(u32 *)((u8 *)r + 4) = 0xe100000a; - r->addr = OTE->addr; - OTE->addr = (u32)r; -} +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC01_080/ov_SC01_080_after.c b/src/ov_SC01_080/ov_SC01_080_after.c index e1f72bcb1f..663d9f5284 100644 --- a/src/ov_SC01_080/ov_SC01_080_after.c +++ b/src/ov_SC01_080/ov_SC01_080_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC01_080/ov_SC01_080_jr_8012ACE0.c b/src/ov_SC01_080/ov_SC01_080_jr_8012ACE0.c index f2cac4018e..923a05df04 100644 --- a/src/ov_SC01_080/ov_SC01_080_jr_8012ACE0.c +++ b/src/ov_SC01_080/ov_SC01_080_jr_8012ACE0.c @@ -3062,6 +3062,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC01_084/ov_SC01_084_after.c b/src/ov_SC01_084/ov_SC01_084_after.c index 48414841ae..0f2c0bc553 100644 --- a/src/ov_SC01_084/ov_SC01_084_after.c +++ b/src/ov_SC01_084/ov_SC01_084_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC01_084/ov_SC01_084_jr_8012ACE0.c b/src/ov_SC01_084/ov_SC01_084_jr_8012ACE0.c index 5df5e0680a..d18ca3b3b2 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_8012ACE0.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_8012ACE0.c @@ -3062,6 +3062,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC02_000/ov_SC02_000_after.c b/src/ov_SC02_000/ov_SC02_000_after.c index 038851f9b9..1056d40ed9 100644 --- a/src/ov_SC02_000/ov_SC02_000_after.c +++ b/src/ov_SC02_000/ov_SC02_000_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC02_000/ov_SC02_000_jr_8012ACE0.c b/src/ov_SC02_000/ov_SC02_000_jr_8012ACE0.c index 0ef7f36021..f8e5c860e2 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_8012ACE0.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_8012ACE0.c @@ -3061,6 +3061,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC02_003/ov_SC02_003_after.c b/src/ov_SC02_003/ov_SC02_003_after.c index 75999ffbad..ccebcfb975 100644 --- a/src/ov_SC02_003/ov_SC02_003_after.c +++ b/src/ov_SC02_003/ov_SC02_003_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC02_003/ov_SC02_003_jr_8012ACE0.c b/src/ov_SC02_003/ov_SC02_003_jr_8012ACE0.c index 4a7ac3742a..a542f06bf2 100644 --- a/src/ov_SC02_003/ov_SC02_003_jr_8012ACE0.c +++ b/src/ov_SC02_003/ov_SC02_003_jr_8012ACE0.c @@ -3061,6 +3061,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC02_004/ov_SC02_004_after.c b/src/ov_SC02_004/ov_SC02_004_after.c index c03b502d4a..2e71729485 100644 --- a/src/ov_SC02_004/ov_SC02_004_after.c +++ b/src/ov_SC02_004/ov_SC02_004_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC02_004/ov_SC02_004_jr_8012ACE0.c b/src/ov_SC02_004/ov_SC02_004_jr_8012ACE0.c index aef1183d02..1b057757ce 100644 --- a/src/ov_SC02_004/ov_SC02_004_jr_8012ACE0.c +++ b/src/ov_SC02_004/ov_SC02_004_jr_8012ACE0.c @@ -3062,6 +3062,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC02_005/ov_SC02_005_after.c b/src/ov_SC02_005/ov_SC02_005_after.c index 7429155a70..df5b2785a4 100644 --- a/src/ov_SC02_005/ov_SC02_005_after.c +++ b/src/ov_SC02_005/ov_SC02_005_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC02_005/ov_SC02_005_jr_8012ACE0.c b/src/ov_SC02_005/ov_SC02_005_jr_8012ACE0.c index 3ed9c29983..68dc79b6f4 100644 --- a/src/ov_SC02_005/ov_SC02_005_jr_8012ACE0.c +++ b/src/ov_SC02_005/ov_SC02_005_jr_8012ACE0.c @@ -3062,6 +3062,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC02_011/ov_SC02_011_after.c b/src/ov_SC02_011/ov_SC02_011_after.c index ab9d6fc1ef..982ac11c53 100644 --- a/src/ov_SC02_011/ov_SC02_011_after.c +++ b/src/ov_SC02_011/ov_SC02_011_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC02_011/ov_SC02_011_jr_8012ACE0.c b/src/ov_SC02_011/ov_SC02_011_jr_8012ACE0.c index 8c84b675d0..a1ae38a716 100644 --- a/src/ov_SC02_011/ov_SC02_011_jr_8012ACE0.c +++ b/src/ov_SC02_011/ov_SC02_011_jr_8012ACE0.c @@ -3062,6 +3062,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC02_015/ov_SC02_015_after.c b/src/ov_SC02_015/ov_SC02_015_after.c index caaea3c0f4..3b81b0ad6c 100644 --- a/src/ov_SC02_015/ov_SC02_015_after.c +++ b/src/ov_SC02_015/ov_SC02_015_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC02_015/ov_SC02_015_jr_8012ACE0.c b/src/ov_SC02_015/ov_SC02_015_jr_8012ACE0.c index 49b92449d0..576c3c6c2f 100644 --- a/src/ov_SC02_015/ov_SC02_015_jr_8012ACE0.c +++ b/src/ov_SC02_015/ov_SC02_015_jr_8012ACE0.c @@ -3062,6 +3062,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC02_016/ov_SC02_016_after.c b/src/ov_SC02_016/ov_SC02_016_after.c index 2ae9a4ab94..b457c98e25 100644 --- a/src/ov_SC02_016/ov_SC02_016_after.c +++ b/src/ov_SC02_016/ov_SC02_016_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC02_016/ov_SC02_016_jr_8012ACE0.c b/src/ov_SC02_016/ov_SC02_016_jr_8012ACE0.c index c1ef09084e..66648c905c 100644 --- a/src/ov_SC02_016/ov_SC02_016_jr_8012ACE0.c +++ b/src/ov_SC02_016/ov_SC02_016_jr_8012ACE0.c @@ -3062,6 +3062,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC02_017/ov_SC02_017_after.c b/src/ov_SC02_017/ov_SC02_017_after.c index a9f96abaa5..6bd0d5b800 100644 --- a/src/ov_SC02_017/ov_SC02_017_after.c +++ b/src/ov_SC02_017/ov_SC02_017_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC02_017/ov_SC02_017_jr_8012ACE0.c b/src/ov_SC02_017/ov_SC02_017_jr_8012ACE0.c index 5a7e6d8f8d..14f9476d10 100644 --- a/src/ov_SC02_017/ov_SC02_017_jr_8012ACE0.c +++ b/src/ov_SC02_017/ov_SC02_017_jr_8012ACE0.c @@ -3062,6 +3062,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC02_021/ov_SC02_021_after.c b/src/ov_SC02_021/ov_SC02_021_after.c index 39becec362..cb89921fa6 100644 --- a/src/ov_SC02_021/ov_SC02_021_after.c +++ b/src/ov_SC02_021/ov_SC02_021_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC02_021/ov_SC02_021_jr_8012ACE0.c b/src/ov_SC02_021/ov_SC02_021_jr_8012ACE0.c index 2d32bfaa2e..0bf735e48e 100644 --- a/src/ov_SC02_021/ov_SC02_021_jr_8012ACE0.c +++ b/src/ov_SC02_021/ov_SC02_021_jr_8012ACE0.c @@ -3062,6 +3062,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC02_026/ov_SC02_026_after.c b/src/ov_SC02_026/ov_SC02_026_after.c index 76b426126e..5e205ea727 100644 --- a/src/ov_SC02_026/ov_SC02_026_after.c +++ b/src/ov_SC02_026/ov_SC02_026_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC02_026/ov_SC02_026_jr_8012ACE0.c b/src/ov_SC02_026/ov_SC02_026_jr_8012ACE0.c index 1753173d12..d950970833 100644 --- a/src/ov_SC02_026/ov_SC02_026_jr_8012ACE0.c +++ b/src/ov_SC02_026/ov_SC02_026_jr_8012ACE0.c @@ -3062,6 +3062,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC02_027/ov_SC02_027_after.c b/src/ov_SC02_027/ov_SC02_027_after.c index 917ec5a5c4..e92cf2d05d 100644 --- a/src/ov_SC02_027/ov_SC02_027_after.c +++ b/src/ov_SC02_027/ov_SC02_027_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC02_027/ov_SC02_027_jr_8012ACE0.c b/src/ov_SC02_027/ov_SC02_027_jr_8012ACE0.c index 62d5245e41..a9cf7f3cb8 100644 --- a/src/ov_SC02_027/ov_SC02_027_jr_8012ACE0.c +++ b/src/ov_SC02_027/ov_SC02_027_jr_8012ACE0.c @@ -3062,6 +3062,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC02_028/ov_SC02_028_after.c b/src/ov_SC02_028/ov_SC02_028_after.c index 0be7959248..776c6ded0a 100644 --- a/src/ov_SC02_028/ov_SC02_028_after.c +++ b/src/ov_SC02_028/ov_SC02_028_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC02_028/ov_SC02_028_jr_8012ACE0.c b/src/ov_SC02_028/ov_SC02_028_jr_8012ACE0.c index e6dff1bb6e..b07c202a0b 100644 --- a/src/ov_SC02_028/ov_SC02_028_jr_8012ACE0.c +++ b/src/ov_SC02_028/ov_SC02_028_jr_8012ACE0.c @@ -3062,6 +3062,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC02_031/ov_SC02_031_after.c b/src/ov_SC02_031/ov_SC02_031_after.c index c702dd8959..2cfcf555b9 100644 --- a/src/ov_SC02_031/ov_SC02_031_after.c +++ b/src/ov_SC02_031/ov_SC02_031_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC02_031/ov_SC02_031_jr_8012ACE0.c b/src/ov_SC02_031/ov_SC02_031_jr_8012ACE0.c index 6fccde18fb..a8d46c0728 100644 --- a/src/ov_SC02_031/ov_SC02_031_jr_8012ACE0.c +++ b/src/ov_SC02_031/ov_SC02_031_jr_8012ACE0.c @@ -3062,6 +3062,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC02_035/ov_SC02_035_after.c b/src/ov_SC02_035/ov_SC02_035_after.c index 23c61b67d6..8e9df87efb 100644 --- a/src/ov_SC02_035/ov_SC02_035_after.c +++ b/src/ov_SC02_035/ov_SC02_035_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC02_035/ov_SC02_035_jr_8012ACE0.c b/src/ov_SC02_035/ov_SC02_035_jr_8012ACE0.c index 96914a36fa..c38f41a008 100644 --- a/src/ov_SC02_035/ov_SC02_035_jr_8012ACE0.c +++ b/src/ov_SC02_035/ov_SC02_035_jr_8012ACE0.c @@ -3062,6 +3062,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC02_039/ov_SC02_039_after.c b/src/ov_SC02_039/ov_SC02_039_after.c index 14136f26b5..69c83f9530 100644 --- a/src/ov_SC02_039/ov_SC02_039_after.c +++ b/src/ov_SC02_039/ov_SC02_039_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC02_039/ov_SC02_039_jr_8012ACE0.c b/src/ov_SC02_039/ov_SC02_039_jr_8012ACE0.c index 1f6ab78c04..e466c1c563 100644 --- a/src/ov_SC02_039/ov_SC02_039_jr_8012ACE0.c +++ b/src/ov_SC02_039/ov_SC02_039_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC02_041/ov_SC02_041_after.c b/src/ov_SC02_041/ov_SC02_041_after.c index 6100da3172..ae227a5307 100644 --- a/src/ov_SC02_041/ov_SC02_041_after.c +++ b/src/ov_SC02_041/ov_SC02_041_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC02_041/ov_SC02_041_jr_8012ACE0.c b/src/ov_SC02_041/ov_SC02_041_jr_8012ACE0.c index b484638a7b..526b6e58be 100644 --- a/src/ov_SC02_041/ov_SC02_041_jr_8012ACE0.c +++ b/src/ov_SC02_041/ov_SC02_041_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_001/ov_SC03_001_after.c b/src/ov_SC03_001/ov_SC03_001_after.c index f98ede75ac..1e56da47fc 100644 --- a/src/ov_SC03_001/ov_SC03_001_after.c +++ b/src/ov_SC03_001/ov_SC03_001_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_001/ov_SC03_001_jr_8012ACE0.c b/src/ov_SC03_001/ov_SC03_001_jr_8012ACE0.c index 96e9737b1f..22dac84bf9 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_8012ACE0.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_8012ACE0.c @@ -3061,6 +3061,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_002/ov_SC03_002_after.c b/src/ov_SC03_002/ov_SC03_002_after.c index 5864d555bd..bf73fd0737 100644 --- a/src/ov_SC03_002/ov_SC03_002_after.c +++ b/src/ov_SC03_002/ov_SC03_002_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_002/ov_SC03_002_jr_8012ACE0.c b/src/ov_SC03_002/ov_SC03_002_jr_8012ACE0.c index 87675f4996..35d4012f55 100644 --- a/src/ov_SC03_002/ov_SC03_002_jr_8012ACE0.c +++ b/src/ov_SC03_002/ov_SC03_002_jr_8012ACE0.c @@ -3065,6 +3065,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_003/ov_SC03_003_after.c b/src/ov_SC03_003/ov_SC03_003_after.c index 8469f3dc1f..2bcf2cb212 100644 --- a/src/ov_SC03_003/ov_SC03_003_after.c +++ b/src/ov_SC03_003/ov_SC03_003_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_003/ov_SC03_003_jr_8012ACE0.c b/src/ov_SC03_003/ov_SC03_003_jr_8012ACE0.c index 2d1053ed06..1c048f71bb 100644 --- a/src/ov_SC03_003/ov_SC03_003_jr_8012ACE0.c +++ b/src/ov_SC03_003/ov_SC03_003_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_006/ov_SC03_006_after.c b/src/ov_SC03_006/ov_SC03_006_after.c index 5321c97288..2b054ae09a 100644 --- a/src/ov_SC03_006/ov_SC03_006_after.c +++ b/src/ov_SC03_006/ov_SC03_006_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_006/ov_SC03_006_jr_8012ACE0.c b/src/ov_SC03_006/ov_SC03_006_jr_8012ACE0.c index 075df48ef3..e750727543 100644 --- a/src/ov_SC03_006/ov_SC03_006_jr_8012ACE0.c +++ b/src/ov_SC03_006/ov_SC03_006_jr_8012ACE0.c @@ -3065,6 +3065,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_007/ov_SC03_007_after.c b/src/ov_SC03_007/ov_SC03_007_after.c index f9d26c7737..3fda0f8ec8 100644 --- a/src/ov_SC03_007/ov_SC03_007_after.c +++ b/src/ov_SC03_007/ov_SC03_007_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_007/ov_SC03_007_jr_8012ACE0.c b/src/ov_SC03_007/ov_SC03_007_jr_8012ACE0.c index fcdfafa8e7..a54af7f4b9 100644 --- a/src/ov_SC03_007/ov_SC03_007_jr_8012ACE0.c +++ b/src/ov_SC03_007/ov_SC03_007_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_010/ov_SC03_010_after.c b/src/ov_SC03_010/ov_SC03_010_after.c index f6e4c954fc..e522b649b9 100644 --- a/src/ov_SC03_010/ov_SC03_010_after.c +++ b/src/ov_SC03_010/ov_SC03_010_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_010/ov_SC03_010_jr_8012ACE0.c b/src/ov_SC03_010/ov_SC03_010_jr_8012ACE0.c index ce39eb4448..b39829331f 100644 --- a/src/ov_SC03_010/ov_SC03_010_jr_8012ACE0.c +++ b/src/ov_SC03_010/ov_SC03_010_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_011/ov_SC03_011_after.c b/src/ov_SC03_011/ov_SC03_011_after.c index d8d2c5a694..2ba799afbc 100644 --- a/src/ov_SC03_011/ov_SC03_011_after.c +++ b/src/ov_SC03_011/ov_SC03_011_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_011/ov_SC03_011_jr_8012ACE0.c b/src/ov_SC03_011/ov_SC03_011_jr_8012ACE0.c index 31794c7e67..fb5ea1e0ca 100644 --- a/src/ov_SC03_011/ov_SC03_011_jr_8012ACE0.c +++ b/src/ov_SC03_011/ov_SC03_011_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_012/ov_SC03_012_after.c b/src/ov_SC03_012/ov_SC03_012_after.c index 9b5f2c4ba4..89e87cffb8 100644 --- a/src/ov_SC03_012/ov_SC03_012_after.c +++ b/src/ov_SC03_012/ov_SC03_012_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_012/ov_SC03_012_jr_8012ACE0.c b/src/ov_SC03_012/ov_SC03_012_jr_8012ACE0.c index 69406ccfe8..82ebe2b42c 100644 --- a/src/ov_SC03_012/ov_SC03_012_jr_8012ACE0.c +++ b/src/ov_SC03_012/ov_SC03_012_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_013/ov_SC03_013_after.c b/src/ov_SC03_013/ov_SC03_013_after.c index 0323a0e237..cbed024215 100644 --- a/src/ov_SC03_013/ov_SC03_013_after.c +++ b/src/ov_SC03_013/ov_SC03_013_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_013/ov_SC03_013_jr_8012ACE0.c b/src/ov_SC03_013/ov_SC03_013_jr_8012ACE0.c index 3e156d3f44..84935df980 100644 --- a/src/ov_SC03_013/ov_SC03_013_jr_8012ACE0.c +++ b/src/ov_SC03_013/ov_SC03_013_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_014/ov_SC03_014_after.c b/src/ov_SC03_014/ov_SC03_014_after.c index e9ae78641a..ad5853d79a 100644 --- a/src/ov_SC03_014/ov_SC03_014_after.c +++ b/src/ov_SC03_014/ov_SC03_014_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_014/ov_SC03_014_jr_8012ACE0.c b/src/ov_SC03_014/ov_SC03_014_jr_8012ACE0.c index 3de3b0f68c..b7ecc68f1a 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_8012ACE0.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_015/ov_SC03_015_after.c b/src/ov_SC03_015/ov_SC03_015_after.c index 1fa68b99e2..0e8df9377f 100644 --- a/src/ov_SC03_015/ov_SC03_015_after.c +++ b/src/ov_SC03_015/ov_SC03_015_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_015/ov_SC03_015_jr_8012ACE0.c b/src/ov_SC03_015/ov_SC03_015_jr_8012ACE0.c index f7e3de68f3..572f35003d 100644 --- a/src/ov_SC03_015/ov_SC03_015_jr_8012ACE0.c +++ b/src/ov_SC03_015/ov_SC03_015_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_023/ov_SC03_023_after.c b/src/ov_SC03_023/ov_SC03_023_after.c index 6384464159..56fd02daa1 100644 --- a/src/ov_SC03_023/ov_SC03_023_after.c +++ b/src/ov_SC03_023/ov_SC03_023_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_023/ov_SC03_023_jr_8012ACE0.c b/src/ov_SC03_023/ov_SC03_023_jr_8012ACE0.c index e3f46c493b..03c5c33288 100644 --- a/src/ov_SC03_023/ov_SC03_023_jr_8012ACE0.c +++ b/src/ov_SC03_023/ov_SC03_023_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_024/ov_SC03_024_after.c b/src/ov_SC03_024/ov_SC03_024_after.c index efdd9e42d2..58dfda39d8 100644 --- a/src/ov_SC03_024/ov_SC03_024_after.c +++ b/src/ov_SC03_024/ov_SC03_024_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_024/ov_SC03_024_jr_8012ACE0.c b/src/ov_SC03_024/ov_SC03_024_jr_8012ACE0.c index 8a07fa48db..3bb0839acc 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_8012ACE0.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_028/ov_SC03_028_after.c b/src/ov_SC03_028/ov_SC03_028_after.c index b824283027..cb0a1c2115 100644 --- a/src/ov_SC03_028/ov_SC03_028_after.c +++ b/src/ov_SC03_028/ov_SC03_028_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_028/ov_SC03_028_jr_8012ACE0.c b/src/ov_SC03_028/ov_SC03_028_jr_8012ACE0.c index 8f44431d5c..0ba6cafc62 100644 --- a/src/ov_SC03_028/ov_SC03_028_jr_8012ACE0.c +++ b/src/ov_SC03_028/ov_SC03_028_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_029/ov_SC03_029_after.c b/src/ov_SC03_029/ov_SC03_029_after.c index 551e292a03..4b63437827 100644 --- a/src/ov_SC03_029/ov_SC03_029_after.c +++ b/src/ov_SC03_029/ov_SC03_029_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_029/ov_SC03_029_jr_8012ACE0.c b/src/ov_SC03_029/ov_SC03_029_jr_8012ACE0.c index 94626ed856..aa51427920 100644 --- a/src/ov_SC03_029/ov_SC03_029_jr_8012ACE0.c +++ b/src/ov_SC03_029/ov_SC03_029_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_030/ov_SC03_030_after.c b/src/ov_SC03_030/ov_SC03_030_after.c index cb454d9ca4..453fd01254 100644 --- a/src/ov_SC03_030/ov_SC03_030_after.c +++ b/src/ov_SC03_030/ov_SC03_030_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_030/ov_SC03_030_jr_8012ACE0.c b/src/ov_SC03_030/ov_SC03_030_jr_8012ACE0.c index 7772271df4..c9b2dc99f7 100644 --- a/src/ov_SC03_030/ov_SC03_030_jr_8012ACE0.c +++ b/src/ov_SC03_030/ov_SC03_030_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_031/ov_SC03_031_after.c b/src/ov_SC03_031/ov_SC03_031_after.c index 130f6f8b21..6ca9bd75d0 100644 --- a/src/ov_SC03_031/ov_SC03_031_after.c +++ b/src/ov_SC03_031/ov_SC03_031_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_031/ov_SC03_031_jr_8012ACE0.c b/src/ov_SC03_031/ov_SC03_031_jr_8012ACE0.c index 2a441d4519..b0272386b6 100644 --- a/src/ov_SC03_031/ov_SC03_031_jr_8012ACE0.c +++ b/src/ov_SC03_031/ov_SC03_031_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_089/ov_SC03_089_after.c b/src/ov_SC03_089/ov_SC03_089_after.c index 2909706daa..12780507cb 100644 --- a/src/ov_SC03_089/ov_SC03_089_after.c +++ b/src/ov_SC03_089/ov_SC03_089_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_089/ov_SC03_089_jr_8012ACE0.c b/src/ov_SC03_089/ov_SC03_089_jr_8012ACE0.c index b8443d5e60..6c91a5d67e 100644 --- a/src/ov_SC03_089/ov_SC03_089_jr_8012ACE0.c +++ b/src/ov_SC03_089/ov_SC03_089_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_090/ov_SC03_090_after.c b/src/ov_SC03_090/ov_SC03_090_after.c index 31d52046ba..8390239d58 100644 --- a/src/ov_SC03_090/ov_SC03_090_after.c +++ b/src/ov_SC03_090/ov_SC03_090_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_090/ov_SC03_090_jr_8012ACE0.c b/src/ov_SC03_090/ov_SC03_090_jr_8012ACE0.c index 91f0bb23dc..ae2c53f6e8 100644 --- a/src/ov_SC03_090/ov_SC03_090_jr_8012ACE0.c +++ b/src/ov_SC03_090/ov_SC03_090_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_091/ov_SC03_091_after.c b/src/ov_SC03_091/ov_SC03_091_after.c index 04e0c63bf5..216446ae22 100644 --- a/src/ov_SC03_091/ov_SC03_091_after.c +++ b/src/ov_SC03_091/ov_SC03_091_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_091/ov_SC03_091_jr_8012ACE0.c b/src/ov_SC03_091/ov_SC03_091_jr_8012ACE0.c index 8d4fa77232..17d2c6002e 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_8012ACE0.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_092/ov_SC03_092_after.c b/src/ov_SC03_092/ov_SC03_092_after.c index 49efc3b036..9da05fdab2 100644 --- a/src/ov_SC03_092/ov_SC03_092_after.c +++ b/src/ov_SC03_092/ov_SC03_092_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_092/ov_SC03_092_jr_8012ACE0.c b/src/ov_SC03_092/ov_SC03_092_jr_8012ACE0.c index fbb3cedb50..4657db663f 100644 --- a/src/ov_SC03_092/ov_SC03_092_jr_8012ACE0.c +++ b/src/ov_SC03_092/ov_SC03_092_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_093/ov_SC03_093_after.c b/src/ov_SC03_093/ov_SC03_093_after.c index 9b3cdce5f5..55a35b12a9 100644 --- a/src/ov_SC03_093/ov_SC03_093_after.c +++ b/src/ov_SC03_093/ov_SC03_093_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_093/ov_SC03_093_jr_8012ACE0.c b/src/ov_SC03_093/ov_SC03_093_jr_8012ACE0.c index 25e7db8f06..9cb5685399 100644 --- a/src/ov_SC03_093/ov_SC03_093_jr_8012ACE0.c +++ b/src/ov_SC03_093/ov_SC03_093_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_094/ov_SC03_094_after.c b/src/ov_SC03_094/ov_SC03_094_after.c index e16cce28e4..498014d8d1 100644 --- a/src/ov_SC03_094/ov_SC03_094_after.c +++ b/src/ov_SC03_094/ov_SC03_094_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_094/ov_SC03_094_jr_8012ACE0.c b/src/ov_SC03_094/ov_SC03_094_jr_8012ACE0.c index bdbe86b3a4..cee5e14919 100644 --- a/src/ov_SC03_094/ov_SC03_094_jr_8012ACE0.c +++ b/src/ov_SC03_094/ov_SC03_094_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_095/ov_SC03_095_after.c b/src/ov_SC03_095/ov_SC03_095_after.c index 4c480167f5..21be3647c9 100644 --- a/src/ov_SC03_095/ov_SC03_095_after.c +++ b/src/ov_SC03_095/ov_SC03_095_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_095/ov_SC03_095_jr_8012ACE0.c b/src/ov_SC03_095/ov_SC03_095_jr_8012ACE0.c index c92ea5ba8c..7f43a68a38 100644 --- a/src/ov_SC03_095/ov_SC03_095_jr_8012ACE0.c +++ b/src/ov_SC03_095/ov_SC03_095_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_096/ov_SC03_096_after.c b/src/ov_SC03_096/ov_SC03_096_after.c index a9acbb632e..9c3f3340ec 100644 --- a/src/ov_SC03_096/ov_SC03_096_after.c +++ b/src/ov_SC03_096/ov_SC03_096_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_096/ov_SC03_096_jr_8012ACE0.c b/src/ov_SC03_096/ov_SC03_096_jr_8012ACE0.c index c985571376..12f1b6cb01 100644 --- a/src/ov_SC03_096/ov_SC03_096_jr_8012ACE0.c +++ b/src/ov_SC03_096/ov_SC03_096_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_097/ov_SC03_097_after.c b/src/ov_SC03_097/ov_SC03_097_after.c index be9ec872a0..0152a03d34 100644 --- a/src/ov_SC03_097/ov_SC03_097_after.c +++ b/src/ov_SC03_097/ov_SC03_097_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_097/ov_SC03_097_jr_8012ACE0.c b/src/ov_SC03_097/ov_SC03_097_jr_8012ACE0.c index 4e0659df0c..566c7a29d5 100644 --- a/src/ov_SC03_097/ov_SC03_097_jr_8012ACE0.c +++ b/src/ov_SC03_097/ov_SC03_097_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_098/ov_SC03_098_after.c b/src/ov_SC03_098/ov_SC03_098_after.c index e29cc62784..c75c24d6c2 100644 --- a/src/ov_SC03_098/ov_SC03_098_after.c +++ b/src/ov_SC03_098/ov_SC03_098_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_098/ov_SC03_098_jr_8012ACE0.c b/src/ov_SC03_098/ov_SC03_098_jr_8012ACE0.c index f8eba0669c..a7de646e07 100644 --- a/src/ov_SC03_098/ov_SC03_098_jr_8012ACE0.c +++ b/src/ov_SC03_098/ov_SC03_098_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_099/ov_SC03_099_after.c b/src/ov_SC03_099/ov_SC03_099_after.c index 400bc9df18..a25630e712 100644 --- a/src/ov_SC03_099/ov_SC03_099_after.c +++ b/src/ov_SC03_099/ov_SC03_099_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_099/ov_SC03_099_jr_8012ACE0.c b/src/ov_SC03_099/ov_SC03_099_jr_8012ACE0.c index 8b2a2475d6..0767401f73 100644 --- a/src/ov_SC03_099/ov_SC03_099_jr_8012ACE0.c +++ b/src/ov_SC03_099/ov_SC03_099_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_100/ov_SC03_100_after.c b/src/ov_SC03_100/ov_SC03_100_after.c index 0e381bccf5..4a46a8f1ba 100644 --- a/src/ov_SC03_100/ov_SC03_100_after.c +++ b/src/ov_SC03_100/ov_SC03_100_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_100/ov_SC03_100_jr_8012ACE0.c b/src/ov_SC03_100/ov_SC03_100_jr_8012ACE0.c index 980ce0e412..b852d98909 100644 --- a/src/ov_SC03_100/ov_SC03_100_jr_8012ACE0.c +++ b/src/ov_SC03_100/ov_SC03_100_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_101/ov_SC03_101_after.c b/src/ov_SC03_101/ov_SC03_101_after.c index 518ea58b6a..8f59e43153 100644 --- a/src/ov_SC03_101/ov_SC03_101_after.c +++ b/src/ov_SC03_101/ov_SC03_101_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_101/ov_SC03_101_jr_8012ACE0.c b/src/ov_SC03_101/ov_SC03_101_jr_8012ACE0.c index f9ef023a9a..b225bb0ef1 100644 --- a/src/ov_SC03_101/ov_SC03_101_jr_8012ACE0.c +++ b/src/ov_SC03_101/ov_SC03_101_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_102/ov_SC03_102_after.c b/src/ov_SC03_102/ov_SC03_102_after.c index b13053d500..3594684739 100644 --- a/src/ov_SC03_102/ov_SC03_102_after.c +++ b/src/ov_SC03_102/ov_SC03_102_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_102/ov_SC03_102_jr_8012ACE0.c b/src/ov_SC03_102/ov_SC03_102_jr_8012ACE0.c index 1abded77ec..30fad482cd 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_8012ACE0.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_103/ov_SC03_103_after.c b/src/ov_SC03_103/ov_SC03_103_after.c index 15d1abaf63..1012deb2d5 100644 --- a/src/ov_SC03_103/ov_SC03_103_after.c +++ b/src/ov_SC03_103/ov_SC03_103_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_103/ov_SC03_103_jr_8012ACE0.c b/src/ov_SC03_103/ov_SC03_103_jr_8012ACE0.c index 4fc9d547d1..ba998785ca 100644 --- a/src/ov_SC03_103/ov_SC03_103_jr_8012ACE0.c +++ b/src/ov_SC03_103/ov_SC03_103_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_104/ov_SC03_104_after.c b/src/ov_SC03_104/ov_SC03_104_after.c index e7074c8489..8b244f7943 100644 --- a/src/ov_SC03_104/ov_SC03_104_after.c +++ b/src/ov_SC03_104/ov_SC03_104_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_104/ov_SC03_104_jr_8012ACE0.c b/src/ov_SC03_104/ov_SC03_104_jr_8012ACE0.c index f34cbc9530..a0e58652f1 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_8012ACE0.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_105/ov_SC03_105_after.c b/src/ov_SC03_105/ov_SC03_105_after.c index a8f15fee9f..cf5f677206 100644 --- a/src/ov_SC03_105/ov_SC03_105_after.c +++ b/src/ov_SC03_105/ov_SC03_105_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_105/ov_SC03_105_jr_8012ACE0.c b/src/ov_SC03_105/ov_SC03_105_jr_8012ACE0.c index 887f45d6a3..5e211ffebd 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_8012ACE0.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_108/ov_SC03_108_after.c b/src/ov_SC03_108/ov_SC03_108_after.c index b55b0629db..d4386d5c8d 100644 --- a/src/ov_SC03_108/ov_SC03_108_after.c +++ b/src/ov_SC03_108/ov_SC03_108_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_108/ov_SC03_108_jr_8012ACE0.c b/src/ov_SC03_108/ov_SC03_108_jr_8012ACE0.c index 58b5bd38c0..ed164f3991 100644 --- a/src/ov_SC03_108/ov_SC03_108_jr_8012ACE0.c +++ b/src/ov_SC03_108/ov_SC03_108_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_109/ov_SC03_109_after.c b/src/ov_SC03_109/ov_SC03_109_after.c index 6a632c8c92..fc31f4080b 100644 --- a/src/ov_SC03_109/ov_SC03_109_after.c +++ b/src/ov_SC03_109/ov_SC03_109_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_109/ov_SC03_109_jr_8012ACE0.c b/src/ov_SC03_109/ov_SC03_109_jr_8012ACE0.c index 20558980c4..22825fbfaa 100644 --- a/src/ov_SC03_109/ov_SC03_109_jr_8012ACE0.c +++ b/src/ov_SC03_109/ov_SC03_109_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_110/ov_SC03_110_after.c b/src/ov_SC03_110/ov_SC03_110_after.c index 247f925378..2293e6dd2f 100644 --- a/src/ov_SC03_110/ov_SC03_110_after.c +++ b/src/ov_SC03_110/ov_SC03_110_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_110/ov_SC03_110_jr_8012ACE0.c b/src/ov_SC03_110/ov_SC03_110_jr_8012ACE0.c index 0b5abb7d8f..e957ccc37b 100644 --- a/src/ov_SC03_110/ov_SC03_110_jr_8012ACE0.c +++ b/src/ov_SC03_110/ov_SC03_110_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_111/ov_SC03_111_after.c b/src/ov_SC03_111/ov_SC03_111_after.c index 397bc4965f..7821b44808 100644 --- a/src/ov_SC03_111/ov_SC03_111_after.c +++ b/src/ov_SC03_111/ov_SC03_111_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_111/ov_SC03_111_jr_8012ACE0.c b/src/ov_SC03_111/ov_SC03_111_jr_8012ACE0.c index 09b6ac1e54..c93c9d80e1 100644 --- a/src/ov_SC03_111/ov_SC03_111_jr_8012ACE0.c +++ b/src/ov_SC03_111/ov_SC03_111_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_112/ov_SC03_112_after.c b/src/ov_SC03_112/ov_SC03_112_after.c index 2bfbf13f5b..33f0e9cdbc 100644 --- a/src/ov_SC03_112/ov_SC03_112_after.c +++ b/src/ov_SC03_112/ov_SC03_112_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_112/ov_SC03_112_jr_8012ACE0.c b/src/ov_SC03_112/ov_SC03_112_jr_8012ACE0.c index 8cb183816a..22027e3688 100644 --- a/src/ov_SC03_112/ov_SC03_112_jr_8012ACE0.c +++ b/src/ov_SC03_112/ov_SC03_112_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_113/ov_SC03_113_after.c b/src/ov_SC03_113/ov_SC03_113_after.c index eced7f6b09..83a2b0da3e 100644 --- a/src/ov_SC03_113/ov_SC03_113_after.c +++ b/src/ov_SC03_113/ov_SC03_113_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_113/ov_SC03_113_jr_8012ACE0.c b/src/ov_SC03_113/ov_SC03_113_jr_8012ACE0.c index dd523094e3..94e7219380 100644 --- a/src/ov_SC03_113/ov_SC03_113_jr_8012ACE0.c +++ b/src/ov_SC03_113/ov_SC03_113_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_114/ov_SC03_114_after.c b/src/ov_SC03_114/ov_SC03_114_after.c index 21547cf8fa..004eb5120c 100644 --- a/src/ov_SC03_114/ov_SC03_114_after.c +++ b/src/ov_SC03_114/ov_SC03_114_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_114/ov_SC03_114_jr_8012ACE0.c b/src/ov_SC03_114/ov_SC03_114_jr_8012ACE0.c index dc0dc1ea38..a17845b26b 100644 --- a/src/ov_SC03_114/ov_SC03_114_jr_8012ACE0.c +++ b/src/ov_SC03_114/ov_SC03_114_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_115/ov_SC03_115_after.c b/src/ov_SC03_115/ov_SC03_115_after.c index 3bdb330a99..d6e7df309d 100644 --- a/src/ov_SC03_115/ov_SC03_115_after.c +++ b/src/ov_SC03_115/ov_SC03_115_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_115/ov_SC03_115_jr_8012ACE0.c b/src/ov_SC03_115/ov_SC03_115_jr_8012ACE0.c index 047857aa89..5678232ea1 100644 --- a/src/ov_SC03_115/ov_SC03_115_jr_8012ACE0.c +++ b/src/ov_SC03_115/ov_SC03_115_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_116/ov_SC03_116_after.c b/src/ov_SC03_116/ov_SC03_116_after.c index 1f6368b065..375128845a 100644 --- a/src/ov_SC03_116/ov_SC03_116_after.c +++ b/src/ov_SC03_116/ov_SC03_116_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_116/ov_SC03_116_jr_8012ACE0.c b/src/ov_SC03_116/ov_SC03_116_jr_8012ACE0.c index 5af65a99fa..ce63cabd1f 100644 --- a/src/ov_SC03_116/ov_SC03_116_jr_8012ACE0.c +++ b/src/ov_SC03_116/ov_SC03_116_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_117/ov_SC03_117_after.c b/src/ov_SC03_117/ov_SC03_117_after.c index 035bd6736a..d662f95996 100644 --- a/src/ov_SC03_117/ov_SC03_117_after.c +++ b/src/ov_SC03_117/ov_SC03_117_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_117/ov_SC03_117_jr_8012ACE0.c b/src/ov_SC03_117/ov_SC03_117_jr_8012ACE0.c index fb1b7d7af0..fe81a9ac55 100644 --- a/src/ov_SC03_117/ov_SC03_117_jr_8012ACE0.c +++ b/src/ov_SC03_117/ov_SC03_117_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_118/ov_SC03_118_after.c b/src/ov_SC03_118/ov_SC03_118_after.c index 9ed786ee7f..0b1ab73c3a 100644 --- a/src/ov_SC03_118/ov_SC03_118_after.c +++ b/src/ov_SC03_118/ov_SC03_118_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_118/ov_SC03_118_jr_8012ACE0.c b/src/ov_SC03_118/ov_SC03_118_jr_8012ACE0.c index 669218d8a6..047661b3e2 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_8012ACE0.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_119/ov_SC03_119_after.c b/src/ov_SC03_119/ov_SC03_119_after.c index b64dac1231..81ad531980 100644 --- a/src/ov_SC03_119/ov_SC03_119_after.c +++ b/src/ov_SC03_119/ov_SC03_119_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_119/ov_SC03_119_jr_8012ACE0.c b/src/ov_SC03_119/ov_SC03_119_jr_8012ACE0.c index 0e9d276af6..ff5a0ab4b7 100644 --- a/src/ov_SC03_119/ov_SC03_119_jr_8012ACE0.c +++ b/src/ov_SC03_119/ov_SC03_119_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_121/ov_SC03_121_after.c b/src/ov_SC03_121/ov_SC03_121_after.c index ab3dc6cf91..1ccc9c2df7 100644 --- a/src/ov_SC03_121/ov_SC03_121_after.c +++ b/src/ov_SC03_121/ov_SC03_121_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_121/ov_SC03_121_jr_8012ACE0.c b/src/ov_SC03_121/ov_SC03_121_jr_8012ACE0.c index daae591c61..23911b9186 100644 --- a/src/ov_SC03_121/ov_SC03_121_jr_8012ACE0.c +++ b/src/ov_SC03_121/ov_SC03_121_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_124/ov_SC03_124_after.c b/src/ov_SC03_124/ov_SC03_124_after.c index ef02ec824c..661cd41d75 100644 --- a/src/ov_SC03_124/ov_SC03_124_after.c +++ b/src/ov_SC03_124/ov_SC03_124_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_124/ov_SC03_124_jr_8012ACE0.c b/src/ov_SC03_124/ov_SC03_124_jr_8012ACE0.c index de2d30f1c1..59fc87a1a0 100644 --- a/src/ov_SC03_124/ov_SC03_124_jr_8012ACE0.c +++ b/src/ov_SC03_124/ov_SC03_124_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_125/ov_SC03_125_after.c b/src/ov_SC03_125/ov_SC03_125_after.c index c34f66977c..86bfa867b1 100644 --- a/src/ov_SC03_125/ov_SC03_125_after.c +++ b/src/ov_SC03_125/ov_SC03_125_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_125/ov_SC03_125_jr_8012ACE0.c b/src/ov_SC03_125/ov_SC03_125_jr_8012ACE0.c index 1e36b51318..7f41a7240d 100644 --- a/src/ov_SC03_125/ov_SC03_125_jr_8012ACE0.c +++ b/src/ov_SC03_125/ov_SC03_125_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC03_126/ov_SC03_126_after.c b/src/ov_SC03_126/ov_SC03_126_after.c index 7b75cdccc9..4bd0bf9687 100644 --- a/src/ov_SC03_126/ov_SC03_126_after.c +++ b/src/ov_SC03_126/ov_SC03_126_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC03_126/ov_SC03_126_jr_8012ACE0.c b/src/ov_SC03_126/ov_SC03_126_jr_8012ACE0.c index 5174aade8d..450a838142 100644 --- a/src/ov_SC03_126/ov_SC03_126_jr_8012ACE0.c +++ b/src/ov_SC03_126/ov_SC03_126_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC04_000/ov_SC04_000_after.c b/src/ov_SC04_000/ov_SC04_000_after.c index b6872f3d09..1ff07c7c98 100644 --- a/src/ov_SC04_000/ov_SC04_000_after.c +++ b/src/ov_SC04_000/ov_SC04_000_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC04_000/ov_SC04_000_jr_8012ACE0.c b/src/ov_SC04_000/ov_SC04_000_jr_8012ACE0.c index abf8f517bc..f91c2d2637 100644 --- a/src/ov_SC04_000/ov_SC04_000_jr_8012ACE0.c +++ b/src/ov_SC04_000/ov_SC04_000_jr_8012ACE0.c @@ -3065,6 +3065,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC04_002/ov_SC04_002_after.c b/src/ov_SC04_002/ov_SC04_002_after.c index 9e395fa908..c0ab26a3cf 100644 --- a/src/ov_SC04_002/ov_SC04_002_after.c +++ b/src/ov_SC04_002/ov_SC04_002_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC04_002/ov_SC04_002_jr_8012ACE0.c b/src/ov_SC04_002/ov_SC04_002_jr_8012ACE0.c index 30130740fd..14d2f8112b 100644 --- a/src/ov_SC04_002/ov_SC04_002_jr_8012ACE0.c +++ b/src/ov_SC04_002/ov_SC04_002_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC04_003/ov_SC04_003_after.c b/src/ov_SC04_003/ov_SC04_003_after.c index 9d3a44de4f..51aff1ba70 100644 --- a/src/ov_SC04_003/ov_SC04_003_after.c +++ b/src/ov_SC04_003/ov_SC04_003_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC04_003/ov_SC04_003_jr_8012ACE0.c b/src/ov_SC04_003/ov_SC04_003_jr_8012ACE0.c index aec86242fe..34bee873c0 100644 --- a/src/ov_SC04_003/ov_SC04_003_jr_8012ACE0.c +++ b/src/ov_SC04_003/ov_SC04_003_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC04_004/ov_SC04_004_after.c b/src/ov_SC04_004/ov_SC04_004_after.c index 8fe7c11e6c..7c3b9e9cad 100644 --- a/src/ov_SC04_004/ov_SC04_004_after.c +++ b/src/ov_SC04_004/ov_SC04_004_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC04_004/ov_SC04_004_jr_8012ACE0.c b/src/ov_SC04_004/ov_SC04_004_jr_8012ACE0.c index f828caedeb..32145bd3c3 100644 --- a/src/ov_SC04_004/ov_SC04_004_jr_8012ACE0.c +++ b/src/ov_SC04_004/ov_SC04_004_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC04_005/ov_SC04_005_after.c b/src/ov_SC04_005/ov_SC04_005_after.c index 908c3ac942..4aeace1e6f 100644 --- a/src/ov_SC04_005/ov_SC04_005_after.c +++ b/src/ov_SC04_005/ov_SC04_005_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC04_005/ov_SC04_005_jr_8012ACE0.c b/src/ov_SC04_005/ov_SC04_005_jr_8012ACE0.c index a9e9439c0a..8176eb9d7b 100644 --- a/src/ov_SC04_005/ov_SC04_005_jr_8012ACE0.c +++ b/src/ov_SC04_005/ov_SC04_005_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC04_006/ov_SC04_006_after.c b/src/ov_SC04_006/ov_SC04_006_after.c index 8c1f4f0bd4..bea54f8136 100644 --- a/src/ov_SC04_006/ov_SC04_006_after.c +++ b/src/ov_SC04_006/ov_SC04_006_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC04_006/ov_SC04_006_jr_8012ACE0.c b/src/ov_SC04_006/ov_SC04_006_jr_8012ACE0.c index 75247143e6..0bffff6584 100644 --- a/src/ov_SC04_006/ov_SC04_006_jr_8012ACE0.c +++ b/src/ov_SC04_006/ov_SC04_006_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC04_007/ov_SC04_007_after.c b/src/ov_SC04_007/ov_SC04_007_after.c index df8202a58e..7ff313d62c 100644 --- a/src/ov_SC04_007/ov_SC04_007_after.c +++ b/src/ov_SC04_007/ov_SC04_007_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC04_007/ov_SC04_007_jr_8012ACE0.c b/src/ov_SC04_007/ov_SC04_007_jr_8012ACE0.c index a622323b0a..c36851bb48 100644 --- a/src/ov_SC04_007/ov_SC04_007_jr_8012ACE0.c +++ b/src/ov_SC04_007/ov_SC04_007_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC04_008/ov_SC04_008_after.c b/src/ov_SC04_008/ov_SC04_008_after.c index b9d8b98d64..cc3bbb9878 100644 --- a/src/ov_SC04_008/ov_SC04_008_after.c +++ b/src/ov_SC04_008/ov_SC04_008_after.c @@ -1442,7 +1442,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC04_008/ov_SC04_008_jr_8012ACE0.c b/src/ov_SC04_008/ov_SC04_008_jr_8012ACE0.c index d9820fb1da..21bc53b94d 100644 --- a/src/ov_SC04_008/ov_SC04_008_jr_8012ACE0.c +++ b/src/ov_SC04_008/ov_SC04_008_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC04_009/ov_SC04_009_after.c b/src/ov_SC04_009/ov_SC04_009_after.c index 5a08a97f2e..4e9da78828 100644 --- a/src/ov_SC04_009/ov_SC04_009_after.c +++ b/src/ov_SC04_009/ov_SC04_009_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC04_009/ov_SC04_009_jr_8012ACE0.c b/src/ov_SC04_009/ov_SC04_009_jr_8012ACE0.c index fd9c574bb3..093eaeaa44 100644 --- a/src/ov_SC04_009/ov_SC04_009_jr_8012ACE0.c +++ b/src/ov_SC04_009/ov_SC04_009_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC04_010/ov_SC04_010_after.c b/src/ov_SC04_010/ov_SC04_010_after.c index ab37b21144..817f8077ee 100644 --- a/src/ov_SC04_010/ov_SC04_010_after.c +++ b/src/ov_SC04_010/ov_SC04_010_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC04_010/ov_SC04_010_jr_8012ACE0.c b/src/ov_SC04_010/ov_SC04_010_jr_8012ACE0.c index e213b80854..caf7c3cd5e 100644 --- a/src/ov_SC04_010/ov_SC04_010_jr_8012ACE0.c +++ b/src/ov_SC04_010/ov_SC04_010_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC04_011/ov_SC04_011_after.c b/src/ov_SC04_011/ov_SC04_011_after.c index 83542a3f59..038b9f2a56 100644 --- a/src/ov_SC04_011/ov_SC04_011_after.c +++ b/src/ov_SC04_011/ov_SC04_011_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.c b/src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.c index fa3f29b8de..2a5a6f160c 100644 --- a/src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.c +++ b/src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC04_012/ov_SC04_012_after.c b/src/ov_SC04_012/ov_SC04_012_after.c index 6dbcb7e336..1241f5385f 100644 --- a/src/ov_SC04_012/ov_SC04_012_after.c +++ b/src/ov_SC04_012/ov_SC04_012_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC04_012/ov_SC04_012_jr_8012ACE0.c b/src/ov_SC04_012/ov_SC04_012_jr_8012ACE0.c index 377ddc90ac..d362ed5e36 100644 --- a/src/ov_SC04_012/ov_SC04_012_jr_8012ACE0.c +++ b/src/ov_SC04_012/ov_SC04_012_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC04_015/ov_SC04_015_after.c b/src/ov_SC04_015/ov_SC04_015_after.c index be92e7ac0e..6727416908 100644 --- a/src/ov_SC04_015/ov_SC04_015_after.c +++ b/src/ov_SC04_015/ov_SC04_015_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC04_015/ov_SC04_015_jr_8012ACE0.c b/src/ov_SC04_015/ov_SC04_015_jr_8012ACE0.c index e7bf5b3b96..273eadad50 100644 --- a/src/ov_SC04_015/ov_SC04_015_jr_8012ACE0.c +++ b/src/ov_SC04_015/ov_SC04_015_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC04_016/ov_SC04_016_after.c b/src/ov_SC04_016/ov_SC04_016_after.c index 2018050e83..38b1acd1ab 100644 --- a/src/ov_SC04_016/ov_SC04_016_after.c +++ b/src/ov_SC04_016/ov_SC04_016_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC04_016/ov_SC04_016_jr_8012ACE0.c b/src/ov_SC04_016/ov_SC04_016_jr_8012ACE0.c index 1226cc2923..22db76b4a1 100644 --- a/src/ov_SC04_016/ov_SC04_016_jr_8012ACE0.c +++ b/src/ov_SC04_016/ov_SC04_016_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC04_018/ov_SC04_018_after.c b/src/ov_SC04_018/ov_SC04_018_after.c index a706a56f73..c5ca27b88e 100644 --- a/src/ov_SC04_018/ov_SC04_018_after.c +++ b/src/ov_SC04_018/ov_SC04_018_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC04_018/ov_SC04_018_jr_8012ACE0.c b/src/ov_SC04_018/ov_SC04_018_jr_8012ACE0.c index 90b3b645a2..f4d7c15534 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_8012ACE0.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_8012ACE0.c @@ -3065,6 +3065,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC04_019/ov_SC04_019_after.c b/src/ov_SC04_019/ov_SC04_019_after.c index 4bd5e0d6c8..606783fa95 100644 --- a/src/ov_SC04_019/ov_SC04_019_after.c +++ b/src/ov_SC04_019/ov_SC04_019_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC04_019/ov_SC04_019_jr_8012ACE0.c b/src/ov_SC04_019/ov_SC04_019_jr_8012ACE0.c index d1e237acc9..7bd6f9a495 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_8012ACE0.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_8012ACE0.c @@ -3065,6 +3065,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC04_020/ov_SC04_020_after.c b/src/ov_SC04_020/ov_SC04_020_after.c index d00110afda..ed5f8200c2 100644 --- a/src/ov_SC04_020/ov_SC04_020_after.c +++ b/src/ov_SC04_020/ov_SC04_020_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC04_020/ov_SC04_020_jr_8012ACE0.c b/src/ov_SC04_020/ov_SC04_020_jr_8012ACE0.c index 630c7ee7cd..3af46c97ef 100644 --- a/src/ov_SC04_020/ov_SC04_020_jr_8012ACE0.c +++ b/src/ov_SC04_020/ov_SC04_020_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC04_021/ov_SC04_021_after.c b/src/ov_SC04_021/ov_SC04_021_after.c index 074561efff..c18a597ac1 100644 --- a/src/ov_SC04_021/ov_SC04_021_after.c +++ b/src/ov_SC04_021/ov_SC04_021_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC04_021/ov_SC04_021_jr_8012ACE0.c b/src/ov_SC04_021/ov_SC04_021_jr_8012ACE0.c index 9436216056..0a214b708d 100644 --- a/src/ov_SC04_021/ov_SC04_021_jr_8012ACE0.c +++ b/src/ov_SC04_021/ov_SC04_021_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC05_000/ov_SC05_000_after.c b/src/ov_SC05_000/ov_SC05_000_after.c index 4764490763..3387442474 100644 --- a/src/ov_SC05_000/ov_SC05_000_after.c +++ b/src/ov_SC05_000/ov_SC05_000_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC05_000/ov_SC05_000_jr_8012ACE0.c b/src/ov_SC05_000/ov_SC05_000_jr_8012ACE0.c index 51d957ac73..64b2543d0e 100644 --- a/src/ov_SC05_000/ov_SC05_000_jr_8012ACE0.c +++ b/src/ov_SC05_000/ov_SC05_000_jr_8012ACE0.c @@ -3065,6 +3065,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC05_001/ov_SC05_001_after.c b/src/ov_SC05_001/ov_SC05_001_after.c index 8720e2820b..e05178fa58 100644 --- a/src/ov_SC05_001/ov_SC05_001_after.c +++ b/src/ov_SC05_001/ov_SC05_001_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC05_001/ov_SC05_001_jr_8012ACE0.c b/src/ov_SC05_001/ov_SC05_001_jr_8012ACE0.c index 9675c500ea..015cf64058 100644 --- a/src/ov_SC05_001/ov_SC05_001_jr_8012ACE0.c +++ b/src/ov_SC05_001/ov_SC05_001_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC05_002/ov_SC05_002_after.c b/src/ov_SC05_002/ov_SC05_002_after.c index 484a80b9d1..c262751dbb 100644 --- a/src/ov_SC05_002/ov_SC05_002_after.c +++ b/src/ov_SC05_002/ov_SC05_002_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC05_002/ov_SC05_002_jr_8012ACE0.c b/src/ov_SC05_002/ov_SC05_002_jr_8012ACE0.c index 1cc233aca1..9b7eb486b2 100644 --- a/src/ov_SC05_002/ov_SC05_002_jr_8012ACE0.c +++ b/src/ov_SC05_002/ov_SC05_002_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC05_003/ov_SC05_003_after.c b/src/ov_SC05_003/ov_SC05_003_after.c index b67b9dc64b..23921d82a8 100644 --- a/src/ov_SC05_003/ov_SC05_003_after.c +++ b/src/ov_SC05_003/ov_SC05_003_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC05_003/ov_SC05_003_jr_8012ACE0.c b/src/ov_SC05_003/ov_SC05_003_jr_8012ACE0.c index 1e3e39f892..84a2459b57 100644 --- a/src/ov_SC05_003/ov_SC05_003_jr_8012ACE0.c +++ b/src/ov_SC05_003/ov_SC05_003_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC05_004/ov_SC05_004_after.c b/src/ov_SC05_004/ov_SC05_004_after.c index 1cf1fb5a81..5a60aaf562 100644 --- a/src/ov_SC05_004/ov_SC05_004_after.c +++ b/src/ov_SC05_004/ov_SC05_004_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC05_004/ov_SC05_004_jr_8012ACE0.c b/src/ov_SC05_004/ov_SC05_004_jr_8012ACE0.c index c1e01aad67..7e5f2f32ef 100644 --- a/src/ov_SC05_004/ov_SC05_004_jr_8012ACE0.c +++ b/src/ov_SC05_004/ov_SC05_004_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC05_005/ov_SC05_005_after.c b/src/ov_SC05_005/ov_SC05_005_after.c index 1309f10837..c4095c3dce 100644 --- a/src/ov_SC05_005/ov_SC05_005_after.c +++ b/src/ov_SC05_005/ov_SC05_005_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC05_005/ov_SC05_005_jr_8012ACE0.c b/src/ov_SC05_005/ov_SC05_005_jr_8012ACE0.c index 7a6c88dec5..33b66ac21c 100644 --- a/src/ov_SC05_005/ov_SC05_005_jr_8012ACE0.c +++ b/src/ov_SC05_005/ov_SC05_005_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC05_006/ov_SC05_006_after.c b/src/ov_SC05_006/ov_SC05_006_after.c index 5a0473f7b9..e488d0cba9 100644 --- a/src/ov_SC05_006/ov_SC05_006_after.c +++ b/src/ov_SC05_006/ov_SC05_006_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC05_006/ov_SC05_006_jr_8012ACE0.c b/src/ov_SC05_006/ov_SC05_006_jr_8012ACE0.c index 7f51706a2d..0ce3c387b8 100644 --- a/src/ov_SC05_006/ov_SC05_006_jr_8012ACE0.c +++ b/src/ov_SC05_006/ov_SC05_006_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC05_007/ov_SC05_007_after.c b/src/ov_SC05_007/ov_SC05_007_after.c index 4a010ae918..7b453f85be 100644 --- a/src/ov_SC05_007/ov_SC05_007_after.c +++ b/src/ov_SC05_007/ov_SC05_007_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC05_007/ov_SC05_007_jr_8012ACE0.c b/src/ov_SC05_007/ov_SC05_007_jr_8012ACE0.c index 4bfabe3bd8..6fb919e2f7 100644 --- a/src/ov_SC05_007/ov_SC05_007_jr_8012ACE0.c +++ b/src/ov_SC05_007/ov_SC05_007_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC05_008/ov_SC05_008_after.c b/src/ov_SC05_008/ov_SC05_008_after.c index 101f3882bd..8f4c0622c4 100644 --- a/src/ov_SC05_008/ov_SC05_008_after.c +++ b/src/ov_SC05_008/ov_SC05_008_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC05_008/ov_SC05_008_jr_8012ACE0.c b/src/ov_SC05_008/ov_SC05_008_jr_8012ACE0.c index 8ad72f1748..6f83217790 100644 --- a/src/ov_SC05_008/ov_SC05_008_jr_8012ACE0.c +++ b/src/ov_SC05_008/ov_SC05_008_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC05_009/ov_SC05_009_after.c b/src/ov_SC05_009/ov_SC05_009_after.c index 105c1909b6..180d3887b0 100644 --- a/src/ov_SC05_009/ov_SC05_009_after.c +++ b/src/ov_SC05_009/ov_SC05_009_after.c @@ -1442,7 +1442,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC05_009/ov_SC05_009_jr_8012ACE0.c b/src/ov_SC05_009/ov_SC05_009_jr_8012ACE0.c index cb6930d6f4..bf1558d94e 100644 --- a/src/ov_SC05_009/ov_SC05_009_jr_8012ACE0.c +++ b/src/ov_SC05_009/ov_SC05_009_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC05_010/ov_SC05_010_after.c b/src/ov_SC05_010/ov_SC05_010_after.c index 4e2efb23a9..fad67a2802 100644 --- a/src/ov_SC05_010/ov_SC05_010_after.c +++ b/src/ov_SC05_010/ov_SC05_010_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC05_010/ov_SC05_010_jr_8012ACE0.c b/src/ov_SC05_010/ov_SC05_010_jr_8012ACE0.c index 9742a8a6c9..0b0bfb8fe9 100644 --- a/src/ov_SC05_010/ov_SC05_010_jr_8012ACE0.c +++ b/src/ov_SC05_010/ov_SC05_010_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC05_011/ov_SC05_011_after.c b/src/ov_SC05_011/ov_SC05_011_after.c index 4aafc28f58..de8112895a 100644 --- a/src/ov_SC05_011/ov_SC05_011_after.c +++ b/src/ov_SC05_011/ov_SC05_011_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC05_011/ov_SC05_011_jr_8012ACE0.c b/src/ov_SC05_011/ov_SC05_011_jr_8012ACE0.c index 51f4e9c62c..533e89ff47 100644 --- a/src/ov_SC05_011/ov_SC05_011_jr_8012ACE0.c +++ b/src/ov_SC05_011/ov_SC05_011_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC05_017/ov_SC05_017_after.c b/src/ov_SC05_017/ov_SC05_017_after.c index 3cbd9433cc..38eeb408f2 100644 --- a/src/ov_SC05_017/ov_SC05_017_after.c +++ b/src/ov_SC05_017/ov_SC05_017_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC05_017/ov_SC05_017_jr_8012ACE0.c b/src/ov_SC05_017/ov_SC05_017_jr_8012ACE0.c index 7a06d7981c..1c3698b50b 100644 --- a/src/ov_SC05_017/ov_SC05_017_jr_8012ACE0.c +++ b/src/ov_SC05_017/ov_SC05_017_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC05_018/ov_SC05_018_after.c b/src/ov_SC05_018/ov_SC05_018_after.c index bc33db2f64..924bcc0da6 100644 --- a/src/ov_SC05_018/ov_SC05_018_after.c +++ b/src/ov_SC05_018/ov_SC05_018_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC05_018/ov_SC05_018_jr_8012ACE0.c b/src/ov_SC05_018/ov_SC05_018_jr_8012ACE0.c index 5744ffe410..9ecc23c453 100644 --- a/src/ov_SC05_018/ov_SC05_018_jr_8012ACE0.c +++ b/src/ov_SC05_018/ov_SC05_018_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC05_019/ov_SC05_019_after.c b/src/ov_SC05_019/ov_SC05_019_after.c index e7794d0c98..c5386f3206 100644 --- a/src/ov_SC05_019/ov_SC05_019_after.c +++ b/src/ov_SC05_019/ov_SC05_019_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC05_019/ov_SC05_019_jr_8012ACE0.c b/src/ov_SC05_019/ov_SC05_019_jr_8012ACE0.c index 4ba74b0e49..b59291cbdf 100644 --- a/src/ov_SC05_019/ov_SC05_019_jr_8012ACE0.c +++ b/src/ov_SC05_019/ov_SC05_019_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC06_000/ov_SC06_000_after.c b/src/ov_SC06_000/ov_SC06_000_after.c index aa2f06e227..0d67f8a884 100644 --- a/src/ov_SC06_000/ov_SC06_000_after.c +++ b/src/ov_SC06_000/ov_SC06_000_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC06_000/ov_SC06_000_jr_8012ACE0.c b/src/ov_SC06_000/ov_SC06_000_jr_8012ACE0.c index fd5cc1a309..60e1df5988 100644 --- a/src/ov_SC06_000/ov_SC06_000_jr_8012ACE0.c +++ b/src/ov_SC06_000/ov_SC06_000_jr_8012ACE0.c @@ -3065,6 +3065,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC06_006/ov_SC06_006_after.c b/src/ov_SC06_006/ov_SC06_006_after.c index 5e656c2f28..51fcb461ab 100644 --- a/src/ov_SC06_006/ov_SC06_006_after.c +++ b/src/ov_SC06_006/ov_SC06_006_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC06_006/ov_SC06_006_jr_8012ACE0.c b/src/ov_SC06_006/ov_SC06_006_jr_8012ACE0.c index e0299b91cc..1fbc498e87 100644 --- a/src/ov_SC06_006/ov_SC06_006_jr_8012ACE0.c +++ b/src/ov_SC06_006/ov_SC06_006_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC06_008/ov_SC06_008_after.c b/src/ov_SC06_008/ov_SC06_008_after.c index e23f312f07..06cb69c7b2 100644 --- a/src/ov_SC06_008/ov_SC06_008_after.c +++ b/src/ov_SC06_008/ov_SC06_008_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC06_008/ov_SC06_008_jr_8012ACE0.c b/src/ov_SC06_008/ov_SC06_008_jr_8012ACE0.c index a2a54ffd90..08a362f59e 100644 --- a/src/ov_SC06_008/ov_SC06_008_jr_8012ACE0.c +++ b/src/ov_SC06_008/ov_SC06_008_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC06_010/ov_SC06_010_after.c b/src/ov_SC06_010/ov_SC06_010_after.c index 504cc2308a..e122dfe428 100644 --- a/src/ov_SC06_010/ov_SC06_010_after.c +++ b/src/ov_SC06_010/ov_SC06_010_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC06_010/ov_SC06_010_jr_8012ACE0.c b/src/ov_SC06_010/ov_SC06_010_jr_8012ACE0.c index 562e88c098..828337254d 100644 --- a/src/ov_SC06_010/ov_SC06_010_jr_8012ACE0.c +++ b/src/ov_SC06_010/ov_SC06_010_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC06_011/ov_SC06_011_after.c b/src/ov_SC06_011/ov_SC06_011_after.c index e7aa344f33..14f70a8628 100644 --- a/src/ov_SC06_011/ov_SC06_011_after.c +++ b/src/ov_SC06_011/ov_SC06_011_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC06_011/ov_SC06_011_jr_8012ACE0.c b/src/ov_SC06_011/ov_SC06_011_jr_8012ACE0.c index 67184b2843..95600743dd 100644 --- a/src/ov_SC06_011/ov_SC06_011_jr_8012ACE0.c +++ b/src/ov_SC06_011/ov_SC06_011_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC06_013/ov_SC06_013_after.c b/src/ov_SC06_013/ov_SC06_013_after.c index c273dcd70f..b7940b92ed 100644 --- a/src/ov_SC06_013/ov_SC06_013_after.c +++ b/src/ov_SC06_013/ov_SC06_013_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC06_013/ov_SC06_013_jr_8012ACE0.c b/src/ov_SC06_013/ov_SC06_013_jr_8012ACE0.c index 55adc2d310..7568d605c8 100644 --- a/src/ov_SC06_013/ov_SC06_013_jr_8012ACE0.c +++ b/src/ov_SC06_013/ov_SC06_013_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC06_014/ov_SC06_014_after.c b/src/ov_SC06_014/ov_SC06_014_after.c index 79d6dfd775..3361f4d84e 100644 --- a/src/ov_SC06_014/ov_SC06_014_after.c +++ b/src/ov_SC06_014/ov_SC06_014_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC06_014/ov_SC06_014_jr_8012ACE0.c b/src/ov_SC06_014/ov_SC06_014_jr_8012ACE0.c index 9a9d1e99cb..5ee194e607 100644 --- a/src/ov_SC06_014/ov_SC06_014_jr_8012ACE0.c +++ b/src/ov_SC06_014/ov_SC06_014_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC06_015/ov_SC06_015_after.c b/src/ov_SC06_015/ov_SC06_015_after.c index c62ad86991..344114d416 100644 --- a/src/ov_SC06_015/ov_SC06_015_after.c +++ b/src/ov_SC06_015/ov_SC06_015_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC06_015/ov_SC06_015_jr_8012ACE0.c b/src/ov_SC06_015/ov_SC06_015_jr_8012ACE0.c index c3dc7bdfa3..58b4a4e173 100644 --- a/src/ov_SC06_015/ov_SC06_015_jr_8012ACE0.c +++ b/src/ov_SC06_015/ov_SC06_015_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC06_016/ov_SC06_016_after.c b/src/ov_SC06_016/ov_SC06_016_after.c index 01f53ae102..e4a95a5c8a 100644 --- a/src/ov_SC06_016/ov_SC06_016_after.c +++ b/src/ov_SC06_016/ov_SC06_016_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC06_016/ov_SC06_016_jr_8012ACE0.c b/src/ov_SC06_016/ov_SC06_016_jr_8012ACE0.c index f854143b00..b80f1e3f6c 100644 --- a/src/ov_SC06_016/ov_SC06_016_jr_8012ACE0.c +++ b/src/ov_SC06_016/ov_SC06_016_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC06_018/ov_SC06_018_after.c b/src/ov_SC06_018/ov_SC06_018_after.c index 8b2be6fc25..90142753d0 100644 --- a/src/ov_SC06_018/ov_SC06_018_after.c +++ b/src/ov_SC06_018/ov_SC06_018_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC06_018/ov_SC06_018_jr_8012ACE0.c b/src/ov_SC06_018/ov_SC06_018_jr_8012ACE0.c index 5573d80774..3453c57459 100644 --- a/src/ov_SC06_018/ov_SC06_018_jr_8012ACE0.c +++ b/src/ov_SC06_018/ov_SC06_018_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC06_020/ov_SC06_020_after.c b/src/ov_SC06_020/ov_SC06_020_after.c index 1e738812bd..7dd90e1bf4 100644 --- a/src/ov_SC06_020/ov_SC06_020_after.c +++ b/src/ov_SC06_020/ov_SC06_020_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC06_020/ov_SC06_020_jr_8012ACE0.c b/src/ov_SC06_020/ov_SC06_020_jr_8012ACE0.c index f53e93dba5..d97b79ca75 100644 --- a/src/ov_SC06_020/ov_SC06_020_jr_8012ACE0.c +++ b/src/ov_SC06_020/ov_SC06_020_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC06_022/ov_SC06_022_after.c b/src/ov_SC06_022/ov_SC06_022_after.c index da25cfb35d..b2d4caf43e 100644 --- a/src/ov_SC06_022/ov_SC06_022_after.c +++ b/src/ov_SC06_022/ov_SC06_022_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC06_022/ov_SC06_022_jr_8012ACE0.c b/src/ov_SC06_022/ov_SC06_022_jr_8012ACE0.c index 7565e7455d..27fda03fbd 100644 --- a/src/ov_SC06_022/ov_SC06_022_jr_8012ACE0.c +++ b/src/ov_SC06_022/ov_SC06_022_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC06_024/ov_SC06_024_after.c b/src/ov_SC06_024/ov_SC06_024_after.c index 219607a788..d50ff5b3c3 100644 --- a/src/ov_SC06_024/ov_SC06_024_after.c +++ b/src/ov_SC06_024/ov_SC06_024_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC06_024/ov_SC06_024_jr_8012ACE0.c b/src/ov_SC06_024/ov_SC06_024_jr_8012ACE0.c index 6e12c5f063..4862c1b5d4 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_8012ACE0.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC06_025/ov_SC06_025_after.c b/src/ov_SC06_025/ov_SC06_025_after.c index d10d826a97..7076f9a65a 100644 --- a/src/ov_SC06_025/ov_SC06_025_after.c +++ b/src/ov_SC06_025/ov_SC06_025_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC06_025/ov_SC06_025_jr_8012ACE0.c b/src/ov_SC06_025/ov_SC06_025_jr_8012ACE0.c index a2850f9cb1..77da9603ed 100644 --- a/src/ov_SC06_025/ov_SC06_025_jr_8012ACE0.c +++ b/src/ov_SC06_025/ov_SC06_025_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC06_027/ov_SC06_027_after.c b/src/ov_SC06_027/ov_SC06_027_after.c index 255eec4cb1..6e7b5a55fd 100644 --- a/src/ov_SC06_027/ov_SC06_027_after.c +++ b/src/ov_SC06_027/ov_SC06_027_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC06_027/ov_SC06_027_jr_8012ACE0.c b/src/ov_SC06_027/ov_SC06_027_jr_8012ACE0.c index 9a156b7a29..f110a3c882 100644 --- a/src/ov_SC06_027/ov_SC06_027_jr_8012ACE0.c +++ b/src/ov_SC06_027/ov_SC06_027_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC06_029/ov_SC06_029_after.c b/src/ov_SC06_029/ov_SC06_029_after.c index 7dd49d03df..4441243367 100644 --- a/src/ov_SC06_029/ov_SC06_029_after.c +++ b/src/ov_SC06_029/ov_SC06_029_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC06_029/ov_SC06_029_jr_8012ACE0.c b/src/ov_SC06_029/ov_SC06_029_jr_8012ACE0.c index 28ab51c584..c98845570e 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_8012ACE0.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC06_030/ov_SC06_030_after.c b/src/ov_SC06_030/ov_SC06_030_after.c index 3884dddde4..074f600a48 100644 --- a/src/ov_SC06_030/ov_SC06_030_after.c +++ b/src/ov_SC06_030/ov_SC06_030_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC06_030/ov_SC06_030_jr_8012ACE0.c b/src/ov_SC06_030/ov_SC06_030_jr_8012ACE0.c index f0ead9ea8a..6a4fe521a0 100644 --- a/src/ov_SC06_030/ov_SC06_030_jr_8012ACE0.c +++ b/src/ov_SC06_030/ov_SC06_030_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC06_032/ov_SC06_032_after.c b/src/ov_SC06_032/ov_SC06_032_after.c index d3fad3e219..fcf5d2532b 100644 --- a/src/ov_SC06_032/ov_SC06_032_after.c +++ b/src/ov_SC06_032/ov_SC06_032_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC06_032/ov_SC06_032_jr_8012ACE0.c b/src/ov_SC06_032/ov_SC06_032_jr_8012ACE0.c index bfd9671ba6..e7000f0c6a 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_8012ACE0.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC06_033/ov_SC06_033_after.c b/src/ov_SC06_033/ov_SC06_033_after.c index 488c6510b2..5d8b9e8697 100644 --- a/src/ov_SC06_033/ov_SC06_033_after.c +++ b/src/ov_SC06_033/ov_SC06_033_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC06_033/ov_SC06_033_jr_8012ACE0.c b/src/ov_SC06_033/ov_SC06_033_jr_8012ACE0.c index f68ed3070b..7a2f339bd3 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_8012ACE0.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC07_000/ov_SC07_000_after.c b/src/ov_SC07_000/ov_SC07_000_after.c index 58e87a10ac..be5e793fc5 100644 --- a/src/ov_SC07_000/ov_SC07_000_after.c +++ b/src/ov_SC07_000/ov_SC07_000_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC07_000/ov_SC07_000_jr_8012ACE0.c b/src/ov_SC07_000/ov_SC07_000_jr_8012ACE0.c index 26a0f6823a..f998ac8b20 100644 --- a/src/ov_SC07_000/ov_SC07_000_jr_8012ACE0.c +++ b/src/ov_SC07_000/ov_SC07_000_jr_8012ACE0.c @@ -3065,6 +3065,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC07_001/ov_SC07_001_after.c b/src/ov_SC07_001/ov_SC07_001_after.c index c7f78867fa..3fd0a14640 100644 --- a/src/ov_SC07_001/ov_SC07_001_after.c +++ b/src/ov_SC07_001/ov_SC07_001_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC07_001/ov_SC07_001_jr_8012ACE0.c b/src/ov_SC07_001/ov_SC07_001_jr_8012ACE0.c index cf4d9d8e46..26046bd883 100644 --- a/src/ov_SC07_001/ov_SC07_001_jr_8012ACE0.c +++ b/src/ov_SC07_001/ov_SC07_001_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC07_002/ov_SC07_002_after.c b/src/ov_SC07_002/ov_SC07_002_after.c index aec84fe661..91941f56fd 100644 --- a/src/ov_SC07_002/ov_SC07_002_after.c +++ b/src/ov_SC07_002/ov_SC07_002_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC07_002/ov_SC07_002_jr_8012ACE0.c b/src/ov_SC07_002/ov_SC07_002_jr_8012ACE0.c index 117a7e6606..5fef62489a 100644 --- a/src/ov_SC07_002/ov_SC07_002_jr_8012ACE0.c +++ b/src/ov_SC07_002/ov_SC07_002_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC07_006/ov_SC07_006.c b/src/ov_SC07_006/ov_SC07_006.c index e5dcc607f1..b5784a75e7 100644 --- a/src/ov_SC07_006/ov_SC07_006.c +++ b/src/ov_SC07_006/ov_SC07_006.c @@ -3152,7 +3152,7 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC07_006/nonmatchings/ov_SC07_006", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137fd8 (src/shared) */ @@ -7215,7 +7215,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014df94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014e048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_006/nonmatchings/ov_SC07_006", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_006/nonmatchings/ov_SC07_006", func_8014E434); diff --git a/src/ov_SC07_007/ov_SC07_007.c b/src/ov_SC07_007/ov_SC07_007.c index 56d004d74e..a91ea029ce 100644 --- a/src/ov_SC07_007/ov_SC07_007.c +++ b/src/ov_SC07_007/ov_SC07_007.c @@ -3152,7 +3152,7 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC07_007/nonmatchings/ov_SC07_007", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137fd8 (src/shared) */ @@ -7215,7 +7215,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014df94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014e048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_007/nonmatchings/ov_SC07_007", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_007/nonmatchings/ov_SC07_007", func_8014E434); diff --git a/src/ov_SC07_008/ov_SC07_008_after.c b/src/ov_SC07_008/ov_SC07_008_after.c index 43292406d7..2256bba3d5 100644 --- a/src/ov_SC07_008/ov_SC07_008_after.c +++ b/src/ov_SC07_008/ov_SC07_008_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC07_008/ov_SC07_008_jr_8012ACE0.c b/src/ov_SC07_008/ov_SC07_008_jr_8012ACE0.c index f2b269c8bf..5341fc14d1 100644 --- a/src/ov_SC07_008/ov_SC07_008_jr_8012ACE0.c +++ b/src/ov_SC07_008/ov_SC07_008_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC07_009/ov_SC07_009_after.c b/src/ov_SC07_009/ov_SC07_009_after.c index 553d813ef9..aeb0499ad2 100644 --- a/src/ov_SC07_009/ov_SC07_009_after.c +++ b/src/ov_SC07_009/ov_SC07_009_after.c @@ -1448,7 +1448,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014DF94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014E048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009_after", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ extern void func_8014E48C(s32 a0); diff --git a/src/ov_SC07_009/ov_SC07_009_jr_8012ACE0.c b/src/ov_SC07_009/ov_SC07_009_jr_8012ACE0.c index baf91f3a9e..3f32662e7c 100644 --- a/src/ov_SC07_009/ov_SC07_009_jr_8012ACE0.c +++ b/src/ov_SC07_009/ov_SC07_009_jr_8012ACE0.c @@ -3063,6 +3063,6 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009_jr_8012ACE0", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137FD8 (src/shared) */ diff --git a/src/ov_SC07_010/ov_SC07_010.c b/src/ov_SC07_010/ov_SC07_010.c index 97d8e70186..bda2eb7c6a 100644 --- a/src/ov_SC07_010/ov_SC07_010.c +++ b/src/ov_SC07_010/ov_SC07_010.c @@ -3223,7 +3223,7 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC07_010/nonmatchings/ov_SC07_010", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137fd8 (src/shared) */ diff --git a/src/ov_SC07_010/ov_SC07_010_o2b.c b/src/ov_SC07_010/ov_SC07_010_o2b.c index 20017eea1a..4f5650ab76 100644 --- a/src/ov_SC07_010/ov_SC07_010_o2b.c +++ b/src/ov_SC07_010/ov_SC07_010_o2b.c @@ -3932,7 +3932,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014df94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014e048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_010/nonmatchings/ov_SC07_010_o2b", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_010/nonmatchings/ov_SC07_010_o2b", func_8014E434); diff --git a/src/ov_SC07_011/ov_SC07_011.c b/src/ov_SC07_011/ov_SC07_011.c index 694fdfcb9d..76b998de32 100644 --- a/src/ov_SC07_011/ov_SC07_011.c +++ b/src/ov_SC07_011/ov_SC07_011.c @@ -3152,7 +3152,7 @@ int func_80137D08(int arg0, int arg1, short arg2) } -INCLUDE_ASM("asm/ov_SC07_011/nonmatchings/ov_SC07_011", func_80137DD4); +DEFINE_func_80137DD4() /* dedup: shared engine-core @0x80137DD4 (src/shared) */ DEFINE_func_80137FD8() /* dedup: shared engine-core @0x80137fd8 (src/shared) */ @@ -7231,7 +7231,7 @@ DEFINE_func_8014DF94() /* dedup: shared engine-core @0x8014df94 (src/shared) */ DEFINE_func_8014E048() /* dedup: shared engine-core @0x8014e048 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_011/nonmatchings/ov_SC07_011", func_8014E284); +DEFINE_func_8014E284() /* dedup: shared engine-core @0x8014E284 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_011/nonmatchings/ov_SC07_011", func_8014E434); diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 61d4693174..a585c706b7 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -27842,4 +27842,86 @@ return 0; \ } +#define DEFINE_func_8014E284() \ + extern u8 D_801202A0[]; \ + extern s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3); /* canonical (engine_core.h:11555) */ \ + extern s32 ratan2(s32 a0, s32 a1); \ + extern s32 func_80012A60(s32 a0, s32 a1); \ + s32 func_8014E284(s32 a0, s16 *arg1, s16 *arg2) { \ + u16 *a1 = (u16 *)arg1; \ + u16 *a2 = (u16 *)arg2; \ + EntSC01077 *p; \ + s16 dx; \ + s16 dz; \ + s16 ax; \ + s16 az; \ + s32 r1; \ + s32 r2; \ + dx = a2[0] - a1[0]; \ + dz = a2[2] - a1[2]; \ + if ((s16)(dx | dz) != 0) { \ + for (p = (EntSC01077 *)D_801202A0; p < (EntSC01077 *)D_801202A0 + 96; p++) { \ + if (p->f00 == 0) continue; \ + if (p->f58 == 0) continue; \ + if ((p->f5C & 0x1000) == 0) continue; \ + /* §17a-1 fn-ptr cast: keep the canonical extern, call with the intended sig. */ \ + if (((s32 (*)(s32, s32, u16 *, u16 *))func_80135A4C)(p->f20, p->f58, a1, a2) == 0) continue; \ + ax = p->f06 - *(u16 *)(a0 + 6); \ + az = p->f0E - *(u16 *)(a0 + 0xE); \ + r1 = (s16)ratan2(dz, dx); \ + r2 = (s16)ratan2(az, ax); \ + if ((s16)func_80012A60(r1, r2) < 0x400) { \ + *(s32 *)(a0 + 0x170) = (s32)p; \ + *(u16 *)(a0 + 6) = a2[0]; \ + *(u16 *)(a0 + 0xA) = a2[1] + 0x10; \ + *(u16 *)(a0 + 0xE) = a2[2]; \ + return 1; \ + } \ + } \ + } \ + return 0; \ + } + +#define DEFINE_func_80137DD4() \ + extern void *func_80010A08(s32); \ + extern void func_80137FD8(s32 a0, s32 a1, s32 a2, s32 a3); \ + void func_80137DD4(s32 ent, u8 *arg, u8 *work) { \ + register s32 t __asm__("$4"); \ + s32 d, c, c1, sub, y; \ + u32 b; \ + P_TAG_80137DD4 *q, *r; \ + { \ + register u32 h12 __asm__("$2"), h16 __asm__("$3"); \ + h12 = *(u16 *)(ent + 0x12); \ + h16 = *(u16 *)(ent + 0x16); \ + t = h12 - h16; \ + } \ + d = t; \ + if ((s16)t < 0) { \ + register s32 e __asm__("$2"); \ + e = t + 1; \ + d = (u32)*(u16 *)(ent + 0x2e) + e; \ + } \ + b = *(volatile u8 *)(ent + 0x1f); \ + c = (s8)b; \ + sub = d - (u32)*(u8 *)(ent + 0x21); \ + c1 = c + 1; \ + y = (u32)*(u16 *)(ent + 0x32) + (s16)(sub + c1) * 0xe; \ + q = (P_TAG_80137DD4 *)func_80010A08(0x48); \ + *(u8 *)(arg + 3) = 0; \ + func_80137FD8(ent, (s32)arg, (s32)q, (s16)y); \ + q->addr = ((P_TAG_80137DD4 *)((u32)*(u16 *)(ent + 0x1a) * 4 + *(s32 *)(work + 4)))->addr; \ + ((P_TAG_80137DD4 *)((u32)*(u16 *)(ent + 0x1a) * 4 + *(s32 *)(work + 4)))->addr = (u32)q; \ + q = (P_TAG_80137DD4 *)((u8 *)q + 0x24); \ + *(u8 *)(arg + 3) = 1; \ + func_80137FD8(ent, (s32)arg, (s32)q, (s16)y); \ + q->addr = ((P_TAG_80137DD4 *)((u32)*(u16 *)(ent + 0x1a) * 4 + *(s32 *)(work + 4)))->addr; \ + ((P_TAG_80137DD4 *)((u32)*(u16 *)(ent + 0x1a) * 4 + *(s32 *)(work + 4)))->addr = (u32)q; \ + r = (P_TAG_80137DD4 *)func_80010A08(8); \ + r->len = 1; \ + *(u32 *)((u8 *)r + 4) = 0xe100000a; \ + r->addr = ((P_TAG_80137DD4 *)((u32)*(u16 *)(ent + 0x1a) * 4 + *(s32 *)(work + 4)))->addr; \ + ((P_TAG_80137DD4 *)((u32)*(u16 *)(ent + 0x1a) * 4 + *(s32 *)(work + 4)))->addr = (u32)r; \ + } + #endif diff --git a/src/shared/engine_types.h b/src/shared/engine_types.h index b982a6a376..03992bd991 100644 --- a/src/shared/engine_types.h +++ b/src/shared/engine_types.h @@ -585,4 +585,24 @@ typedef struct { u16 a, b, c, d; } SV4U; typedef struct { short a, b, c; } SV3; + +/* lifted for dedup propagation (Phase 29 T4 type-lift): func_8014E284 / func_80137DD4 */ +typedef struct EntSC01077 { + u16 f00; + u8 pad02[4]; + u16 f06; + u8 pad08[2]; + u16 f0A; + u8 pad0C[2]; + u16 f0E; + u8 pad10[0x10]; + s32 f20; + u8 pad24[0x34]; + s32 f58; + u16 f5C; + u8 pad5E[0xAE]; +} EntSC01077; + +typedef struct { u32 addr : 24; u32 len : 8; u8 r0, g0, b0, code; } P_TAG_80137DD4; + #endif /* BFM_ENGINE_TYPES_H */