From b3597c08e0cd701abd88e3bb3e72f707a2ace465 Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Thu, 23 Jul 2026 18:04:44 -0600 Subject: [PATCH] =?UTF-8?q?feat(phase-29):=202=20=C2=A720-unblocked=20core?= =?UTF-8?q?s=20propagated=20x138=20(+276)=20via=20the=20type-lift?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit func_8012B4B8 + func_8012E138 — freed by the Mat32/Cam8012E138 fleet lift (commit:0859) — propagated x138 (live 138->0 each, +276 stubs). R22 clean-fleet 140/140. No --recover needed (clean h_exact). decision-log: the §20 type-lift is safely executable when SCOPED to clean types (lift_types.py + R22); classify-first, lift the 1-def/copy-only-variant types now, defer the fleet-split variants (MATRIX/Vec8/Buf/M8) to a per-camp reconcile pass. --- config/dedup.us.yaml | 7 ++++ docs/decision-log.md | 13 +++++++ src/ov_SC01_000/ov_SC01_000_jr_8012ACE0.c | 2 +- src/ov_SC01_001/ov_SC01_001_jr_8012ACE0.c | 2 +- src/ov_SC01_004/ov_SC01_004_jr_8012ACE0.c | 2 +- src/ov_SC01_005/ov_SC01_005_jr_8012ACE0.c | 2 +- src/ov_SC01_006/ov_SC01_006_jr_8012ACE0.c | 2 +- src/ov_SC01_008/ov_SC01_008_jr_8012ACE0.c | 2 +- src/ov_SC01_009/ov_SC01_009_jr_8012ACE0.c | 2 +- src/ov_SC01_074/ov_SC01_074_jr_8012ACE0.c | 2 +- src/ov_SC01_077/ov_SC01_077_jr_8012ACE0.c | 2 +- src/ov_SC01_080/ov_SC01_080_jr_8012ACE0.c | 2 +- src/ov_SC01_084/ov_SC01_084_jr_8012ACE0.c | 2 +- src/ov_SC02_000/ov_SC02_000_jr_8012ACE0.c | 2 +- src/ov_SC02_003/ov_SC02_003_jr_8012ACE0.c | 2 +- src/ov_SC02_004/ov_SC02_004_jr_8012ACE0.c | 2 +- src/ov_SC02_005/ov_SC02_005_jr_8012ACE0.c | 2 +- src/ov_SC02_011/ov_SC02_011_jr_8012ACE0.c | 2 +- src/ov_SC02_015/ov_SC02_015_jr_8012ACE0.c | 2 +- src/ov_SC02_016/ov_SC02_016_jr_8012ACE0.c | 2 +- src/ov_SC02_017/ov_SC02_017_jr_8012ACE0.c | 2 +- src/ov_SC02_021/ov_SC02_021_jr_8012ACE0.c | 2 +- src/ov_SC02_026/ov_SC02_026_jr_8012ACE0.c | 2 +- src/ov_SC02_027/ov_SC02_027_jr_8012ACE0.c | 2 +- src/ov_SC02_028/ov_SC02_028_jr_8012ACE0.c | 2 +- src/ov_SC02_031/ov_SC02_031_jr_8012ACE0.c | 2 +- src/ov_SC02_035/ov_SC02_035_jr_8012ACE0.c | 2 +- src/ov_SC02_039/ov_SC02_039_jr_8012ACE0.c | 2 +- src/ov_SC02_041/ov_SC02_041_jr_8012ACE0.c | 2 +- src/ov_SC03_001/ov_SC03_001_jr_8012ACE0.c | 2 +- src/ov_SC03_002/ov_SC03_002_jr_8012ACE0.c | 2 +- src/ov_SC03_003/ov_SC03_003_jr_8012ACE0.c | 2 +- src/ov_SC03_006/ov_SC03_006_jr_8012ACE0.c | 2 +- src/ov_SC03_007/ov_SC03_007_jr_8012ACE0.c | 2 +- src/ov_SC03_010/ov_SC03_010_jr_8012ACE0.c | 2 +- src/ov_SC03_011/ov_SC03_011_jr_8012ACE0.c | 2 +- src/ov_SC03_012/ov_SC03_012_jr_8012ACE0.c | 2 +- src/ov_SC03_013/ov_SC03_013_jr_8012ACE0.c | 2 +- src/ov_SC03_014/ov_SC03_014_jr_8012ACE0.c | 2 +- src/ov_SC03_015/ov_SC03_015_jr_8012ACE0.c | 2 +- src/ov_SC03_023/ov_SC03_023_jr_8012ACE0.c | 2 +- src/ov_SC03_024/ov_SC03_024_jr_8012ACE0.c | 2 +- src/ov_SC03_028/ov_SC03_028_jr_8012ACE0.c | 2 +- src/ov_SC03_029/ov_SC03_029_jr_8012ACE0.c | 2 +- src/ov_SC03_030/ov_SC03_030_jr_8012ACE0.c | 2 +- src/ov_SC03_031/ov_SC03_031_jr_8012ACE0.c | 2 +- src/ov_SC03_089/ov_SC03_089_jr_8012ACE0.c | 2 +- src/ov_SC03_090/ov_SC03_090_jr_8012ACE0.c | 2 +- src/ov_SC03_091/ov_SC03_091_jr_8012ACE0.c | 2 +- src/ov_SC03_092/ov_SC03_092_jr_8012ACE0.c | 2 +- src/ov_SC03_093/ov_SC03_093_jr_8012ACE0.c | 2 +- src/ov_SC03_094/ov_SC03_094_jr_8012ACE0.c | 2 +- src/ov_SC03_095/ov_SC03_095_jr_8012ACE0.c | 2 +- src/ov_SC03_096/ov_SC03_096_jr_8012ACE0.c | 2 +- src/ov_SC03_097/ov_SC03_097_jr_8012ACE0.c | 2 +- src/ov_SC03_098/ov_SC03_098_jr_8012ACE0.c | 2 +- src/ov_SC03_099/ov_SC03_099_jr_8012ACE0.c | 2 +- src/ov_SC03_100/ov_SC03_100_jr_8012ACE0.c | 2 +- src/ov_SC03_101/ov_SC03_101_jr_8012ACE0.c | 2 +- src/ov_SC03_102/ov_SC03_102_jr_8012ACE0.c | 2 +- src/ov_SC03_103/ov_SC03_103_jr_8012ACE0.c | 2 +- src/ov_SC03_104/ov_SC03_104_jr_8012ACE0.c | 2 +- src/ov_SC03_105/ov_SC03_105_jr_8012ACE0.c | 2 +- src/ov_SC03_108/ov_SC03_108_jr_8012ACE0.c | 2 +- src/ov_SC03_109/ov_SC03_109_jr_8012ACE0.c | 2 +- src/ov_SC03_110/ov_SC03_110_jr_8012ACE0.c | 2 +- src/ov_SC03_111/ov_SC03_111_jr_8012ACE0.c | 2 +- src/ov_SC03_112/ov_SC03_112_jr_8012ACE0.c | 2 +- src/ov_SC03_113/ov_SC03_113_jr_8012ACE0.c | 2 +- src/ov_SC03_114/ov_SC03_114_jr_8012ACE0.c | 2 +- src/ov_SC03_115/ov_SC03_115_jr_8012ACE0.c | 2 +- src/ov_SC03_116/ov_SC03_116_jr_8012ACE0.c | 2 +- src/ov_SC03_117/ov_SC03_117_jr_8012ACE0.c | 2 +- src/ov_SC03_118/ov_SC03_118_jr_8012ACE0.c | 2 +- src/ov_SC03_119/ov_SC03_119_jr_8012ACE0.c | 2 +- src/ov_SC03_121/ov_SC03_121_jr_8012ACE0.c | 2 +- src/ov_SC03_124/ov_SC03_124_jr_8012ACE0.c | 2 +- src/ov_SC03_125/ov_SC03_125_jr_8012ACE0.c | 2 +- src/ov_SC03_126/ov_SC03_126_jr_8012ACE0.c | 2 +- src/ov_SC04_000/ov_SC04_000_jr_8012ACE0.c | 2 +- src/ov_SC04_002/ov_SC04_002_jr_8012ACE0.c | 2 +- src/ov_SC04_003/ov_SC04_003_jr_8012ACE0.c | 2 +- src/ov_SC04_004/ov_SC04_004_jr_8012ACE0.c | 2 +- src/ov_SC04_005/ov_SC04_005_jr_8012ACE0.c | 2 +- src/ov_SC04_006/ov_SC04_006_jr_8012ACE0.c | 2 +- src/ov_SC04_007/ov_SC04_007_jr_8012ACE0.c | 2 +- src/ov_SC04_008/ov_SC04_008_jr_8012ACE0.c | 2 +- src/ov_SC04_009/ov_SC04_009_jr_8012ACE0.c | 2 +- src/ov_SC04_010/ov_SC04_010_jr_8012ACE0.c | 2 +- src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.c | 2 +- src/ov_SC04_012/ov_SC04_012_jr_8012ACE0.c | 2 +- src/ov_SC04_015/ov_SC04_015_jr_8012ACE0.c | 2 +- src/ov_SC04_016/ov_SC04_016_jr_8012ACE0.c | 2 +- src/ov_SC04_018/ov_SC04_018_jr_8012ACE0.c | 2 +- src/ov_SC04_019/ov_SC04_019_jr_8012ACE0.c | 2 +- src/ov_SC04_020/ov_SC04_020_jr_8012ACE0.c | 2 +- src/ov_SC04_021/ov_SC04_021_jr_8012ACE0.c | 2 +- src/ov_SC05_000/ov_SC05_000_jr_8012ACE0.c | 2 +- src/ov_SC05_001/ov_SC05_001_jr_8012ACE0.c | 2 +- src/ov_SC05_002/ov_SC05_002_jr_8012ACE0.c | 2 +- src/ov_SC05_003/ov_SC05_003_jr_8012ACE0.c | 2 +- src/ov_SC05_004/ov_SC05_004_jr_8012ACE0.c | 2 +- src/ov_SC05_005/ov_SC05_005_jr_8012ACE0.c | 2 +- src/ov_SC05_006/ov_SC05_006_jr_8012ACE0.c | 2 +- src/ov_SC05_007/ov_SC05_007_jr_8012ACE0.c | 2 +- src/ov_SC05_008/ov_SC05_008_jr_8012ACE0.c | 2 +- src/ov_SC05_009/ov_SC05_009_jr_8012ACE0.c | 2 +- src/ov_SC05_010/ov_SC05_010_jr_8012ACE0.c | 2 +- src/ov_SC05_011/ov_SC05_011_jr_8012ACE0.c | 2 +- src/ov_SC05_017/ov_SC05_017_jr_8012ACE0.c | 2 +- src/ov_SC05_018/ov_SC05_018_jr_8012ACE0.c | 2 +- src/ov_SC05_019/ov_SC05_019_jr_8012ACE0.c | 2 +- src/ov_SC06_000/ov_SC06_000_jr_8012ACE0.c | 2 +- src/ov_SC06_006/ov_SC06_006_jr_8012ACE0.c | 2 +- src/ov_SC06_008/ov_SC06_008_jr_8012ACE0.c | 2 +- src/ov_SC06_010/ov_SC06_010_jr_8012ACE0.c | 2 +- src/ov_SC06_011/ov_SC06_011_jr_8012ACE0.c | 2 +- src/ov_SC06_013/ov_SC06_013_jr_8012ACE0.c | 2 +- src/ov_SC06_014/ov_SC06_014_jr_8012ACE0.c | 2 +- src/ov_SC06_015/ov_SC06_015_jr_8012ACE0.c | 2 +- src/ov_SC06_016/ov_SC06_016_jr_8012ACE0.c | 2 +- src/ov_SC06_018/ov_SC06_018_jr_8012ACE0.c | 2 +- src/ov_SC06_020/ov_SC06_020_jr_8012ACE0.c | 2 +- src/ov_SC06_022/ov_SC06_022_jr_8012ACE0.c | 2 +- src/ov_SC06_024/ov_SC06_024_jr_8012ACE0.c | 2 +- src/ov_SC06_025/ov_SC06_025_jr_8012ACE0.c | 2 +- src/ov_SC06_027/ov_SC06_027_jr_8012ACE0.c | 2 +- src/ov_SC06_029/ov_SC06_029_jr_8012ACE0.c | 2 +- src/ov_SC06_030/ov_SC06_030_jr_8012ACE0.c | 2 +- src/ov_SC06_032/ov_SC06_032_jr_8012ACE0.c | 2 +- src/ov_SC06_033/ov_SC06_033_jr_8012ACE0.c | 2 +- src/ov_SC07_000/ov_SC07_000_jr_8012ACE0.c | 2 +- src/ov_SC07_001/ov_SC07_001_jr_8012ACE0.c | 2 +- src/ov_SC07_002/ov_SC07_002_jr_8012ACE0.c | 2 +- src/ov_SC07_006/ov_SC07_006.c | 44 +---------------------- src/ov_SC07_007/ov_SC07_007.c | 2 +- src/ov_SC07_008/ov_SC07_008_jr_8012ACE0.c | 2 +- src/ov_SC07_009/ov_SC07_009_jr_8012ACE0.c | 2 +- src/ov_SC07_010/ov_SC07_010.c | 2 +- src/ov_SC07_011/ov_SC07_011.c | 2 +- src/shared/engine_core.h | 42 ++++++++++++++++++++++ 141 files changed, 200 insertions(+), 180 deletions(-) diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index a8dfc452c..190da4bff 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -13095,3 +13095,10 @@ groups: func: DEFINE_func_80137178 vram: 0x80137178 binaries: [ov_SC01_077, ov_SC01_005, ov_SC01_006, ov_SC03_001, ov_SC01_000, ov_SC01_001, ov_SC02_000, ov_SC02_003, ov_SC03_002, ov_SC03_006, ov_SC04_000, ov_SC04_018, ov_SC04_019, ov_SC05_000, ov_SC06_000, ov_SC07_000, ov_SC01_004, ov_SC01_008, ov_SC01_009, ov_SC01_074, ov_SC01_080, ov_SC01_084, ov_SC02_004, ov_SC02_005, ov_SC02_011, ov_SC02_015, ov_SC02_016, ov_SC02_017, ov_SC02_021, ov_SC02_026, ov_SC02_027, ov_SC02_028, ov_SC02_031, ov_SC02_035, ov_SC02_039, ov_SC02_041, ov_SC03_003, ov_SC03_007, ov_SC03_010, ov_SC03_011, ov_SC03_012, ov_SC03_013, ov_SC03_014, ov_SC03_015, ov_SC03_023, ov_SC03_024, ov_SC03_028, ov_SC03_029, ov_SC03_030, ov_SC03_031, ov_SC03_089, ov_SC03_090, ov_SC03_091, ov_SC03_092, ov_SC03_093, ov_SC03_094, ov_SC03_095, ov_SC03_096, ov_SC03_097, ov_SC03_098, ov_SC03_099, ov_SC03_100, ov_SC03_101, ov_SC03_102, ov_SC03_103, ov_SC03_104, ov_SC03_105, ov_SC03_108, ov_SC03_109, ov_SC03_110, ov_SC03_111, ov_SC03_112, ov_SC03_113, ov_SC03_114, ov_SC03_115, ov_SC03_116, ov_SC03_117, ov_SC03_118, ov_SC03_119, ov_SC03_121, ov_SC03_124, ov_SC03_125, ov_SC03_126, ov_SC04_002, ov_SC04_003, ov_SC04_004, ov_SC04_005, ov_SC04_006, ov_SC04_007, ov_SC04_008, ov_SC04_009, ov_SC04_010, ov_SC04_011, ov_SC04_012, ov_SC04_015, ov_SC04_016, ov_SC04_020, ov_SC04_021, ov_SC05_001, ov_SC05_002, ov_SC05_003, ov_SC05_004, ov_SC05_005, ov_SC05_006, ov_SC05_007, ov_SC05_008, ov_SC05_009, ov_SC05_010, ov_SC05_011, ov_SC05_017, ov_SC05_018, ov_SC05_019, ov_SC06_006, ov_SC06_008, ov_SC06_010, ov_SC06_011, ov_SC06_013, ov_SC06_014, ov_SC06_015, ov_SC06_016, ov_SC06_018, ov_SC06_020, ov_SC06_022, ov_SC06_024, ov_SC06_025, ov_SC06_027, ov_SC06_029, ov_SC06_030, ov_SC06_032, ov_SC06_033, ov_SC07_001, ov_SC07_002, ov_SC07_008, ov_SC07_009, ov_SC07_006, ov_SC07_007, ov_SC07_010, ov_SC07_011] + - id: E_func_8012E138 + tier: h_exact + hash: 11b77ce574e0e277e3ee86ad9e23a412a8c632de + source: src/shared/engine_core.h + func: DEFINE_func_8012E138 + vram: 0x8012E138 + binaries: [ov_SC01_077, ov_SC01_005, ov_SC01_006, ov_SC03_001, ov_SC01_000, ov_SC01_001, ov_SC02_000, ov_SC02_003, ov_SC03_002, ov_SC03_006, ov_SC04_000, ov_SC04_018, ov_SC04_019, ov_SC05_000, ov_SC06_000, ov_SC07_000, ov_SC01_004, ov_SC01_008, ov_SC01_009, ov_SC01_074, ov_SC01_080, ov_SC01_084, ov_SC02_004, ov_SC02_005, ov_SC02_011, ov_SC02_015, ov_SC02_016, ov_SC02_017, ov_SC02_021, ov_SC02_026, ov_SC02_027, ov_SC02_028, ov_SC02_031, ov_SC02_035, ov_SC02_039, ov_SC02_041, ov_SC03_003, ov_SC03_007, ov_SC03_010, ov_SC03_011, ov_SC03_012, ov_SC03_013, ov_SC03_014, ov_SC03_015, ov_SC03_023, ov_SC03_024, ov_SC03_028, ov_SC03_029, ov_SC03_030, ov_SC03_031, ov_SC03_089, ov_SC03_090, ov_SC03_091, ov_SC03_092, ov_SC03_093, ov_SC03_094, ov_SC03_095, ov_SC03_096, ov_SC03_097, ov_SC03_098, ov_SC03_099, ov_SC03_100, ov_SC03_101, ov_SC03_102, ov_SC03_103, ov_SC03_104, ov_SC03_105, ov_SC03_108, ov_SC03_109, ov_SC03_110, ov_SC03_111, ov_SC03_112, ov_SC03_113, ov_SC03_114, ov_SC03_115, ov_SC03_116, ov_SC03_117, ov_SC03_118, ov_SC03_119, ov_SC03_121, ov_SC03_124, ov_SC03_125, ov_SC03_126, ov_SC04_002, ov_SC04_003, ov_SC04_004, ov_SC04_005, ov_SC04_006, ov_SC04_007, ov_SC04_008, ov_SC04_009, ov_SC04_010, ov_SC04_011, ov_SC04_012, ov_SC04_015, ov_SC04_016, ov_SC04_020, ov_SC04_021, ov_SC05_001, ov_SC05_002, ov_SC05_003, ov_SC05_004, ov_SC05_005, ov_SC05_006, ov_SC05_007, ov_SC05_008, ov_SC05_009, ov_SC05_010, ov_SC05_011, ov_SC05_017, ov_SC05_018, ov_SC05_019, ov_SC06_006, ov_SC06_008, ov_SC06_010, ov_SC06_011, ov_SC06_013, ov_SC06_014, ov_SC06_015, ov_SC06_016, ov_SC06_018, ov_SC06_020, ov_SC06_022, ov_SC06_024, ov_SC06_025, ov_SC06_027, ov_SC06_029, ov_SC06_030, ov_SC06_032, ov_SC06_033, ov_SC07_001, ov_SC07_002, ov_SC07_008, ov_SC07_009, ov_SC07_006, ov_SC07_007, ov_SC07_010, ov_SC07_011] diff --git a/docs/decision-log.md b/docs/decision-log.md index 30a2e4e9d..dea933f8c 100644 --- a/docs/decision-log.md +++ b/docs/decision-log.md @@ -1790,3 +1790,16 @@ RE-DRAFTING under the caller-canonical sig. So the type-lift is real but not a f `[^;]*` one is retired), a per-type canonical-def picker + a draft-reconcile pass, fleet-wide strip orchestration (build the missing `make lift-types` that loops all overlays + `--exclude` the irreconcilable), and R22. It is high-value (roadmap B4) but must be planned, not improvised. The 4 cores stay ×1 until then. + +## 2026-07-23 (Phase 29, SESSION-13) — UPDATE: the §20 type-lift IS safely executable when SCOPED to clean types (lift_types.py works) + +Refines the "do NOT improvise it" entry above. The fleet type-lift is NOT all-or-nothing: `tools/lift_types.py` +(built this session — reuses build_engine_types' brace-aware parser, picks each type's CANONICAL/majority def +fleet-wide, strips all local copies, R22 arbitrates) lets you lift the CLEAN subset safely while deferring the +variant-heavy types. Applied to Mat32 (138 canonical + 1 copy-only variant) + Cam8012E138 (unique): R22 +**140/140**, unblocked **func_8012B4B8 + func_8012E138** for ×138 propagation. **The doctrine:** classify each +type first (`lift_types --types … ` dry-run reports distinct-def counts + variant overlays); lift the 1-def and +copy-only-variant types NOW (byte-neutral, R22-verified); DEFER the genuinely fleet-split types (MATRIX 3-def, +Vec8 180/139, Buf 3-def, M8 2-def) to a per-camp reconcile pass — they need field-access reconciliation, not a +blind strip. So: not a monolith, an incremental clean-first lift. The variant reconcile is the remaining hard +part of roadmap B4. diff --git a/src/ov_SC01_000/ov_SC01_000_jr_8012ACE0.c b/src/ov_SC01_000/ov_SC01_000_jr_8012ACE0.c index fed512d7b..e39142a6b 100644 --- a/src/ov_SC01_000/ov_SC01_000_jr_8012ACE0.c +++ b/src/ov_SC01_000/ov_SC01_000_jr_8012ACE0.c @@ -743,7 +743,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 1; diff --git a/src/ov_SC01_001/ov_SC01_001_jr_8012ACE0.c b/src/ov_SC01_001/ov_SC01_001_jr_8012ACE0.c index 127064cab..8f1d74774 100644 --- a/src/ov_SC01_001/ov_SC01_001_jr_8012ACE0.c +++ b/src/ov_SC01_001/ov_SC01_001_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC01_004/ov_SC01_004_jr_8012ACE0.c b/src/ov_SC01_004/ov_SC01_004_jr_8012ACE0.c index 2325cee84..bf07a9b7d 100644 --- a/src/ov_SC01_004/ov_SC01_004_jr_8012ACE0.c +++ b/src/ov_SC01_004/ov_SC01_004_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC01_005/ov_SC01_005_jr_8012ACE0.c b/src/ov_SC01_005/ov_SC01_005_jr_8012ACE0.c index 0884ebcb4..e8dbbe80e 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_8012ACE0.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_8012ACE0.c @@ -673,7 +673,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ RETCONST(func_8012E27C, 1) /* dedup: shared with ov_SC01_006 (src/shared/ov_setters.h) */ diff --git a/src/ov_SC01_006/ov_SC01_006_jr_8012ACE0.c b/src/ov_SC01_006/ov_SC01_006_jr_8012ACE0.c index cd499d9ba..c9b2134d8 100644 --- a/src/ov_SC01_006/ov_SC01_006_jr_8012ACE0.c +++ b/src/ov_SC01_006/ov_SC01_006_jr_8012ACE0.c @@ -673,7 +673,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ RETCONST(func_8012E27C, 1) /* dedup: shared with ov_SC01_005 (src/shared/ov_setters.h) */ diff --git a/src/ov_SC01_008/ov_SC01_008_jr_8012ACE0.c b/src/ov_SC01_008/ov_SC01_008_jr_8012ACE0.c index 1d0046517..dc5af7369 100644 --- a/src/ov_SC01_008/ov_SC01_008_jr_8012ACE0.c +++ b/src/ov_SC01_008/ov_SC01_008_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC01_009/ov_SC01_009_jr_8012ACE0.c b/src/ov_SC01_009/ov_SC01_009_jr_8012ACE0.c index c5cfec848..363cd1081 100644 --- a/src/ov_SC01_009/ov_SC01_009_jr_8012ACE0.c +++ b/src/ov_SC01_009/ov_SC01_009_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC01_074/ov_SC01_074_jr_8012ACE0.c b/src/ov_SC01_074/ov_SC01_074_jr_8012ACE0.c index 4dc4db162..33392b51f 100644 --- a/src/ov_SC01_074/ov_SC01_074_jr_8012ACE0.c +++ b/src/ov_SC01_074/ov_SC01_074_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC01_077/ov_SC01_077_jr_8012ACE0.c b/src/ov_SC01_077/ov_SC01_077_jr_8012ACE0.c index 26c146dc4..e5f677095 100644 --- a/src/ov_SC01_077/ov_SC01_077_jr_8012ACE0.c +++ b/src/ov_SC01_077/ov_SC01_077_jr_8012ACE0.c @@ -876,7 +876,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 1; diff --git a/src/ov_SC01_080/ov_SC01_080_jr_8012ACE0.c b/src/ov_SC01_080/ov_SC01_080_jr_8012ACE0.c index d885b35f8..17ca2d445 100644 --- a/src/ov_SC01_080/ov_SC01_080_jr_8012ACE0.c +++ b/src/ov_SC01_080/ov_SC01_080_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC01_084/ov_SC01_084_jr_8012ACE0.c b/src/ov_SC01_084/ov_SC01_084_jr_8012ACE0.c index 4f5fae700..717d52a4f 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_8012ACE0.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC02_000/ov_SC02_000_jr_8012ACE0.c b/src/ov_SC02_000/ov_SC02_000_jr_8012ACE0.c index 892612ad3..c92ab23c2 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_8012ACE0.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC02_003/ov_SC02_003_jr_8012ACE0.c b/src/ov_SC02_003/ov_SC02_003_jr_8012ACE0.c index 3ed3a4f15..32ed1e120 100644 --- a/src/ov_SC02_003/ov_SC02_003_jr_8012ACE0.c +++ b/src/ov_SC02_003/ov_SC02_003_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC02_004/ov_SC02_004_jr_8012ACE0.c b/src/ov_SC02_004/ov_SC02_004_jr_8012ACE0.c index 65a469d57..1589d8ab3 100644 --- a/src/ov_SC02_004/ov_SC02_004_jr_8012ACE0.c +++ b/src/ov_SC02_004/ov_SC02_004_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC02_005/ov_SC02_005_jr_8012ACE0.c b/src/ov_SC02_005/ov_SC02_005_jr_8012ACE0.c index bc68a77f4..23536e32f 100644 --- a/src/ov_SC02_005/ov_SC02_005_jr_8012ACE0.c +++ b/src/ov_SC02_005/ov_SC02_005_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC02_011/ov_SC02_011_jr_8012ACE0.c b/src/ov_SC02_011/ov_SC02_011_jr_8012ACE0.c index 52f0ff0a7..720e96b31 100644 --- a/src/ov_SC02_011/ov_SC02_011_jr_8012ACE0.c +++ b/src/ov_SC02_011/ov_SC02_011_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC02_015/ov_SC02_015_jr_8012ACE0.c b/src/ov_SC02_015/ov_SC02_015_jr_8012ACE0.c index 2c88635b3..a547da551 100644 --- a/src/ov_SC02_015/ov_SC02_015_jr_8012ACE0.c +++ b/src/ov_SC02_015/ov_SC02_015_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC02_016/ov_SC02_016_jr_8012ACE0.c b/src/ov_SC02_016/ov_SC02_016_jr_8012ACE0.c index ea2d27b03..6923196be 100644 --- a/src/ov_SC02_016/ov_SC02_016_jr_8012ACE0.c +++ b/src/ov_SC02_016/ov_SC02_016_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC02_017/ov_SC02_017_jr_8012ACE0.c b/src/ov_SC02_017/ov_SC02_017_jr_8012ACE0.c index b15a9d473..5e24ecd3f 100644 --- a/src/ov_SC02_017/ov_SC02_017_jr_8012ACE0.c +++ b/src/ov_SC02_017/ov_SC02_017_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC02_021/ov_SC02_021_jr_8012ACE0.c b/src/ov_SC02_021/ov_SC02_021_jr_8012ACE0.c index c9316c3f6..bd40e3fd2 100644 --- a/src/ov_SC02_021/ov_SC02_021_jr_8012ACE0.c +++ b/src/ov_SC02_021/ov_SC02_021_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC02_026/ov_SC02_026_jr_8012ACE0.c b/src/ov_SC02_026/ov_SC02_026_jr_8012ACE0.c index f0e5d14ab..08b41df36 100644 --- a/src/ov_SC02_026/ov_SC02_026_jr_8012ACE0.c +++ b/src/ov_SC02_026/ov_SC02_026_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC02_027/ov_SC02_027_jr_8012ACE0.c b/src/ov_SC02_027/ov_SC02_027_jr_8012ACE0.c index c761dbab4..f18f1d200 100644 --- a/src/ov_SC02_027/ov_SC02_027_jr_8012ACE0.c +++ b/src/ov_SC02_027/ov_SC02_027_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC02_028/ov_SC02_028_jr_8012ACE0.c b/src/ov_SC02_028/ov_SC02_028_jr_8012ACE0.c index 70e8d02fc..292095525 100644 --- a/src/ov_SC02_028/ov_SC02_028_jr_8012ACE0.c +++ b/src/ov_SC02_028/ov_SC02_028_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC02_031/ov_SC02_031_jr_8012ACE0.c b/src/ov_SC02_031/ov_SC02_031_jr_8012ACE0.c index e2c5c1235..de8af1e61 100644 --- a/src/ov_SC02_031/ov_SC02_031_jr_8012ACE0.c +++ b/src/ov_SC02_031/ov_SC02_031_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC02_035/ov_SC02_035_jr_8012ACE0.c b/src/ov_SC02_035/ov_SC02_035_jr_8012ACE0.c index afe9a014f..4878bfba3 100644 --- a/src/ov_SC02_035/ov_SC02_035_jr_8012ACE0.c +++ b/src/ov_SC02_035/ov_SC02_035_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC02_039/ov_SC02_039_jr_8012ACE0.c b/src/ov_SC02_039/ov_SC02_039_jr_8012ACE0.c index 03a9b2072..0941580ef 100644 --- a/src/ov_SC02_039/ov_SC02_039_jr_8012ACE0.c +++ b/src/ov_SC02_039/ov_SC02_039_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC02_041/ov_SC02_041_jr_8012ACE0.c b/src/ov_SC02_041/ov_SC02_041_jr_8012ACE0.c index 8270f1ddf..d388b99d2 100644 --- a/src/ov_SC02_041/ov_SC02_041_jr_8012ACE0.c +++ b/src/ov_SC02_041/ov_SC02_041_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_001/ov_SC03_001_jr_8012ACE0.c b/src/ov_SC03_001/ov_SC03_001_jr_8012ACE0.c index 661c204bf..3bbf12d9f 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_8012ACE0.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_8012ACE0.c @@ -678,7 +678,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { return 0x1; diff --git a/src/ov_SC03_002/ov_SC03_002_jr_8012ACE0.c b/src/ov_SC03_002/ov_SC03_002_jr_8012ACE0.c index 5ba053d6d..03f883539 100644 --- a/src/ov_SC03_002/ov_SC03_002_jr_8012ACE0.c +++ b/src/ov_SC03_002/ov_SC03_002_jr_8012ACE0.c @@ -681,7 +681,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_003/ov_SC03_003_jr_8012ACE0.c b/src/ov_SC03_003/ov_SC03_003_jr_8012ACE0.c index c68eab9ef..1fc0d452d 100644 --- a/src/ov_SC03_003/ov_SC03_003_jr_8012ACE0.c +++ b/src/ov_SC03_003/ov_SC03_003_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_006/ov_SC03_006_jr_8012ACE0.c b/src/ov_SC03_006/ov_SC03_006_jr_8012ACE0.c index 234f349ba..e9648498f 100644 --- a/src/ov_SC03_006/ov_SC03_006_jr_8012ACE0.c +++ b/src/ov_SC03_006/ov_SC03_006_jr_8012ACE0.c @@ -681,7 +681,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_007/ov_SC03_007_jr_8012ACE0.c b/src/ov_SC03_007/ov_SC03_007_jr_8012ACE0.c index 68465af6e..5e6c8563d 100644 --- a/src/ov_SC03_007/ov_SC03_007_jr_8012ACE0.c +++ b/src/ov_SC03_007/ov_SC03_007_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_010/ov_SC03_010_jr_8012ACE0.c b/src/ov_SC03_010/ov_SC03_010_jr_8012ACE0.c index 57fa5eeb9..8bc602502 100644 --- a/src/ov_SC03_010/ov_SC03_010_jr_8012ACE0.c +++ b/src/ov_SC03_010/ov_SC03_010_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_011/ov_SC03_011_jr_8012ACE0.c b/src/ov_SC03_011/ov_SC03_011_jr_8012ACE0.c index 3895db586..3bdf3808f 100644 --- a/src/ov_SC03_011/ov_SC03_011_jr_8012ACE0.c +++ b/src/ov_SC03_011/ov_SC03_011_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_012/ov_SC03_012_jr_8012ACE0.c b/src/ov_SC03_012/ov_SC03_012_jr_8012ACE0.c index 2da3e53a6..49ea4878b 100644 --- a/src/ov_SC03_012/ov_SC03_012_jr_8012ACE0.c +++ b/src/ov_SC03_012/ov_SC03_012_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_013/ov_SC03_013_jr_8012ACE0.c b/src/ov_SC03_013/ov_SC03_013_jr_8012ACE0.c index ec31e3865..c598387f6 100644 --- a/src/ov_SC03_013/ov_SC03_013_jr_8012ACE0.c +++ b/src/ov_SC03_013/ov_SC03_013_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_014/ov_SC03_014_jr_8012ACE0.c b/src/ov_SC03_014/ov_SC03_014_jr_8012ACE0.c index cca0d1c19..ece2b8e1c 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_8012ACE0.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_015/ov_SC03_015_jr_8012ACE0.c b/src/ov_SC03_015/ov_SC03_015_jr_8012ACE0.c index 69bf3a2d2..13633d87a 100644 --- a/src/ov_SC03_015/ov_SC03_015_jr_8012ACE0.c +++ b/src/ov_SC03_015/ov_SC03_015_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_023/ov_SC03_023_jr_8012ACE0.c b/src/ov_SC03_023/ov_SC03_023_jr_8012ACE0.c index e506d7d6a..d266fb1ab 100644 --- a/src/ov_SC03_023/ov_SC03_023_jr_8012ACE0.c +++ b/src/ov_SC03_023/ov_SC03_023_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_024/ov_SC03_024_jr_8012ACE0.c b/src/ov_SC03_024/ov_SC03_024_jr_8012ACE0.c index 07647721b..696062292 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_8012ACE0.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_028/ov_SC03_028_jr_8012ACE0.c b/src/ov_SC03_028/ov_SC03_028_jr_8012ACE0.c index 8188a6870..b367df24f 100644 --- a/src/ov_SC03_028/ov_SC03_028_jr_8012ACE0.c +++ b/src/ov_SC03_028/ov_SC03_028_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_029/ov_SC03_029_jr_8012ACE0.c b/src/ov_SC03_029/ov_SC03_029_jr_8012ACE0.c index cd69136bf..1270cc7a0 100644 --- a/src/ov_SC03_029/ov_SC03_029_jr_8012ACE0.c +++ b/src/ov_SC03_029/ov_SC03_029_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_030/ov_SC03_030_jr_8012ACE0.c b/src/ov_SC03_030/ov_SC03_030_jr_8012ACE0.c index 7419df0b2..8f7ebda05 100644 --- a/src/ov_SC03_030/ov_SC03_030_jr_8012ACE0.c +++ b/src/ov_SC03_030/ov_SC03_030_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_031/ov_SC03_031_jr_8012ACE0.c b/src/ov_SC03_031/ov_SC03_031_jr_8012ACE0.c index 8aaa9e008..18df66023 100644 --- a/src/ov_SC03_031/ov_SC03_031_jr_8012ACE0.c +++ b/src/ov_SC03_031/ov_SC03_031_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_089/ov_SC03_089_jr_8012ACE0.c b/src/ov_SC03_089/ov_SC03_089_jr_8012ACE0.c index 1940066f9..34803a39c 100644 --- a/src/ov_SC03_089/ov_SC03_089_jr_8012ACE0.c +++ b/src/ov_SC03_089/ov_SC03_089_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_090/ov_SC03_090_jr_8012ACE0.c b/src/ov_SC03_090/ov_SC03_090_jr_8012ACE0.c index c8216fd55..39d72020a 100644 --- a/src/ov_SC03_090/ov_SC03_090_jr_8012ACE0.c +++ b/src/ov_SC03_090/ov_SC03_090_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_091/ov_SC03_091_jr_8012ACE0.c b/src/ov_SC03_091/ov_SC03_091_jr_8012ACE0.c index 3469277d4..7f9220aa1 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_8012ACE0.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_092/ov_SC03_092_jr_8012ACE0.c b/src/ov_SC03_092/ov_SC03_092_jr_8012ACE0.c index 1c8ea1333..9a98be344 100644 --- a/src/ov_SC03_092/ov_SC03_092_jr_8012ACE0.c +++ b/src/ov_SC03_092/ov_SC03_092_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_093/ov_SC03_093_jr_8012ACE0.c b/src/ov_SC03_093/ov_SC03_093_jr_8012ACE0.c index ced7692b9..77847a6eb 100644 --- a/src/ov_SC03_093/ov_SC03_093_jr_8012ACE0.c +++ b/src/ov_SC03_093/ov_SC03_093_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_094/ov_SC03_094_jr_8012ACE0.c b/src/ov_SC03_094/ov_SC03_094_jr_8012ACE0.c index 8c22b1e79..8992467fa 100644 --- a/src/ov_SC03_094/ov_SC03_094_jr_8012ACE0.c +++ b/src/ov_SC03_094/ov_SC03_094_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_095/ov_SC03_095_jr_8012ACE0.c b/src/ov_SC03_095/ov_SC03_095_jr_8012ACE0.c index d4698584a..916577912 100644 --- a/src/ov_SC03_095/ov_SC03_095_jr_8012ACE0.c +++ b/src/ov_SC03_095/ov_SC03_095_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_096/ov_SC03_096_jr_8012ACE0.c b/src/ov_SC03_096/ov_SC03_096_jr_8012ACE0.c index ba5b45de4..776a37ff3 100644 --- a/src/ov_SC03_096/ov_SC03_096_jr_8012ACE0.c +++ b/src/ov_SC03_096/ov_SC03_096_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_097/ov_SC03_097_jr_8012ACE0.c b/src/ov_SC03_097/ov_SC03_097_jr_8012ACE0.c index 0d8addb2f..a4dcbdd9c 100644 --- a/src/ov_SC03_097/ov_SC03_097_jr_8012ACE0.c +++ b/src/ov_SC03_097/ov_SC03_097_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_098/ov_SC03_098_jr_8012ACE0.c b/src/ov_SC03_098/ov_SC03_098_jr_8012ACE0.c index c3afc97fb..31ef2c8eb 100644 --- a/src/ov_SC03_098/ov_SC03_098_jr_8012ACE0.c +++ b/src/ov_SC03_098/ov_SC03_098_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_099/ov_SC03_099_jr_8012ACE0.c b/src/ov_SC03_099/ov_SC03_099_jr_8012ACE0.c index e1af2ed17..ab18e1959 100644 --- a/src/ov_SC03_099/ov_SC03_099_jr_8012ACE0.c +++ b/src/ov_SC03_099/ov_SC03_099_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_100/ov_SC03_100_jr_8012ACE0.c b/src/ov_SC03_100/ov_SC03_100_jr_8012ACE0.c index d62cd77a3..1b5e7dfd7 100644 --- a/src/ov_SC03_100/ov_SC03_100_jr_8012ACE0.c +++ b/src/ov_SC03_100/ov_SC03_100_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_101/ov_SC03_101_jr_8012ACE0.c b/src/ov_SC03_101/ov_SC03_101_jr_8012ACE0.c index 595faf021..0dcfb98b6 100644 --- a/src/ov_SC03_101/ov_SC03_101_jr_8012ACE0.c +++ b/src/ov_SC03_101/ov_SC03_101_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_102/ov_SC03_102_jr_8012ACE0.c b/src/ov_SC03_102/ov_SC03_102_jr_8012ACE0.c index 09a07689f..27b7fb096 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_8012ACE0.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_103/ov_SC03_103_jr_8012ACE0.c b/src/ov_SC03_103/ov_SC03_103_jr_8012ACE0.c index 02e8b071d..e05504215 100644 --- a/src/ov_SC03_103/ov_SC03_103_jr_8012ACE0.c +++ b/src/ov_SC03_103/ov_SC03_103_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_104/ov_SC03_104_jr_8012ACE0.c b/src/ov_SC03_104/ov_SC03_104_jr_8012ACE0.c index 6cdab1891..a25949ded 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_8012ACE0.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_105/ov_SC03_105_jr_8012ACE0.c b/src/ov_SC03_105/ov_SC03_105_jr_8012ACE0.c index be71eeb31..ccee117a9 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_8012ACE0.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_108/ov_SC03_108_jr_8012ACE0.c b/src/ov_SC03_108/ov_SC03_108_jr_8012ACE0.c index 20a88573b..8f6297cd2 100644 --- a/src/ov_SC03_108/ov_SC03_108_jr_8012ACE0.c +++ b/src/ov_SC03_108/ov_SC03_108_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_109/ov_SC03_109_jr_8012ACE0.c b/src/ov_SC03_109/ov_SC03_109_jr_8012ACE0.c index aa05b6990..a7f1d885a 100644 --- a/src/ov_SC03_109/ov_SC03_109_jr_8012ACE0.c +++ b/src/ov_SC03_109/ov_SC03_109_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_110/ov_SC03_110_jr_8012ACE0.c b/src/ov_SC03_110/ov_SC03_110_jr_8012ACE0.c index 4e59549aa..0cf642f51 100644 --- a/src/ov_SC03_110/ov_SC03_110_jr_8012ACE0.c +++ b/src/ov_SC03_110/ov_SC03_110_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_111/ov_SC03_111_jr_8012ACE0.c b/src/ov_SC03_111/ov_SC03_111_jr_8012ACE0.c index e0122c2f8..c930b1712 100644 --- a/src/ov_SC03_111/ov_SC03_111_jr_8012ACE0.c +++ b/src/ov_SC03_111/ov_SC03_111_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_112/ov_SC03_112_jr_8012ACE0.c b/src/ov_SC03_112/ov_SC03_112_jr_8012ACE0.c index 4ee410668..5021b35e9 100644 --- a/src/ov_SC03_112/ov_SC03_112_jr_8012ACE0.c +++ b/src/ov_SC03_112/ov_SC03_112_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_113/ov_SC03_113_jr_8012ACE0.c b/src/ov_SC03_113/ov_SC03_113_jr_8012ACE0.c index 7e57a6265..58348d831 100644 --- a/src/ov_SC03_113/ov_SC03_113_jr_8012ACE0.c +++ b/src/ov_SC03_113/ov_SC03_113_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_114/ov_SC03_114_jr_8012ACE0.c b/src/ov_SC03_114/ov_SC03_114_jr_8012ACE0.c index a326bc906..183abc618 100644 --- a/src/ov_SC03_114/ov_SC03_114_jr_8012ACE0.c +++ b/src/ov_SC03_114/ov_SC03_114_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_115/ov_SC03_115_jr_8012ACE0.c b/src/ov_SC03_115/ov_SC03_115_jr_8012ACE0.c index 92d647817..0581a2cd9 100644 --- a/src/ov_SC03_115/ov_SC03_115_jr_8012ACE0.c +++ b/src/ov_SC03_115/ov_SC03_115_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_116/ov_SC03_116_jr_8012ACE0.c b/src/ov_SC03_116/ov_SC03_116_jr_8012ACE0.c index 99a36dbf6..62ec4f28e 100644 --- a/src/ov_SC03_116/ov_SC03_116_jr_8012ACE0.c +++ b/src/ov_SC03_116/ov_SC03_116_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_117/ov_SC03_117_jr_8012ACE0.c b/src/ov_SC03_117/ov_SC03_117_jr_8012ACE0.c index 4bb8a871f..763cfc0c3 100644 --- a/src/ov_SC03_117/ov_SC03_117_jr_8012ACE0.c +++ b/src/ov_SC03_117/ov_SC03_117_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_118/ov_SC03_118_jr_8012ACE0.c b/src/ov_SC03_118/ov_SC03_118_jr_8012ACE0.c index 44db2ba1d..379a80ffe 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_8012ACE0.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_119/ov_SC03_119_jr_8012ACE0.c b/src/ov_SC03_119/ov_SC03_119_jr_8012ACE0.c index 4e1ffb43f..f7b604f49 100644 --- a/src/ov_SC03_119/ov_SC03_119_jr_8012ACE0.c +++ b/src/ov_SC03_119/ov_SC03_119_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_121/ov_SC03_121_jr_8012ACE0.c b/src/ov_SC03_121/ov_SC03_121_jr_8012ACE0.c index 189e95151..81333b6a1 100644 --- a/src/ov_SC03_121/ov_SC03_121_jr_8012ACE0.c +++ b/src/ov_SC03_121/ov_SC03_121_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_124/ov_SC03_124_jr_8012ACE0.c b/src/ov_SC03_124/ov_SC03_124_jr_8012ACE0.c index 95f020748..63fbd8a48 100644 --- a/src/ov_SC03_124/ov_SC03_124_jr_8012ACE0.c +++ b/src/ov_SC03_124/ov_SC03_124_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_125/ov_SC03_125_jr_8012ACE0.c b/src/ov_SC03_125/ov_SC03_125_jr_8012ACE0.c index d07b8877c..1e07ab1cf 100644 --- a/src/ov_SC03_125/ov_SC03_125_jr_8012ACE0.c +++ b/src/ov_SC03_125/ov_SC03_125_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC03_126/ov_SC03_126_jr_8012ACE0.c b/src/ov_SC03_126/ov_SC03_126_jr_8012ACE0.c index 5db34dfcb..c0b83dfdb 100644 --- a/src/ov_SC03_126/ov_SC03_126_jr_8012ACE0.c +++ b/src/ov_SC03_126/ov_SC03_126_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC04_000/ov_SC04_000_jr_8012ACE0.c b/src/ov_SC04_000/ov_SC04_000_jr_8012ACE0.c index 85d408252..fea71c1ef 100644 --- a/src/ov_SC04_000/ov_SC04_000_jr_8012ACE0.c +++ b/src/ov_SC04_000/ov_SC04_000_jr_8012ACE0.c @@ -681,7 +681,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC04_002/ov_SC04_002_jr_8012ACE0.c b/src/ov_SC04_002/ov_SC04_002_jr_8012ACE0.c index 5e85bfbdb..e675a6661 100644 --- a/src/ov_SC04_002/ov_SC04_002_jr_8012ACE0.c +++ b/src/ov_SC04_002/ov_SC04_002_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC04_003/ov_SC04_003_jr_8012ACE0.c b/src/ov_SC04_003/ov_SC04_003_jr_8012ACE0.c index 011f5704b..6c615971e 100644 --- a/src/ov_SC04_003/ov_SC04_003_jr_8012ACE0.c +++ b/src/ov_SC04_003/ov_SC04_003_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC04_004/ov_SC04_004_jr_8012ACE0.c b/src/ov_SC04_004/ov_SC04_004_jr_8012ACE0.c index 30c982886..502067827 100644 --- a/src/ov_SC04_004/ov_SC04_004_jr_8012ACE0.c +++ b/src/ov_SC04_004/ov_SC04_004_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC04_005/ov_SC04_005_jr_8012ACE0.c b/src/ov_SC04_005/ov_SC04_005_jr_8012ACE0.c index 8b120d1ec..595cfaf0d 100644 --- a/src/ov_SC04_005/ov_SC04_005_jr_8012ACE0.c +++ b/src/ov_SC04_005/ov_SC04_005_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC04_006/ov_SC04_006_jr_8012ACE0.c b/src/ov_SC04_006/ov_SC04_006_jr_8012ACE0.c index 3bc622573..51652000f 100644 --- a/src/ov_SC04_006/ov_SC04_006_jr_8012ACE0.c +++ b/src/ov_SC04_006/ov_SC04_006_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC04_007/ov_SC04_007_jr_8012ACE0.c b/src/ov_SC04_007/ov_SC04_007_jr_8012ACE0.c index b4c4bc44e..8d1713549 100644 --- a/src/ov_SC04_007/ov_SC04_007_jr_8012ACE0.c +++ b/src/ov_SC04_007/ov_SC04_007_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC04_008/ov_SC04_008_jr_8012ACE0.c b/src/ov_SC04_008/ov_SC04_008_jr_8012ACE0.c index 7d06e697e..41bc14fef 100644 --- a/src/ov_SC04_008/ov_SC04_008_jr_8012ACE0.c +++ b/src/ov_SC04_008/ov_SC04_008_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC04_009/ov_SC04_009_jr_8012ACE0.c b/src/ov_SC04_009/ov_SC04_009_jr_8012ACE0.c index 6c6c2aadb..6932adff1 100644 --- a/src/ov_SC04_009/ov_SC04_009_jr_8012ACE0.c +++ b/src/ov_SC04_009/ov_SC04_009_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC04_010/ov_SC04_010_jr_8012ACE0.c b/src/ov_SC04_010/ov_SC04_010_jr_8012ACE0.c index 3e7f4f334..960f95fbe 100644 --- a/src/ov_SC04_010/ov_SC04_010_jr_8012ACE0.c +++ b/src/ov_SC04_010/ov_SC04_010_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.c b/src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.c index 325154d29..0c8727489 100644 --- a/src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.c +++ b/src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC04_012/ov_SC04_012_jr_8012ACE0.c b/src/ov_SC04_012/ov_SC04_012_jr_8012ACE0.c index 98b34398c..88335462c 100644 --- a/src/ov_SC04_012/ov_SC04_012_jr_8012ACE0.c +++ b/src/ov_SC04_012/ov_SC04_012_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC04_015/ov_SC04_015_jr_8012ACE0.c b/src/ov_SC04_015/ov_SC04_015_jr_8012ACE0.c index 85da7c796..bb9f9b474 100644 --- a/src/ov_SC04_015/ov_SC04_015_jr_8012ACE0.c +++ b/src/ov_SC04_015/ov_SC04_015_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC04_016/ov_SC04_016_jr_8012ACE0.c b/src/ov_SC04_016/ov_SC04_016_jr_8012ACE0.c index a72568712..3d96991b0 100644 --- a/src/ov_SC04_016/ov_SC04_016_jr_8012ACE0.c +++ b/src/ov_SC04_016/ov_SC04_016_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC04_018/ov_SC04_018_jr_8012ACE0.c b/src/ov_SC04_018/ov_SC04_018_jr_8012ACE0.c index b8eaa217e..be2b9b54c 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_8012ACE0.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_8012ACE0.c @@ -681,7 +681,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC04_019/ov_SC04_019_jr_8012ACE0.c b/src/ov_SC04_019/ov_SC04_019_jr_8012ACE0.c index 5169cc71b..19412ec1f 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_8012ACE0.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_8012ACE0.c @@ -681,7 +681,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC04_020/ov_SC04_020_jr_8012ACE0.c b/src/ov_SC04_020/ov_SC04_020_jr_8012ACE0.c index 01f9743d9..63f37a6c3 100644 --- a/src/ov_SC04_020/ov_SC04_020_jr_8012ACE0.c +++ b/src/ov_SC04_020/ov_SC04_020_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC04_021/ov_SC04_021_jr_8012ACE0.c b/src/ov_SC04_021/ov_SC04_021_jr_8012ACE0.c index 8cbd697a1..90f253e15 100644 --- a/src/ov_SC04_021/ov_SC04_021_jr_8012ACE0.c +++ b/src/ov_SC04_021/ov_SC04_021_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC05_000/ov_SC05_000_jr_8012ACE0.c b/src/ov_SC05_000/ov_SC05_000_jr_8012ACE0.c index 8085fe233..cef59525d 100644 --- a/src/ov_SC05_000/ov_SC05_000_jr_8012ACE0.c +++ b/src/ov_SC05_000/ov_SC05_000_jr_8012ACE0.c @@ -681,7 +681,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC05_001/ov_SC05_001_jr_8012ACE0.c b/src/ov_SC05_001/ov_SC05_001_jr_8012ACE0.c index 3185aa0a4..acdc35c0c 100644 --- a/src/ov_SC05_001/ov_SC05_001_jr_8012ACE0.c +++ b/src/ov_SC05_001/ov_SC05_001_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC05_002/ov_SC05_002_jr_8012ACE0.c b/src/ov_SC05_002/ov_SC05_002_jr_8012ACE0.c index 48bcedcc6..5596371f3 100644 --- a/src/ov_SC05_002/ov_SC05_002_jr_8012ACE0.c +++ b/src/ov_SC05_002/ov_SC05_002_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC05_003/ov_SC05_003_jr_8012ACE0.c b/src/ov_SC05_003/ov_SC05_003_jr_8012ACE0.c index 556a8b390..f59604e59 100644 --- a/src/ov_SC05_003/ov_SC05_003_jr_8012ACE0.c +++ b/src/ov_SC05_003/ov_SC05_003_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC05_004/ov_SC05_004_jr_8012ACE0.c b/src/ov_SC05_004/ov_SC05_004_jr_8012ACE0.c index 2559729e3..0aef5383a 100644 --- a/src/ov_SC05_004/ov_SC05_004_jr_8012ACE0.c +++ b/src/ov_SC05_004/ov_SC05_004_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC05_005/ov_SC05_005_jr_8012ACE0.c b/src/ov_SC05_005/ov_SC05_005_jr_8012ACE0.c index 98fc955b2..624633e06 100644 --- a/src/ov_SC05_005/ov_SC05_005_jr_8012ACE0.c +++ b/src/ov_SC05_005/ov_SC05_005_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC05_006/ov_SC05_006_jr_8012ACE0.c b/src/ov_SC05_006/ov_SC05_006_jr_8012ACE0.c index 40654f4c2..64505f950 100644 --- a/src/ov_SC05_006/ov_SC05_006_jr_8012ACE0.c +++ b/src/ov_SC05_006/ov_SC05_006_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC05_007/ov_SC05_007_jr_8012ACE0.c b/src/ov_SC05_007/ov_SC05_007_jr_8012ACE0.c index a88adbb57..93b3a0427 100644 --- a/src/ov_SC05_007/ov_SC05_007_jr_8012ACE0.c +++ b/src/ov_SC05_007/ov_SC05_007_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC05_008/ov_SC05_008_jr_8012ACE0.c b/src/ov_SC05_008/ov_SC05_008_jr_8012ACE0.c index d7f249f31..9606d5f36 100644 --- a/src/ov_SC05_008/ov_SC05_008_jr_8012ACE0.c +++ b/src/ov_SC05_008/ov_SC05_008_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC05_009/ov_SC05_009_jr_8012ACE0.c b/src/ov_SC05_009/ov_SC05_009_jr_8012ACE0.c index 4fcb1b3e6..55fa5c6da 100644 --- a/src/ov_SC05_009/ov_SC05_009_jr_8012ACE0.c +++ b/src/ov_SC05_009/ov_SC05_009_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC05_010/ov_SC05_010_jr_8012ACE0.c b/src/ov_SC05_010/ov_SC05_010_jr_8012ACE0.c index 2578e23dd..7c6090ac1 100644 --- a/src/ov_SC05_010/ov_SC05_010_jr_8012ACE0.c +++ b/src/ov_SC05_010/ov_SC05_010_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC05_011/ov_SC05_011_jr_8012ACE0.c b/src/ov_SC05_011/ov_SC05_011_jr_8012ACE0.c index 9b16710f1..d960787c3 100644 --- a/src/ov_SC05_011/ov_SC05_011_jr_8012ACE0.c +++ b/src/ov_SC05_011/ov_SC05_011_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC05_017/ov_SC05_017_jr_8012ACE0.c b/src/ov_SC05_017/ov_SC05_017_jr_8012ACE0.c index 6686d5682..b320c5b12 100644 --- a/src/ov_SC05_017/ov_SC05_017_jr_8012ACE0.c +++ b/src/ov_SC05_017/ov_SC05_017_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC05_018/ov_SC05_018_jr_8012ACE0.c b/src/ov_SC05_018/ov_SC05_018_jr_8012ACE0.c index 47cdb38bc..1cd59068d 100644 --- a/src/ov_SC05_018/ov_SC05_018_jr_8012ACE0.c +++ b/src/ov_SC05_018/ov_SC05_018_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC05_019/ov_SC05_019_jr_8012ACE0.c b/src/ov_SC05_019/ov_SC05_019_jr_8012ACE0.c index ebef1bf6b..0023a22b5 100644 --- a/src/ov_SC05_019/ov_SC05_019_jr_8012ACE0.c +++ b/src/ov_SC05_019/ov_SC05_019_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC06_000/ov_SC06_000_jr_8012ACE0.c b/src/ov_SC06_000/ov_SC06_000_jr_8012ACE0.c index 06af4cef3..35d747c35 100644 --- a/src/ov_SC06_000/ov_SC06_000_jr_8012ACE0.c +++ b/src/ov_SC06_000/ov_SC06_000_jr_8012ACE0.c @@ -681,7 +681,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC06_006/ov_SC06_006_jr_8012ACE0.c b/src/ov_SC06_006/ov_SC06_006_jr_8012ACE0.c index 1f51df8b6..3b29ef738 100644 --- a/src/ov_SC06_006/ov_SC06_006_jr_8012ACE0.c +++ b/src/ov_SC06_006/ov_SC06_006_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC06_008/ov_SC06_008_jr_8012ACE0.c b/src/ov_SC06_008/ov_SC06_008_jr_8012ACE0.c index 6f4b7ca42..95791f1cd 100644 --- a/src/ov_SC06_008/ov_SC06_008_jr_8012ACE0.c +++ b/src/ov_SC06_008/ov_SC06_008_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC06_010/ov_SC06_010_jr_8012ACE0.c b/src/ov_SC06_010/ov_SC06_010_jr_8012ACE0.c index 7fb13129f..2d0ababc5 100644 --- a/src/ov_SC06_010/ov_SC06_010_jr_8012ACE0.c +++ b/src/ov_SC06_010/ov_SC06_010_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC06_011/ov_SC06_011_jr_8012ACE0.c b/src/ov_SC06_011/ov_SC06_011_jr_8012ACE0.c index e83098298..76a384b1d 100644 --- a/src/ov_SC06_011/ov_SC06_011_jr_8012ACE0.c +++ b/src/ov_SC06_011/ov_SC06_011_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC06_013/ov_SC06_013_jr_8012ACE0.c b/src/ov_SC06_013/ov_SC06_013_jr_8012ACE0.c index 839c93e3c..6112f2bd9 100644 --- a/src/ov_SC06_013/ov_SC06_013_jr_8012ACE0.c +++ b/src/ov_SC06_013/ov_SC06_013_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC06_014/ov_SC06_014_jr_8012ACE0.c b/src/ov_SC06_014/ov_SC06_014_jr_8012ACE0.c index fffbdf517..13380a373 100644 --- a/src/ov_SC06_014/ov_SC06_014_jr_8012ACE0.c +++ b/src/ov_SC06_014/ov_SC06_014_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC06_015/ov_SC06_015_jr_8012ACE0.c b/src/ov_SC06_015/ov_SC06_015_jr_8012ACE0.c index 05d977328..7951b94bd 100644 --- a/src/ov_SC06_015/ov_SC06_015_jr_8012ACE0.c +++ b/src/ov_SC06_015/ov_SC06_015_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC06_016/ov_SC06_016_jr_8012ACE0.c b/src/ov_SC06_016/ov_SC06_016_jr_8012ACE0.c index 53793fb98..40fe6e335 100644 --- a/src/ov_SC06_016/ov_SC06_016_jr_8012ACE0.c +++ b/src/ov_SC06_016/ov_SC06_016_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC06_018/ov_SC06_018_jr_8012ACE0.c b/src/ov_SC06_018/ov_SC06_018_jr_8012ACE0.c index 710d1bd3d..3db9fff23 100644 --- a/src/ov_SC06_018/ov_SC06_018_jr_8012ACE0.c +++ b/src/ov_SC06_018/ov_SC06_018_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC06_020/ov_SC06_020_jr_8012ACE0.c b/src/ov_SC06_020/ov_SC06_020_jr_8012ACE0.c index fb99ad975..ec2fa0914 100644 --- a/src/ov_SC06_020/ov_SC06_020_jr_8012ACE0.c +++ b/src/ov_SC06_020/ov_SC06_020_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC06_022/ov_SC06_022_jr_8012ACE0.c b/src/ov_SC06_022/ov_SC06_022_jr_8012ACE0.c index c4a482358..c1e33d8cf 100644 --- a/src/ov_SC06_022/ov_SC06_022_jr_8012ACE0.c +++ b/src/ov_SC06_022/ov_SC06_022_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC06_024/ov_SC06_024_jr_8012ACE0.c b/src/ov_SC06_024/ov_SC06_024_jr_8012ACE0.c index 233322a08..1a68937ea 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_8012ACE0.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC06_025/ov_SC06_025_jr_8012ACE0.c b/src/ov_SC06_025/ov_SC06_025_jr_8012ACE0.c index 7ff661e04..2b7b5611c 100644 --- a/src/ov_SC06_025/ov_SC06_025_jr_8012ACE0.c +++ b/src/ov_SC06_025/ov_SC06_025_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC06_027/ov_SC06_027_jr_8012ACE0.c b/src/ov_SC06_027/ov_SC06_027_jr_8012ACE0.c index f73053da4..5a588bf3b 100644 --- a/src/ov_SC06_027/ov_SC06_027_jr_8012ACE0.c +++ b/src/ov_SC06_027/ov_SC06_027_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC06_029/ov_SC06_029_jr_8012ACE0.c b/src/ov_SC06_029/ov_SC06_029_jr_8012ACE0.c index 4962773cd..617c22c1b 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_8012ACE0.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC06_030/ov_SC06_030_jr_8012ACE0.c b/src/ov_SC06_030/ov_SC06_030_jr_8012ACE0.c index 87e7b8f34..c279ab3a3 100644 --- a/src/ov_SC06_030/ov_SC06_030_jr_8012ACE0.c +++ b/src/ov_SC06_030/ov_SC06_030_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC06_032/ov_SC06_032_jr_8012ACE0.c b/src/ov_SC06_032/ov_SC06_032_jr_8012ACE0.c index 68e847598..c2547ae17 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_8012ACE0.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC06_033/ov_SC06_033_jr_8012ACE0.c b/src/ov_SC06_033/ov_SC06_033_jr_8012ACE0.c index fea5d3065..6cc8f7f18 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_8012ACE0.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC07_000/ov_SC07_000_jr_8012ACE0.c b/src/ov_SC07_000/ov_SC07_000_jr_8012ACE0.c index eabe7bbab..d15d53b95 100644 --- a/src/ov_SC07_000/ov_SC07_000_jr_8012ACE0.c +++ b/src/ov_SC07_000/ov_SC07_000_jr_8012ACE0.c @@ -681,7 +681,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC07_001/ov_SC07_001_jr_8012ACE0.c b/src/ov_SC07_001/ov_SC07_001_jr_8012ACE0.c index bb385c450..57328f4d6 100644 --- a/src/ov_SC07_001/ov_SC07_001_jr_8012ACE0.c +++ b/src/ov_SC07_001/ov_SC07_001_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC07_002/ov_SC07_002_jr_8012ACE0.c b/src/ov_SC07_002/ov_SC07_002_jr_8012ACE0.c index 49a1f9526..24c87f421 100644 --- a/src/ov_SC07_002/ov_SC07_002_jr_8012ACE0.c +++ b/src/ov_SC07_002/ov_SC07_002_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC07_006/ov_SC07_006.c b/src/ov_SC07_006/ov_SC07_006.c index 61b392d16..276f55f4a 100644 --- a/src/ov_SC07_006/ov_SC07_006.c +++ b/src/ov_SC07_006/ov_SC07_006.c @@ -1296,49 +1296,7 @@ INCLUDE_ASM("asm/ov_SC07_006/nonmatchings/ov_SC07_006", func_8012E014); #include "common.h" -extern u16 D_80126B5E; -extern u16 D_80126B62; -extern u16 D_80126B66; - -extern void func_8012F038(); -extern void func_80049CAC(); -extern void func_8012F14C(); -extern s32 func_80135888(); - -void func_8012E138(int model) { - struct Cam8012E138 cam; - int bufB[2]; - int bufA[2]; - int m; - short s; - - cam.a = D_80126B5E; - cam.b = D_80126B62; - cam.c = D_80126B66; - func_8012F038(*(int *)(model + 0x20) + 0x34, &cam, bufA); - m = *(int *)(model + 0x20); - if (m != 0) { - int mm; - func_80049CAC(m + 0x10, m + 0x34); - mm = *(int *)(model + 0x20); - s = *(u16 *)(model + 6) + *(u16 *)(model + 0x50); - *(u16 *)(mm + 8) = s; - *(int *)(mm + 0x48) = s; - s = *(u16 *)(model + 0xA) + *(u16 *)(model + 0x52); - *(u16 *)(mm + 0xA) = s; - *(int *)(mm + 0x4C) = s; - s = *(u16 *)(model + 0xE) + *(u16 *)(model + 0x54); - *(u16 *)(mm + 0xC) = s; - *(u16 *)(mm + 0x2C) = *(u16 *)(mm + 0x2C) | 1; - *(int *)(mm + 0x50) = s; - } - func_8012F14C(*(int *)(model + 0x20) + 0x34, bufA, bufB); - if (func_80135888(*(int *)(model + 0x20), *(int *)(model + 0x58), bufB, &cam)) { - D_80126B5E = cam.a; - D_80126B62 = cam.b; - D_80126B66 = cam.c; - } -} +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ diff --git a/src/ov_SC07_007/ov_SC07_007.c b/src/ov_SC07_007/ov_SC07_007.c index 8b4f67139..dc1d8bfa5 100644 --- a/src/ov_SC07_007/ov_SC07_007.c +++ b/src/ov_SC07_007/ov_SC07_007.c @@ -1197,7 +1197,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012dfd4 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_007/nonmatchings/ov_SC07_007", func_8012E014); -INCLUDE_ASM("asm/ov_SC07_007/nonmatchings/ov_SC07_007", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC07_008/ov_SC07_008_jr_8012ACE0.c b/src/ov_SC07_008/ov_SC07_008_jr_8012ACE0.c index 1f7a9f07f..09f6ddd5f 100644 --- a/src/ov_SC07_008/ov_SC07_008_jr_8012ACE0.c +++ b/src/ov_SC07_008/ov_SC07_008_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC07_009/ov_SC07_009_jr_8012ACE0.c b/src/ov_SC07_009/ov_SC07_009_jr_8012ACE0.c index fae012183..f95c06527 100644 --- a/src/ov_SC07_009/ov_SC07_009_jr_8012ACE0.c +++ b/src/ov_SC07_009/ov_SC07_009_jr_8012ACE0.c @@ -679,7 +679,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012DFD4 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009_jr_8012ACE0", func_8012E014); -INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009_jr_8012ACE0", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC07_010/ov_SC07_010.c b/src/ov_SC07_010/ov_SC07_010.c index 7c2b1fe4d..6e9444314 100644 --- a/src/ov_SC07_010/ov_SC07_010.c +++ b/src/ov_SC07_010/ov_SC07_010.c @@ -1197,7 +1197,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012dfd4 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_010/nonmatchings/ov_SC07_010", func_8012E014); -INCLUDE_ASM("asm/ov_SC07_010/nonmatchings/ov_SC07_010", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/ov_SC07_011/ov_SC07_011.c b/src/ov_SC07_011/ov_SC07_011.c index cb0892fff..79db6852d 100644 --- a/src/ov_SC07_011/ov_SC07_011.c +++ b/src/ov_SC07_011/ov_SC07_011.c @@ -1197,7 +1197,7 @@ DEFINE_func_8012DFD4() /* dedup: shared engine-core @0x8012dfd4 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_011/nonmatchings/ov_SC07_011", func_8012E014); -INCLUDE_ASM("asm/ov_SC07_011/nonmatchings/ov_SC07_011", func_8012E138); +DEFINE_func_8012E138() /* dedup: shared engine-core @0x8012E138 (src/shared) */ s32 func_8012E27C(void) { diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index b3726305f..e61f82f1c 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -28236,4 +28236,46 @@ GsSortLine(&line, &base[(u16)D_800B9A02 * 20], 0); \ } +#define DEFINE_func_8012E138() \ + extern u16 D_80126B5E; \ + extern u16 D_80126B62; \ + extern u16 D_80126B66; \ + extern void func_8012F038(); \ + extern void func_80049CAC(); \ + extern void func_8012F14C(); \ + extern s32 func_80135888(); \ + void func_8012E138(int model) { \ + struct Cam8012E138 cam; \ + int bufB[2]; \ + int bufA[2]; \ + int m; \ + short s; \ + cam.a = D_80126B5E; \ + cam.b = D_80126B62; \ + cam.c = D_80126B66; \ + func_8012F038(*(int *)(model + 0x20) + 0x34, &cam, bufA); \ + m = *(int *)(model + 0x20); \ + if (m != 0) { \ + int mm; \ + func_80049CAC(m + 0x10, m + 0x34); \ + mm = *(int *)(model + 0x20); \ + s = *(u16 *)(model + 6) + *(u16 *)(model + 0x50); \ + *(u16 *)(mm + 8) = s; \ + *(int *)(mm + 0x48) = s; \ + s = *(u16 *)(model + 0xA) + *(u16 *)(model + 0x52); \ + *(u16 *)(mm + 0xA) = s; \ + *(int *)(mm + 0x4C) = s; \ + s = *(u16 *)(model + 0xE) + *(u16 *)(model + 0x54); \ + *(u16 *)(mm + 0xC) = s; \ + *(u16 *)(mm + 0x2C) = *(u16 *)(mm + 0x2C) | 1; \ + *(int *)(mm + 0x50) = s; \ + } \ + func_8012F14C(*(int *)(model + 0x20) + 0x34, bufA, bufB); \ + if (func_80135888(*(int *)(model + 0x20), *(int *)(model + 0x58), bufB, &cam)) { \ + D_80126B5E = cam.a; \ + D_80126B62 = cam.b; \ + D_80126B66 = cam.c; \ + } \ + } + #endif