From 8ba3b823078472a7ca86b54ff9c2f5461f5359be Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Sat, 4 Jul 2026 04:14:43 -0600 Subject: [PATCH] =?UTF-8?q?feat(phase-24):=20T7=20=E2=80=94=203=20Fable5-c?= =?UTF-8?q?racked=20giants=20=C3=97134=20(func=5F801392FC/8013A530/8013AF2?= =?UTF-8?q?0);=20fleet=2065.64->65.75%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - func_801392FC (182, close=2->MATCH): CROSS-BB COMBINE LAW (a backedge-crossing count is a variable, not a foldable (s16)load; reorg steals the sll into the delay slot) + VOLATILE-FRAME-PARITY (volatile count-load avoids the cse-common -> combine keep-load -> stale-allocno reload slot). cookbook §36. - func_8013A530 (204, close=10->MATCH): the RC-6 'reload knot' WAS the pins; the $0-ADD OPAQUE COPY (iVar7 = fc + zr, zr=$0) assembles to addu $v1,$a1,$zero but doesn't reserve the reg + 3 zero-byte levers. regalloc.md RC-12/RC-13, §36. - func_8013AF20 (185, close=15->MATCH): the 'impossible' const-hoist order was libgpu addPrim's 24-bit BITFIELD store (store_fixed_bit_field emits 0x00ffffff first) + delete the inherited barrier; P_TAG lifted to engine_types.h (byte-neutral). loop.md, RC-7, §36. - banked via the §35 recipe (fix_arity_callers --any-proto -> sig_unify -> harvest_verify -> dedup_propagate --recover). clean fleet check-all 136/136, dedup 1806/0, 0 NON_MATCHING. - SESSION: 7 giants ×134 total (1 R14-free, 2 Opus-solo, 4 Opus->Fable5); fleet 65.48 -> 65.75%. gcc-2.7.2 reference tree extended (expmed.c/mips.md/... added). Giant queue (§G) stored for next session. --- config/dedup.us.yaml | 21 +++ docs/backlog.md | 2 +- docs/gcc-2.7.2-map/loop.md | 12 ++ docs/gcc-2.7.2-map/regalloc.md | 23 +++ docs/matching-cookbook.md | 21 ++- docs/progress.fleet.md | 274 ++++++++++++++++---------------- src/ov_SC01_000/ov_SC01_000.c | 6 +- src/ov_SC01_001/ov_SC01_001.c | 6 +- src/ov_SC01_004/ov_SC01_004.c | 6 +- src/ov_SC01_005/ov_SC01_005.c | 6 +- src/ov_SC01_006/ov_SC01_006.c | 6 +- src/ov_SC01_008/ov_SC01_008.c | 6 +- src/ov_SC01_009/ov_SC01_009.c | 6 +- src/ov_SC01_074/ov_SC01_074.c | 6 +- src/ov_SC01_077/ov_SC01_077_a.c | 146 ++++++++++++++++- src/ov_SC01_080/ov_SC01_080.c | 6 +- src/ov_SC01_084/ov_SC01_084.c | 6 +- src/ov_SC02_000/ov_SC02_000.c | 6 +- src/ov_SC02_003/ov_SC02_003.c | 6 +- src/ov_SC02_004/ov_SC02_004.c | 6 +- src/ov_SC02_005/ov_SC02_005.c | 6 +- src/ov_SC02_011/ov_SC02_011.c | 6 +- src/ov_SC02_015/ov_SC02_015.c | 6 +- src/ov_SC02_016/ov_SC02_016.c | 6 +- src/ov_SC02_017/ov_SC02_017.c | 6 +- src/ov_SC02_021/ov_SC02_021.c | 6 +- src/ov_SC02_026/ov_SC02_026.c | 6 +- src/ov_SC02_027/ov_SC02_027.c | 6 +- src/ov_SC02_028/ov_SC02_028.c | 6 +- src/ov_SC02_031/ov_SC02_031.c | 6 +- src/ov_SC02_035/ov_SC02_035.c | 6 +- src/ov_SC02_039/ov_SC02_039.c | 6 +- src/ov_SC02_041/ov_SC02_041.c | 6 +- src/ov_SC03_001/ov_SC03_001.c | 6 +- src/ov_SC03_002/ov_SC03_002.c | 6 +- src/ov_SC03_003/ov_SC03_003.c | 6 +- src/ov_SC03_006/ov_SC03_006.c | 6 +- src/ov_SC03_007/ov_SC03_007.c | 6 +- src/ov_SC03_010/ov_SC03_010.c | 6 +- src/ov_SC03_011/ov_SC03_011.c | 6 +- src/ov_SC03_012/ov_SC03_012.c | 6 +- src/ov_SC03_013/ov_SC03_013.c | 6 +- src/ov_SC03_014/ov_SC03_014.c | 6 +- src/ov_SC03_015/ov_SC03_015.c | 6 +- src/ov_SC03_023/ov_SC03_023.c | 6 +- src/ov_SC03_024/ov_SC03_024.c | 6 +- src/ov_SC03_028/ov_SC03_028.c | 6 +- src/ov_SC03_029/ov_SC03_029.c | 6 +- src/ov_SC03_030/ov_SC03_030.c | 6 +- src/ov_SC03_031/ov_SC03_031.c | 6 +- src/ov_SC03_089/ov_SC03_089.c | 6 +- src/ov_SC03_090/ov_SC03_090.c | 6 +- src/ov_SC03_091/ov_SC03_091.c | 6 +- src/ov_SC03_092/ov_SC03_092.c | 6 +- src/ov_SC03_093/ov_SC03_093.c | 6 +- src/ov_SC03_094/ov_SC03_094.c | 6 +- src/ov_SC03_095/ov_SC03_095.c | 6 +- src/ov_SC03_096/ov_SC03_096.c | 6 +- src/ov_SC03_097/ov_SC03_097.c | 6 +- src/ov_SC03_098/ov_SC03_098.c | 6 +- src/ov_SC03_099/ov_SC03_099.c | 6 +- src/ov_SC03_100/ov_SC03_100.c | 6 +- src/ov_SC03_101/ov_SC03_101.c | 6 +- src/ov_SC03_102/ov_SC03_102.c | 6 +- src/ov_SC03_103/ov_SC03_103.c | 6 +- src/ov_SC03_104/ov_SC03_104.c | 6 +- src/ov_SC03_105/ov_SC03_105.c | 6 +- src/ov_SC03_108/ov_SC03_108.c | 6 +- src/ov_SC03_109/ov_SC03_109.c | 6 +- src/ov_SC03_110/ov_SC03_110.c | 6 +- src/ov_SC03_111/ov_SC03_111.c | 6 +- src/ov_SC03_112/ov_SC03_112.c | 6 +- src/ov_SC03_113/ov_SC03_113.c | 6 +- src/ov_SC03_114/ov_SC03_114.c | 6 +- src/ov_SC03_115/ov_SC03_115.c | 6 +- src/ov_SC03_116/ov_SC03_116.c | 6 +- src/ov_SC03_117/ov_SC03_117.c | 6 +- src/ov_SC03_118/ov_SC03_118.c | 6 +- src/ov_SC03_119/ov_SC03_119.c | 6 +- src/ov_SC03_121/ov_SC03_121.c | 6 +- src/ov_SC03_124/ov_SC03_124.c | 6 +- src/ov_SC03_125/ov_SC03_125.c | 6 +- src/ov_SC03_126/ov_SC03_126.c | 6 +- src/ov_SC04_000/ov_SC04_000.c | 6 +- src/ov_SC04_002/ov_SC04_002.c | 6 +- src/ov_SC04_003/ov_SC04_003.c | 6 +- src/ov_SC04_004/ov_SC04_004.c | 6 +- src/ov_SC04_005/ov_SC04_005.c | 6 +- src/ov_SC04_006/ov_SC04_006.c | 6 +- src/ov_SC04_007/ov_SC04_007.c | 6 +- src/ov_SC04_008/ov_SC04_008.c | 6 +- src/ov_SC04_009/ov_SC04_009.c | 6 +- src/ov_SC04_010/ov_SC04_010.c | 6 +- src/ov_SC04_011/ov_SC04_011.c | 6 +- src/ov_SC04_012/ov_SC04_012.c | 6 +- src/ov_SC04_015/ov_SC04_015.c | 6 +- src/ov_SC04_016/ov_SC04_016.c | 6 +- src/ov_SC04_018/ov_SC04_018.c | 6 +- src/ov_SC04_019/ov_SC04_019.c | 6 +- src/ov_SC04_020/ov_SC04_020.c | 6 +- src/ov_SC04_021/ov_SC04_021.c | 6 +- src/ov_SC05_000/ov_SC05_000.c | 6 +- src/ov_SC05_001/ov_SC05_001.c | 6 +- src/ov_SC05_002/ov_SC05_002.c | 6 +- src/ov_SC05_003/ov_SC05_003.c | 6 +- src/ov_SC05_004/ov_SC05_004.c | 6 +- src/ov_SC05_005/ov_SC05_005.c | 6 +- src/ov_SC05_006/ov_SC05_006.c | 6 +- src/ov_SC05_007/ov_SC05_007.c | 6 +- src/ov_SC05_008/ov_SC05_008.c | 6 +- src/ov_SC05_009/ov_SC05_009.c | 6 +- src/ov_SC05_010/ov_SC05_010.c | 6 +- src/ov_SC05_011/ov_SC05_011.c | 6 +- src/ov_SC05_017/ov_SC05_017.c | 6 +- src/ov_SC05_018/ov_SC05_018.c | 6 +- src/ov_SC05_019/ov_SC05_019.c | 6 +- src/ov_SC06_000/ov_SC06_000.c | 6 +- src/ov_SC06_006/ov_SC06_006.c | 6 +- src/ov_SC06_008/ov_SC06_008.c | 6 +- src/ov_SC06_010/ov_SC06_010.c | 6 +- src/ov_SC06_011/ov_SC06_011.c | 6 +- src/ov_SC06_013/ov_SC06_013.c | 6 +- src/ov_SC06_014/ov_SC06_014.c | 6 +- src/ov_SC06_015/ov_SC06_015.c | 6 +- src/ov_SC06_016/ov_SC06_016.c | 6 +- src/ov_SC06_018/ov_SC06_018.c | 6 +- src/ov_SC06_020/ov_SC06_020.c | 6 +- src/ov_SC06_022/ov_SC06_022.c | 6 +- src/ov_SC06_024/ov_SC06_024.c | 6 +- src/ov_SC06_025/ov_SC06_025.c | 6 +- src/ov_SC06_027/ov_SC06_027.c | 6 +- src/ov_SC06_029/ov_SC06_029.c | 6 +- src/ov_SC06_030/ov_SC06_030.c | 6 +- src/ov_SC06_032/ov_SC06_032.c | 6 +- src/ov_SC06_033/ov_SC06_033.c | 6 +- src/ov_SC07_000/ov_SC07_000.c | 6 +- src/ov_SC07_001/ov_SC07_001.c | 6 +- src/ov_SC07_002/ov_SC07_002.c | 6 +- src/ov_SC07_008/ov_SC07_008.c | 6 +- src/ov_SC07_009/ov_SC07_009.c | 6 +- src/shared/engine_core.h | 256 ++++++++++++++++++++++++++++- src/shared/engine_types.h | 1 + 142 files changed, 1007 insertions(+), 547 deletions(-) diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 862cc22367..8789cc0b18 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -12742,3 +12742,24 @@ groups: func: DEFINE_func_8012EC04 vram: 0x8012EC04 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_801392FC + tier: h_exact + hash: f712e6904e234059b92264676d4cf14ed6d4fe8c + source: src/shared/engine_core.h + func: DEFINE_func_801392FC + vram: 0x801392FC + 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_8013A530 + tier: h_exact + hash: 4ab0c4ef025f1d02ca8eac5db0a4bc73c6f68b07 + source: src/shared/engine_core.h + func: DEFINE_func_8013A530 + vram: 0x8013A530 + 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_8013AF20 + tier: h_exact + hash: c7ed6f700887ed563bf47304a295339fc41f76a6 + source: src/shared/engine_core.h + func: DEFINE_func_8013AF20 + vram: 0x8013AF20 + binaries: [ov_SC01_077, ov_SC01_005, ov_SC01_006, ov_SC03_001, ov_SC01_000, ov_SC01_001, ov_SC02_000, ov_SC02_003, ov_SC03_002, ov_SC03_006, ov_SC04_000, ov_SC04_018, ov_SC04_019, ov_SC05_000, ov_SC06_000, ov_SC07_000, ov_SC01_004, ov_SC01_008, ov_SC01_009, ov_SC01_074, ov_SC01_080, ov_SC01_084, ov_SC02_004, ov_SC02_005, ov_SC02_011, ov_SC02_015, ov_SC02_016, ov_SC02_017, ov_SC02_021, ov_SC02_026, ov_SC02_027, ov_SC02_028, ov_SC02_031, ov_SC02_035, ov_SC02_039, ov_SC02_041, ov_SC03_003, ov_SC03_007, ov_SC03_010, ov_SC03_011, ov_SC03_012, ov_SC03_013, ov_SC03_014, ov_SC03_015, ov_SC03_023, ov_SC03_024, ov_SC03_028, ov_SC03_029, ov_SC03_030, ov_SC03_031, ov_SC03_089, ov_SC03_090, ov_SC03_091, ov_SC03_092, ov_SC03_093, ov_SC03_094, ov_SC03_095, ov_SC03_096, ov_SC03_097, ov_SC03_098, ov_SC03_099, ov_SC03_100, ov_SC03_101, ov_SC03_102, ov_SC03_103, ov_SC03_104, ov_SC03_105, ov_SC03_108, ov_SC03_109, ov_SC03_110, ov_SC03_111, ov_SC03_112, ov_SC03_113, ov_SC03_114, ov_SC03_115, ov_SC03_116, ov_SC03_117, ov_SC03_118, ov_SC03_119, ov_SC03_121, ov_SC03_124, ov_SC03_125, ov_SC03_126, ov_SC04_002, ov_SC04_003, ov_SC04_004, ov_SC04_005, ov_SC04_006, ov_SC04_007, ov_SC04_008, ov_SC04_009, ov_SC04_010, ov_SC04_011, ov_SC04_012, ov_SC04_015, ov_SC04_016, ov_SC04_020, ov_SC04_021, ov_SC05_001, ov_SC05_002, ov_SC05_003, ov_SC05_004, ov_SC05_005, ov_SC05_006, ov_SC05_007, ov_SC05_008, ov_SC05_009, ov_SC05_010, ov_SC05_011, ov_SC05_017, ov_SC05_018, ov_SC05_019, ov_SC06_006, ov_SC06_008, ov_SC06_010, ov_SC06_011, ov_SC06_013, ov_SC06_014, ov_SC06_015, ov_SC06_016, ov_SC06_018, ov_SC06_020, ov_SC06_022, ov_SC06_024, ov_SC06_025, ov_SC06_027, ov_SC06_029, ov_SC06_030, ov_SC06_032, ov_SC06_033, ov_SC07_001, ov_SC07_002, ov_SC07_008, ov_SC07_009] diff --git a/docs/backlog.md b/docs/backlog.md index 8c9b857c66..d13e240074 100644 --- a/docs/backlog.md +++ b/docs/backlog.md @@ -74,7 +74,7 @@ | 66 | func_80161374 | 134 | schedule | 41 | near | 10 | none — MATCH (41/41 relocation-masked) | `.run/backlog_drafts/func_80161374.c` | | 67 | func_80163764 | 134 | regalloc-order | 42 | near | 10 | none — MATCH (42 ins). pins $s2/$s1/$s0/$s3 + u32 counter (sltiu) + init order s2,s3,i,p | `.run/backlog_drafts/func_80163764.c` | | 68 | func_80136F3C | 134 | schedule | 61 | near | 10 | 10/61 — regalloc EXACT (param-copy + corner register-pins). residual = gcc list-scheduler permutation of the prologue window (idx 7-16): target saves $s0 before computing xp, sets $s4=0xFF before the D_800B9A02 lhu, and defers xm($s1=$s1-3) to AFTER the lhu; no C-level reorder/barrier reaches it; permuter can't run (pycparser rejects register __asm__). | `.run/backlog_drafts/func_80136F3C.c` | -| 69 | func_8013A530 | 134 | regalloc | 204 | | 10 | RC-6 reload-pressure at clamp: iVar7->v1 pin over-reserves v1 so field0xE reloads a0 not v1 (+mflo whack-a-mole); directed permuter over clamp v0/v1/a0 OR Fable5 | `.run/t7/func_8013A530.c` | +| 69 | func_8013A530 | 134 | regalloc | 204 | near | 0 | none — MATCH (204 ins, Fable5 Phase-24 T7): $v1 pin replaced by `iVar7 = fc + zr` ($0-add opaque copy) + then-cond operand flip + else-arm 2-input density dummy + post-clamp fc keepalive; full lever set in the draft header + cookbook §36 | `.run/t7/func_8013A530.c` | | 70 | func_8012EFB8 | 134 | other | 32 | near | 11 | none — MATCH (32 ins, byte-verified via objdump -dz; match_one's default objdump elides the 2 consecutive rtps-delay nops as "..." and miscounts 30, but raw bytes are identical) | `.run/backlog_drafts/func_8012EFB8.c` | | 71 | func_80146AFC | 134 | schedule | 40 | near | 13 | none — MATCH | `.run/backlog_drafts/func_80146AFC.c` | | 72 | func_80131CF4 | 134 | schedule | 29 | near | 15 | 15 mismatches cascade from a 2-instruction gap — target reloads *param_1 (lw v0,0(a0)) into v0 before the loop + a loop-label nop; gcc CSEs the guard-read with the loop-entry read so the pre-loop reload never emits. Top 9 instructions (bnez a0 + j epilogue + shared return-block-at-top) MATCH with this for-form. | `.run/backlog_drafts/func_80131CF4.c` | diff --git a/docs/gcc-2.7.2-map/loop.md b/docs/gcc-2.7.2-map/loop.md index f664191f0e..1543965e1e 100644 --- a/docs/gcc-2.7.2-map/loop.md +++ b/docs/gcc-2.7.2-map/loop.md @@ -324,5 +324,17 @@ function, compare where the increment sits relative to branches. Experiment corpus: `.run/gccmap/exp/{expA..expH}.c` + `cc.sh` (rerunnable one-liners); counter-proof C for the banked exemplar: `.run/gccmap/exp/func_80150528_{twoptr,anchor20}.c`. +### Movables EMISSION ORDER — the bitfield mask decoupler (Phase 24 T7, cookbook §36, byte-proven func_8013AF20) — **STEERABLE** +`move_movables` emits hoisted const-sets in the order `scan_loop` FOUND them = loop-body insn +order. A user-mask statement materializes its constants in C expression order — COUPLED to the +AND/OR compute shape (reordering `&`-operands flips both). The one C form that materializes +`0x00ffffff` BEFORE `0xff000000` while still computing `dest & 0xff000000` first is the +**BITFIELD store** (libgpu `setaddr`/`addPrim`): `store_fixed_bit_field` masks the VALUE first +(expmed.c:667 `must_and` → :679-681), the dest second (:694-696), `ior` dest-first (:706). +Downstream, preheader birth order sets the K2 tie-break (later-born = shorter LL = higher +priority), and a lui+ori const additionally SKIPS local-alloc.c:1064's LL-doubling (sched.c:4830 +`try_split` → mips.md:3208 `large_int` split → `reg_n_sets==2` fails the :1021 gate) — see +regalloc.md RC-7. Full chain + gdb numbers: cookbook §36. + ### The giv-init fence — force `emit_iv_add_mult`'s giv-init MOVE (Phase 24 T5, cookbook §34) — **STEERABLE** When a loop's counter-derived pointer (a general induction var) has its init COALESCED with the invariant address, gcc drops one instruction → a full count mismatch vs a target that kept the `addu dst,base,$zero`. **Fix:** `asm("":"=r"(base):"0"(base)); dst = base;` forces `emit_iv_add_mult`'s giv-init move (`loop.c:5556 if (reg != result) emit_move_insn(reg,result)`) to materialize = the target's `addu dst,base,$zero`. The general fix for the "gcc coalesced the giv init, dropping an instruction" class on any giant with a counter-derived pointer. diff --git a/docs/gcc-2.7.2-map/regalloc.md b/docs/gcc-2.7.2-map/regalloc.md index eb8cd4714b..cd4129280e 100644 --- a/docs/gcc-2.7.2-map/regalloc.md +++ b/docs/gcc-2.7.2-map/regalloc.md @@ -76,6 +76,7 @@ A pin makes every ref of the variable an explicit HARD reg from RTL-expansion on - **The call killer:** `validate_equiv_mem` (`local-alloc.c:583`) rejects a MEM equivalence if ANY call occurs between the load and the reg's death (non-`RTX_UNCHANGING_P`) → a stack-local's VALUE loaded before a call can't be rematerialized from its home slot; it must hold a reg or spill to a NEW slot. Address-CONSTANTS survive calls; MEM-values don't. This asymmetry explains the whole class. - **Lever (byte-proven, cookbook §17, func_8012B4B8 88→52):** pass a stack buffer as a decayed **array** (`T buf[N]`, pass `buf`) — the address stays a rematerializable constant, `addiu $sp` re-emitted per call, no callee-saved consumed. Any address-taken form (`&struct`, `mtx.w`, `*(T*)arr`) forces the address into a pseudo that crosses calls → callee-saved + bigger frame. - **Priority side-effect to know:** an equiv-reg's `REG_LIVE_LENGTH` is **doubled** (`local-alloc.c:1153`) — deliberately halving its K2 priority ("reload can always recreate it"). So a single-set address/constant var LOSES callee-saved races on purpose. If the target holds such a value in $sN anyway, your draft must defeat the equiv: give the var a **second set** (`REG_N_SETS != 1` fails the `update_equiv_regs` gate) — the same REG_N_SETS knob as §30's birthing-boost, one pass earlier. Also: a set-once-used-once non-block-local pseudo gets its init MOVED to just before its use (`:1230-1270`, `LIVE_LENGTH=2, calls_crossed=0`) — if the target shows the init far from the use (or vice versa), this pass did/didn't fire; check REG_N_REFS==2. +- **2-INSTRUCTION CONSTANTS get the second set FOR FREE → they escape the doubling (Phase 24 T7, byte-proven func_8013AF20, gdb-verified):** sched1 pre-reload-splits every insn (`sched.c:4830 try_split`) → mips.md:3208 `large_int` define_split turns `li BIG` into lui + ori = `reg_n_sets==2` → fails the single-set gate (`local-alloc.c:1021`, vanilla line) → **no ×2 penalty**. A lui+ori const (`0x00ffffff`) therefore out-prioritizes every same-ref 1-instruction const (addiu-able or lui-only, whose LL doubled) and allocates FIRST. When a preheader const-register contest looks "impossible by density", check the contenders' instruction counts before anything else (gdb: `((short*)reg_n_sets)[N]` at `update_equiv_regs`). Full chain: cookbook §36. ### RC-8 — Reload artifacts: reg identity, missing/extra `lw`, missing `sw`, reload order — **DETERMINED (fix upstream, don't chase)** These are pure consequences; a diff here means an UPSTREAM divergence (slot count/shape, block structure), except the listed direct levers: @@ -171,3 +172,25 @@ diverge from the original's unpinned shape. ### RC-11 — The 3-qty local-alloc SORT BUG + the zero-byte asm allocation toolkit (Phase 24 T5, cookbook §34) — **STEERABLE (decoy qty / dummies)** `local-alloc.c:1441-1463`/:1494-1516: for a block with **≤3 local register quantities** the unrolled compare switch compares *fixed qty numbers* (`qty_compare(0,1),(1,2),(0,1)`) but exchanges *order slots* — when `pri(q1)` is highest the third compare re-fires and undoes the first swap, so **≤3-qty blocks allocate in qty-CREATION order, not density order** (≥4 qtys → qsort, correct). A genuine gcc-2.7.2 bug. Symptom: a low-density local grabs a reg the density order would deny. **Fix:** a **zero-instruction decoy qty** (`asm("":"=r"(decoy):"r"(x)); asm("" :: "r"(decoy));`) bumps the block to 4 qtys → the qsort path → correct density first-fit (`find_reg`, `global.c:904`; `regs_used_so_far` pre-seeded with call-used regs, `global.c:352-355`). **The zero-byte asm toolkit** (allocation/schedule dials that emit NOTHING; the byte-gate certifies): **input-only** `asm("" :: "r"(v))` floats to v's def (ref/density dial); **multi-input** `asm("" :: "r"(a),"r"(b))` anchors at the latest def (lifetime-extender / joint-release → `rank_for_schedule` class rule `sched.c:2385`); **def+use pair** mints the decoy qty above. gdb-on-cc1 (`find_free_reg`/`post_mark_life`) settles the real qty order when hand-modeling stalls. Cite vanilla `tools/reference/gcc-2.7.2/local-alloc.c`. + +--- + +## §G Phase-24 T7 extension — the func_8013A530 clamp crack (RC-6 "reload-pressure" downgraded again; 3 new levers) +Exemplar: `func_8013A530` (204 ins, close=10 "RC-6 reload-pressure" → MATCH, `.run/t7/func_8013A530.c`; dumps/variants `.run/t7/fable/a530/`). The "pressure" was three separable, steerable decisions: + +### RC-12 — The $0-ADD OPAQUE COPY: force a live `move` that neither cse nor combine can remove/reverse — **STEERABLE (new tool)** +- **Problem shape:** target keeps `load→rA` and `copy rC=rA` as TWO live regs, compares reading rA, arithmetic reading rC. A pseudo copy `int c = a;` is destroyed by canon (`cse.c:826 make_regs_eqv` head-promotion + `canon_reg` rewriting every pseudo use); with `a` pinned, combine instead REVERSES it (load absorbed into the pseudo via the added-sets path, the pin becomes the copy dest, 1 insn short). No plain-C spelling survives both. +- **Lever:** `register int zr __asm__("$0"); c = a + zr;` — RTL `(plus rA (reg 0))`: not a reg-reg set (no qty merge, no canon), not load-absorbable (no extend+plus pattern), assembles to the byte-identical `addu $rC,$rA,$zero`. $0 is fixed → no regs_explicitly_used/bad_spill side channels (unlike any real-reg pin). +- Alternative for the same class: the S13 asm-copy (`asm("":"=r"(c):"0"(a))`, reload materializes the tie-move) — but its `#APP` markers constrain placement (see below); the $0-add is a real, freely schedulable insn. Prefer $0-add. + +### RC-5 channel 2 EXTENDED — pins poison `retry_global_alloc`, moving registers function-wide where the pinned var is DEAD +- `regs_explicitly_used → bad_spill_regs` (`reload1.c:3900-15`) affects not only the spill-reg identity but the **reload-driven allocation retry**: an allocno that failed main `find_reg` (here: the div-magic `Need 1 reg of class LO_REG/MD_REGS` spill path) is re-allocated by `retry_global_alloc` with bad_spill_regs forbidden. Seed: `$v1`/`$v0` pins → CASE1's 2nd-product "Register 178 now in 10" (`mflo $t2`); unpinned → "now in 3" (`mflo $v1`). **Tell:** a scratch-reg diff in a region where no pinned var is live + a `Spilling reg N` line in `.greg` → audit pins, not liveness. + +### RC-13 — Reload-birth vs pin/pseudo death is set by CONDITION OPERAND ORDER (sched1 backward + mem-unit hazard), not by allocation +- The clamp's after-store reload `lh` is hoisted by sched1 (backward list scheduler; `blocking insn N for 1 cycles` mem-unit hazard against the `sh`; boosted-group ties break toward higher uid) to the block TOP when the condition is spelled `(int)mem < x` (mem expands first, lowest uids) — birthing the reload INSIDE the previous value's live window → hard conflict → the "reload-pressure" mis-allocation. Spelling the SAME canonical slt as `x > (int)mem` mirrors the uids (the else-arm's natural order) and keeps the lh below the killing insn → both values share the reg disjointly. **Zero-byte, zero-semantic lever; check both spellings before any RC-6 verdict.** + +### RC-11 toolkit CAVEAT — `#APP` blocks the maspsx/ASPSX-2.56 delay-slot hop +cc1 emits `[lh;lh;addu;slt;beqz]`; the target's `[..;slt;beqz;addu-in-slot]` + load-delay nop layout is made by **maspsx** hopping the eligible addu over the slt into the branch slot. Any zero-byte asm dummy between the addu and the branch emits `#APP/#NO_APP` and kills the hop (costs exactly 1 insn + a cascade). **Placement rule:** park density/lifetime dummies inside an arm, as a 2-input `asm("" :: "r"(v),"r"(t))` anchored at a local def — never in a block tail the assembler must reorder. (Density effect proven: +1 ref lifted the allocno from 3/10 to 8/11 `allocno_compare` priority, flipping the $v1/$a0 grant order.) + +### local-alloc suggestion note (companion to K5) — a dying pinned reg SUGGESTS itself into the next dest +A compare/arith result qty whose insn kills a HARD (pinned) input records `qty_phys_sugg`; suggested qtys allocate FIRST trying only that reg (`local-alloc.c:1593-1625`) — the else-compare's slt temp took the dying fc pin's $a1 over free $v0. A zero-byte keepalive read of the pinned var AFTER the insn removes the death → no suggestion → plain first-fit. **Tell:** a scratch result landing in an arg/pinned reg that dies in the same insn. diff --git a/docs/matching-cookbook.md b/docs/matching-cookbook.md index f8bb7cf7a8..e5bc99f366 100644 --- a/docs/matching-cookbook.md +++ b/docs/matching-cookbook.md @@ -2176,4 +2176,23 @@ Cracking the 5 remaining region-a giants via parallel Opus agents applying §32/ **New loop idioms (byte-verified; §31/loop.md fodder):** *dest-off-base giv* — write every primitive store `*(u16*)((s32)p + k)` off ONE biv so they combine into a single dest-addr giv (kills giv-split); *index-form source* `param_3[j+k]` with `j+=2` (not a walked pointer) reduces to one address biv; *sltiu-outer/slti-inner without CSE* — a redundant SIGNED range-guard that must stay `slt`/`slti` needs a **separate signed-int copy** (`int s = u;`), since only CSE-*reuse* canonicalizes signed→unsigned; *div2 range-extension* — a zero-byte `asm("":: "r"(x))` after the last flag-test extends a pinned reg's live range so a trailing `andi` lands in the target reg. -**The 3 deferred residuals (Fable5 batch — close=2/10/15; precise root-cause in `.run/t7/.c` headers + `docs/backlog.md`):** `func_801392FC` (**2**: combine folds `(s16)`load → atomic `lh` before sched2, so the pipelineable split-load never exists; permuter can't reach) · `func_8013A530` (**10**: RC-6 reload-pressure — an `iVar7→$v1` pin over-reserves $v1 so the clamp's 2nd split reloads into $a0; directed permuter over the clamp OR Fable5) · `func_8013AF20` (**15**: loop-invariant constant-hoist ORDER — the two AND-masks materialize opposite, coupled to the AND-operand order; permuter plateaued at 15). All single-class, high byte-weight (×134), ideal Fable5 targets. +**The 3 deferred residuals (Fable5 batch — close=2/10/15; precise root-cause in `.run/t7/.c` headers + `docs/backlog.md`):** `func_801392FC` (**2**: combine folds `(s16)`load → atomic `lh` before sched2, so the pipelineable split-load never exists; permuter can't reach) · `func_8013A530` (**10** → **MATCHED ×1**, §36 below — the "RC-6 reload-pressure" verdict was wrong: it was the $2/$3 pins themselves (reload-retry poison + sched1 load-hoist collision); cracked pin-free via the $0-add opaque copy + condition-operand flip + else-arm density dummy, regalloc.md §G) · `func_8013AF20` (**15**: loop-invariant constant-hoist ORDER — the two AND-masks materialize opposite, coupled to the AND-operand order; permuter plateaued at 15). All single-class, high byte-weight (×134), ideal Fable5 targets. + +## §36 — Fable5 giant-crack levers (Phase 24 T7 Fable5 batch; accumulates as each lands — full RTL dumps in `.run/t7/fable/`) +**`func_801392FC` (loop count-load, close=2 → MATCH ×134):** +- **CROSS-BB COMBINE LAW.** combine never spans basic blocks (`flow.c:2087` — `LOG_LINKS(y)` created only when `BLOCK_NUM(y)==blocknum`). So a value crossing a loop BACKEDGE — a `u16 cnt` reloaded at the loop tail after a call, `(s16)cnt+1` at the top — is a VARIABLE, not a foldable `(sign_extend(mem))`→`lh`. The "split-and-schedulable" count sign-extend the target shows is **cross-BB dataflow, not a fold-defeat**; `reorg.c fill_slots_from_thread` steals the top-BB `sll` into the loop-back `bnez` delay slot + redirects the label to `sra` → the duplicated `sll` (preheader fall-in + delay-slot copy). Don't hunt for an un-fold; make the value cross the backedge. +- **VOLATILE-FRAME-PARITY.** Make the loop-carried count-load `volatile`. A non-volatile `cnt` gets cse-commoned with the same-address condition read → combine's keep-load fold (`newi2pat`; `combine.c:2089 elim_i2`) keeps a dead ashift-temp's `REG_DEAD` alive → a `(use reg)` planted at the nearest label (`combine.c:10835-10847`) → a stale allocno grabs an extra 8-byte reload slot (frame 0x90 vs target 0x80). `volatile` mems are never cse-hashed (clean condition fold) yet `sched.c:811 read_dependence` (both mems volatile) still lets the `lh` hoist above the volatile `lhu`. `volatile` matches BOTH frame size and schedule — suspect it when a loop-carried count is 8 bytes frame-over. +- **Secondary (byte-verified):** route `buf+0xF` byte-store sums through `s32` temps (defeats the C-frontend QImode-plus operand-swap `addu v1,v1,v0` vs the target's SImode `addu v0,v0,v1`); statement position drives sched2's BACKWARD list scheduler (INSN_LUID tie-break, `rank_for_schedule`) — put `i++`/`acc+=` AFTER the call to fill the `jal` delay; a `register __asm__("$5")` re-arm before an arm's 2nd call limits post-reload cross-jump merge depth (jump2 sits between sched2 and dbr). + +**`func_8013A530` (the LARGEST giant, 204 ins, clamp double register-split, close=10 → MATCH ×1; dumps `.run/t7/fable/a530/`):** +- **THE $0-ADD OPAQUE COPY (new tool — the un-reversible, un-cse-able `move`).** `register int zr __asm__("$0"); iVar7 = fc + zr;` emits the byte-identical `addu $rd,$rs,$zero` but as RTL `(plus reg $0)`, NOT `(set reg reg)`: cse's `make_regs_eqv` never links the two (no canon poisoning in either direction — `canon_reg` cse.c:2545 also never rewrites the hard-reg side), and combine cannot absorb the source's load into the dest (no extend+plus pattern). A plain `int iVar7 = fc;` (fc pinned) gets REVERSED by combine — load lands in the pseudo, the pin becomes the copy dest, 1 insn shorter. Use it whenever the target keeps load+copy as two live registers with compares reading the LOAD and arms reading the COPY. $0 is fixed → zero RC-5 side channels. +- **PIN → RELOAD-RETRY POISON (RC-5 ch.2 extends to retry_global_alloc).** The old `iVar7 $v1`/`t $v0` pins put $2/$3 in `bad_spill_regs` (`reload1.c:3900-15` regs_explicitly_used); the div-magic LO/MD "Need" spill forced CASE1's 2nd-product allocno through `retry_global_alloc`, which skips bad_spill_regs → `mflo $t2`. Unpinned: `.greg "Register 177 now in 3"` → `mflo $v1`. A pin can move a register FUNCTION-WIDE through the retry path even where the pinned var is dead. +- **CONDITION-OPERAND ORDER = LOAD PLACEMENT (sched1 backward + mem-unit hazard).** `(int)mem < t-ext` vs `t-ext > (int)mem` produce the SAME canonical slt but mirrored expansion uids; sched1's backward scheduler (boosted-group ties break toward higher uid; `blocking insn N for 1 cycles` when the sh occupies the mem unit) hoists the mem-first spelling's `lh` to the block TOP — birthing the reload INTO the pin/pseudo's live window (the RC-6 "reload-pressure" was really this). The `>` spelling keeps the lh below the addiu that kills iVar7 → reload (local, first pick) and iVar7 (global) sit in $v1 disjointly. +- **DENSITY DUMMY PLACEMENT vs maspsx (#APP blocks the ASPSX slot-hop).** cc1 emits `[lh;lh;addu;slt;beqz]`; maspsx/ASPSX-2.56 HOPS the addu over the slt into the branch delay slot (and re-inserts the load-delay nop) — but NOT across `#APP/#NO_APP`. A zero-byte dummy between the addu and slt kills the hop (that was the last 1-insn diff). Park density dummies inside an ARM as a 2-input `asm("" :: "r"(v),"r"(t))` anchored at t's def — +1 ref lifted iVar7's `allocno_compare` priority (3/10→8/11) past the fe-load's 3/5 → iVar7 allocates first → $v1, fe → $a0. +- **KEEPALIVE KILLS THE DYING-HARD-REG SUGGESTION.** The else-compare's slt-result temp grabbed $a1 via `qty_phys_sugg` (fc/$a1 dying in that slt; suggested qtys allocate first). `__asm__("" :: "r"(fc));` after the clamp keeps $a1 alive there → no suggestion → plain first-fit $v0 (target). +- **The 2nd split is NATURAL (promoted-HI store-copy).** `if ((cmp)) *(s16*)(p+0xc) = *(s16*)(p+0xe);` — the condition's `(int)mem` expands as HI-load+sll/sra, the body's re-load cse-folds onto the HI pseudo, combine merges the extend into one `lh` and re-emits the HI pseudo as a subreg copy → `lh $v1; addu $a0,$v1; slt ..$v1..; sh $a0` for free. Never pin for this shape. + +**`func_8013AF20` (185 ins, 3 addPrim GPU-builder loops, close=15 "const-order⊗AND-order coupling" → MATCH, permuter had plateaued 40k iters; dumps `.run/t7/fable/dumps_C/`):** +- **BITFIELD STORE = THE MASK-ORDER DECOUPLER (the libgpu addPrim idiom).** A target preheader that materializes `0x00ffffff` (lui+ori) BEFORE `0xff000000` (lui) while the body still computes `*dest & 0xff000000` FIRST cannot come from user-mask C (`*p = *p & 0xff000000 | *ot & 0xffffff` materializes in expression order, and every operand reorder flips the AND/OR shape with it — the byte-verified 19/182-diff coupling). It comes from the SDK's `setaddr` 24-bit BITFIELD store: `store_fixed_bit_field` (expmed.c:556) expands value∧`mask_rtx(mode,0,bitsize,0)`=0x00ffffff FIRST (`must_and` :667 → :679-681), THEN dest∧`mask_rtx(mode,bitpos,bitsize,1)`=0xff000000 (:694-696), THEN `ior(destmasked,value)` (:706 — dest chain stays op0). scan_loop then finds the mask movables in that insn order → move_movables emits the preheader consts […, 0x00ffffff, 0xff000000] with the body bytes unchanged. Transcribe `addPrim(ot,p)` literally: `((P_TAG*)p)->addr = ((P_TAG*)ot)->addr; ((P_TAG*)ot)->addr = (u32)p;` with the real `P_TAG {u32 addr:24; u32 len:8; u8 r0,g0,b0,code;}` (a bitfield STORE with user-mask RHS also byte-matches; the read is optional). 15→8. **Suspect this lever on ANY OT/linked-list 24-bit-pointer-field target.** +- **2-INSTRUCTION CONSTANTS DODGE THE EQUIV LL-DOUBLING → they WIN the low scratch regs (gdb-proven).** sched1 splits every insn pre-reload (sched.c:4830 `try_split`) → mips.md:3208 `large_int` define_split turns `li 0xffffff` into lui+ori = TWO SETS → `reg_n_sets==2` fails `update_equiv_regs`' single-set gate (local-alloc.c:1021) → the mask ESCAPES the `reg_live_length *= 2` const-penalty (local-alloc.c:1064) that hits every 1-instruction const (addiu-able 3/0x40/0x3d, lui-only 0xff000000). Priorities: mask fl2(7)*7/35 = 4000 ≫ 0x3d fl2(7)*7/72 = 1944 → the mask allocates FIRST (`allocno_compare`) → first-fit $a2 (loops 1/2) / $a1 (loop 3). gdb ground truth: n_sets {61:1, 0xffffff:**2**, 0xff000000:1}; LL pre→post update_equiv_regs 36/35/33 → 72/**35**/66. A preheader const-register contest that looks "impossible by density" is usually this. +- **A do{}while(0) barrier is a LOOP-DEPTH REF INFLATOR (flow.c), not just a LUID shifter.** flow weights every mention by loop_depth (flow.c:2067/2315/2501/2711 `reg_n_refs += loop_depth`; here: preheader set=1, body mention=2, +1 more per extra NOTE_INSN_LOOP nest). The Opus draft's barrier wrapped the three `0x3d` byte-stores → refs 7→10 → pri 4166 > 4000 → 0x3d stole $a2 from the mask (the final 8 diffs). Deleting it (obsolete once the bitfield form reshaped the body) restored the refs tie → mask-first allocation → MATCH. **AUDIT inherited barriers whenever a preheader-const register identity is off by one.** diff --git a/docs/progress.fleet.md b/docs/progress.fleet.md index aaa513d03c..b67eb8bf18 100644 --- a/docs/progress.fleet.md +++ b/docs/progress.fleet.md @@ -3,148 +3,148 @@ # source-derived (committed src/*.c + config/dedup.us.yaml). Live byte gate: `make check-all`; # cross-binary collapsible-byte leverage: docs/duplicates.cross.md. -FLEET REAL substantive : 224875 (of which dedup-shared 222334 via 1803 groups / 222385 instances) +FLEET REAL substantive : 225277 (of which dedup-shared 222736 via 1806 groups / 222787 instances) FLEET LINKED PsyQ objs : 959 -FLEET byte-identical : 226404 / 344941 = 65.64% (REAL+LINKED+empties) +FLEET byte-identical : 226806 / 344941 = 65.75% (REAL+LINKED+empties) FLEET NON_MATCHING : 7 (0 in any default build — G4) -FLEET INCLUDE_ASM stubs : 118530 +FLEET INCLUDE_ASM stubs : 118128 FLEET matchable : 344941 | binary | REAL | shared | LINKED | byte-ident | matchable | byte-ident % | |---|---:|---:|---:|---:|---:|---:| | main | 54 | 2 | 959 | 1055 | 2096 | 50.3% | | resident | 123 | 0 | 0 | 125 | 146 | 85.6% | -| ov_SC01_000 | 1676 | 1662 | 0 | 1676 | 2410 | 69.5% | -| ov_SC01_001 | 1672 | 1662 | 0 | 1674 | 2474 | 67.7% | -| ov_SC01_004 | 1665 | 1653 | 0 | 1666 | 2423 | 68.8% | -| ov_SC01_005 | 1688 | 1675 | 0 | 1688 | 2511 | 67.2% | -| ov_SC01_006 | 1687 | 1675 | 0 | 1687 | 2511 | 67.2% | -| ov_SC01_008 | 1666 | 1653 | 0 | 1668 | 2435 | 68.5% | -| ov_SC01_009 | 1687 | 1654 | 0 | 1688 | 2517 | 67.1% | -| ov_SC01_074 | 1666 | 1654 | 0 | 1668 | 2434 | 68.5% | -| ov_SC01_077 | 2181 | 1614 | 0 | 2183 | 2586 | 84.4% | -| ov_SC01_080 | 1684 | 1657 | 0 | 1684 | 2522 | 66.8% | -| ov_SC01_084 | 1689 | 1657 | 0 | 1694 | 2588 | 65.5% | -| ov_SC02_000 | 1703 | 1692 | 0 | 1703 | 2691 | 63.3% | -| ov_SC02_003 | 1703 | 1692 | 0 | 1703 | 2691 | 63.3% | -| ov_SC02_004 | 1670 | 1657 | 0 | 1670 | 2410 | 69.3% | -| ov_SC02_005 | 1729 | 1653 | 0 | 1739 | 2937 | 59.2% | -| ov_SC02_011 | 1710 | 1660 | 0 | 1721 | 2903 | 59.3% | -| ov_SC02_015 | 1670 | 1659 | 0 | 1670 | 2423 | 68.9% | -| ov_SC02_016 | 1674 | 1659 | 0 | 1677 | 2555 | 65.6% | -| ov_SC02_017 | 1694 | 1659 | 0 | 1702 | 2742 | 62.1% | -| ov_SC02_021 | 1673 | 1659 | 0 | 1673 | 2446 | 68.4% | -| ov_SC02_026 | 1678 | 1657 | 0 | 1684 | 2582 | 65.2% | -| ov_SC02_027 | 1687 | 1657 | 0 | 1696 | 2702 | 62.8% | -| ov_SC02_028 | 1695 | 1657 | 0 | 1705 | 2711 | 62.9% | -| ov_SC02_031 | 1685 | 1658 | 0 | 1690 | 2572 | 65.7% | -| ov_SC02_035 | 1676 | 1657 | 0 | 1679 | 2530 | 66.4% | -| ov_SC02_039 | 1661 | 1657 | 0 | 1661 | 2425 | 68.5% | -| ov_SC02_041 | 1668 | 1657 | 0 | 1671 | 2570 | 65.0% | -| ov_SC03_001 | 1726 | 1658 | 0 | 1743 | 2877 | 60.6% | -| ov_SC03_002 | 1687 | 1662 | 0 | 1702 | 2639 | 64.5% | -| ov_SC03_003 | 1659 | 1657 | 0 | 1660 | 2432 | 68.3% | -| ov_SC03_006 | 1700 | 1663 | 0 | 1709 | 2775 | 61.6% | -| ov_SC03_007 | 1675 | 1657 | 0 | 1679 | 2633 | 63.8% | -| ov_SC03_010 | 1669 | 1657 | 0 | 1669 | 2479 | 67.3% | -| ov_SC03_011 | 1665 | 1657 | 0 | 1671 | 2537 | 65.9% | -| ov_SC03_012 | 1660 | 1657 | 0 | 1661 | 2415 | 68.8% | -| ov_SC03_013 | 1668 | 1657 | 0 | 1668 | 2502 | 66.7% | -| ov_SC03_014 | 1691 | 1682 | 0 | 1691 | 2695 | 62.7% | -| ov_SC03_015 | 1697 | 1682 | 0 | 1697 | 2695 | 63.0% | -| ov_SC03_023 | 1662 | 1657 | 0 | 1663 | 2444 | 68.0% | -| ov_SC03_024 | 1692 | 1662 | 0 | 1699 | 2651 | 64.1% | -| ov_SC03_028 | 1683 | 1657 | 0 | 1687 | 2674 | 63.1% | -| ov_SC03_029 | 1669 | 1659 | 0 | 1679 | 2654 | 63.3% | -| ov_SC03_030 | 1668 | 1661 | 0 | 1670 | 2505 | 66.7% | -| ov_SC03_031 | 1664 | 1657 | 0 | 1668 | 2524 | 66.1% | -| ov_SC03_089 | 1674 | 1657 | 0 | 1681 | 2591 | 64.9% | -| ov_SC03_090 | 1675 | 1657 | 0 | 1683 | 2635 | 63.9% | -| ov_SC03_091 | 1674 | 1657 | 0 | 1682 | 2650 | 63.5% | -| ov_SC03_092 | 1674 | 1657 | 0 | 1686 | 2597 | 64.9% | -| ov_SC03_093 | 1671 | 1657 | 0 | 1675 | 2573 | 65.1% | -| ov_SC03_094 | 1665 | 1657 | 0 | 1671 | 2586 | 64.6% | -| ov_SC03_095 | 1663 | 1657 | 0 | 1666 | 2484 | 67.1% | -| ov_SC03_096 | 1666 | 1657 | 0 | 1669 | 2475 | 67.4% | -| ov_SC03_097 | 1670 | 1657 | 0 | 1677 | 2613 | 64.2% | -| ov_SC03_098 | 1666 | 1657 | 0 | 1669 | 2551 | 65.4% | -| ov_SC03_099 | 1663 | 1657 | 0 | 1666 | 2514 | 66.3% | -| ov_SC03_100 | 1665 | 1657 | 0 | 1669 | 2549 | 65.5% | -| ov_SC03_101 | 1667 | 1657 | 0 | 1671 | 2538 | 65.8% | -| ov_SC03_102 | 1667 | 1657 | 0 | 1670 | 2502 | 66.7% | -| ov_SC03_103 | 1665 | 1659 | 0 | 1668 | 2520 | 66.2% | -| ov_SC03_104 | 1677 | 1657 | 0 | 1684 | 2626 | 64.1% | -| ov_SC03_105 | 1671 | 1657 | 0 | 1678 | 2607 | 64.4% | -| ov_SC03_108 | 1659 | 1657 | 0 | 1659 | 2453 | 67.6% | -| ov_SC03_109 | 1660 | 1657 | 0 | 1662 | 2433 | 68.3% | -| ov_SC03_110 | 1662 | 1657 | 0 | 1662 | 2478 | 67.1% | -| ov_SC03_111 | 1667 | 1657 | 0 | 1670 | 2520 | 66.3% | -| ov_SC03_112 | 1664 | 1659 | 0 | 1666 | 2536 | 65.7% | -| ov_SC03_113 | 1661 | 1659 | 0 | 1664 | 2478 | 67.2% | -| ov_SC03_114 | 1658 | 1657 | 0 | 1660 | 2424 | 68.5% | -| ov_SC03_115 | 1666 | 1657 | 0 | 1668 | 2482 | 67.2% | -| ov_SC03_116 | 1664 | 1657 | 0 | 1667 | 2448 | 68.1% | -| ov_SC03_117 | 1665 | 1657 | 0 | 1671 | 2567 | 65.1% | -| ov_SC03_118 | 1692 | 1681 | 0 | 1693 | 2695 | 62.8% | -| ov_SC03_119 | 1688 | 1681 | 0 | 1689 | 2695 | 62.7% | -| ov_SC03_121 | 1664 | 1657 | 0 | 1667 | 2469 | 67.5% | -| ov_SC03_124 | 1689 | 1653 | 0 | 1709 | 2751 | 62.1% | -| ov_SC03_125 | 1670 | 1657 | 0 | 1682 | 2598 | 64.7% | -| ov_SC03_126 | 1661 | 1659 | 0 | 1661 | 2432 | 68.3% | -| ov_SC04_000 | 1671 | 1661 | 0 | 1680 | 2554 | 65.8% | -| ov_SC04_002 | 1674 | 1657 | 0 | 1678 | 2646 | 63.4% | -| ov_SC04_003 | 1662 | 1657 | 0 | 1666 | 2512 | 66.3% | -| ov_SC04_004 | 1669 | 1657 | 0 | 1671 | 2568 | 65.1% | -| ov_SC04_005 | 1671 | 1657 | 0 | 1677 | 2622 | 64.0% | -| ov_SC04_006 | 1660 | 1657 | 0 | 1662 | 2463 | 67.5% | -| ov_SC04_007 | 1670 | 1657 | 0 | 1674 | 2579 | 64.9% | -| ov_SC04_008 | 1660 | 1657 | 0 | 1660 | 2424 | 68.5% | -| ov_SC04_009 | 1663 | 1657 | 0 | 1666 | 2450 | 68.0% | -| ov_SC04_010 | 1663 | 1657 | 0 | 1664 | 2428 | 68.5% | -| ov_SC04_011 | 1686 | 1657 | 0 | 1692 | 2813 | 60.1% | -| ov_SC04_012 | 1660 | 1657 | 0 | 1661 | 2429 | 68.4% | -| ov_SC04_015 | 1680 | 1658 | 0 | 1691 | 2621 | 64.5% | -| ov_SC04_016 | 1658 | 1657 | 0 | 1660 | 2449 | 67.8% | -| ov_SC04_018 | 1707 | 1692 | 0 | 1707 | 2865 | 59.6% | -| ov_SC04_019 | 1711 | 1692 | 0 | 1711 | 2865 | 59.7% | -| ov_SC04_020 | 1673 | 1657 | 0 | 1685 | 2577 | 65.4% | -| ov_SC04_021 | 1659 | 1659 | 0 | 1659 | 2432 | 68.2% | -| ov_SC05_000 | 1663 | 1661 | 0 | 1666 | 2429 | 68.6% | -| ov_SC05_001 | 1663 | 1657 | 0 | 1668 | 2584 | 64.6% | -| ov_SC05_002 | 1660 | 1657 | 0 | 1663 | 2452 | 67.8% | -| ov_SC05_003 | 1661 | 1657 | 0 | 1662 | 2491 | 66.7% | -| ov_SC05_004 | 1661 | 1657 | 0 | 1663 | 2474 | 67.2% | -| ov_SC05_005 | 1662 | 1657 | 0 | 1663 | 2501 | 66.5% | -| ov_SC05_006 | 1659 | 1657 | 0 | 1659 | 2439 | 68.0% | -| ov_SC05_007 | 1664 | 1657 | 0 | 1669 | 2492 | 67.0% | -| ov_SC05_008 | 1684 | 1657 | 0 | 1686 | 2553 | 66.0% | -| ov_SC05_009 | 1664 | 1657 | 0 | 1668 | 2447 | 68.2% | -| ov_SC05_010 | 1672 | 1657 | 0 | 1676 | 2598 | 64.5% | -| ov_SC05_011 | 1659 | 1657 | 0 | 1660 | 2418 | 68.7% | -| ov_SC05_017 | 1691 | 1654 | 0 | 1702 | 2852 | 59.7% | -| ov_SC05_018 | 1682 | 1657 | 0 | 1695 | 2683 | 63.2% | -| ov_SC05_019 | 1660 | 1659 | 0 | 1660 | 2432 | 68.3% | -| ov_SC06_000 | 1694 | 1666 | 0 | 1697 | 2699 | 62.9% | -| ov_SC06_006 | 1667 | 1657 | 0 | 1668 | 2521 | 66.2% | -| ov_SC06_008 | 1671 | 1659 | 0 | 1677 | 2551 | 65.7% | -| ov_SC06_010 | 1671 | 1657 | 0 | 1676 | 2527 | 66.3% | -| ov_SC06_011 | 1663 | 1657 | 0 | 1667 | 2478 | 67.3% | -| ov_SC06_013 | 1662 | 1657 | 0 | 1663 | 2434 | 68.3% | -| ov_SC06_014 | 1664 | 1657 | 0 | 1666 | 2462 | 67.7% | -| ov_SC06_015 | 1661 | 1657 | 0 | 1661 | 2430 | 68.4% | -| ov_SC06_016 | 1672 | 1657 | 0 | 1674 | 2559 | 65.4% | -| ov_SC06_018 | 1671 | 1660 | 0 | 1678 | 2675 | 62.7% | -| ov_SC06_020 | 1665 | 1659 | 0 | 1666 | 2528 | 65.9% | -| ov_SC06_022 | 1671 | 1657 | 0 | 1679 | 2652 | 63.3% | -| ov_SC06_024 | 1676 | 1657 | 0 | 1682 | 2677 | 62.8% | -| ov_SC06_025 | 1669 | 1657 | 0 | 1674 | 2582 | 64.8% | -| ov_SC06_027 | 1657 | 1657 | 0 | 1658 | 2417 | 68.6% | -| ov_SC06_029 | 1686 | 1657 | 0 | 1698 | 2672 | 63.5% | -| ov_SC06_030 | 1664 | 1657 | 0 | 1664 | 2466 | 67.5% | -| ov_SC06_032 | 1664 | 1658 | 0 | 1671 | 2668 | 62.6% | -| ov_SC06_033 | 1672 | 1658 | 0 | 1679 | 2641 | 63.6% | -| ov_SC07_000 | 1675 | 1661 | 0 | 1677 | 2529 | 66.3% | -| ov_SC07_001 | 1664 | 1657 | 0 | 1666 | 2464 | 67.6% | -| ov_SC07_002 | 1678 | 1657 | 0 | 1682 | 2589 | 65.0% | -| ov_SC07_008 | 1658 | 1657 | 0 | 1658 | 2395 | 69.2% | -| ov_SC07_009 | 1666 | 1657 | 0 | 1668 | 2439 | 68.4% | +| ov_SC01_000 | 1679 | 1665 | 0 | 1679 | 2410 | 69.7% | +| ov_SC01_001 | 1675 | 1665 | 0 | 1677 | 2474 | 67.8% | +| ov_SC01_004 | 1668 | 1656 | 0 | 1669 | 2423 | 68.9% | +| ov_SC01_005 | 1691 | 1678 | 0 | 1691 | 2511 | 67.3% | +| ov_SC01_006 | 1690 | 1678 | 0 | 1690 | 2511 | 67.3% | +| ov_SC01_008 | 1669 | 1656 | 0 | 1671 | 2435 | 68.6% | +| ov_SC01_009 | 1690 | 1657 | 0 | 1691 | 2517 | 67.2% | +| ov_SC01_074 | 1669 | 1657 | 0 | 1671 | 2434 | 68.7% | +| ov_SC01_077 | 2184 | 1617 | 0 | 2186 | 2586 | 84.5% | +| ov_SC01_080 | 1687 | 1660 | 0 | 1687 | 2522 | 66.9% | +| ov_SC01_084 | 1692 | 1660 | 0 | 1697 | 2588 | 65.6% | +| ov_SC02_000 | 1706 | 1695 | 0 | 1706 | 2691 | 63.4% | +| ov_SC02_003 | 1706 | 1695 | 0 | 1706 | 2691 | 63.4% | +| ov_SC02_004 | 1673 | 1660 | 0 | 1673 | 2410 | 69.4% | +| ov_SC02_005 | 1732 | 1656 | 0 | 1742 | 2937 | 59.3% | +| ov_SC02_011 | 1713 | 1663 | 0 | 1724 | 2903 | 59.4% | +| ov_SC02_015 | 1673 | 1662 | 0 | 1673 | 2423 | 69.0% | +| ov_SC02_016 | 1677 | 1662 | 0 | 1680 | 2555 | 65.8% | +| ov_SC02_017 | 1697 | 1662 | 0 | 1705 | 2742 | 62.2% | +| ov_SC02_021 | 1676 | 1662 | 0 | 1676 | 2446 | 68.5% | +| ov_SC02_026 | 1681 | 1660 | 0 | 1687 | 2582 | 65.3% | +| ov_SC02_027 | 1690 | 1660 | 0 | 1699 | 2702 | 62.9% | +| ov_SC02_028 | 1698 | 1660 | 0 | 1708 | 2711 | 63.0% | +| ov_SC02_031 | 1688 | 1661 | 0 | 1693 | 2572 | 65.8% | +| ov_SC02_035 | 1679 | 1660 | 0 | 1682 | 2530 | 66.5% | +| ov_SC02_039 | 1664 | 1660 | 0 | 1664 | 2425 | 68.6% | +| ov_SC02_041 | 1671 | 1660 | 0 | 1674 | 2570 | 65.1% | +| ov_SC03_001 | 1729 | 1661 | 0 | 1746 | 2877 | 60.7% | +| ov_SC03_002 | 1690 | 1665 | 0 | 1705 | 2639 | 64.6% | +| ov_SC03_003 | 1662 | 1660 | 0 | 1663 | 2432 | 68.4% | +| ov_SC03_006 | 1703 | 1666 | 0 | 1712 | 2775 | 61.7% | +| ov_SC03_007 | 1678 | 1660 | 0 | 1682 | 2633 | 63.9% | +| ov_SC03_010 | 1672 | 1660 | 0 | 1672 | 2479 | 67.4% | +| ov_SC03_011 | 1668 | 1660 | 0 | 1674 | 2537 | 66.0% | +| ov_SC03_012 | 1663 | 1660 | 0 | 1664 | 2415 | 68.9% | +| ov_SC03_013 | 1671 | 1660 | 0 | 1671 | 2502 | 66.8% | +| ov_SC03_014 | 1694 | 1685 | 0 | 1694 | 2695 | 62.9% | +| ov_SC03_015 | 1700 | 1685 | 0 | 1700 | 2695 | 63.1% | +| ov_SC03_023 | 1665 | 1660 | 0 | 1666 | 2444 | 68.2% | +| ov_SC03_024 | 1695 | 1665 | 0 | 1702 | 2651 | 64.2% | +| ov_SC03_028 | 1686 | 1660 | 0 | 1690 | 2674 | 63.2% | +| ov_SC03_029 | 1672 | 1662 | 0 | 1682 | 2654 | 63.4% | +| ov_SC03_030 | 1671 | 1664 | 0 | 1673 | 2505 | 66.8% | +| ov_SC03_031 | 1667 | 1660 | 0 | 1671 | 2524 | 66.2% | +| ov_SC03_089 | 1677 | 1660 | 0 | 1684 | 2591 | 65.0% | +| ov_SC03_090 | 1678 | 1660 | 0 | 1686 | 2635 | 64.0% | +| ov_SC03_091 | 1677 | 1660 | 0 | 1685 | 2650 | 63.6% | +| ov_SC03_092 | 1677 | 1660 | 0 | 1689 | 2597 | 65.0% | +| ov_SC03_093 | 1674 | 1660 | 0 | 1678 | 2573 | 65.2% | +| ov_SC03_094 | 1668 | 1660 | 0 | 1674 | 2586 | 64.7% | +| ov_SC03_095 | 1666 | 1660 | 0 | 1669 | 2484 | 67.2% | +| ov_SC03_096 | 1669 | 1660 | 0 | 1672 | 2475 | 67.6% | +| ov_SC03_097 | 1673 | 1660 | 0 | 1680 | 2613 | 64.3% | +| ov_SC03_098 | 1669 | 1660 | 0 | 1672 | 2551 | 65.5% | +| ov_SC03_099 | 1666 | 1660 | 0 | 1669 | 2514 | 66.4% | +| ov_SC03_100 | 1668 | 1660 | 0 | 1672 | 2549 | 65.6% | +| ov_SC03_101 | 1670 | 1660 | 0 | 1674 | 2538 | 66.0% | +| ov_SC03_102 | 1670 | 1660 | 0 | 1673 | 2502 | 66.9% | +| ov_SC03_103 | 1668 | 1662 | 0 | 1671 | 2520 | 66.3% | +| ov_SC03_104 | 1680 | 1660 | 0 | 1687 | 2626 | 64.2% | +| ov_SC03_105 | 1674 | 1660 | 0 | 1681 | 2607 | 64.5% | +| ov_SC03_108 | 1662 | 1660 | 0 | 1662 | 2453 | 67.8% | +| ov_SC03_109 | 1663 | 1660 | 0 | 1665 | 2433 | 68.4% | +| ov_SC03_110 | 1665 | 1660 | 0 | 1665 | 2478 | 67.2% | +| ov_SC03_111 | 1670 | 1660 | 0 | 1673 | 2520 | 66.4% | +| ov_SC03_112 | 1667 | 1662 | 0 | 1669 | 2536 | 65.8% | +| ov_SC03_113 | 1664 | 1662 | 0 | 1667 | 2478 | 67.3% | +| ov_SC03_114 | 1661 | 1660 | 0 | 1663 | 2424 | 68.6% | +| ov_SC03_115 | 1669 | 1660 | 0 | 1671 | 2482 | 67.3% | +| ov_SC03_116 | 1667 | 1660 | 0 | 1670 | 2448 | 68.2% | +| ov_SC03_117 | 1668 | 1660 | 0 | 1674 | 2567 | 65.2% | +| ov_SC03_118 | 1695 | 1684 | 0 | 1696 | 2695 | 62.9% | +| ov_SC03_119 | 1691 | 1684 | 0 | 1692 | 2695 | 62.8% | +| ov_SC03_121 | 1667 | 1660 | 0 | 1670 | 2469 | 67.6% | +| ov_SC03_124 | 1692 | 1656 | 0 | 1712 | 2751 | 62.2% | +| ov_SC03_125 | 1673 | 1660 | 0 | 1685 | 2598 | 64.9% | +| ov_SC03_126 | 1664 | 1662 | 0 | 1664 | 2432 | 68.4% | +| ov_SC04_000 | 1674 | 1664 | 0 | 1683 | 2554 | 65.9% | +| ov_SC04_002 | 1677 | 1660 | 0 | 1681 | 2646 | 63.5% | +| ov_SC04_003 | 1665 | 1660 | 0 | 1669 | 2512 | 66.4% | +| ov_SC04_004 | 1672 | 1660 | 0 | 1674 | 2568 | 65.2% | +| ov_SC04_005 | 1674 | 1660 | 0 | 1680 | 2622 | 64.1% | +| ov_SC04_006 | 1663 | 1660 | 0 | 1665 | 2463 | 67.6% | +| ov_SC04_007 | 1673 | 1660 | 0 | 1677 | 2579 | 65.0% | +| ov_SC04_008 | 1663 | 1660 | 0 | 1663 | 2424 | 68.6% | +| ov_SC04_009 | 1666 | 1660 | 0 | 1669 | 2450 | 68.1% | +| ov_SC04_010 | 1666 | 1660 | 0 | 1667 | 2428 | 68.7% | +| ov_SC04_011 | 1689 | 1660 | 0 | 1695 | 2813 | 60.3% | +| ov_SC04_012 | 1663 | 1660 | 0 | 1664 | 2429 | 68.5% | +| ov_SC04_015 | 1683 | 1661 | 0 | 1694 | 2621 | 64.6% | +| ov_SC04_016 | 1661 | 1660 | 0 | 1663 | 2449 | 67.9% | +| ov_SC04_018 | 1710 | 1695 | 0 | 1710 | 2865 | 59.7% | +| ov_SC04_019 | 1714 | 1695 | 0 | 1714 | 2865 | 59.8% | +| ov_SC04_020 | 1676 | 1660 | 0 | 1688 | 2577 | 65.5% | +| ov_SC04_021 | 1662 | 1662 | 0 | 1662 | 2432 | 68.3% | +| ov_SC05_000 | 1666 | 1664 | 0 | 1669 | 2429 | 68.7% | +| ov_SC05_001 | 1666 | 1660 | 0 | 1671 | 2584 | 64.7% | +| ov_SC05_002 | 1663 | 1660 | 0 | 1666 | 2452 | 67.9% | +| ov_SC05_003 | 1664 | 1660 | 0 | 1665 | 2491 | 66.8% | +| ov_SC05_004 | 1664 | 1660 | 0 | 1666 | 2474 | 67.3% | +| ov_SC05_005 | 1665 | 1660 | 0 | 1666 | 2501 | 66.6% | +| ov_SC05_006 | 1662 | 1660 | 0 | 1662 | 2439 | 68.1% | +| ov_SC05_007 | 1667 | 1660 | 0 | 1672 | 2492 | 67.1% | +| ov_SC05_008 | 1687 | 1660 | 0 | 1689 | 2553 | 66.2% | +| ov_SC05_009 | 1667 | 1660 | 0 | 1671 | 2447 | 68.3% | +| ov_SC05_010 | 1675 | 1660 | 0 | 1679 | 2598 | 64.6% | +| ov_SC05_011 | 1662 | 1660 | 0 | 1663 | 2418 | 68.8% | +| ov_SC05_017 | 1694 | 1657 | 0 | 1705 | 2852 | 59.8% | +| ov_SC05_018 | 1685 | 1660 | 0 | 1698 | 2683 | 63.3% | +| ov_SC05_019 | 1663 | 1662 | 0 | 1663 | 2432 | 68.4% | +| ov_SC06_000 | 1697 | 1669 | 0 | 1700 | 2699 | 63.0% | +| ov_SC06_006 | 1670 | 1660 | 0 | 1671 | 2521 | 66.3% | +| ov_SC06_008 | 1674 | 1662 | 0 | 1680 | 2551 | 65.9% | +| ov_SC06_010 | 1674 | 1660 | 0 | 1679 | 2527 | 66.4% | +| ov_SC06_011 | 1666 | 1660 | 0 | 1670 | 2478 | 67.4% | +| ov_SC06_013 | 1665 | 1660 | 0 | 1666 | 2434 | 68.4% | +| ov_SC06_014 | 1667 | 1660 | 0 | 1669 | 2462 | 67.8% | +| ov_SC06_015 | 1664 | 1660 | 0 | 1664 | 2430 | 68.5% | +| ov_SC06_016 | 1675 | 1660 | 0 | 1677 | 2559 | 65.5% | +| ov_SC06_018 | 1674 | 1663 | 0 | 1681 | 2675 | 62.8% | +| ov_SC06_020 | 1668 | 1662 | 0 | 1669 | 2528 | 66.0% | +| ov_SC06_022 | 1674 | 1660 | 0 | 1682 | 2652 | 63.4% | +| ov_SC06_024 | 1679 | 1660 | 0 | 1685 | 2677 | 62.9% | +| ov_SC06_025 | 1672 | 1660 | 0 | 1677 | 2582 | 64.9% | +| ov_SC06_027 | 1660 | 1660 | 0 | 1661 | 2417 | 68.7% | +| ov_SC06_029 | 1689 | 1660 | 0 | 1701 | 2672 | 63.7% | +| ov_SC06_030 | 1667 | 1660 | 0 | 1667 | 2466 | 67.6% | +| ov_SC06_032 | 1667 | 1661 | 0 | 1674 | 2668 | 62.7% | +| ov_SC06_033 | 1675 | 1661 | 0 | 1682 | 2641 | 63.7% | +| ov_SC07_000 | 1678 | 1664 | 0 | 1680 | 2529 | 66.4% | +| ov_SC07_001 | 1667 | 1660 | 0 | 1669 | 2464 | 67.7% | +| ov_SC07_002 | 1681 | 1660 | 0 | 1685 | 2589 | 65.1% | +| ov_SC07_008 | 1661 | 1660 | 0 | 1661 | 2395 | 69.4% | +| ov_SC07_009 | 1669 | 1660 | 0 | 1671 | 2439 | 68.5% | diff --git a/src/ov_SC01_000/ov_SC01_000.c b/src/ov_SC01_000/ov_SC01_000.c index a0e88f7337..625e8ef248 100644 --- a/src/ov_SC01_000/ov_SC01_000.c +++ b/src/ov_SC01_000/ov_SC01_000.c @@ -787,7 +787,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000", func_801395D4); @@ -855,7 +855,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -875,7 +875,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000", func_8013AD38); -INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC01_001/ov_SC01_001.c b/src/ov_SC01_001/ov_SC01_001.c index 14ddab1866..390b5e0cc5 100644 --- a/src/ov_SC01_001/ov_SC01_001.c +++ b/src/ov_SC01_001/ov_SC01_001.c @@ -778,7 +778,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001", func_801395D4); @@ -846,7 +846,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -866,7 +866,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001", func_8013AD38); -INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC01_004/ov_SC01_004.c b/src/ov_SC01_004/ov_SC01_004.c index 9d33465616..6bffe191ba 100644 --- a/src/ov_SC01_004/ov_SC01_004.c +++ b/src/ov_SC01_004/ov_SC01_004.c @@ -805,7 +805,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004", func_801395D4); @@ -873,7 +873,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -893,7 +893,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004", func_8013AD38); -INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC01_005/ov_SC01_005.c b/src/ov_SC01_005/ov_SC01_005.c index b022270b0f..77d5da4ece 100644 --- a/src/ov_SC01_005/ov_SC01_005.c +++ b/src/ov_SC01_005/ov_SC01_005.c @@ -770,7 +770,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005", func_801395D4); @@ -838,7 +838,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -858,7 +858,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005", func_8013AD38); -INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC01_006/ov_SC01_006.c b/src/ov_SC01_006/ov_SC01_006.c index 07300ded6c..1dd1985989 100644 --- a/src/ov_SC01_006/ov_SC01_006.c +++ b/src/ov_SC01_006/ov_SC01_006.c @@ -770,7 +770,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006", func_801395D4); @@ -838,7 +838,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -858,7 +858,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006", func_8013AD38); -INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC01_008/ov_SC01_008.c b/src/ov_SC01_008/ov_SC01_008.c index cef9bf557d..9fb84f2471 100644 --- a/src/ov_SC01_008/ov_SC01_008.c +++ b/src/ov_SC01_008/ov_SC01_008.c @@ -805,7 +805,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008", func_801395D4); @@ -873,7 +873,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -893,7 +893,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008", func_8013AD38); -INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC01_009/ov_SC01_009.c b/src/ov_SC01_009/ov_SC01_009.c index 635d23ce5c..e0bee4266e 100644 --- a/src/ov_SC01_009/ov_SC01_009.c +++ b/src/ov_SC01_009/ov_SC01_009.c @@ -805,7 +805,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009", func_801395D4); @@ -873,7 +873,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -893,7 +893,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009", func_8013AD38); -INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC01_074/ov_SC01_074.c b/src/ov_SC01_074/ov_SC01_074.c index e0ed504eaf..805e4f916f 100644 --- a/src/ov_SC01_074/ov_SC01_074.c +++ b/src/ov_SC01_074/ov_SC01_074.c @@ -806,7 +806,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074", func_801395D4); @@ -874,7 +874,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -894,7 +894,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074", func_8013AD38); -INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC01_077/ov_SC01_077_a.c b/src/ov_SC01_077/ov_SC01_077_a.c index c93b50cf92..1d710c6afa 100644 --- a/src/ov_SC01_077/ov_SC01_077_a.c +++ b/src/ov_SC01_077/ov_SC01_077_a.c @@ -1796,7 +1796,61 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077_a", func_801392FC); +/* func_801392FC (T7, 182 ins, reach-134, HARDEST tier — all 8 $s0-$s7) — MATCH (182 ins). + * GsSPRITE-drawing loop; LOOP form of the banked twin func_80139680 (engine_core.h DEFINE_). + * $s map: $s0=arg0, $s1=i, $s2=rem, $s3=arg1, $s4=acc(+=0xC), $s5=arg2(natural, NO pin), $s6=0xC, + * $s7=0xC-arg1. Solved by Fable5 from the Opus close=2 seed; every lever below byte-verified. + * + * LEVER 1 (R1, the wall — count-load software-pipeline): carry the raw count across the backedge: + * u16 cnt loaded VOLATILE in the preheader and re-loaded VOLATILE at the loop tail (after the + * call); divisor = (s16)cnt + 1 at the loop top. Mechanics (gcc-2.7.2 source): + * - flow.c:2087: LOG_LINKS only created when BLOCK_NUM(use)==BLOCK_NUM(def) — combine can never + * fold the tail/preheader lhu (def BB) into the top-BB sll/sra sign-extend, so the "split and + * schedulable" sequence the target shows is simply a cross-BB dataflow, unreachable from any + * single-BB expression (that was the seed's dead end). + * - reorg.c fill_slots_from_thread then steals the top-BB-leading sll into the loop-back bnez + * delay slot and redirects the label to the sra (the sll appears twice: preheader fall-in + + * delay slot). + * - WHY VOLATILE (frame parity, not semantics): a non-volatile cnt load gets cse-commoned with + * the same-address *(s16*) condition read (the LOOP_CONT label between them is deleted as + * unused before cse2), and combine then does the KEEP-LOAD fold (newi2pat): combine.c:2089 + * sets elim_i2=0 when newi2pat!=0, so the dead ashift-temp's REG_DEAD is NOT dropped + * (distribute_notes:10741), walks back, hits a CODE_LABEL and plants a (use reg) insn + * (combine.c:10835-10847); the stale-ref allocno then gets an 8-byte reload stack slot + * (frame 0x88/0x90 instead of 0x80). The volatile mem is never hashed by cse (do_not_record), + * the condition folds CLEAN (temps fully elided, no slot), and sched2 still hoists the lh + * above the volatile lhu because sched.c:811 read_dependence requires BOTH mems volatile. + * Target frame keeps exactly ONE such slot: the w keep-load fold at +0x34 (lh/addu/slti shape). + * LEVER 2 (prologue): NO $21 register pin (the seed needed one; with this body shape arg2 lands + * in $s5 naturally). The natural param copy is batched sw s5/addu s5,a2 ahead of a0=0/a1=1. + * LEVER 3 (buf+0x0F byte stores): route each `rem*12 + *(u8*)(arg0+0x3A) [+ arg1]` sum through an + * s32 temp — defeats the C-frontend QI-shorten, whose canonical QImode (plus (lbu) (prod)) has + * the operands swapped vs the target's SI-mode (plus (prod) (lbu)) — [addu v0,v0,v1 not + * addu v1,v1,v0]. (The s16 store at buf+0x06 IS shortened: mem-first there is correct.) + * LEVER 4 (pre-call schedule / jal delay = i++): `acc += 0xC; i++;` AFTER the call statement. + * sched2 is the 2.7.2 BACKWARD list scheduler; rank_for_schedule ties break on INSN_LUID + * (original order), so statement position steers the a0/a1 arg setups early and leaves i++ + * adjacent for reorg's slot fill. + * LEVER 5 (post-loop block): statement order buf+0x04, buf+0x06, buf+0x0A, buf+0x0E, buf+0x0F — + * the LOOP BODY's own order (x,y,h,0E,0F), NOT the emission order. This keeps sched1 from + * sinking the buf4 store into the s3-2 chain (which would stretch the 0x30-tmp's live range and + * flip the local-alloc v0/v1 assignment cascade: qty priority = log2(refs)*refs*size/length, + * local-alloc.c qty_compare). The lone load-delay nop after lhu 0x30 is the target's own stall. + * LEVER 6 (>=0xFD tail): the final call is WRITTEN IN BOTH ARMS (duplicated). Post-reload + * cross-jumping (jump2 runs between sched2 and dbr) merges only the identical [jal] suffix + * (arm tails diverge one insn earlier), creating .L8013959C at the else's jal; dbr then fills + * the arm's j-slot with the a0 copy and the shared jal's slot stays nop (label blocks the + * backward scan). The buf+0x04 += old buf+0x08 read is INLINE (no u16 t local) — expansion + * order lhu30-then-lhu(buf8) puts the loaded old-w in $a0 and lets sched pull the 0x20/0x0E + * stores into the load latency, matching 145-152 exactly. + * LEVER 7 (the one pin): register s32 a1c __asm__("$5") used ONLY to re-arm a1 before the arm's + * SECOND call (`a1c = (s32)arg2; func(..., a1c, ...)`), producing the mid-block addu a1,s5 and + * suppressing call#2's own a1 copy (which is what limits the cross-jump depth to [jal] and + * frees the j delay slot for a0). Call#1 and the else call pass plain (s32)arg2 — call#1's own + * a1 copy becomes its jal-delay fill. + */ +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ + extern void func_80059888(void *a0, s32 a1, s32 a2, s32 a3); @@ -1898,7 +1952,58 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077_a", func_8013A530); +/* func_8013A530 — region-a giant (204 ins, reach-134, HARDEST tier: ALL 8 $s0-$s7 + $fp). + * Camera/entity transform dispatch on mode = *(u16*)(ent+0x18) (ent = *(param_1+4), held in $fp). + * STATUS: match_one MATCH (204 ins), Fable5 Phase-24 T7. LOOSE/intended types. + * + * The whole function is byte-exact: the CASE1 block (all 8 $s regs live across three calls + * func_80015F04/F04/5D4C), the sltiu/slti dispatch, both magic divisions (/0x9a,/0x2a), the + * unaligned 4-byte copy, the frame, AND the clamp's double register-split (the last 10). + * + * LEVERS (all cookbook-cited): + * [dispatch] outer `uVar2<7` on the u16 -> sltiu (gcc folds u16 a FRESH slti (a single signed cmp emits slt; only + * CSE-reuse canonicalises signed->unsigned). Branch polarity read off the target `beq ==1`: + * `if(uVar2!=1){DEFAULT}else{CASE1}` makes DEFAULT the fall-through, CASE1 the branched-to/last. + * [§17a] unaligned 4-byte mem->mem copy -> memcpy((void*)dst,(void*)src,4) -> lwl/lwr/swl/swr. + * [§32-5] frame is +8 over args+saves -> a dead 8-byte local (int deadlocal[2]). + * [§17] bVar1 pinned $t0 (fixes its reg + pushes the 0x99/4 consts to $t1); a zero-byte + * __asm__("":: "r"(bVar1)) extends its range past the div2 `&0x10` so the andi lands in $v0 + * (not in-place $t0) -> div1+div2 byte-exact. + * [§17] f34 pinned $a1 (field34) so uVar6 takes $a0 (density-tie the target resolves the other way). + * + * CLAMP (the former close=10 residual — RC-6 verdict OVERTURNED, no $v1 pin needed; cookbook §36): + * [pin] fc stays pinned $a1: canon_reg NEVER rewrites hard-reg uses (cse.c:2545 "Never replace a + * hard reg") -> both compares keep reading fc even while iVar7 holds an equivalent value. + * [$0-add] `register int zr __asm__("$0"); iVar7 = fc + zr;` — the copy as (plus $a1 $0), NOT + * (set reg reg): cse forms no fc<->iVar7 equivalence (make_regs_eqv never runs -> no canon + * poisoning either direction) and combine cannot absorb the fc load into iVar7 (no extend+plus + * pattern) — a plain `int iVar7 = fc;` gets REVERSED (load->pseudo, pin<-copy, 1 insn short). + * (plus $a1 $0) assembles to the byte-identical `addu $v1,$a1,$zero`; maspsx/ASPSX-2.56 hops it + * over the slt into the beqz delay slot (cc1 emits [lh;lh;addu;slt;beqz]). + * iVar7 as a PSEUDO (not a $v1 pin) un-poisons reload's retry pool: with $2/$3 pins, + * regs_explicitly_used -> bad_spill_regs (reload1.c:3900-15) forced CASE1's 2nd-product + * retry_global_alloc to $t2; unpinned it lands $v1 (".greg: Register 177 now in 3"). + * [flip] then-arm inner compare spelled `((t<<16)>>16) > (int)mem` (canonically the SAME slt as + * `mem < t-ext`): mirrors the else-arm's expansion-uid order so sched1's BACKWARD list + * scheduler (mem-unit hazard blocks the lh next to the sh; boosted-group ties break by uid) + * keeps the fe-reload lh BELOW the addiu that kills iVar7 -> the reload (local-alloc, first + * pick) and iVar7 (global) are live-DISJOINT and can both hold $v1. Unflipped, sched1 hoists + * the lh to the block top ("blocking insn 185 for 1 cycles") -> hard-3 conflict -> iVar7=$a0. + * [dens] two-input dummy `__asm__("" :: "r"(iVar7), "r"(t));` in the ELSE arm (anchors at t's def, + * §34 toolkit): +1 ref lifts iVar7's allocno priority (global.c:594 floor_log2(refs)*refs/len: + * 3/10 -> 8/11) past the fe-load's 3/5, so iVar7 allocates FIRST -> $v1, fe -> $a0. Must NOT + * sit in block1: its #APP markers land between the addu-copy and the slt and block maspsx's + * delay-slot hop (that was v4's last diff). + * [keep] `__asm__("" :: "r"(fc));` after the clamp: fc/$a1 no longer DIES at the else-compare slt, + * so the slt-result temp gets no qty_phys_sugg $a1 suggestion (local-alloc.c suggested-first + * path) and falls to plain first-fit $v0, matching the target. + * [nat] the 2nd split (lh $v1 / addu $a0,$v1 / slt on $v1 / sh $a0) is NATURAL: `(int)mem` + * expands as HI-load + sll/sra; the body re-load cse-folds onto the HI pseudo; combine merges + * the extend into one lh and re-emits the HI pseudo as a subreg copy (the store temp). + */ +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ + DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -1920,7 +2025,42 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077_a", func_8013AD38); -INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077_a", func_8013AF20); +/* func_8013AF20 — MATCH (185 ins) — Phase 24 T7 Fable5 batch, giant 3/3. + * + * 3 GPU-primitive-builder loops (2× LINE_F2 len=3 code=0x40, 1× POLY_F4 len=5 + * code=0x28), each ending in the PS1 libgpu addPrim(ot, prim) idiom. + * + * THE CRACK (was: Opus close=15, permuter-stuck 40k iters — "loop-invariant + * const-materialization order coupled to AND order"): + * + * 1) addPrim is a P_TAG BITFIELD store, not user masks. setaddr writes the + * 24-bit `addr` field; gcc's store_fixed_bit_field (expmed.c:556) expands + * it as: value & 0x00ffffff FIRST (must_and :667, mask emitted :679-681), + * THEN *dest & 0xff000000 (:694-696), THEN or(destmasked, value) (:706 — + * dest chain stays op0 of the OR). So the 0x00ffffff movable is FOUND (and + * preheader-emitted by move_movables) BEFORE 0xff000000, while the body + * still computes the dest-AND first — the decoupling no user-mask C reorder + * can express (any `&`-operand swap flips the AND/OR shape with it). + * + * 2) NO scheduling barrier. The old do{}while(0) around the 0x3d stores added + * a NOTE_INSN_LOOP nest: flow.c weights refs by loop_depth (flow.c:2067/ + * 2315/2501/2711), inflating the 0x3d const's refs 7→10 and flipping the + * loop-1 $a2/$a3 contest (pri 4166 > 4000). With the bitfield form the + * barrier's original purpose (puVar5→$t1) holds without it. + * + * 3) Why the mask WINS $a2 (gdb-on-cc1 verified): sched1 pre-reload-splits + * every insn (sched.c:4830 try_split) → mips.md:3208 large_int define_split + * turns li 0xffffff into lui+ori → reg_n_sets=2 → FAILS the single-set gate + * (local-alloc.c:1021) → ESCAPES update_equiv_regs' live-length doubling + * (local-alloc.c:1064). One-instruction consts (61, 0x40, 3, 0xff000000) + * get doubled. Priorities (allocno_compare, global.c): mask fl2(7)*7/35 = + * 4000 vs 0x3d fl2(7)*7/72 = 1944 → mask allocates first → first-fit $a2. + * (n_sets 61=1 mask=2 ff000000=1; LL 36/35/33 → post-equiv 72/35/66.) + * + * Cookbook §36 (this entry) + gcc-2.7.2-map/loop.md L4 / regalloc.md RC-7. + */ +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ + DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC01_080/ov_SC01_080.c b/src/ov_SC01_080/ov_SC01_080.c index 52082ece3d..19e6ae74c6 100644 --- a/src/ov_SC01_080/ov_SC01_080.c +++ b/src/ov_SC01_080/ov_SC01_080.c @@ -806,7 +806,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080", func_801395D4); @@ -874,7 +874,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -894,7 +894,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080", func_8013AD38); -INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC01_084/ov_SC01_084.c b/src/ov_SC01_084/ov_SC01_084.c index 608a073c2f..fbf5c37b1b 100644 --- a/src/ov_SC01_084/ov_SC01_084.c +++ b/src/ov_SC01_084/ov_SC01_084.c @@ -806,7 +806,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084", func_801395D4); @@ -874,7 +874,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -894,7 +894,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084", func_8013AD38); -INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC02_000/ov_SC02_000.c b/src/ov_SC02_000/ov_SC02_000.c index 4dbf9446e5..5e6fde3e6a 100644 --- a/src/ov_SC02_000/ov_SC02_000.c +++ b/src/ov_SC02_000/ov_SC02_000.c @@ -778,7 +778,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000", func_801395D4); @@ -846,7 +846,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -866,7 +866,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000", func_8013AD38); -INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC02_003/ov_SC02_003.c b/src/ov_SC02_003/ov_SC02_003.c index 35f8354906..4a70c3407b 100644 --- a/src/ov_SC02_003/ov_SC02_003.c +++ b/src/ov_SC02_003/ov_SC02_003.c @@ -778,7 +778,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003", func_801395D4); @@ -846,7 +846,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -866,7 +866,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003", func_8013AD38); -INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC02_004/ov_SC02_004.c b/src/ov_SC02_004/ov_SC02_004.c index ad82a8f1b3..091a419ba3 100644 --- a/src/ov_SC02_004/ov_SC02_004.c +++ b/src/ov_SC02_004/ov_SC02_004.c @@ -806,7 +806,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004", func_801395D4); @@ -874,7 +874,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -894,7 +894,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004", func_8013AD38); -INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC02_005/ov_SC02_005.c b/src/ov_SC02_005/ov_SC02_005.c index bb3d9284b9..e4358fc28d 100644 --- a/src/ov_SC02_005/ov_SC02_005.c +++ b/src/ov_SC02_005/ov_SC02_005.c @@ -806,7 +806,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005", func_801395D4); @@ -874,7 +874,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -894,7 +894,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005", func_8013AD38); -INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC02_011/ov_SC02_011.c b/src/ov_SC02_011/ov_SC02_011.c index 6df68247af..06828b4846 100644 --- a/src/ov_SC02_011/ov_SC02_011.c +++ b/src/ov_SC02_011/ov_SC02_011.c @@ -806,7 +806,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011", func_801395D4); @@ -874,7 +874,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -894,7 +894,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011", func_8013AD38); -INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC02_015/ov_SC02_015.c b/src/ov_SC02_015/ov_SC02_015.c index b64a7ac0f5..35c8f499dd 100644 --- a/src/ov_SC02_015/ov_SC02_015.c +++ b/src/ov_SC02_015/ov_SC02_015.c @@ -806,7 +806,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015", func_801395D4); @@ -874,7 +874,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -894,7 +894,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015", func_8013AD38); -INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC02_016/ov_SC02_016.c b/src/ov_SC02_016/ov_SC02_016.c index c2c956d4bc..35fc88752e 100644 --- a/src/ov_SC02_016/ov_SC02_016.c +++ b/src/ov_SC02_016/ov_SC02_016.c @@ -806,7 +806,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_801395D4); @@ -874,7 +874,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -894,7 +894,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8013AD38); -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC02_017/ov_SC02_017.c b/src/ov_SC02_017/ov_SC02_017.c index 2905259464..44626ebefe 100644 --- a/src/ov_SC02_017/ov_SC02_017.c +++ b/src/ov_SC02_017/ov_SC02_017.c @@ -806,7 +806,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017", func_801395D4); @@ -874,7 +874,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -894,7 +894,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017", func_8013AD38); -INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC02_021/ov_SC02_021.c b/src/ov_SC02_021/ov_SC02_021.c index 0c4415c992..5f72d17877 100644 --- a/src/ov_SC02_021/ov_SC02_021.c +++ b/src/ov_SC02_021/ov_SC02_021.c @@ -806,7 +806,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_801395D4); @@ -874,7 +874,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -894,7 +894,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8013AD38); -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC02_026/ov_SC02_026.c b/src/ov_SC02_026/ov_SC02_026.c index d8ee17f20e..9ad29c8d12 100644 --- a/src/ov_SC02_026/ov_SC02_026.c +++ b/src/ov_SC02_026/ov_SC02_026.c @@ -806,7 +806,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026", func_801395D4); @@ -874,7 +874,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -894,7 +894,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026", func_8013AD38); -INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC02_027/ov_SC02_027.c b/src/ov_SC02_027/ov_SC02_027.c index 42b24387ec..b822edabf3 100644 --- a/src/ov_SC02_027/ov_SC02_027.c +++ b/src/ov_SC02_027/ov_SC02_027.c @@ -806,7 +806,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027", func_801395D4); @@ -874,7 +874,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -894,7 +894,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027", func_8013AD38); -INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC02_028/ov_SC02_028.c b/src/ov_SC02_028/ov_SC02_028.c index 79aca9b568..d285b1680b 100644 --- a/src/ov_SC02_028/ov_SC02_028.c +++ b/src/ov_SC02_028/ov_SC02_028.c @@ -806,7 +806,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028", func_801395D4); @@ -874,7 +874,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -894,7 +894,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028", func_8013AD38); -INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC02_031/ov_SC02_031.c b/src/ov_SC02_031/ov_SC02_031.c index d0c12d35ea..039f3a1343 100644 --- a/src/ov_SC02_031/ov_SC02_031.c +++ b/src/ov_SC02_031/ov_SC02_031.c @@ -806,7 +806,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031", func_801395D4); @@ -874,7 +874,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -894,7 +894,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031", func_8013AD38); -INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC02_035/ov_SC02_035.c b/src/ov_SC02_035/ov_SC02_035.c index bca0b31c5e..2dd00bf288 100644 --- a/src/ov_SC02_035/ov_SC02_035.c +++ b/src/ov_SC02_035/ov_SC02_035.c @@ -806,7 +806,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035", func_801395D4); @@ -874,7 +874,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -894,7 +894,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035", func_8013AD38); -INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC02_039/ov_SC02_039.c b/src/ov_SC02_039/ov_SC02_039.c index f925b47132..a173c08a10 100644 --- a/src/ov_SC02_039/ov_SC02_039.c +++ b/src/ov_SC02_039/ov_SC02_039.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039", func_8013AD38); -INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC02_041/ov_SC02_041.c b/src/ov_SC02_041/ov_SC02_041.c index 16f70d55c1..f6ef817ce0 100644 --- a/src/ov_SC02_041/ov_SC02_041.c +++ b/src/ov_SC02_041/ov_SC02_041.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041", func_8013AD38); -INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_001/ov_SC03_001.c b/src/ov_SC03_001/ov_SC03_001.c index 2250519c1e..dd55ed723e 100644 --- a/src/ov_SC03_001/ov_SC03_001.c +++ b/src/ov_SC03_001/ov_SC03_001.c @@ -778,7 +778,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001", func_801395D4); @@ -846,7 +846,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -866,7 +866,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_002/ov_SC03_002.c b/src/ov_SC03_002/ov_SC03_002.c index f086a2b453..915bd75672 100644 --- a/src/ov_SC03_002/ov_SC03_002.c +++ b/src/ov_SC03_002/ov_SC03_002.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_003/ov_SC03_003.c b/src/ov_SC03_003/ov_SC03_003.c index d59253d3da..1f35134120 100644 --- a/src/ov_SC03_003/ov_SC03_003.c +++ b/src/ov_SC03_003/ov_SC03_003.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_006/ov_SC03_006.c b/src/ov_SC03_006/ov_SC03_006.c index 3be3db4fbb..4afd2f2694 100644 --- a/src/ov_SC03_006/ov_SC03_006.c +++ b/src/ov_SC03_006/ov_SC03_006.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_007/ov_SC03_007.c b/src/ov_SC03_007/ov_SC03_007.c index 0f111440e7..0c6bf4a6fc 100644 --- a/src/ov_SC03_007/ov_SC03_007.c +++ b/src/ov_SC03_007/ov_SC03_007.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_010/ov_SC03_010.c b/src/ov_SC03_010/ov_SC03_010.c index 377a16ac78..312edd22f2 100644 --- a/src/ov_SC03_010/ov_SC03_010.c +++ b/src/ov_SC03_010/ov_SC03_010.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_011/ov_SC03_011.c b/src/ov_SC03_011/ov_SC03_011.c index 558aee3e31..8f5a10977f 100644 --- a/src/ov_SC03_011/ov_SC03_011.c +++ b/src/ov_SC03_011/ov_SC03_011.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_012/ov_SC03_012.c b/src/ov_SC03_012/ov_SC03_012.c index 5d99337160..57cb971a82 100644 --- a/src/ov_SC03_012/ov_SC03_012.c +++ b/src/ov_SC03_012/ov_SC03_012.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_013/ov_SC03_013.c b/src/ov_SC03_013/ov_SC03_013.c index 41867d2cb9..f62f821bc5 100644 --- a/src/ov_SC03_013/ov_SC03_013.c +++ b/src/ov_SC03_013/ov_SC03_013.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_014/ov_SC03_014.c b/src/ov_SC03_014/ov_SC03_014.c index 5930552dad..bd0fb92642 100644 --- a/src/ov_SC03_014/ov_SC03_014.c +++ b/src/ov_SC03_014/ov_SC03_014.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_015/ov_SC03_015.c b/src/ov_SC03_015/ov_SC03_015.c index 066c0af650..fd3a48b819 100644 --- a/src/ov_SC03_015/ov_SC03_015.c +++ b/src/ov_SC03_015/ov_SC03_015.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_023/ov_SC03_023.c b/src/ov_SC03_023/ov_SC03_023.c index 1c02370767..555b0e77cc 100644 --- a/src/ov_SC03_023/ov_SC03_023.c +++ b/src/ov_SC03_023/ov_SC03_023.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_024/ov_SC03_024.c b/src/ov_SC03_024/ov_SC03_024.c index 853f9dc83c..9e4b16b059 100644 --- a/src/ov_SC03_024/ov_SC03_024.c +++ b/src/ov_SC03_024/ov_SC03_024.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_028/ov_SC03_028.c b/src/ov_SC03_028/ov_SC03_028.c index a16def1954..e2afd6174c 100644 --- a/src/ov_SC03_028/ov_SC03_028.c +++ b/src/ov_SC03_028/ov_SC03_028.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_029/ov_SC03_029.c b/src/ov_SC03_029/ov_SC03_029.c index 21e84cae38..83508d0ee9 100644 --- a/src/ov_SC03_029/ov_SC03_029.c +++ b/src/ov_SC03_029/ov_SC03_029.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_030/ov_SC03_030.c b/src/ov_SC03_030/ov_SC03_030.c index 3569d77791..9b1cb19cf9 100644 --- a/src/ov_SC03_030/ov_SC03_030.c +++ b/src/ov_SC03_030/ov_SC03_030.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_031/ov_SC03_031.c b/src/ov_SC03_031/ov_SC03_031.c index 838b4dafb9..b65313d218 100644 --- a/src/ov_SC03_031/ov_SC03_031.c +++ b/src/ov_SC03_031/ov_SC03_031.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_089/ov_SC03_089.c b/src/ov_SC03_089/ov_SC03_089.c index 74ecb06ac1..e6db8a1918 100644 --- a/src/ov_SC03_089/ov_SC03_089.c +++ b/src/ov_SC03_089/ov_SC03_089.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_090/ov_SC03_090.c b/src/ov_SC03_090/ov_SC03_090.c index c30b4bc218..a1a25e6dff 100644 --- a/src/ov_SC03_090/ov_SC03_090.c +++ b/src/ov_SC03_090/ov_SC03_090.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_091/ov_SC03_091.c b/src/ov_SC03_091/ov_SC03_091.c index fd3c3aa292..33b11a7248 100644 --- a/src/ov_SC03_091/ov_SC03_091.c +++ b/src/ov_SC03_091/ov_SC03_091.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_092/ov_SC03_092.c b/src/ov_SC03_092/ov_SC03_092.c index 69eac7ae0b..69ce08943f 100644 --- a/src/ov_SC03_092/ov_SC03_092.c +++ b/src/ov_SC03_092/ov_SC03_092.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_093/ov_SC03_093.c b/src/ov_SC03_093/ov_SC03_093.c index 8ca6ed1545..89ab12ac58 100644 --- a/src/ov_SC03_093/ov_SC03_093.c +++ b/src/ov_SC03_093/ov_SC03_093.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_094/ov_SC03_094.c b/src/ov_SC03_094/ov_SC03_094.c index d93cdb6b2b..6be2ef6e26 100644 --- a/src/ov_SC03_094/ov_SC03_094.c +++ b/src/ov_SC03_094/ov_SC03_094.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_095/ov_SC03_095.c b/src/ov_SC03_095/ov_SC03_095.c index f51388ce5c..13684ad4a3 100644 --- a/src/ov_SC03_095/ov_SC03_095.c +++ b/src/ov_SC03_095/ov_SC03_095.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_096/ov_SC03_096.c b/src/ov_SC03_096/ov_SC03_096.c index 0b177be513..0f6141413c 100644 --- a/src/ov_SC03_096/ov_SC03_096.c +++ b/src/ov_SC03_096/ov_SC03_096.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_097/ov_SC03_097.c b/src/ov_SC03_097/ov_SC03_097.c index a5f1b18844..98e04546e5 100644 --- a/src/ov_SC03_097/ov_SC03_097.c +++ b/src/ov_SC03_097/ov_SC03_097.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_098/ov_SC03_098.c b/src/ov_SC03_098/ov_SC03_098.c index 9b9e36d653..9c571d5b73 100644 --- a/src/ov_SC03_098/ov_SC03_098.c +++ b/src/ov_SC03_098/ov_SC03_098.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_099/ov_SC03_099.c b/src/ov_SC03_099/ov_SC03_099.c index 66ac2cf05c..3390c26d5c 100644 --- a/src/ov_SC03_099/ov_SC03_099.c +++ b/src/ov_SC03_099/ov_SC03_099.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_100/ov_SC03_100.c b/src/ov_SC03_100/ov_SC03_100.c index ca157cc6f7..04bfbc7b9e 100644 --- a/src/ov_SC03_100/ov_SC03_100.c +++ b/src/ov_SC03_100/ov_SC03_100.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_101/ov_SC03_101.c b/src/ov_SC03_101/ov_SC03_101.c index f3c32f8506..07d080f112 100644 --- a/src/ov_SC03_101/ov_SC03_101.c +++ b/src/ov_SC03_101/ov_SC03_101.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_102/ov_SC03_102.c b/src/ov_SC03_102/ov_SC03_102.c index 222475e7cb..856981cf72 100644 --- a/src/ov_SC03_102/ov_SC03_102.c +++ b/src/ov_SC03_102/ov_SC03_102.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_103/ov_SC03_103.c b/src/ov_SC03_103/ov_SC03_103.c index 31619d7621..75ef041e2f 100644 --- a/src/ov_SC03_103/ov_SC03_103.c +++ b/src/ov_SC03_103/ov_SC03_103.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_104/ov_SC03_104.c b/src/ov_SC03_104/ov_SC03_104.c index f65aee208f..9075d1d62f 100644 --- a/src/ov_SC03_104/ov_SC03_104.c +++ b/src/ov_SC03_104/ov_SC03_104.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_105/ov_SC03_105.c b/src/ov_SC03_105/ov_SC03_105.c index de20cbd4bf..2b6645edd8 100644 --- a/src/ov_SC03_105/ov_SC03_105.c +++ b/src/ov_SC03_105/ov_SC03_105.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_108/ov_SC03_108.c b/src/ov_SC03_108/ov_SC03_108.c index dd4082cd37..5642275a1a 100644 --- a/src/ov_SC03_108/ov_SC03_108.c +++ b/src/ov_SC03_108/ov_SC03_108.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_109/ov_SC03_109.c b/src/ov_SC03_109/ov_SC03_109.c index 9c092a0843..1a28b025d7 100644 --- a/src/ov_SC03_109/ov_SC03_109.c +++ b/src/ov_SC03_109/ov_SC03_109.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_110/ov_SC03_110.c b/src/ov_SC03_110/ov_SC03_110.c index 0898881725..9ee082eb0c 100644 --- a/src/ov_SC03_110/ov_SC03_110.c +++ b/src/ov_SC03_110/ov_SC03_110.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_111/ov_SC03_111.c b/src/ov_SC03_111/ov_SC03_111.c index 9b4e8171fc..5a8aee9b11 100644 --- a/src/ov_SC03_111/ov_SC03_111.c +++ b/src/ov_SC03_111/ov_SC03_111.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_112/ov_SC03_112.c b/src/ov_SC03_112/ov_SC03_112.c index c2c81377aa..45d08cccd8 100644 --- a/src/ov_SC03_112/ov_SC03_112.c +++ b/src/ov_SC03_112/ov_SC03_112.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_113/ov_SC03_113.c b/src/ov_SC03_113/ov_SC03_113.c index 92690540b6..df0ddacdb3 100644 --- a/src/ov_SC03_113/ov_SC03_113.c +++ b/src/ov_SC03_113/ov_SC03_113.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_114/ov_SC03_114.c b/src/ov_SC03_114/ov_SC03_114.c index ac6de5ae24..339f1f9ddc 100644 --- a/src/ov_SC03_114/ov_SC03_114.c +++ b/src/ov_SC03_114/ov_SC03_114.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_115/ov_SC03_115.c b/src/ov_SC03_115/ov_SC03_115.c index 40ff2e1fe6..15b26e6a45 100644 --- a/src/ov_SC03_115/ov_SC03_115.c +++ b/src/ov_SC03_115/ov_SC03_115.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_116/ov_SC03_116.c b/src/ov_SC03_116/ov_SC03_116.c index ce7a69e10f..402740a899 100644 --- a/src/ov_SC03_116/ov_SC03_116.c +++ b/src/ov_SC03_116/ov_SC03_116.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_117/ov_SC03_117.c b/src/ov_SC03_117/ov_SC03_117.c index 0c924bc937..af08ab5afe 100644 --- a/src/ov_SC03_117/ov_SC03_117.c +++ b/src/ov_SC03_117/ov_SC03_117.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_118/ov_SC03_118.c b/src/ov_SC03_118/ov_SC03_118.c index d0c2298e38..488dd8b818 100644 --- a/src/ov_SC03_118/ov_SC03_118.c +++ b/src/ov_SC03_118/ov_SC03_118.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_119/ov_SC03_119.c b/src/ov_SC03_119/ov_SC03_119.c index 51256d3da6..9b65f1ea7d 100644 --- a/src/ov_SC03_119/ov_SC03_119.c +++ b/src/ov_SC03_119/ov_SC03_119.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_121/ov_SC03_121.c b/src/ov_SC03_121/ov_SC03_121.c index bf017b8023..4277c4a9d2 100644 --- a/src/ov_SC03_121/ov_SC03_121.c +++ b/src/ov_SC03_121/ov_SC03_121.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_124/ov_SC03_124.c b/src/ov_SC03_124/ov_SC03_124.c index b4896f9217..adc49623e5 100644 --- a/src/ov_SC03_124/ov_SC03_124.c +++ b/src/ov_SC03_124/ov_SC03_124.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_125/ov_SC03_125.c b/src/ov_SC03_125/ov_SC03_125.c index 437347546b..680b8e3b87 100644 --- a/src/ov_SC03_125/ov_SC03_125.c +++ b/src/ov_SC03_125/ov_SC03_125.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC03_126/ov_SC03_126.c b/src/ov_SC03_126/ov_SC03_126.c index 2f33a58fbf..9c5af40f53 100644 --- a/src/ov_SC03_126/ov_SC03_126.c +++ b/src/ov_SC03_126/ov_SC03_126.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126", func_8013AD38); -INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC04_000/ov_SC04_000.c b/src/ov_SC04_000/ov_SC04_000.c index 95aeadb51a..1beee7e6db 100644 --- a/src/ov_SC04_000/ov_SC04_000.c +++ b/src/ov_SC04_000/ov_SC04_000.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000", func_8013AD38); -INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC04_002/ov_SC04_002.c b/src/ov_SC04_002/ov_SC04_002.c index 25e20c9986..17fbf01946 100644 --- a/src/ov_SC04_002/ov_SC04_002.c +++ b/src/ov_SC04_002/ov_SC04_002.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002", func_8013AD38); -INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC04_003/ov_SC04_003.c b/src/ov_SC04_003/ov_SC04_003.c index 7733b0f09c..27386273e0 100644 --- a/src/ov_SC04_003/ov_SC04_003.c +++ b/src/ov_SC04_003/ov_SC04_003.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003", func_8013AD38); -INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC04_004/ov_SC04_004.c b/src/ov_SC04_004/ov_SC04_004.c index 3769c73c28..4c6afad64c 100644 --- a/src/ov_SC04_004/ov_SC04_004.c +++ b/src/ov_SC04_004/ov_SC04_004.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004", func_8013AD38); -INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC04_005/ov_SC04_005.c b/src/ov_SC04_005/ov_SC04_005.c index bdae0f7a45..0cac8f138f 100644 --- a/src/ov_SC04_005/ov_SC04_005.c +++ b/src/ov_SC04_005/ov_SC04_005.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005", func_8013AD38); -INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC04_006/ov_SC04_006.c b/src/ov_SC04_006/ov_SC04_006.c index c50f80fa2a..a5df18cd6d 100644 --- a/src/ov_SC04_006/ov_SC04_006.c +++ b/src/ov_SC04_006/ov_SC04_006.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006", func_8013AD38); -INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC04_007/ov_SC04_007.c b/src/ov_SC04_007/ov_SC04_007.c index f07fcf9780..86182f9f97 100644 --- a/src/ov_SC04_007/ov_SC04_007.c +++ b/src/ov_SC04_007/ov_SC04_007.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007", func_8013AD38); -INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC04_008/ov_SC04_008.c b/src/ov_SC04_008/ov_SC04_008.c index 1bbd8baf75..b396657545 100644 --- a/src/ov_SC04_008/ov_SC04_008.c +++ b/src/ov_SC04_008/ov_SC04_008.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008", func_8013AD38); -INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC04_009/ov_SC04_009.c b/src/ov_SC04_009/ov_SC04_009.c index 4373d3d524..6ad125d8a3 100644 --- a/src/ov_SC04_009/ov_SC04_009.c +++ b/src/ov_SC04_009/ov_SC04_009.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009", func_8013AD38); -INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC04_010/ov_SC04_010.c b/src/ov_SC04_010/ov_SC04_010.c index 8119089a1f..72c7691cf1 100644 --- a/src/ov_SC04_010/ov_SC04_010.c +++ b/src/ov_SC04_010/ov_SC04_010.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010", func_8013AD38); -INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC04_011/ov_SC04_011.c b/src/ov_SC04_011/ov_SC04_011.c index d87dafae40..0c48fe992f 100644 --- a/src/ov_SC04_011/ov_SC04_011.c +++ b/src/ov_SC04_011/ov_SC04_011.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011", func_8013AD38); -INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC04_012/ov_SC04_012.c b/src/ov_SC04_012/ov_SC04_012.c index 9843a816b7..605bbf818a 100644 --- a/src/ov_SC04_012/ov_SC04_012.c +++ b/src/ov_SC04_012/ov_SC04_012.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012", func_8013AD38); -INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC04_015/ov_SC04_015.c b/src/ov_SC04_015/ov_SC04_015.c index dc0abc313a..0f26bf2219 100644 --- a/src/ov_SC04_015/ov_SC04_015.c +++ b/src/ov_SC04_015/ov_SC04_015.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015", func_8013AD38); -INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC04_016/ov_SC04_016.c b/src/ov_SC04_016/ov_SC04_016.c index a4debec06b..ce7dec0853 100644 --- a/src/ov_SC04_016/ov_SC04_016.c +++ b/src/ov_SC04_016/ov_SC04_016.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016", func_8013AD38); -INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC04_018/ov_SC04_018.c b/src/ov_SC04_018/ov_SC04_018.c index 264c0ff651..ef61d43603 100644 --- a/src/ov_SC04_018/ov_SC04_018.c +++ b/src/ov_SC04_018/ov_SC04_018.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018", func_8013AD38); -INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC04_019/ov_SC04_019.c b/src/ov_SC04_019/ov_SC04_019.c index d6e5bb9c1a..7bfee0f6e0 100644 --- a/src/ov_SC04_019/ov_SC04_019.c +++ b/src/ov_SC04_019/ov_SC04_019.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019", func_8013AD38); -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC04_020/ov_SC04_020.c b/src/ov_SC04_020/ov_SC04_020.c index be2da10c1d..8a162bbec3 100644 --- a/src/ov_SC04_020/ov_SC04_020.c +++ b/src/ov_SC04_020/ov_SC04_020.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020", func_8013AD38); -INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC04_021/ov_SC04_021.c b/src/ov_SC04_021/ov_SC04_021.c index 0579b4f539..bbab57d682 100644 --- a/src/ov_SC04_021/ov_SC04_021.c +++ b/src/ov_SC04_021/ov_SC04_021.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021", func_8013AD38); -INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC05_000/ov_SC05_000.c b/src/ov_SC05_000/ov_SC05_000.c index 2e36b5c245..4263ee89c4 100644 --- a/src/ov_SC05_000/ov_SC05_000.c +++ b/src/ov_SC05_000/ov_SC05_000.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000", func_8013AD38); -INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC05_001/ov_SC05_001.c b/src/ov_SC05_001/ov_SC05_001.c index 64ced5aacc..c2978402c5 100644 --- a/src/ov_SC05_001/ov_SC05_001.c +++ b/src/ov_SC05_001/ov_SC05_001.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001", func_8013AD38); -INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC05_002/ov_SC05_002.c b/src/ov_SC05_002/ov_SC05_002.c index 1dac448a54..a9c184471b 100644 --- a/src/ov_SC05_002/ov_SC05_002.c +++ b/src/ov_SC05_002/ov_SC05_002.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002", func_8013AD38); -INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC05_003/ov_SC05_003.c b/src/ov_SC05_003/ov_SC05_003.c index 7467481dce..f1002d961a 100644 --- a/src/ov_SC05_003/ov_SC05_003.c +++ b/src/ov_SC05_003/ov_SC05_003.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003", func_8013AD38); -INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC05_004/ov_SC05_004.c b/src/ov_SC05_004/ov_SC05_004.c index 990edc8a05..1147c8e4ac 100644 --- a/src/ov_SC05_004/ov_SC05_004.c +++ b/src/ov_SC05_004/ov_SC05_004.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004", func_8013AD38); -INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC05_005/ov_SC05_005.c b/src/ov_SC05_005/ov_SC05_005.c index 491a99b237..6fdcd18d73 100644 --- a/src/ov_SC05_005/ov_SC05_005.c +++ b/src/ov_SC05_005/ov_SC05_005.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005", func_8013AD38); -INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC05_006/ov_SC05_006.c b/src/ov_SC05_006/ov_SC05_006.c index 37328c5827..5dab806f9a 100644 --- a/src/ov_SC05_006/ov_SC05_006.c +++ b/src/ov_SC05_006/ov_SC05_006.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006", func_8013AD38); -INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC05_007/ov_SC05_007.c b/src/ov_SC05_007/ov_SC05_007.c index f12fda701c..f6d444b4b9 100644 --- a/src/ov_SC05_007/ov_SC05_007.c +++ b/src/ov_SC05_007/ov_SC05_007.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007", func_8013AD38); -INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC05_008/ov_SC05_008.c b/src/ov_SC05_008/ov_SC05_008.c index c8e1d24cfa..f061ef309f 100644 --- a/src/ov_SC05_008/ov_SC05_008.c +++ b/src/ov_SC05_008/ov_SC05_008.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008", func_8013AD38); -INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC05_009/ov_SC05_009.c b/src/ov_SC05_009/ov_SC05_009.c index 2561a5bed3..5ded611a3d 100644 --- a/src/ov_SC05_009/ov_SC05_009.c +++ b/src/ov_SC05_009/ov_SC05_009.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009", func_8013AD38); -INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC05_010/ov_SC05_010.c b/src/ov_SC05_010/ov_SC05_010.c index 9eeee83773..224b7b1a21 100644 --- a/src/ov_SC05_010/ov_SC05_010.c +++ b/src/ov_SC05_010/ov_SC05_010.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010", func_8013AD38); -INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC05_011/ov_SC05_011.c b/src/ov_SC05_011/ov_SC05_011.c index 8bc513b5f0..40dfc3b3ff 100644 --- a/src/ov_SC05_011/ov_SC05_011.c +++ b/src/ov_SC05_011/ov_SC05_011.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011", func_8013AD38); -INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC05_017/ov_SC05_017.c b/src/ov_SC05_017/ov_SC05_017.c index e7f49ae556..3fcc89ccd9 100644 --- a/src/ov_SC05_017/ov_SC05_017.c +++ b/src/ov_SC05_017/ov_SC05_017.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017", func_8013AD38); -INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC05_018/ov_SC05_018.c b/src/ov_SC05_018/ov_SC05_018.c index 14d35d7932..e0c08d3986 100644 --- a/src/ov_SC05_018/ov_SC05_018.c +++ b/src/ov_SC05_018/ov_SC05_018.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018", func_8013AD38); -INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC05_019/ov_SC05_019.c b/src/ov_SC05_019/ov_SC05_019.c index 7ac68d346c..ae82f83271 100644 --- a/src/ov_SC05_019/ov_SC05_019.c +++ b/src/ov_SC05_019/ov_SC05_019.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019", func_8013AD38); -INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC06_000/ov_SC06_000.c b/src/ov_SC06_000/ov_SC06_000.c index d9b891b85c..efe79ba393 100644 --- a/src/ov_SC06_000/ov_SC06_000.c +++ b/src/ov_SC06_000/ov_SC06_000.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000", func_8013AD38); -INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC06_006/ov_SC06_006.c b/src/ov_SC06_006/ov_SC06_006.c index 336a8c8305..8397c38cde 100644 --- a/src/ov_SC06_006/ov_SC06_006.c +++ b/src/ov_SC06_006/ov_SC06_006.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006", func_8013AD38); -INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC06_008/ov_SC06_008.c b/src/ov_SC06_008/ov_SC06_008.c index f9c939d212..49006d127f 100644 --- a/src/ov_SC06_008/ov_SC06_008.c +++ b/src/ov_SC06_008/ov_SC06_008.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008", func_8013AD38); -INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC06_010/ov_SC06_010.c b/src/ov_SC06_010/ov_SC06_010.c index 3eb8b3934a..2333b9ca91 100644 --- a/src/ov_SC06_010/ov_SC06_010.c +++ b/src/ov_SC06_010/ov_SC06_010.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010", func_8013AD38); -INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC06_011/ov_SC06_011.c b/src/ov_SC06_011/ov_SC06_011.c index 03fe399393..3d5a64f1ce 100644 --- a/src/ov_SC06_011/ov_SC06_011.c +++ b/src/ov_SC06_011/ov_SC06_011.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011", func_8013AD38); -INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC06_013/ov_SC06_013.c b/src/ov_SC06_013/ov_SC06_013.c index df31b853af..4e09404e17 100644 --- a/src/ov_SC06_013/ov_SC06_013.c +++ b/src/ov_SC06_013/ov_SC06_013.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013", func_8013AD38); -INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC06_014/ov_SC06_014.c b/src/ov_SC06_014/ov_SC06_014.c index 213f17065b..c434529372 100644 --- a/src/ov_SC06_014/ov_SC06_014.c +++ b/src/ov_SC06_014/ov_SC06_014.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014", func_8013AD38); -INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC06_015/ov_SC06_015.c b/src/ov_SC06_015/ov_SC06_015.c index acf374fc86..3ebc1c9445 100644 --- a/src/ov_SC06_015/ov_SC06_015.c +++ b/src/ov_SC06_015/ov_SC06_015.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015", func_8013AD38); -INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC06_016/ov_SC06_016.c b/src/ov_SC06_016/ov_SC06_016.c index 2532df48cf..cdd0b19b80 100644 --- a/src/ov_SC06_016/ov_SC06_016.c +++ b/src/ov_SC06_016/ov_SC06_016.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016", func_8013AD38); -INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC06_018/ov_SC06_018.c b/src/ov_SC06_018/ov_SC06_018.c index 33aeedd916..dcd003260a 100644 --- a/src/ov_SC06_018/ov_SC06_018.c +++ b/src/ov_SC06_018/ov_SC06_018.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018", func_8013AD38); -INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC06_020/ov_SC06_020.c b/src/ov_SC06_020/ov_SC06_020.c index df4d5507d7..6d322448d5 100644 --- a/src/ov_SC06_020/ov_SC06_020.c +++ b/src/ov_SC06_020/ov_SC06_020.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020", func_8013AD38); -INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC06_022/ov_SC06_022.c b/src/ov_SC06_022/ov_SC06_022.c index adcf520df6..216f1ca27e 100644 --- a/src/ov_SC06_022/ov_SC06_022.c +++ b/src/ov_SC06_022/ov_SC06_022.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022", func_8013AD38); -INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC06_024/ov_SC06_024.c b/src/ov_SC06_024/ov_SC06_024.c index 9871f9ebdd..97e291b9f5 100644 --- a/src/ov_SC06_024/ov_SC06_024.c +++ b/src/ov_SC06_024/ov_SC06_024.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024", func_8013AD38); -INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC06_025/ov_SC06_025.c b/src/ov_SC06_025/ov_SC06_025.c index 94c1b43318..c766d363d7 100644 --- a/src/ov_SC06_025/ov_SC06_025.c +++ b/src/ov_SC06_025/ov_SC06_025.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025", func_8013AD38); -INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC06_027/ov_SC06_027.c b/src/ov_SC06_027/ov_SC06_027.c index 5ec5e991dd..571f647468 100644 --- a/src/ov_SC06_027/ov_SC06_027.c +++ b/src/ov_SC06_027/ov_SC06_027.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027", func_8013AD38); -INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC06_029/ov_SC06_029.c b/src/ov_SC06_029/ov_SC06_029.c index 5b1f5f9e4c..8e34fcd2f6 100644 --- a/src/ov_SC06_029/ov_SC06_029.c +++ b/src/ov_SC06_029/ov_SC06_029.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029", func_8013AD38); -INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC06_030/ov_SC06_030.c b/src/ov_SC06_030/ov_SC06_030.c index 2b4e98ed25..4f4cf0c343 100644 --- a/src/ov_SC06_030/ov_SC06_030.c +++ b/src/ov_SC06_030/ov_SC06_030.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030", func_8013AD38); -INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC06_032/ov_SC06_032.c b/src/ov_SC06_032/ov_SC06_032.c index d0c1dc6287..6c01876a0f 100644 --- a/src/ov_SC06_032/ov_SC06_032.c +++ b/src/ov_SC06_032/ov_SC06_032.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032", func_8013AD38); -INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC06_033/ov_SC06_033.c b/src/ov_SC06_033/ov_SC06_033.c index 03431fbeba..873d128c9d 100644 --- a/src/ov_SC06_033/ov_SC06_033.c +++ b/src/ov_SC06_033/ov_SC06_033.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033", func_8013AD38); -INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC07_000/ov_SC07_000.c b/src/ov_SC07_000/ov_SC07_000.c index c2dd752744..a0ffc17da3 100644 --- a/src/ov_SC07_000/ov_SC07_000.c +++ b/src/ov_SC07_000/ov_SC07_000.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000", func_8013AD38); -INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC07_001/ov_SC07_001.c b/src/ov_SC07_001/ov_SC07_001.c index 60e6810d63..3be981e7c4 100644 --- a/src/ov_SC07_001/ov_SC07_001.c +++ b/src/ov_SC07_001/ov_SC07_001.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001", func_8013AD38); -INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC07_002/ov_SC07_002.c b/src/ov_SC07_002/ov_SC07_002.c index 4cf3c39856..f7294df32c 100644 --- a/src/ov_SC07_002/ov_SC07_002.c +++ b/src/ov_SC07_002/ov_SC07_002.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002", func_8013AD38); -INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC07_008/ov_SC07_008.c b/src/ov_SC07_008/ov_SC07_008.c index 353f863247..7be3271f2a 100644 --- a/src/ov_SC07_008/ov_SC07_008.c +++ b/src/ov_SC07_008/ov_SC07_008.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008", func_8013AD38); -INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/ov_SC07_009/ov_SC07_009.c b/src/ov_SC07_009/ov_SC07_009.c index dfad370aa4..9dece1c6f5 100644 --- a/src/ov_SC07_009/ov_SC07_009.c +++ b/src/ov_SC07_009/ov_SC07_009.c @@ -769,7 +769,7 @@ DEFINE_func_80139220() /* dedup: shared engine-core @0x80139220 (src/shared) */ DEFINE_func_801392C8() /* dedup: shared engine-core @0x801392C8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009", func_801392FC); +DEFINE_func_801392FC() /* dedup: shared engine-core @0x801392FC (src/shared) */ INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009", func_801395D4); @@ -837,7 +837,7 @@ DEFINE_func_8013A448() /* dedup: shared engine-core @0x8013A448 (src/shared) */ DEFINE_func_8013A4C4() /* dedup: shared engine-core @0x8013A4C4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009", func_8013A530); +DEFINE_func_8013A530() /* dedup: shared engine-core @0x8013A530 (src/shared) */ DEFINE_func_8013A860() /* dedup: shared engine-core @0x8013A860 (src/shared) */ @@ -857,7 +857,7 @@ DEFINE_func_8013AB54() /* dedup: shared engine-core @0x8013AB54 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009", func_8013AD38); -INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009", func_8013AF20); +DEFINE_func_8013AF20() /* dedup: shared engine-core @0x8013AF20 (src/shared) */ DEFINE_func_8013B204() /* dedup: shared engine-core @0x8013B204 (src/shared) */ diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 8fe3827ab4..c619e460ee 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -9060,7 +9060,7 @@ } #define DEFINE_func_8013A448() \ - extern void func_8013A530(void); \ + extern void func_8013A530(); \ void func_8013A448(void *a0) { \ s16 *a1 = *(s16 **)((char *)a0 + 0x4); \ if (*(u16 *)((char *)a0 + 0x2) == 0) { \ @@ -11826,7 +11826,7 @@ } #define DEFINE_func_80137BD8() \ - extern void func_801392FC(s32 a0, s32 a1, u8 *a2); \ + extern void func_801392FC(); \ extern void func_801397B0(s32 a0); \ extern void func_80137DD4(s32 a0, u8 *a1, u8 *a2); \ extern void func_80139680(s32 a0, u8 *a1); \ @@ -11860,7 +11860,7 @@ #define DEFINE_func_8013AA24() \ extern void func_8013AD38(void *a0, s32 a1, void *a2, void *a3); \ extern void func_8013B204(s32 a0, s32 a1); \ - extern void func_8013AF20(s32 a0, s32 a1, void *a2, void *a3); \ + extern void func_8013AF20(); \ extern short D_800B9A02; \ extern s32 D_800A651C; \ void func_8013AA24(s32 a0, s32 a1) { \ @@ -12496,7 +12496,7 @@ #define DEFINE_func_8013AB54() \ extern void func_8013AD38(void *a0, s32 a1, void *a2, void *a3); \ extern void func_8013B274(s32 a0, s32 a1, void *a2); \ - extern void func_8013AF20(s32 a0, s32 a1, void *a2, void *a3); \ + extern void func_8013AF20(); \ extern s32 D_800A5E60; \ s32 func_8013AB54(s32 a0, s32 a1, s32 a2, s32 a3) { \ u8 buf[0xE4]; /* spans 0x10 .. 0xF4 */ \ @@ -13234,7 +13234,7 @@ } #define DEFINE_func_8013A4C4() \ - extern void func_8013A530(void); \ + extern void func_8013A530(); \ void func_8013A4C4(struct S8013A4C4 *a0) { \ struct Inner8013A4C4 *a1 = a0->unk4; \ a0->unkE = 0; \ @@ -17395,7 +17395,7 @@ #define DEFINE_func_8013A380() \ extern u8 D_8011DA80[]; \ - extern void func_8013A530(void); \ + extern void func_8013A530(); \ extern void func_8013A448(void *a0); \ extern void func_8013A4C4(struct S8013A4C4 *a0); \ void func_8013A380(void) { \ @@ -25980,4 +25980,248 @@ : : "r"(c) : "memory"); \ } +#define DEFINE_func_801392FC() \ + extern s32 GetTPage(s32 a0, s32 a1, s32 a2, s32 a3); \ + extern s32 func_80052460(s32 a0, s32 a1, s32 a2); \ + void func_801392FC(s32 arg0, s32 arg1, u8 *arg2) \ + { \ + s32 buf[16]; \ + s32 i; \ + s32 acc; \ + s32 rem; \ + u16 cnt; \ + register s32 a1c __asm__("$5"); \ + *(s32 *)((u8 *)buf + 0x00) = 0; \ + *(s16 *)((u8 *)buf + 0x0C) = GetTPage(0, 1, \ + *(s16 *)((u8 *)arg0 + 0x38) & 0xFFC0, \ + *(s16 *)((u8 *)arg0 + 0x3A) & 0xFF00); \ + *(s16 *)((u8 *)buf + 0x10) = *(u16 *)((u8 *)arg0 + 0x3C); \ + *(s16 *)((u8 *)buf + 0x12) = *(u16 *)((u8 *)arg0 + 0x3E); \ + *(u8 *)((u8 *)buf + 0x16) = 0x80; \ + *(u8 *)((u8 *)buf + 0x15) = 0x80; \ + *(u8 *)((u8 *)buf + 0x14) = 0x80; \ + i = 0; \ + cnt = *(volatile u16 *)((u8 *)arg0 + 0x2E); \ + if (*(s16 *)((u8 *)arg0 + 0x2E) > 0) { \ + s32 c12 = 0xC; \ + s32 c12ma = 0xC - arg1; \ + acc = 0; \ + do { \ + rem = (*(u16 *)((u8 *)arg0 + 0x16) + i) % ((s16)cnt + 1); \ + *(s16 *)((u8 *)buf + 0x04) = *(u16 *)((u8 *)arg0 + 0x30); \ + if (i != 0) { \ + *(s16 *)((u8 *)buf + 0x06) = (*(u16 *)((u8 *)arg0 + 0x32) + acc - arg1) + i * 2; \ + } else { \ + *(s16 *)((u8 *)buf + 0x06) = *(u16 *)((u8 *)arg0 + 0x32); \ + } \ + if (i == 0) { \ + *(s16 *)((u8 *)buf + 0x0A) = c12ma; \ + } else { \ + *(s16 *)((u8 *)buf + 0x0A) = c12; \ + } \ + *(u8 *)((u8 *)buf + 0x0E) = 0; \ + if (i != 0) { \ + s32 t = rem * 12 + *(u8 *)((u8 *)arg0 + 0x3A); \ + *(u8 *)((u8 *)buf + 0x0F) = t; \ + } else { \ + s32 t = rem * 12 + *(u8 *)((u8 *)arg0 + 0x3A) + arg1; \ + *(u8 *)((u8 *)buf + 0x0F) = t; \ + } \ + *(s16 *)((u8 *)buf + 0x08) = *(u16 *)((u8 *)arg0 + 0x34); \ + func_80052460((s32)buf, (s32)arg2, *(u16 *)((u8 *)arg0 + 0x1A)); \ + acc += 0xC; \ + i++; \ + cnt = *(volatile u16 *)((u8 *)arg0 + 0x2E); \ + } while (i < *(s16 *)((u8 *)arg0 + 0x2E)); \ + } \ + if (arg1 != 0) { \ + s16 w; \ + rem = (*(u16 *)((u8 *)arg0 + 0x16) + i) % (*(s16 *)((u8 *)arg0 + 0x2E) + 1); \ + *(s16 *)((u8 *)buf + 0x04) = *(u16 *)((u8 *)arg0 + 0x30); \ + *(s16 *)((u8 *)buf + 0x06) = (*(u16 *)((u8 *)arg0 + 0x32) + i * 12) - arg1 + i * 2; \ + *(s16 *)((u8 *)buf + 0x0A) = arg1 - 2; \ + *(u8 *)((u8 *)buf + 0x0E) = 0; \ + { \ + s32 t = rem * 12 + *(u8 *)((u8 *)arg0 + 0x3A); \ + *(u8 *)((u8 *)buf + 0x0F) = t; \ + } \ + w = *(s16 *)((u8 *)arg0 + 0x34); \ + if (w >= 0xFD) { \ + *(s16 *)((u8 *)buf + 0x08) = 0x100; \ + func_80052460((s32)buf, (s32)arg2, *(u16 *)((u8 *)arg0 + 0x1A)); \ + { \ + s32 t2; \ + *(s16 *)((u8 *)buf + 0x04) = *(u16 *)((u8 *)arg0 + 0x30) + *(u16 *)((u8 *)buf + 0x08); \ + *(s16 *)((u8 *)buf + 0x08) = 0x20; \ + *(u8 *)((u8 *)buf + 0x0E) = rem << 5; \ + t2 = (*(s16 *)((u8 *)arg0 + 0x2E) + 1) * 12 + *(u8 *)((u8 *)arg0 + 0x3A); \ + *(u8 *)((u8 *)buf + 0x0F) = t2; \ + } \ + a1c = (s32)arg2; \ + func_80052460((s32)buf, a1c, *(u16 *)((u8 *)arg0 + 0x1A)); \ + } else { \ + *(s16 *)((u8 *)buf + 0x08) = w; \ + func_80052460((s32)buf, (s32)arg2, *(u16 *)((u8 *)arg0 + 0x1A)); \ + } \ + } \ + } + +#define DEFINE_func_8013A530() \ + extern void *memcpy(void *, const void *, u32); \ + extern void func_80015D4C(); \ + extern void func_80015F04(); \ + extern void func_8013AA24(s32 a0, s32 a1); \ + void func_8013A530(int param_1) \ + { \ + int iVar11; \ + u16 uVar2; \ + int sVar2; \ + register u8 bVar1 __asm__("$8"); \ + int deadlocal[2]; \ + iVar11 = *(int *)(param_1 + 4); \ + uVar2 = *(u16 *)(iVar11 + 0x18); \ + sVar2 = uVar2; \ + bVar1 = *(u8 *)(iVar11 + 0x22); \ + if (uVar2 != 0 && uVar2 < 7) { \ + if (uVar2 != 1) { \ + if (sVar2 != 0 && sVar2 < 7) { \ + register u32 f34 __asm__("$5"); \ + u32 uVar2b; \ + u32 uVar6; \ + short sVar5; \ + register int fc __asm__("$5"); \ + register int zr __asm__("$0"); \ + int iVar7; \ + f34 = *(u16 *)(iVar11 + 0x34); \ + uVar6 = f34 + 0x10; \ + uVar2b = *(u16 *)(iVar11 + 0x36) + 0x10; \ + if (*(u8 *)(iVar11 + 0x20) != 0) { \ + uVar6 = f34 + 0x38; \ + } \ + sVar5 = (short)((int)((int)*(s16 *)(iVar11 + 0x28) * (uVar6 & 0xffff)) / 0x9a); \ + *(s16 *)(param_1 + 8) = sVar5; \ + if ((bVar1 & 8) == 0) { \ + *(s16 *)(param_1 + 8) = -sVar5; \ + } \ + if ((bVar1 & 0x60) == 0 || (bVar1 & 0x80) != 0) { \ + *(s16 *)(param_1 + 8) = -*(s16 *)(param_1 + 8); \ + } \ + sVar5 = (short)((int)((int)*(s16 *)(iVar11 + 0x2a) * (uVar2b & 0xffff)) / 0x2a); \ + *(s16 *)(param_1 + 0xa) = sVar5; \ + if ((bVar1 & 0x10) != 0) { \ + *(s16 *)(param_1 + 0xa) = -sVar5; \ + } \ + __asm__("" :: "r"(bVar1)); \ + fc = *(s16 *)(param_1 + 0xc); \ + iVar7 = fc + zr; \ + if (fc < *(s16 *)(param_1 + 0xe)) { \ + int t = iVar7 + 0x400; \ + *(s16 *)(param_1 + 0xc) = (short)t; \ + if (((t << 16) >> 16) > (int)*(s16 *)(param_1 + 0xe)) { \ + *(s16 *)(param_1 + 0xc) = *(s16 *)(param_1 + 0xe); \ + } \ + } else if (*(s16 *)(param_1 + 0xe) < fc) { \ + int t = iVar7 - 0x400; \ + __asm__("" :: "r"(iVar7), "r"(t)); \ + *(s16 *)(param_1 + 0xc) = (short)t; \ + if (((t << 16) >> 16) < (int)*(s16 *)(param_1 + 0xe)) { \ + *(s16 *)(param_1 + 0xc) = *(s16 *)(param_1 + 0xe); \ + } \ + } \ + __asm__("" :: "r"(fc)); \ + func_8013AA24(iVar11, param_1); \ + } \ + } else { \ + int iVar7, iVar8; \ + u32 uVar6, uVar4; \ + memcpy((void *)(param_1 + 8), (void *)(iVar11 + 0x28), 4); \ + uVar6 = ((*(s16 *)(iVar11 + 0x34) + 0x10) * (int)*(s16 *)(param_1 + 8)) >> 0xc; \ + uVar4 = ((*(s16 *)(iVar11 + 0x36) + 0x10) * (int)*(s16 *)(param_1 + 0xa)) >> 0xc; \ + iVar7 = *(u16 *)(iVar11 + 0x24) - ((uVar6 & 0xffff) >> 1); \ + iVar8 = *(u16 *)(iVar11 + 0x26) - ((uVar4 & 0xffff) >> 1); \ + func_80015F04((int)(s16)iVar7, (int)(s16)iVar8, (int)(s16)uVar6, (int)(s16)uVar4, \ + 0xb3, 0x99, 0x4c, *(u16 *)(iVar11 + 0x1a), 4); \ + func_80015F04((int)(s16)(iVar7 + 1), (int)(s16)(iVar8 + 1), \ + (int)(s16)(uVar6 - 2), (int)(s16)(uVar4 - 2), \ + 0xe6, 0xcc, 0x73, *(u16 *)(iVar11 + 0x1a), 4); \ + func_80015D4C((int)(s16)iVar7, (int)(s16)iVar8, (int)(s16)uVar6, (int)(s16)uVar4, \ + 0xff, 0xe6, 0x99, *(u16 *)(iVar11 + 0x1a), 4); \ + } \ + } \ + return; \ + } + +#define DEFINE_func_8013AF20() \ + extern void *func_80010A08(s32); \ + void func_8013AF20(u32 *param_1, u16 *param_2, u16 *param_3, u8 *param_4) \ + { \ + u32 *puVar3; \ + u32 *puVar4; \ + u32 *puVar5; \ + s32 iVar8; \ + s32 j; \ + puVar3 = (u32 *)func_80010A08(0x168); \ + puVar4 = (u32 *)func_80010A08(0x1e0); \ + puVar5 = (u32 *)func_80010A08(0x1e0); \ + iVar8 = 0; \ + j = 0; \ + do { \ + *(u8 *)((s32)puVar4 + 3) = 3; \ + *(u8 *)((s32)puVar4 + 7) = 0x40; \ + *(u8 *)((s32)puVar4 + 4) = 0x3d; \ + *(u8 *)((s32)puVar4 + 5) = 0x3d; \ + *(u8 *)((s32)puVar4 + 6) = 0x3d; \ + *(u16 *)((s32)puVar4 + 8) = param_3[j]; \ + *(u16 *)((s32)puVar4 + 0xa) = param_3[j + 1]; \ + iVar8 = iVar8 + 1; \ + *(u16 *)((s32)puVar4 + 0xc) = param_3[j + 2]; \ + *(u16 *)((s32)puVar4 + 0xe) = param_3[j + 3]; \ + j += 2; \ + /* addPrim(param_1, puVar4): setaddr(p, getaddr(ot)), setaddr(ot, p) */ \ + ((P_TAG *)puVar4)->addr = ((P_TAG *)param_1)->addr; \ + ((P_TAG *)param_1)->addr = (u32)puVar4; \ + puVar4 = puVar4 + 4; \ + } while (iVar8 < 0x1e); \ + iVar8 = 0; \ + j = 0; \ + do { \ + iVar8 = iVar8 + 1; \ + *(u8 *)((s32)puVar5 + 3) = 3; \ + *(u8 *)((s32)puVar5 + 7) = 0x40; \ + *(u8 *)((s32)puVar5 + 4) = 0x92; \ + *(u8 *)((s32)puVar5 + 5) = 0x92; \ + *(u8 *)((s32)puVar5 + 6) = 0x92; \ + *(u16 *)((s32)puVar5 + 8) = param_3[j] + (s8)param_4[j]; \ + *(u16 *)((s32)puVar5 + 0xa) = param_3[j + 1] + (s8)param_4[j + 1]; \ + *(u16 *)((s32)puVar5 + 0xc) = param_3[j + 2] + (s8)param_4[j + 2]; \ + *(u16 *)((s32)puVar5 + 0xe) = param_3[j + 3] + (s8)param_4[j + 3]; \ + j += 2; \ + ((P_TAG *)puVar5)->addr = ((P_TAG *)param_1)->addr; \ + ((P_TAG *)param_1)->addr = (u32)puVar5; \ + puVar5 = puVar5 + 4; \ + } while (iVar8 < 0x1e); \ + iVar8 = 0; \ + j = 0; \ + do { \ + *(u8 *)((s32)puVar3 + 3) = 5; \ + *(u8 *)((s32)puVar3 + 7) = 0x28; \ + *(u8 *)((s32)puVar3 + 4) = 0xff; \ + *(u8 *)((s32)puVar3 + 5) = 0xff; \ + *(u8 *)((s32)puVar3 + 6) = 0xff; \ + *(u16 *)((s32)puVar3 + 8) = param_3[j]; \ + *(u16 *)((s32)puVar3 + 0xa) = param_3[j + 1]; \ + *(u16 *)((s32)puVar3 + 0xc) = param_2[0]; \ + *(u16 *)((s32)puVar3 + 0xe) = param_2[1]; \ + *(u16 *)((s32)puVar3 + 0x10) = param_3[j + 2]; \ + *(u16 *)((s32)puVar3 + 0x12) = param_3[j + 3]; \ + iVar8 = iVar8 + 2; \ + *(u16 *)((s32)puVar3 + 0x14) = param_3[j + 4]; \ + *(u16 *)((s32)puVar3 + 0x16) = param_3[j + 5]; \ + j += 4; \ + ((P_TAG *)puVar3)->addr = ((P_TAG *)param_1)->addr; \ + ((P_TAG *)param_1)->addr = (u32)puVar3; \ + puVar3 = puVar3 + 6; \ + } while (iVar8 < 0x1e); \ + } + #endif diff --git a/src/shared/engine_types.h b/src/shared/engine_types.h index 31f17c089d..f97d5e059d 100644 --- a/src/shared/engine_types.h +++ b/src/shared/engine_types.h @@ -452,3 +452,4 @@ typedef struct { u16 x, y, z, w; } MoveT; typedef struct { s32 vpx, vpy, vpz, vrx, vry, vrz, rz, super; } RView; #endif /* BFM_ENGINE_TYPES_H */ +typedef struct { u32 addr : 24; u32 len : 8; u8 r0, g0, b0, code; } P_TAG; /* PsyQ libgpu OT primitive tag (§36 func_8013AF20) */