From be38b941478e1c67dcf374c8b95c4728c09f2264 Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Fri, 3 Jul 2026 04:21:15 -0600 Subject: [PATCH] =?UTF-8?q?feat(phase-24):=20T6=20=E2=80=94=20flagship=20f?= =?UTF-8?q?unc=5F80132784=20propagated=20=C3=97134=20(+1.6%=20byte-weight)?= =?UTF-8?q?=20via=20straggler-reconcile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The 400-ins giant func_80132784 (S11 prologue-weave; cracked T4, banked ×1) is now shared across ALL 134 overlays byte-identical — the highest single byte-weight lever in the project. - Blocker (T4-deferred): dedup_propagate's single-`--addr` plan is all-or-nothing; ONE straggler overlay (ov_SC02_005) failed to compile the shared macro -> the whole fn dropped, kept ×1. - Root cause: ov_SC02_005 declared a CONFLICTING caller extern `void func_80132784(s32,s32,s32)` while the def is `(s32,s32,u32)` (3rd param s32 vs u32) -> `conflicting types`. The call site casts `((void(*)(u8*,u8*,u16))func_80132784)(...)` so the extern type is codegen-irrelevant. - Fix (T6 integration-recovery pattern, proven): reconcile the straggler's caller extern to the def's canonical signature (s32->u32, byte-neutral), then propagate. dedup_propagate then rebuilt all 134 overlays BYTE-IDENTICAL; registered group E_func_80132784 (134 members). - dedup-check: 1784 validated, 0 failed. Verified by a clean R22 fleet check-all (136/136). - This is the concrete spec for the T6 tool: detect a straggler's conflicting caller decl, reconcile to the def's canonical sig, re-gate, propagate full (vs. the all-or-nothing drop). --- config/dedup.us.yaml | 7 ++ src/ov_SC01_000/ov_SC01_000.c | 2 +- src/ov_SC01_001/ov_SC01_001.c | 2 +- src/ov_SC01_004/ov_SC01_004.c | 2 +- src/ov_SC01_005/ov_SC01_005.c | 2 +- src/ov_SC01_006/ov_SC01_006.c | 2 +- src/ov_SC01_008/ov_SC01_008.c | 2 +- src/ov_SC01_009/ov_SC01_009.c | 2 +- src/ov_SC01_074/ov_SC01_074.c | 2 +- src/ov_SC01_077/ov_SC01_077_a.c | 190 +------------------------------- src/ov_SC01_080/ov_SC01_080.c | 2 +- src/ov_SC01_084/ov_SC01_084.c | 2 +- src/ov_SC02_000/ov_SC02_000.c | 2 +- src/ov_SC02_003/ov_SC02_003.c | 2 +- src/ov_SC02_004/ov_SC02_004.c | 2 +- src/ov_SC02_005/ov_SC02_005.c | 4 +- src/ov_SC02_011/ov_SC02_011.c | 2 +- src/ov_SC02_015/ov_SC02_015.c | 2 +- src/ov_SC02_016/ov_SC02_016.c | 2 +- src/ov_SC02_017/ov_SC02_017.c | 2 +- src/ov_SC02_021/ov_SC02_021.c | 2 +- src/ov_SC02_026/ov_SC02_026.c | 2 +- src/ov_SC02_027/ov_SC02_027.c | 2 +- src/ov_SC02_028/ov_SC02_028.c | 2 +- src/ov_SC02_031/ov_SC02_031.c | 2 +- src/ov_SC02_035/ov_SC02_035.c | 2 +- src/ov_SC02_039/ov_SC02_039.c | 2 +- src/ov_SC02_041/ov_SC02_041.c | 2 +- src/ov_SC03_001/ov_SC03_001.c | 2 +- src/ov_SC03_002/ov_SC03_002.c | 2 +- src/ov_SC03_003/ov_SC03_003.c | 2 +- src/ov_SC03_006/ov_SC03_006.c | 2 +- src/ov_SC03_007/ov_SC03_007.c | 2 +- src/ov_SC03_010/ov_SC03_010.c | 2 +- src/ov_SC03_011/ov_SC03_011.c | 2 +- src/ov_SC03_012/ov_SC03_012.c | 2 +- src/ov_SC03_013/ov_SC03_013.c | 2 +- src/ov_SC03_014/ov_SC03_014.c | 2 +- src/ov_SC03_015/ov_SC03_015.c | 2 +- src/ov_SC03_023/ov_SC03_023.c | 2 +- src/ov_SC03_024/ov_SC03_024.c | 2 +- src/ov_SC03_028/ov_SC03_028.c | 2 +- src/ov_SC03_029/ov_SC03_029.c | 2 +- src/ov_SC03_030/ov_SC03_030.c | 2 +- src/ov_SC03_031/ov_SC03_031.c | 2 +- src/ov_SC03_089/ov_SC03_089.c | 2 +- src/ov_SC03_090/ov_SC03_090.c | 2 +- src/ov_SC03_091/ov_SC03_091.c | 2 +- src/ov_SC03_092/ov_SC03_092.c | 2 +- src/ov_SC03_093/ov_SC03_093.c | 2 +- src/ov_SC03_094/ov_SC03_094.c | 2 +- src/ov_SC03_095/ov_SC03_095.c | 2 +- src/ov_SC03_096/ov_SC03_096.c | 2 +- src/ov_SC03_097/ov_SC03_097.c | 2 +- src/ov_SC03_098/ov_SC03_098.c | 2 +- src/ov_SC03_099/ov_SC03_099.c | 2 +- src/ov_SC03_100/ov_SC03_100.c | 2 +- src/ov_SC03_101/ov_SC03_101.c | 2 +- src/ov_SC03_102/ov_SC03_102.c | 2 +- src/ov_SC03_103/ov_SC03_103.c | 2 +- src/ov_SC03_104/ov_SC03_104.c | 2 +- src/ov_SC03_105/ov_SC03_105.c | 2 +- src/ov_SC03_108/ov_SC03_108.c | 2 +- src/ov_SC03_109/ov_SC03_109.c | 2 +- src/ov_SC03_110/ov_SC03_110.c | 2 +- src/ov_SC03_111/ov_SC03_111.c | 2 +- src/ov_SC03_112/ov_SC03_112.c | 2 +- src/ov_SC03_113/ov_SC03_113.c | 2 +- src/ov_SC03_114/ov_SC03_114.c | 2 +- src/ov_SC03_115/ov_SC03_115.c | 2 +- src/ov_SC03_116/ov_SC03_116.c | 2 +- src/ov_SC03_117/ov_SC03_117.c | 2 +- src/ov_SC03_118/ov_SC03_118.c | 2 +- src/ov_SC03_119/ov_SC03_119.c | 2 +- src/ov_SC03_121/ov_SC03_121.c | 2 +- src/ov_SC03_124/ov_SC03_124.c | 2 +- src/ov_SC03_125/ov_SC03_125.c | 2 +- src/ov_SC03_126/ov_SC03_126.c | 2 +- src/ov_SC04_000/ov_SC04_000.c | 2 +- src/ov_SC04_002/ov_SC04_002.c | 2 +- src/ov_SC04_003/ov_SC04_003.c | 2 +- src/ov_SC04_004/ov_SC04_004.c | 2 +- src/ov_SC04_005/ov_SC04_005.c | 2 +- src/ov_SC04_006/ov_SC04_006.c | 2 +- src/ov_SC04_007/ov_SC04_007.c | 2 +- src/ov_SC04_008/ov_SC04_008.c | 2 +- src/ov_SC04_009/ov_SC04_009.c | 2 +- src/ov_SC04_010/ov_SC04_010.c | 2 +- src/ov_SC04_011/ov_SC04_011.c | 2 +- src/ov_SC04_012/ov_SC04_012.c | 2 +- src/ov_SC04_015/ov_SC04_015.c | 2 +- src/ov_SC04_016/ov_SC04_016.c | 2 +- src/ov_SC04_018/ov_SC04_018.c | 2 +- src/ov_SC04_019/ov_SC04_019.c | 2 +- src/ov_SC04_020/ov_SC04_020.c | 2 +- src/ov_SC04_021/ov_SC04_021.c | 2 +- src/ov_SC05_000/ov_SC05_000.c | 2 +- src/ov_SC05_001/ov_SC05_001.c | 2 +- src/ov_SC05_002/ov_SC05_002.c | 2 +- src/ov_SC05_003/ov_SC05_003.c | 2 +- src/ov_SC05_004/ov_SC05_004.c | 2 +- src/ov_SC05_005/ov_SC05_005.c | 2 +- src/ov_SC05_006/ov_SC05_006.c | 2 +- src/ov_SC05_007/ov_SC05_007.c | 2 +- src/ov_SC05_008/ov_SC05_008.c | 2 +- src/ov_SC05_009/ov_SC05_009.c | 2 +- src/ov_SC05_010/ov_SC05_010.c | 2 +- src/ov_SC05_011/ov_SC05_011.c | 2 +- src/ov_SC05_017/ov_SC05_017.c | 2 +- src/ov_SC05_018/ov_SC05_018.c | 2 +- src/ov_SC05_019/ov_SC05_019.c | 2 +- src/ov_SC06_000/ov_SC06_000.c | 2 +- src/ov_SC06_006/ov_SC06_006.c | 2 +- src/ov_SC06_008/ov_SC06_008.c | 2 +- src/ov_SC06_010/ov_SC06_010.c | 2 +- src/ov_SC06_011/ov_SC06_011.c | 2 +- src/ov_SC06_013/ov_SC06_013.c | 2 +- src/ov_SC06_014/ov_SC06_014.c | 2 +- src/ov_SC06_015/ov_SC06_015.c | 2 +- src/ov_SC06_016/ov_SC06_016.c | 2 +- src/ov_SC06_018/ov_SC06_018.c | 2 +- src/ov_SC06_020/ov_SC06_020.c | 2 +- src/ov_SC06_022/ov_SC06_022.c | 2 +- src/ov_SC06_024/ov_SC06_024.c | 2 +- src/ov_SC06_025/ov_SC06_025.c | 2 +- src/ov_SC06_027/ov_SC06_027.c | 2 +- src/ov_SC06_029/ov_SC06_029.c | 2 +- src/ov_SC06_030/ov_SC06_030.c | 2 +- src/ov_SC06_032/ov_SC06_032.c | 2 +- src/ov_SC06_033/ov_SC06_033.c | 2 +- src/ov_SC07_000/ov_SC07_000.c | 2 +- src/ov_SC07_001/ov_SC07_001.c | 2 +- src/ov_SC07_002/ov_SC07_002.c | 2 +- src/ov_SC07_008/ov_SC07_008.c | 2 +- src/ov_SC07_009/ov_SC07_009.c | 2 +- src/shared/engine_core.h | 190 ++++++++++++++++++++++++++++++++ 136 files changed, 332 insertions(+), 323 deletions(-) diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 4a3792e998..c01a7600d1 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -12602,3 +12602,10 @@ groups: func: DEFINE_func_80149374 vram: 0x80149374 binaries: [ov_SC01_077, ov_SC01_005, ov_SC01_006, ov_SC03_001, ov_SC01_000, ov_SC01_001, ov_SC02_000, ov_SC02_003, ov_SC03_002, ov_SC03_006, ov_SC04_000, ov_SC04_018, ov_SC04_019, ov_SC05_000, ov_SC06_000, ov_SC07_000, ov_SC01_004, ov_SC01_008, ov_SC01_009, ov_SC01_074, ov_SC01_080, ov_SC01_084, ov_SC02_004, ov_SC02_005, ov_SC02_011, ov_SC02_015, ov_SC02_016, ov_SC02_017, ov_SC02_021, ov_SC02_026, ov_SC02_027, ov_SC02_028, ov_SC02_031, ov_SC02_035, ov_SC02_039, ov_SC02_041, ov_SC03_003, ov_SC03_007, ov_SC03_010, ov_SC03_011, ov_SC03_012, ov_SC03_013, ov_SC03_014, ov_SC03_015, ov_SC03_023, ov_SC03_024, ov_SC03_028, ov_SC03_029, ov_SC03_030, ov_SC03_031, ov_SC03_089, ov_SC03_090, ov_SC03_091, ov_SC03_092, ov_SC03_093, ov_SC03_094, ov_SC03_095, ov_SC03_096, ov_SC03_097, ov_SC03_098, ov_SC03_099, ov_SC03_100, ov_SC03_101, ov_SC03_102, ov_SC03_103, ov_SC03_104, ov_SC03_105, ov_SC03_108, ov_SC03_109, ov_SC03_110, ov_SC03_111, ov_SC03_112, ov_SC03_113, ov_SC03_114, ov_SC03_115, ov_SC03_116, ov_SC03_117, ov_SC03_118, ov_SC03_119, ov_SC03_121, ov_SC03_124, ov_SC03_125, ov_SC03_126, ov_SC04_002, ov_SC04_003, ov_SC04_004, ov_SC04_005, ov_SC04_006, ov_SC04_007, ov_SC04_008, ov_SC04_009, ov_SC04_010, ov_SC04_011, ov_SC04_012, ov_SC04_015, ov_SC04_016, ov_SC04_020, ov_SC04_021, ov_SC05_001, ov_SC05_002, ov_SC05_003, ov_SC05_004, ov_SC05_005, ov_SC05_006, ov_SC05_007, ov_SC05_008, ov_SC05_009, ov_SC05_010, ov_SC05_011, ov_SC05_017, ov_SC05_018, ov_SC05_019, ov_SC06_006, ov_SC06_008, ov_SC06_010, ov_SC06_011, ov_SC06_013, ov_SC06_014, ov_SC06_015, ov_SC06_016, ov_SC06_018, ov_SC06_020, ov_SC06_022, ov_SC06_024, ov_SC06_025, ov_SC06_027, ov_SC06_029, ov_SC06_030, ov_SC06_032, ov_SC06_033, ov_SC07_001, ov_SC07_002, ov_SC07_008, ov_SC07_009] + - id: E_func_80132784 + tier: h_exact + hash: 040f7b5107c6106b70219be4a0357b80f67941cc + source: src/shared/engine_core.h + func: DEFINE_func_80132784 + vram: 0x80132784 + binaries: [ov_SC01_077, ov_SC01_005, ov_SC01_006, ov_SC03_001, ov_SC01_000, ov_SC01_001, ov_SC02_000, ov_SC02_003, ov_SC03_002, ov_SC03_006, ov_SC04_000, ov_SC04_018, ov_SC04_019, ov_SC05_000, ov_SC06_000, ov_SC07_000, ov_SC01_004, ov_SC01_008, ov_SC01_009, ov_SC01_074, ov_SC01_080, ov_SC01_084, ov_SC02_004, ov_SC02_005, ov_SC02_011, ov_SC02_015, ov_SC02_016, ov_SC02_017, ov_SC02_021, ov_SC02_026, ov_SC02_027, ov_SC02_028, ov_SC02_031, ov_SC02_035, ov_SC02_039, ov_SC02_041, ov_SC03_003, ov_SC03_007, ov_SC03_010, ov_SC03_011, ov_SC03_012, ov_SC03_013, ov_SC03_014, ov_SC03_015, ov_SC03_023, ov_SC03_024, ov_SC03_028, ov_SC03_029, ov_SC03_030, ov_SC03_031, ov_SC03_089, ov_SC03_090, ov_SC03_091, ov_SC03_092, ov_SC03_093, ov_SC03_094, ov_SC03_095, ov_SC03_096, ov_SC03_097, ov_SC03_098, ov_SC03_099, ov_SC03_100, ov_SC03_101, ov_SC03_102, ov_SC03_103, ov_SC03_104, ov_SC03_105, ov_SC03_108, ov_SC03_109, ov_SC03_110, ov_SC03_111, ov_SC03_112, ov_SC03_113, ov_SC03_114, ov_SC03_115, ov_SC03_116, ov_SC03_117, ov_SC03_118, ov_SC03_119, ov_SC03_121, ov_SC03_124, ov_SC03_125, ov_SC03_126, ov_SC04_002, ov_SC04_003, ov_SC04_004, ov_SC04_005, ov_SC04_006, ov_SC04_007, ov_SC04_008, ov_SC04_009, ov_SC04_010, ov_SC04_011, ov_SC04_012, ov_SC04_015, ov_SC04_016, ov_SC04_020, ov_SC04_021, ov_SC05_001, ov_SC05_002, ov_SC05_003, ov_SC05_004, ov_SC05_005, ov_SC05_006, ov_SC05_007, ov_SC05_008, ov_SC05_009, ov_SC05_010, ov_SC05_011, ov_SC05_017, ov_SC05_018, ov_SC05_019, ov_SC06_006, ov_SC06_008, ov_SC06_010, ov_SC06_011, ov_SC06_013, ov_SC06_014, ov_SC06_015, ov_SC06_016, ov_SC06_018, ov_SC06_020, ov_SC06_022, ov_SC06_024, ov_SC06_025, ov_SC06_027, ov_SC06_029, ov_SC06_030, ov_SC06_032, ov_SC06_033, ov_SC07_001, ov_SC07_002, ov_SC07_008, ov_SC07_009] diff --git a/src/ov_SC01_000/ov_SC01_000.c b/src/ov_SC01_000/ov_SC01_000.c index 6db2390d37..7f867642ab 100644 --- a/src/ov_SC01_000/ov_SC01_000.c +++ b/src/ov_SC01_000/ov_SC01_000.c @@ -613,7 +613,7 @@ INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC01_001/ov_SC01_001.c b/src/ov_SC01_001/ov_SC01_001.c index 3f869ed0ab..1ce360e1bc 100644 --- a/src/ov_SC01_001/ov_SC01_001.c +++ b/src/ov_SC01_001/ov_SC01_001.c @@ -604,7 +604,7 @@ INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC01_004/ov_SC01_004.c b/src/ov_SC01_004/ov_SC01_004.c index ca772099e8..ca6c6bb7bd 100644 --- a/src/ov_SC01_004/ov_SC01_004.c +++ b/src/ov_SC01_004/ov_SC01_004.c @@ -617,7 +617,7 @@ INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC01_005/ov_SC01_005.c b/src/ov_SC01_005/ov_SC01_005.c index f0cce6fded..525acc1f40 100644 --- a/src/ov_SC01_005/ov_SC01_005.c +++ b/src/ov_SC01_005/ov_SC01_005.c @@ -596,7 +596,7 @@ INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC01_006/ov_SC01_006.c b/src/ov_SC01_006/ov_SC01_006.c index 7be6430010..2b441229c3 100644 --- a/src/ov_SC01_006/ov_SC01_006.c +++ b/src/ov_SC01_006/ov_SC01_006.c @@ -596,7 +596,7 @@ INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC01_008/ov_SC01_008.c b/src/ov_SC01_008/ov_SC01_008.c index c3463f14f9..5873a76451 100644 --- a/src/ov_SC01_008/ov_SC01_008.c +++ b/src/ov_SC01_008/ov_SC01_008.c @@ -617,7 +617,7 @@ INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC01_009/ov_SC01_009.c b/src/ov_SC01_009/ov_SC01_009.c index a7282e99bd..566a7f4d55 100644 --- a/src/ov_SC01_009/ov_SC01_009.c +++ b/src/ov_SC01_009/ov_SC01_009.c @@ -617,7 +617,7 @@ INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC01_074/ov_SC01_074.c b/src/ov_SC01_074/ov_SC01_074.c index 284fbe6a37..e1a19a5f23 100644 --- a/src/ov_SC01_074/ov_SC01_074.c +++ b/src/ov_SC01_074/ov_SC01_074.c @@ -617,7 +617,7 @@ INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC01_077/ov_SC01_077_a.c b/src/ov_SC01_077/ov_SC01_077_a.c index 95e365a777..1f4703687c 100644 --- a/src/ov_SC01_077/ov_SC01_077_a.c +++ b/src/ov_SC01_077/ov_SC01_077_a.c @@ -1486,195 +1486,7 @@ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077_a", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -extern void func_80049CAC(s32 a0, s32 a1); -extern void func_80020F34(s32 a0, s32 a1); -extern void func_80054514(s32 a0, s32 a1); - -void func_80132784(s32 a0, s32 a1, u32 a2) -{ - s32 s7 = a0; - s32 s0p = a1; - u32 s2v = a2; - s32 s6; - s32 s1m; - s16 sVar1; - u8 buf[0xC0]; - if (((*((s32 *) (s7 + 0x20))) != 0) || ((*((s32 *) (s0p + 0x20))) != 0)) - { - s6 = *((s32 *) (s0p + 0x20)); - s1m = *((s32 *) (s6 + 0x20)); - if (s1m != 0) - { - *((s32 *) (buf + 0x48)) = *((s32 *) (s6 + 0x78)); - *((s32 *) (buf + 0x00)) = 0; - if (((*((u16 *) (s6 + 0x2C))) & 1) != 0) - { - *((Blk16 *) (buf + 0x04)) = *((Blk16 *) (s6 + 0x34)); - *((Blk16 *) (buf + 0x14)) = *((Blk16 *) (s6 + 0x44)); - } - else - { - func_80049CAC(s6 + 0x10, (s32) (buf + 0x04)); - sVar1 = (*((s16 *) (s0p + 6))) + (*((s16 *) (s0p + 0x50))); - *((s16 *) (s6 + 8)) = sVar1; - *((s32 *) (buf + 0x18)) = (s32) sVar1; - sVar1 = (*((s16 *) (s0p + 0xA))) + (*((s16 *) (s0p + 0x52))); - *((s16 *) (s6 + 0xA)) = sVar1; - *((s32 *) (buf + 0x1C)) = (s32) sVar1; - sVar1 = (*((s16 *) (s0p + 0xE))) + (*((s16 *) (s0p + 0x54))); - *((s16 *) (s6 + 0xC)) = sVar1; - *((s32 *) (buf + 0x20)) = (s32) sVar1; - *((Blk16 *) (s6 + 0x34)) = *((Blk16 *) (buf + 0x04)); - *((Blk16 *) (s6 + 0x44)) = *((Blk16 *) (buf + 0x14)); - *((u16 *) (s6 + 0x2C)) = (*((u16 *) (s6 + 0x2C))) | 1; - } - if (((*((u16 *) (s6 + 0x2C))) & 0x10) != 0) - { - func_80020F34((s32) (buf + 0x04), s6 + 0x18); - } - func_80054514((s32) (buf + 0x00), (s32) (buf + 0x50)); - if (((s1m & 0x1000000) == 0) && (((*((u16 *) (s6 + 0x2C))) & 0x40) == 0)) - { - s1m = s1m + ((s2v & 0xFFFF) * 0xC); - func_80049CAC(s1m + 6, (s32) (buf + 0x70)); - *((s32 *) (buf + 0x84)) = (s32) (*((s16 *) (s1m + 0))); - *((s32 *) (buf + 0x88)) = (s32) (*((s16 *) (s1m + 2))); - *((s32 *) (buf + 0x8C)) = (s32) (*((s16 *) (s1m + 4))); - } - else - { - u32 *pu = (u32 *) ((s1m & 0xFEFFFFFF) + ((s2v & 0xFFFF) * 8)); - u32 w; - *((u16 *) (buf + 0xB0)) = *((u16 *) (((s32) pu) + 6)); - w = *pu; - *((u16 *) (buf + 0xB2)) = ((u16) (*((u8 *) (((s32) pu) + 1)))) | ((u16) ((w & 0xF) << 8)); - *((u16 *) (buf + 0xB4)) = ((u16) (w >> 0x10)) & 0xFF; - *((u16 *) (buf + 0xB4)) = (*((u16 *) (buf + 0xB4))) | ((u16) ((w & 0xF0) << 4)); - func_80049CAC((s32) (buf + 0xB0), (s32) (buf + 0x70)); - *((s32 *) (buf + 0x84)) = (s32) (*((s8 *) (((s32) pu) + 3))); - *((s32 *) (buf + 0x88)) = (s32) ((s8) pu[1]); - *((s32 *) (buf + 0x8C)) = (s32) (*((s8 *) (((s32) pu) + 5))); - } - { -__asm__ __volatile__( - "lw $12, 0(%0)\n" "lw $13, 4(%0)\n" - "ctc2 $12, $0\n" "ctc2 $13, $1\n" - "lw $12, 8(%0)\n" "lw $13, 12(%0)\n" "lw $14, 16(%0)\n" - "ctc2 $12, $2\n" "ctc2 $13, $3\n" "ctc2 $14, $4\n" - : : "r"((s32 *)(buf + 0x50)) : "$12", "$13", "$14", "memory"); -__asm__ __volatile__( - "lhu $12, 0(%0)\n" "lhu $13, 6(%0)\n" "lhu $14, 12(%0)\n" - "mtc2 $12, $9\n" "mtc2 $13, $10\n" "mtc2 $14, $11\n" - "nop\n" "nop\n" "mvmva 1, 0, 3, 3, 0\n" - : : "r"((s16 *)(buf + 0x70)) : "$12", "$13", "$14", "memory"); -__asm__ __volatile__( - "mfc2 $12, $9\n" "mfc2 $13, $10\n" "mfc2 $14, $11\n" - "sh $12, 0(%0)\n" "sh $13, 6(%0)\n" "sh $14, 12(%0)\n" - : : "r"((s16 *)(buf + 0x90)) : "$12", "$13", "$14", "memory"); -__asm__ __volatile__( - "lhu $12, 0(%0)\n" "lhu $13, 6(%0)\n" "lhu $14, 12(%0)\n" - "mtc2 $12, $9\n" "mtc2 $13, $10\n" "mtc2 $14, $11\n" - "nop\n" "nop\n" "mvmva 1, 0, 3, 3, 0\n" - : : "r"((s16 *)(buf + 0x72)) : "$12", "$13", "$14", "memory"); -__asm__ __volatile__( - "mfc2 $12, $9\n" "mfc2 $13, $10\n" "mfc2 $14, $11\n" - "sh $12, 0(%0)\n" "sh $13, 6(%0)\n" "sh $14, 12(%0)\n" - : : "r"((s16 *)(buf + 0x92)) : "$12", "$13", "$14", "memory"); -__asm__ __volatile__( - "lhu $12, 0(%0)\n" "lhu $13, 6(%0)\n" "lhu $14, 12(%0)\n" - "mtc2 $12, $9\n" "mtc2 $13, $10\n" "mtc2 $14, $11\n" - "nop\n" "nop\n" "mvmva 1, 0, 3, 3, 0\n" - : : "r"((s16 *)(buf + 0x74)) : "$12", "$13", "$14", "memory"); -__asm__ __volatile__( - "mfc2 $12, $9\n" "mfc2 $13, $10\n" "mfc2 $14, $11\n" - "sh $12, 0(%0)\n" "sh $13, 6(%0)\n" "sh $14, 12(%0)\n" - : : "r"((s16 *)(buf + 0x94)) : "$12", "$13", "$14", "memory"); -__asm__ __volatile__( - "lw $12, 20(%0)\n" "lw $13, 24(%0)\n" - "ctc2 $12, $5\n" "lw $14, 28(%0)\n" - "ctc2 $13, $6\n" "ctc2 $14, $7\n" - : : "r"((s32 *)(buf + 0x50)) : "$12", "$13", "$14", "memory"); -__asm__ __volatile__( - "lhu $13, 4(%0)\n" "lhu $12, 0(%0)\n" - "sll $13, $13, 16\n" "or $12, $12, $13\n" - "mtc2 $12, $0\n" "lwc2 $1, 8(%0)\n" - "nop\n" "nop\n" "mvmva 1, 0, 0, 0, 0\n" - : : "r"((s16 *)(buf + 0x84)) : "$12", "$13", "memory"); -__asm__ __volatile__( - "swc2 $25, 0(%0)\n" "swc2 $26, 4(%0)\n" "swc2 $27, 8(%0)\n" - : : "r"((s32 *)(buf + 0xA4)) : "memory"); - } - s6 = *((s32 *) (s7 + 0x20)); - func_80049CAC(s6 + 0x10, (s32) (buf + 0x70)); - sVar1 = (*((s16 *) (s7 + 6))) + (*((s16 *) (s7 + 0x50))); - *((s16 *) (s6 + 8)) = sVar1; - *((s32 *) (buf + 0x84)) = (s32) sVar1; - sVar1 = (*((s16 *) (s7 + 0xA))) + (*((s16 *) (s7 + 0x52))); - *((s16 *) (s6 + 0xA)) = sVar1; - *((s32 *) (buf + 0x88)) = (s32) sVar1; - sVar1 = (*((s16 *) (s7 + 0xE))) + (*((s16 *) (s7 + 0x54))); - *((s16 *) (s6 + 0xC)) = sVar1; - *((s32 *) (buf + 0x8C)) = (s32) sVar1; - { -__asm__ __volatile__( - "lw $12, 0(%0)\n" "lw $13, 4(%0)\n" - "ctc2 $12, $0\n" "ctc2 $13, $1\n" - "lw $12, 8(%0)\n" "lw $13, 12(%0)\n" "lw $14, 16(%0)\n" - "ctc2 $12, $2\n" "ctc2 $13, $3\n" "ctc2 $14, $4\n" - : : "r"((s32 *)(buf + 0x90)) : "$12", "$13", "$14", "memory"); -__asm__ __volatile__( - "lhu $12, 0(%0)\n" "lhu $13, 6(%0)\n" "lhu $14, 12(%0)\n" - "mtc2 $12, $9\n" "mtc2 $13, $10\n" "mtc2 $14, $11\n" - "nop\n" "nop\n" "mvmva 1, 0, 3, 3, 0\n" - : : "r"((s16 *)(buf + 0x70)) : "$12", "$13", "$14", "memory"); -__asm__ __volatile__( - "mfc2 $12, $9\n" "mfc2 $13, $10\n" "mfc2 $14, $11\n" - "sh $12, 0(%0)\n" "sh $13, 6(%0)\n" "sh $14, 12(%0)\n" - : : "r"((s16 *)(buf + 0x50)) : "$12", "$13", "$14", "memory"); -__asm__ __volatile__( - "lhu $12, 0(%0)\n" "lhu $13, 6(%0)\n" "lhu $14, 12(%0)\n" - "mtc2 $12, $9\n" "mtc2 $13, $10\n" "mtc2 $14, $11\n" - "nop\n" "nop\n" "mvmva 1, 0, 3, 3, 0\n" - : : "r"((s16 *)(buf + 0x72)) : "$12", "$13", "$14", "memory"); -__asm__ __volatile__( - "mfc2 $12, $9\n" "mfc2 $13, $10\n" "mfc2 $14, $11\n" - "sh $12, 0(%0)\n" "sh $13, 6(%0)\n" "sh $14, 12(%0)\n" - : : "r"((s16 *)(buf + 0x52)) : "$12", "$13", "$14", "memory"); -__asm__ __volatile__( - "lhu $12, 0(%0)\n" "lhu $13, 6(%0)\n" "lhu $14, 12(%0)\n" - "mtc2 $12, $9\n" "mtc2 $13, $10\n" "mtc2 $14, $11\n" - "nop\n" "nop\n" "mvmva 1, 0, 3, 3, 0\n" - : : "r"((s16 *)(buf + 0x74)) : "$12", "$13", "$14", "memory"); -__asm__ __volatile__( - "mfc2 $12, $9\n" "mfc2 $13, $10\n" "mfc2 $14, $11\n" - "sh $12, 0(%0)\n" "sh $13, 6(%0)\n" "sh $14, 12(%0)\n" - : : "r"((s16 *)(buf + 0x54)) : "$12", "$13", "$14", "memory"); -__asm__ __volatile__( - "lw $12, 20(%0)\n" "lw $13, 24(%0)\n" - "ctc2 $12, $5\n" "lw $14, 28(%0)\n" - "ctc2 $13, $6\n" "ctc2 $14, $7\n" - : : "r"((s32 *)(buf + 0x90)) : "$12", "$13", "$14", "memory"); -__asm__ __volatile__( - "lhu $13, 4(%0)\n" "lhu $12, 0(%0)\n" - "sll $13, $13, 16\n" "or $12, $12, $13\n" - "mtc2 $12, $0\n" "lwc2 $1, 8(%0)\n" - "nop\n" "nop\n" "mvmva 1, 0, 0, 0, 0\n" - : : "r"((s16 *)(buf + 0x84)) : "$12", "$13", "memory"); -__asm__ __volatile__( - "swc2 $25, 0(%0)\n" "swc2 $26, 4(%0)\n" "swc2 $27, 8(%0)\n" - : : "r"((s32 *)(buf + 0x64)) : "memory"); - } - *((Blk16 *) (s6 + 0x34)) = *((Blk16 *) (buf + 0x50)); - *((Blk16 *) (s6 + 0x44)) = *((Blk16 *) (buf + 0x60)); - s0p = 0x30; - *((Blk16 *) (s6 + 0x54)) = *((Blk16 *) (buf + 0x50)); - *((Blk16 *) (s6 + 0x64)) = *((Blk16 *) (buf + 0x60)); - *((s32 *) (s6 + s0p)) = 1; - *((u16 *) (s6 + 0x2C)) = (*((u16 *) (s6 + 0x2C))) | 1; - } - } - return; -} +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC01_080/ov_SC01_080.c b/src/ov_SC01_080/ov_SC01_080.c index 06163da59f..5eabfb92bd 100644 --- a/src/ov_SC01_080/ov_SC01_080.c +++ b/src/ov_SC01_080/ov_SC01_080.c @@ -617,7 +617,7 @@ INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC01_084/ov_SC01_084.c b/src/ov_SC01_084/ov_SC01_084.c index 202896d5a2..e4e64f8051 100644 --- a/src/ov_SC01_084/ov_SC01_084.c +++ b/src/ov_SC01_084/ov_SC01_084.c @@ -617,7 +617,7 @@ INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC02_000/ov_SC02_000.c b/src/ov_SC02_000/ov_SC02_000.c index 1c300005bb..2bab81615b 100644 --- a/src/ov_SC02_000/ov_SC02_000.c +++ b/src/ov_SC02_000/ov_SC02_000.c @@ -604,7 +604,7 @@ INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC02_003/ov_SC02_003.c b/src/ov_SC02_003/ov_SC02_003.c index 9942abd336..7eb4167f77 100644 --- a/src/ov_SC02_003/ov_SC02_003.c +++ b/src/ov_SC02_003/ov_SC02_003.c @@ -604,7 +604,7 @@ INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC02_004/ov_SC02_004.c b/src/ov_SC02_004/ov_SC02_004.c index c38b02a045..1cb32826c8 100644 --- a/src/ov_SC02_004/ov_SC02_004.c +++ b/src/ov_SC02_004/ov_SC02_004.c @@ -617,7 +617,7 @@ INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC02_005/ov_SC02_005.c b/src/ov_SC02_005/ov_SC02_005.c index 1cc518e586..9988d8a2a1 100644 --- a/src/ov_SC02_005/ov_SC02_005.c +++ b/src/ov_SC02_005/ov_SC02_005.c @@ -617,7 +617,7 @@ INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ @@ -5774,7 +5774,7 @@ INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005", func_8018B368); void func_8018B408(void) { } -extern void func_80132784(s32 a0, s32 a1, s32 a2); +extern void func_80132784(s32 a0, s32 a1, u32 a2); void func_8018B410(u8 *a0) { ((void (*)(u8 *, u8 *, u16))func_80132784)(a0, *(u8 **)(a0 + 0x64), *(u16 *)(a0 + 0xfe)); } diff --git a/src/ov_SC02_011/ov_SC02_011.c b/src/ov_SC02_011/ov_SC02_011.c index 0da8bb6ea0..10f944f32d 100644 --- a/src/ov_SC02_011/ov_SC02_011.c +++ b/src/ov_SC02_011/ov_SC02_011.c @@ -617,7 +617,7 @@ INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC02_015/ov_SC02_015.c b/src/ov_SC02_015/ov_SC02_015.c index 43b62bc4ba..a6169ea610 100644 --- a/src/ov_SC02_015/ov_SC02_015.c +++ b/src/ov_SC02_015/ov_SC02_015.c @@ -617,7 +617,7 @@ INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC02_016/ov_SC02_016.c b/src/ov_SC02_016/ov_SC02_016.c index 694e8d6be4..92ea8b38c7 100644 --- a/src/ov_SC02_016/ov_SC02_016.c +++ b/src/ov_SC02_016/ov_SC02_016.c @@ -617,7 +617,7 @@ INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC02_017/ov_SC02_017.c b/src/ov_SC02_017/ov_SC02_017.c index be0b3b327f..1f2046bf5a 100644 --- a/src/ov_SC02_017/ov_SC02_017.c +++ b/src/ov_SC02_017/ov_SC02_017.c @@ -617,7 +617,7 @@ INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC02_021/ov_SC02_021.c b/src/ov_SC02_021/ov_SC02_021.c index b552381c0a..cc59e4d702 100644 --- a/src/ov_SC02_021/ov_SC02_021.c +++ b/src/ov_SC02_021/ov_SC02_021.c @@ -617,7 +617,7 @@ INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC02_026/ov_SC02_026.c b/src/ov_SC02_026/ov_SC02_026.c index e152590d16..9882f64aab 100644 --- a/src/ov_SC02_026/ov_SC02_026.c +++ b/src/ov_SC02_026/ov_SC02_026.c @@ -617,7 +617,7 @@ INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC02_027/ov_SC02_027.c b/src/ov_SC02_027/ov_SC02_027.c index a2bed7ac87..c4a420c5d3 100644 --- a/src/ov_SC02_027/ov_SC02_027.c +++ b/src/ov_SC02_027/ov_SC02_027.c @@ -617,7 +617,7 @@ INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC02_028/ov_SC02_028.c b/src/ov_SC02_028/ov_SC02_028.c index d4628aaee5..a1b4df0ac1 100644 --- a/src/ov_SC02_028/ov_SC02_028.c +++ b/src/ov_SC02_028/ov_SC02_028.c @@ -617,7 +617,7 @@ INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC02_031/ov_SC02_031.c b/src/ov_SC02_031/ov_SC02_031.c index 08e1571322..954bab162f 100644 --- a/src/ov_SC02_031/ov_SC02_031.c +++ b/src/ov_SC02_031/ov_SC02_031.c @@ -617,7 +617,7 @@ INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC02_035/ov_SC02_035.c b/src/ov_SC02_035/ov_SC02_035.c index 3e52ca82da..737fbf49d7 100644 --- a/src/ov_SC02_035/ov_SC02_035.c +++ b/src/ov_SC02_035/ov_SC02_035.c @@ -617,7 +617,7 @@ INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC02_039/ov_SC02_039.c b/src/ov_SC02_039/ov_SC02_039.c index 81a73a67b7..f244a6714e 100644 --- a/src/ov_SC02_039/ov_SC02_039.c +++ b/src/ov_SC02_039/ov_SC02_039.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC02_041/ov_SC02_041.c b/src/ov_SC02_041/ov_SC02_041.c index 51b493ebeb..63806c9884 100644 --- a/src/ov_SC02_041/ov_SC02_041.c +++ b/src/ov_SC02_041/ov_SC02_041.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_001/ov_SC03_001.c b/src/ov_SC03_001/ov_SC03_001.c index 4a71c1baf7..becc3d3064 100644 --- a/src/ov_SC03_001/ov_SC03_001.c +++ b/src/ov_SC03_001/ov_SC03_001.c @@ -604,7 +604,7 @@ INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_002/ov_SC03_002.c b/src/ov_SC03_002/ov_SC03_002.c index ef171d9f9c..fc19eacee2 100644 --- a/src/ov_SC03_002/ov_SC03_002.c +++ b/src/ov_SC03_002/ov_SC03_002.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_003/ov_SC03_003.c b/src/ov_SC03_003/ov_SC03_003.c index 7724ff1b5b..e9d56fc6ed 100644 --- a/src/ov_SC03_003/ov_SC03_003.c +++ b/src/ov_SC03_003/ov_SC03_003.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_006/ov_SC03_006.c b/src/ov_SC03_006/ov_SC03_006.c index b6653902b5..9838ef4e5c 100644 --- a/src/ov_SC03_006/ov_SC03_006.c +++ b/src/ov_SC03_006/ov_SC03_006.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_007/ov_SC03_007.c b/src/ov_SC03_007/ov_SC03_007.c index d4b590db81..312636bd69 100644 --- a/src/ov_SC03_007/ov_SC03_007.c +++ b/src/ov_SC03_007/ov_SC03_007.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_010/ov_SC03_010.c b/src/ov_SC03_010/ov_SC03_010.c index e0ae94dd24..16feb49b00 100644 --- a/src/ov_SC03_010/ov_SC03_010.c +++ b/src/ov_SC03_010/ov_SC03_010.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_011/ov_SC03_011.c b/src/ov_SC03_011/ov_SC03_011.c index f5c3944e7d..ab55715edf 100644 --- a/src/ov_SC03_011/ov_SC03_011.c +++ b/src/ov_SC03_011/ov_SC03_011.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_012/ov_SC03_012.c b/src/ov_SC03_012/ov_SC03_012.c index 460fb6fc45..233d60f160 100644 --- a/src/ov_SC03_012/ov_SC03_012.c +++ b/src/ov_SC03_012/ov_SC03_012.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_013/ov_SC03_013.c b/src/ov_SC03_013/ov_SC03_013.c index bdd8c6f7fb..f8f2833b25 100644 --- a/src/ov_SC03_013/ov_SC03_013.c +++ b/src/ov_SC03_013/ov_SC03_013.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_014/ov_SC03_014.c b/src/ov_SC03_014/ov_SC03_014.c index daf7e728a1..60aba86fff 100644 --- a/src/ov_SC03_014/ov_SC03_014.c +++ b/src/ov_SC03_014/ov_SC03_014.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_015/ov_SC03_015.c b/src/ov_SC03_015/ov_SC03_015.c index 0cbea63e2c..26806d2211 100644 --- a/src/ov_SC03_015/ov_SC03_015.c +++ b/src/ov_SC03_015/ov_SC03_015.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_023/ov_SC03_023.c b/src/ov_SC03_023/ov_SC03_023.c index 458638eccc..eddb643290 100644 --- a/src/ov_SC03_023/ov_SC03_023.c +++ b/src/ov_SC03_023/ov_SC03_023.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_024/ov_SC03_024.c b/src/ov_SC03_024/ov_SC03_024.c index 6654b46eee..c74cb73044 100644 --- a/src/ov_SC03_024/ov_SC03_024.c +++ b/src/ov_SC03_024/ov_SC03_024.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_028/ov_SC03_028.c b/src/ov_SC03_028/ov_SC03_028.c index 3d0ba86425..2628373a9f 100644 --- a/src/ov_SC03_028/ov_SC03_028.c +++ b/src/ov_SC03_028/ov_SC03_028.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_029/ov_SC03_029.c b/src/ov_SC03_029/ov_SC03_029.c index 17e42c497d..ad2f87d2d4 100644 --- a/src/ov_SC03_029/ov_SC03_029.c +++ b/src/ov_SC03_029/ov_SC03_029.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_030/ov_SC03_030.c b/src/ov_SC03_030/ov_SC03_030.c index 990333e5fc..9dd6fa3a4d 100644 --- a/src/ov_SC03_030/ov_SC03_030.c +++ b/src/ov_SC03_030/ov_SC03_030.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_031/ov_SC03_031.c b/src/ov_SC03_031/ov_SC03_031.c index 2397ef626d..484dcc6c52 100644 --- a/src/ov_SC03_031/ov_SC03_031.c +++ b/src/ov_SC03_031/ov_SC03_031.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_089/ov_SC03_089.c b/src/ov_SC03_089/ov_SC03_089.c index 97e1cb2f23..a6ea68708d 100644 --- a/src/ov_SC03_089/ov_SC03_089.c +++ b/src/ov_SC03_089/ov_SC03_089.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_090/ov_SC03_090.c b/src/ov_SC03_090/ov_SC03_090.c index 424ecbb447..25cd64c71d 100644 --- a/src/ov_SC03_090/ov_SC03_090.c +++ b/src/ov_SC03_090/ov_SC03_090.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_091/ov_SC03_091.c b/src/ov_SC03_091/ov_SC03_091.c index b63a3f94e6..4febea335d 100644 --- a/src/ov_SC03_091/ov_SC03_091.c +++ b/src/ov_SC03_091/ov_SC03_091.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_092/ov_SC03_092.c b/src/ov_SC03_092/ov_SC03_092.c index 3648170d0c..c37484b697 100644 --- a/src/ov_SC03_092/ov_SC03_092.c +++ b/src/ov_SC03_092/ov_SC03_092.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_093/ov_SC03_093.c b/src/ov_SC03_093/ov_SC03_093.c index 18b88acf00..bb7ef34aa3 100644 --- a/src/ov_SC03_093/ov_SC03_093.c +++ b/src/ov_SC03_093/ov_SC03_093.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_094/ov_SC03_094.c b/src/ov_SC03_094/ov_SC03_094.c index 6179eed826..eda67d696e 100644 --- a/src/ov_SC03_094/ov_SC03_094.c +++ b/src/ov_SC03_094/ov_SC03_094.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_095/ov_SC03_095.c b/src/ov_SC03_095/ov_SC03_095.c index d02e4615da..b0ccd07836 100644 --- a/src/ov_SC03_095/ov_SC03_095.c +++ b/src/ov_SC03_095/ov_SC03_095.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_096/ov_SC03_096.c b/src/ov_SC03_096/ov_SC03_096.c index b1e7c8e704..57c287e63d 100644 --- a/src/ov_SC03_096/ov_SC03_096.c +++ b/src/ov_SC03_096/ov_SC03_096.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_097/ov_SC03_097.c b/src/ov_SC03_097/ov_SC03_097.c index 1d87a3f5e1..4266bb2a37 100644 --- a/src/ov_SC03_097/ov_SC03_097.c +++ b/src/ov_SC03_097/ov_SC03_097.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_098/ov_SC03_098.c b/src/ov_SC03_098/ov_SC03_098.c index 368cb5f519..63872ec6cd 100644 --- a/src/ov_SC03_098/ov_SC03_098.c +++ b/src/ov_SC03_098/ov_SC03_098.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_099/ov_SC03_099.c b/src/ov_SC03_099/ov_SC03_099.c index 46ed422fe9..0ac3cf9eac 100644 --- a/src/ov_SC03_099/ov_SC03_099.c +++ b/src/ov_SC03_099/ov_SC03_099.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_100/ov_SC03_100.c b/src/ov_SC03_100/ov_SC03_100.c index c9d970898e..cd5158d916 100644 --- a/src/ov_SC03_100/ov_SC03_100.c +++ b/src/ov_SC03_100/ov_SC03_100.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_101/ov_SC03_101.c b/src/ov_SC03_101/ov_SC03_101.c index 86526e341f..83b91c7b73 100644 --- a/src/ov_SC03_101/ov_SC03_101.c +++ b/src/ov_SC03_101/ov_SC03_101.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_102/ov_SC03_102.c b/src/ov_SC03_102/ov_SC03_102.c index d6cd205e8f..b0fe2d0b7f 100644 --- a/src/ov_SC03_102/ov_SC03_102.c +++ b/src/ov_SC03_102/ov_SC03_102.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_103/ov_SC03_103.c b/src/ov_SC03_103/ov_SC03_103.c index 03f59d7357..bce8a41f42 100644 --- a/src/ov_SC03_103/ov_SC03_103.c +++ b/src/ov_SC03_103/ov_SC03_103.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_104/ov_SC03_104.c b/src/ov_SC03_104/ov_SC03_104.c index 5d2578254c..9ade0177de 100644 --- a/src/ov_SC03_104/ov_SC03_104.c +++ b/src/ov_SC03_104/ov_SC03_104.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_105/ov_SC03_105.c b/src/ov_SC03_105/ov_SC03_105.c index d63db9ea8e..945c0111c0 100644 --- a/src/ov_SC03_105/ov_SC03_105.c +++ b/src/ov_SC03_105/ov_SC03_105.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_108/ov_SC03_108.c b/src/ov_SC03_108/ov_SC03_108.c index 89f99c2ad0..1b68ac584a 100644 --- a/src/ov_SC03_108/ov_SC03_108.c +++ b/src/ov_SC03_108/ov_SC03_108.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_109/ov_SC03_109.c b/src/ov_SC03_109/ov_SC03_109.c index f03cb51f1f..1b6b556235 100644 --- a/src/ov_SC03_109/ov_SC03_109.c +++ b/src/ov_SC03_109/ov_SC03_109.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_110/ov_SC03_110.c b/src/ov_SC03_110/ov_SC03_110.c index a6faec4f9a..c4af7b5022 100644 --- a/src/ov_SC03_110/ov_SC03_110.c +++ b/src/ov_SC03_110/ov_SC03_110.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_111/ov_SC03_111.c b/src/ov_SC03_111/ov_SC03_111.c index 078282cdcf..c4d993ffa1 100644 --- a/src/ov_SC03_111/ov_SC03_111.c +++ b/src/ov_SC03_111/ov_SC03_111.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_112/ov_SC03_112.c b/src/ov_SC03_112/ov_SC03_112.c index cf96d58f9f..dfc52fc8d5 100644 --- a/src/ov_SC03_112/ov_SC03_112.c +++ b/src/ov_SC03_112/ov_SC03_112.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_113/ov_SC03_113.c b/src/ov_SC03_113/ov_SC03_113.c index 253f656a70..44ebff836a 100644 --- a/src/ov_SC03_113/ov_SC03_113.c +++ b/src/ov_SC03_113/ov_SC03_113.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_114/ov_SC03_114.c b/src/ov_SC03_114/ov_SC03_114.c index 3215392ba1..cda3f10e1e 100644 --- a/src/ov_SC03_114/ov_SC03_114.c +++ b/src/ov_SC03_114/ov_SC03_114.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_115/ov_SC03_115.c b/src/ov_SC03_115/ov_SC03_115.c index d7e4d15c02..805e99b842 100644 --- a/src/ov_SC03_115/ov_SC03_115.c +++ b/src/ov_SC03_115/ov_SC03_115.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_116/ov_SC03_116.c b/src/ov_SC03_116/ov_SC03_116.c index 8164d8bc7f..54b9417c2d 100644 --- a/src/ov_SC03_116/ov_SC03_116.c +++ b/src/ov_SC03_116/ov_SC03_116.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_117/ov_SC03_117.c b/src/ov_SC03_117/ov_SC03_117.c index ec1c81965b..97d956b379 100644 --- a/src/ov_SC03_117/ov_SC03_117.c +++ b/src/ov_SC03_117/ov_SC03_117.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_118/ov_SC03_118.c b/src/ov_SC03_118/ov_SC03_118.c index 43705fc80b..d8bbd4ba46 100644 --- a/src/ov_SC03_118/ov_SC03_118.c +++ b/src/ov_SC03_118/ov_SC03_118.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_119/ov_SC03_119.c b/src/ov_SC03_119/ov_SC03_119.c index 7ba3c37940..fc45260a2c 100644 --- a/src/ov_SC03_119/ov_SC03_119.c +++ b/src/ov_SC03_119/ov_SC03_119.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_121/ov_SC03_121.c b/src/ov_SC03_121/ov_SC03_121.c index 83197ad2ee..27ec818f7d 100644 --- a/src/ov_SC03_121/ov_SC03_121.c +++ b/src/ov_SC03_121/ov_SC03_121.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_124/ov_SC03_124.c b/src/ov_SC03_124/ov_SC03_124.c index 9988039341..adf943f5df 100644 --- a/src/ov_SC03_124/ov_SC03_124.c +++ b/src/ov_SC03_124/ov_SC03_124.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_125/ov_SC03_125.c b/src/ov_SC03_125/ov_SC03_125.c index ed7a872945..0a06e9ed53 100644 --- a/src/ov_SC03_125/ov_SC03_125.c +++ b/src/ov_SC03_125/ov_SC03_125.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC03_126/ov_SC03_126.c b/src/ov_SC03_126/ov_SC03_126.c index c6d6f3aff3..cf1d5d4240 100644 --- a/src/ov_SC03_126/ov_SC03_126.c +++ b/src/ov_SC03_126/ov_SC03_126.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC04_000/ov_SC04_000.c b/src/ov_SC04_000/ov_SC04_000.c index 7335ec38ce..01bf9c2092 100644 --- a/src/ov_SC04_000/ov_SC04_000.c +++ b/src/ov_SC04_000/ov_SC04_000.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC04_002/ov_SC04_002.c b/src/ov_SC04_002/ov_SC04_002.c index cfe83c403c..ce3d1286d2 100644 --- a/src/ov_SC04_002/ov_SC04_002.c +++ b/src/ov_SC04_002/ov_SC04_002.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC04_003/ov_SC04_003.c b/src/ov_SC04_003/ov_SC04_003.c index 9533b7228b..82fba11a95 100644 --- a/src/ov_SC04_003/ov_SC04_003.c +++ b/src/ov_SC04_003/ov_SC04_003.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC04_004/ov_SC04_004.c b/src/ov_SC04_004/ov_SC04_004.c index 5fb4dc2de2..1d5742f688 100644 --- a/src/ov_SC04_004/ov_SC04_004.c +++ b/src/ov_SC04_004/ov_SC04_004.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC04_005/ov_SC04_005.c b/src/ov_SC04_005/ov_SC04_005.c index efb311ff31..af7bd1bd9c 100644 --- a/src/ov_SC04_005/ov_SC04_005.c +++ b/src/ov_SC04_005/ov_SC04_005.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC04_006/ov_SC04_006.c b/src/ov_SC04_006/ov_SC04_006.c index 706b1ffea4..b596395c78 100644 --- a/src/ov_SC04_006/ov_SC04_006.c +++ b/src/ov_SC04_006/ov_SC04_006.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC04_007/ov_SC04_007.c b/src/ov_SC04_007/ov_SC04_007.c index 442cdc79c7..9fb38bd6ae 100644 --- a/src/ov_SC04_007/ov_SC04_007.c +++ b/src/ov_SC04_007/ov_SC04_007.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC04_008/ov_SC04_008.c b/src/ov_SC04_008/ov_SC04_008.c index 2c45c976d4..2f26d292ad 100644 --- a/src/ov_SC04_008/ov_SC04_008.c +++ b/src/ov_SC04_008/ov_SC04_008.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC04_009/ov_SC04_009.c b/src/ov_SC04_009/ov_SC04_009.c index 964981e41c..d537deacc2 100644 --- a/src/ov_SC04_009/ov_SC04_009.c +++ b/src/ov_SC04_009/ov_SC04_009.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC04_010/ov_SC04_010.c b/src/ov_SC04_010/ov_SC04_010.c index 5ec9129e9d..10b007088b 100644 --- a/src/ov_SC04_010/ov_SC04_010.c +++ b/src/ov_SC04_010/ov_SC04_010.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC04_011/ov_SC04_011.c b/src/ov_SC04_011/ov_SC04_011.c index f755c254f4..474ccabe1c 100644 --- a/src/ov_SC04_011/ov_SC04_011.c +++ b/src/ov_SC04_011/ov_SC04_011.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC04_012/ov_SC04_012.c b/src/ov_SC04_012/ov_SC04_012.c index aa4cde1c48..7316089699 100644 --- a/src/ov_SC04_012/ov_SC04_012.c +++ b/src/ov_SC04_012/ov_SC04_012.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC04_015/ov_SC04_015.c b/src/ov_SC04_015/ov_SC04_015.c index 74c7af7663..e81441db88 100644 --- a/src/ov_SC04_015/ov_SC04_015.c +++ b/src/ov_SC04_015/ov_SC04_015.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC04_016/ov_SC04_016.c b/src/ov_SC04_016/ov_SC04_016.c index e10d2c4220..9698773c63 100644 --- a/src/ov_SC04_016/ov_SC04_016.c +++ b/src/ov_SC04_016/ov_SC04_016.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC04_018/ov_SC04_018.c b/src/ov_SC04_018/ov_SC04_018.c index 93583fdc51..40f031eb48 100644 --- a/src/ov_SC04_018/ov_SC04_018.c +++ b/src/ov_SC04_018/ov_SC04_018.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC04_019/ov_SC04_019.c b/src/ov_SC04_019/ov_SC04_019.c index 4d38bca4f9..80d626bf07 100644 --- a/src/ov_SC04_019/ov_SC04_019.c +++ b/src/ov_SC04_019/ov_SC04_019.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC04_020/ov_SC04_020.c b/src/ov_SC04_020/ov_SC04_020.c index 7340fac921..be1fcb03af 100644 --- a/src/ov_SC04_020/ov_SC04_020.c +++ b/src/ov_SC04_020/ov_SC04_020.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC04_021/ov_SC04_021.c b/src/ov_SC04_021/ov_SC04_021.c index 02b4f85b19..788fd261d4 100644 --- a/src/ov_SC04_021/ov_SC04_021.c +++ b/src/ov_SC04_021/ov_SC04_021.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC05_000/ov_SC05_000.c b/src/ov_SC05_000/ov_SC05_000.c index 4cd553b7f6..25d78d5d46 100644 --- a/src/ov_SC05_000/ov_SC05_000.c +++ b/src/ov_SC05_000/ov_SC05_000.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC05_001/ov_SC05_001.c b/src/ov_SC05_001/ov_SC05_001.c index f8460ed983..d5e2bcb119 100644 --- a/src/ov_SC05_001/ov_SC05_001.c +++ b/src/ov_SC05_001/ov_SC05_001.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC05_002/ov_SC05_002.c b/src/ov_SC05_002/ov_SC05_002.c index 3a46763da4..b89d4073e8 100644 --- a/src/ov_SC05_002/ov_SC05_002.c +++ b/src/ov_SC05_002/ov_SC05_002.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC05_003/ov_SC05_003.c b/src/ov_SC05_003/ov_SC05_003.c index 255864be73..1fb1acd86f 100644 --- a/src/ov_SC05_003/ov_SC05_003.c +++ b/src/ov_SC05_003/ov_SC05_003.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC05_004/ov_SC05_004.c b/src/ov_SC05_004/ov_SC05_004.c index 6186938bf9..0244533d9d 100644 --- a/src/ov_SC05_004/ov_SC05_004.c +++ b/src/ov_SC05_004/ov_SC05_004.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC05_005/ov_SC05_005.c b/src/ov_SC05_005/ov_SC05_005.c index 64e50f6cfc..9af1628e2f 100644 --- a/src/ov_SC05_005/ov_SC05_005.c +++ b/src/ov_SC05_005/ov_SC05_005.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC05_006/ov_SC05_006.c b/src/ov_SC05_006/ov_SC05_006.c index 09851adbc9..e050a6d0b2 100644 --- a/src/ov_SC05_006/ov_SC05_006.c +++ b/src/ov_SC05_006/ov_SC05_006.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC05_007/ov_SC05_007.c b/src/ov_SC05_007/ov_SC05_007.c index 5e3fa6f64c..c73f5c93e2 100644 --- a/src/ov_SC05_007/ov_SC05_007.c +++ b/src/ov_SC05_007/ov_SC05_007.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC05_008/ov_SC05_008.c b/src/ov_SC05_008/ov_SC05_008.c index e8f8cc7cd8..9a9bd9cd1b 100644 --- a/src/ov_SC05_008/ov_SC05_008.c +++ b/src/ov_SC05_008/ov_SC05_008.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC05_009/ov_SC05_009.c b/src/ov_SC05_009/ov_SC05_009.c index 7e6325df22..8498052ae6 100644 --- a/src/ov_SC05_009/ov_SC05_009.c +++ b/src/ov_SC05_009/ov_SC05_009.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC05_010/ov_SC05_010.c b/src/ov_SC05_010/ov_SC05_010.c index 2133552e91..db002e8e43 100644 --- a/src/ov_SC05_010/ov_SC05_010.c +++ b/src/ov_SC05_010/ov_SC05_010.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC05_011/ov_SC05_011.c b/src/ov_SC05_011/ov_SC05_011.c index 241444ef67..5cd3692894 100644 --- a/src/ov_SC05_011/ov_SC05_011.c +++ b/src/ov_SC05_011/ov_SC05_011.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC05_017/ov_SC05_017.c b/src/ov_SC05_017/ov_SC05_017.c index 6bed2a5e8f..d9c0e210bd 100644 --- a/src/ov_SC05_017/ov_SC05_017.c +++ b/src/ov_SC05_017/ov_SC05_017.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC05_018/ov_SC05_018.c b/src/ov_SC05_018/ov_SC05_018.c index 54664bae68..6fce151e64 100644 --- a/src/ov_SC05_018/ov_SC05_018.c +++ b/src/ov_SC05_018/ov_SC05_018.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC05_019/ov_SC05_019.c b/src/ov_SC05_019/ov_SC05_019.c index caba118ae9..5cf29f45db 100644 --- a/src/ov_SC05_019/ov_SC05_019.c +++ b/src/ov_SC05_019/ov_SC05_019.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC06_000/ov_SC06_000.c b/src/ov_SC06_000/ov_SC06_000.c index a91b448f21..0b318a8a81 100644 --- a/src/ov_SC06_000/ov_SC06_000.c +++ b/src/ov_SC06_000/ov_SC06_000.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC06_006/ov_SC06_006.c b/src/ov_SC06_006/ov_SC06_006.c index f27bde3edd..5c55ba49ac 100644 --- a/src/ov_SC06_006/ov_SC06_006.c +++ b/src/ov_SC06_006/ov_SC06_006.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC06_008/ov_SC06_008.c b/src/ov_SC06_008/ov_SC06_008.c index 3e05f6fefb..3903a2ed00 100644 --- a/src/ov_SC06_008/ov_SC06_008.c +++ b/src/ov_SC06_008/ov_SC06_008.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC06_010/ov_SC06_010.c b/src/ov_SC06_010/ov_SC06_010.c index e2946ba9d8..f55cd60083 100644 --- a/src/ov_SC06_010/ov_SC06_010.c +++ b/src/ov_SC06_010/ov_SC06_010.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC06_011/ov_SC06_011.c b/src/ov_SC06_011/ov_SC06_011.c index 6f40a0587b..a9f7231810 100644 --- a/src/ov_SC06_011/ov_SC06_011.c +++ b/src/ov_SC06_011/ov_SC06_011.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC06_013/ov_SC06_013.c b/src/ov_SC06_013/ov_SC06_013.c index 259d839c0f..2412de69c4 100644 --- a/src/ov_SC06_013/ov_SC06_013.c +++ b/src/ov_SC06_013/ov_SC06_013.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC06_014/ov_SC06_014.c b/src/ov_SC06_014/ov_SC06_014.c index 9811822ab1..8ffdfa8ff1 100644 --- a/src/ov_SC06_014/ov_SC06_014.c +++ b/src/ov_SC06_014/ov_SC06_014.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC06_015/ov_SC06_015.c b/src/ov_SC06_015/ov_SC06_015.c index 9c5e81f96e..eaa67cd4c7 100644 --- a/src/ov_SC06_015/ov_SC06_015.c +++ b/src/ov_SC06_015/ov_SC06_015.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC06_016/ov_SC06_016.c b/src/ov_SC06_016/ov_SC06_016.c index 85d6eb0513..d7c2e3f9d8 100644 --- a/src/ov_SC06_016/ov_SC06_016.c +++ b/src/ov_SC06_016/ov_SC06_016.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC06_018/ov_SC06_018.c b/src/ov_SC06_018/ov_SC06_018.c index 5658109125..dfba4f2fe9 100644 --- a/src/ov_SC06_018/ov_SC06_018.c +++ b/src/ov_SC06_018/ov_SC06_018.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC06_020/ov_SC06_020.c b/src/ov_SC06_020/ov_SC06_020.c index a1c7a1a189..3582bb2d97 100644 --- a/src/ov_SC06_020/ov_SC06_020.c +++ b/src/ov_SC06_020/ov_SC06_020.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC06_022/ov_SC06_022.c b/src/ov_SC06_022/ov_SC06_022.c index 8acb2e0295..36541f7b85 100644 --- a/src/ov_SC06_022/ov_SC06_022.c +++ b/src/ov_SC06_022/ov_SC06_022.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC06_024/ov_SC06_024.c b/src/ov_SC06_024/ov_SC06_024.c index cafa53104d..409f98e9b5 100644 --- a/src/ov_SC06_024/ov_SC06_024.c +++ b/src/ov_SC06_024/ov_SC06_024.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC06_025/ov_SC06_025.c b/src/ov_SC06_025/ov_SC06_025.c index 733ccdf052..e8ff389a84 100644 --- a/src/ov_SC06_025/ov_SC06_025.c +++ b/src/ov_SC06_025/ov_SC06_025.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC06_027/ov_SC06_027.c b/src/ov_SC06_027/ov_SC06_027.c index 82f3b50337..c95b9c9d6c 100644 --- a/src/ov_SC06_027/ov_SC06_027.c +++ b/src/ov_SC06_027/ov_SC06_027.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC06_029/ov_SC06_029.c b/src/ov_SC06_029/ov_SC06_029.c index 7edfb2c917..052871e572 100644 --- a/src/ov_SC06_029/ov_SC06_029.c +++ b/src/ov_SC06_029/ov_SC06_029.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC06_030/ov_SC06_030.c b/src/ov_SC06_030/ov_SC06_030.c index 99651e3d3c..4f459b15c9 100644 --- a/src/ov_SC06_030/ov_SC06_030.c +++ b/src/ov_SC06_030/ov_SC06_030.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC06_032/ov_SC06_032.c b/src/ov_SC06_032/ov_SC06_032.c index 3fda41a1b2..76e4e30d6f 100644 --- a/src/ov_SC06_032/ov_SC06_032.c +++ b/src/ov_SC06_032/ov_SC06_032.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC06_033/ov_SC06_033.c b/src/ov_SC06_033/ov_SC06_033.c index f4b238b596..b5ac7c3621 100644 --- a/src/ov_SC06_033/ov_SC06_033.c +++ b/src/ov_SC06_033/ov_SC06_033.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC07_000/ov_SC07_000.c b/src/ov_SC07_000/ov_SC07_000.c index faf7005411..98b668dc2b 100644 --- a/src/ov_SC07_000/ov_SC07_000.c +++ b/src/ov_SC07_000/ov_SC07_000.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC07_001/ov_SC07_001.c b/src/ov_SC07_001/ov_SC07_001.c index 7bf25a2ac1..647944c5f9 100644 --- a/src/ov_SC07_001/ov_SC07_001.c +++ b/src/ov_SC07_001/ov_SC07_001.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC07_002/ov_SC07_002.c b/src/ov_SC07_002/ov_SC07_002.c index d82b9cfc0f..3e0f4e30e4 100644 --- a/src/ov_SC07_002/ov_SC07_002.c +++ b/src/ov_SC07_002/ov_SC07_002.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC07_008/ov_SC07_008.c b/src/ov_SC07_008/ov_SC07_008.c index 01b92a1a4d..db6e2b63db 100644 --- a/src/ov_SC07_008/ov_SC07_008.c +++ b/src/ov_SC07_008/ov_SC07_008.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/ov_SC07_009/ov_SC07_009.c b/src/ov_SC07_009/ov_SC07_009.c index 9521184901..e5a8415eb1 100644 --- a/src/ov_SC07_009/ov_SC07_009.c +++ b/src/ov_SC07_009/ov_SC07_009.c @@ -595,7 +595,7 @@ INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009", func_801325B8); DEFINE_func_8013277C() /* dedup: shared engine-core @0x8013277C (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009", func_80132784); +DEFINE_func_80132784() /* dedup: shared engine-core @0x80132784 (src/shared) */ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 6ed3d736bb..476b9fce67 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -25112,4 +25112,194 @@ ((void (*)(void*, s32))func_80015954)(&sp18, arg1); \ } +#define DEFINE_func_80132784() \ + extern void func_80049CAC(s32 a0, s32 a1); \ + extern void func_80020F34(s32 a0, s32 a1); \ + extern void func_80054514(s32 a0, s32 a1); \ + void func_80132784(s32 a0, s32 a1, u32 a2) \ + { \ + s32 s7 = a0; \ + s32 s0p = a1; \ + u32 s2v = a2; \ + s32 s6; \ + s32 s1m; \ + s16 sVar1; \ + u8 buf[0xC0]; \ + if (((*((s32 *) (s7 + 0x20))) != 0) || ((*((s32 *) (s0p + 0x20))) != 0)) \ + { \ + s6 = *((s32 *) (s0p + 0x20)); \ + s1m = *((s32 *) (s6 + 0x20)); \ + if (s1m != 0) \ + { \ + *((s32 *) (buf + 0x48)) = *((s32 *) (s6 + 0x78)); \ + *((s32 *) (buf + 0x00)) = 0; \ + if (((*((u16 *) (s6 + 0x2C))) & 1) != 0) \ + { \ + *((Blk16 *) (buf + 0x04)) = *((Blk16 *) (s6 + 0x34)); \ + *((Blk16 *) (buf + 0x14)) = *((Blk16 *) (s6 + 0x44)); \ + } \ + else \ + { \ + func_80049CAC(s6 + 0x10, (s32) (buf + 0x04)); \ + sVar1 = (*((s16 *) (s0p + 6))) + (*((s16 *) (s0p + 0x50))); \ + *((s16 *) (s6 + 8)) = sVar1; \ + *((s32 *) (buf + 0x18)) = (s32) sVar1; \ + sVar1 = (*((s16 *) (s0p + 0xA))) + (*((s16 *) (s0p + 0x52))); \ + *((s16 *) (s6 + 0xA)) = sVar1; \ + *((s32 *) (buf + 0x1C)) = (s32) sVar1; \ + sVar1 = (*((s16 *) (s0p + 0xE))) + (*((s16 *) (s0p + 0x54))); \ + *((s16 *) (s6 + 0xC)) = sVar1; \ + *((s32 *) (buf + 0x20)) = (s32) sVar1; \ + *((Blk16 *) (s6 + 0x34)) = *((Blk16 *) (buf + 0x04)); \ + *((Blk16 *) (s6 + 0x44)) = *((Blk16 *) (buf + 0x14)); \ + *((u16 *) (s6 + 0x2C)) = (*((u16 *) (s6 + 0x2C))) | 1; \ + } \ + if (((*((u16 *) (s6 + 0x2C))) & 0x10) != 0) \ + { \ + func_80020F34((s32) (buf + 0x04), s6 + 0x18); \ + } \ + func_80054514((s32) (buf + 0x00), (s32) (buf + 0x50)); \ + if (((s1m & 0x1000000) == 0) && (((*((u16 *) (s6 + 0x2C))) & 0x40) == 0)) \ + { \ + s1m = s1m + ((s2v & 0xFFFF) * 0xC); \ + func_80049CAC(s1m + 6, (s32) (buf + 0x70)); \ + *((s32 *) (buf + 0x84)) = (s32) (*((s16 *) (s1m + 0))); \ + *((s32 *) (buf + 0x88)) = (s32) (*((s16 *) (s1m + 2))); \ + *((s32 *) (buf + 0x8C)) = (s32) (*((s16 *) (s1m + 4))); \ + } \ + else \ + { \ + u32 *pu = (u32 *) ((s1m & 0xFEFFFFFF) + ((s2v & 0xFFFF) * 8)); \ + u32 w; \ + *((u16 *) (buf + 0xB0)) = *((u16 *) (((s32) pu) + 6)); \ + w = *pu; \ + *((u16 *) (buf + 0xB2)) = ((u16) (*((u8 *) (((s32) pu) + 1)))) | ((u16) ((w & 0xF) << 8)); \ + *((u16 *) (buf + 0xB4)) = ((u16) (w >> 0x10)) & 0xFF; \ + *((u16 *) (buf + 0xB4)) = (*((u16 *) (buf + 0xB4))) | ((u16) ((w & 0xF0) << 4)); \ + func_80049CAC((s32) (buf + 0xB0), (s32) (buf + 0x70)); \ + *((s32 *) (buf + 0x84)) = (s32) (*((s8 *) (((s32) pu) + 3))); \ + *((s32 *) (buf + 0x88)) = (s32) ((s8) pu[1]); \ + *((s32 *) (buf + 0x8C)) = (s32) (*((s8 *) (((s32) pu) + 5))); \ + } \ + { \ + __asm__ __volatile__( \ + "lw $12, 0(%0)\n" "lw $13, 4(%0)\n" \ + "ctc2 $12, $0\n" "ctc2 $13, $1\n" \ + "lw $12, 8(%0)\n" "lw $13, 12(%0)\n" "lw $14, 16(%0)\n" \ + "ctc2 $12, $2\n" "ctc2 $13, $3\n" "ctc2 $14, $4\n" \ + : : "r"((s32 *)(buf + 0x50)) : "$12", "$13", "$14", "memory"); \ + __asm__ __volatile__( \ + "lhu $12, 0(%0)\n" "lhu $13, 6(%0)\n" "lhu $14, 12(%0)\n" \ + "mtc2 $12, $9\n" "mtc2 $13, $10\n" "mtc2 $14, $11\n" \ + "nop\n" "nop\n" "mvmva 1, 0, 3, 3, 0\n" \ + : : "r"((s16 *)(buf + 0x70)) : "$12", "$13", "$14", "memory"); \ + __asm__ __volatile__( \ + "mfc2 $12, $9\n" "mfc2 $13, $10\n" "mfc2 $14, $11\n" \ + "sh $12, 0(%0)\n" "sh $13, 6(%0)\n" "sh $14, 12(%0)\n" \ + : : "r"((s16 *)(buf + 0x90)) : "$12", "$13", "$14", "memory"); \ + __asm__ __volatile__( \ + "lhu $12, 0(%0)\n" "lhu $13, 6(%0)\n" "lhu $14, 12(%0)\n" \ + "mtc2 $12, $9\n" "mtc2 $13, $10\n" "mtc2 $14, $11\n" \ + "nop\n" "nop\n" "mvmva 1, 0, 3, 3, 0\n" \ + : : "r"((s16 *)(buf + 0x72)) : "$12", "$13", "$14", "memory"); \ + __asm__ __volatile__( \ + "mfc2 $12, $9\n" "mfc2 $13, $10\n" "mfc2 $14, $11\n" \ + "sh $12, 0(%0)\n" "sh $13, 6(%0)\n" "sh $14, 12(%0)\n" \ + : : "r"((s16 *)(buf + 0x92)) : "$12", "$13", "$14", "memory"); \ + __asm__ __volatile__( \ + "lhu $12, 0(%0)\n" "lhu $13, 6(%0)\n" "lhu $14, 12(%0)\n" \ + "mtc2 $12, $9\n" "mtc2 $13, $10\n" "mtc2 $14, $11\n" \ + "nop\n" "nop\n" "mvmva 1, 0, 3, 3, 0\n" \ + : : "r"((s16 *)(buf + 0x74)) : "$12", "$13", "$14", "memory"); \ + __asm__ __volatile__( \ + "mfc2 $12, $9\n" "mfc2 $13, $10\n" "mfc2 $14, $11\n" \ + "sh $12, 0(%0)\n" "sh $13, 6(%0)\n" "sh $14, 12(%0)\n" \ + : : "r"((s16 *)(buf + 0x94)) : "$12", "$13", "$14", "memory"); \ + __asm__ __volatile__( \ + "lw $12, 20(%0)\n" "lw $13, 24(%0)\n" \ + "ctc2 $12, $5\n" "lw $14, 28(%0)\n" \ + "ctc2 $13, $6\n" "ctc2 $14, $7\n" \ + : : "r"((s32 *)(buf + 0x50)) : "$12", "$13", "$14", "memory"); \ + __asm__ __volatile__( \ + "lhu $13, 4(%0)\n" "lhu $12, 0(%0)\n" \ + "sll $13, $13, 16\n" "or $12, $12, $13\n" \ + "mtc2 $12, $0\n" "lwc2 $1, 8(%0)\n" \ + "nop\n" "nop\n" "mvmva 1, 0, 0, 0, 0\n" \ + : : "r"((s16 *)(buf + 0x84)) : "$12", "$13", "memory"); \ + __asm__ __volatile__( \ + "swc2 $25, 0(%0)\n" "swc2 $26, 4(%0)\n" "swc2 $27, 8(%0)\n" \ + : : "r"((s32 *)(buf + 0xA4)) : "memory"); \ + } \ + s6 = *((s32 *) (s7 + 0x20)); \ + func_80049CAC(s6 + 0x10, (s32) (buf + 0x70)); \ + sVar1 = (*((s16 *) (s7 + 6))) + (*((s16 *) (s7 + 0x50))); \ + *((s16 *) (s6 + 8)) = sVar1; \ + *((s32 *) (buf + 0x84)) = (s32) sVar1; \ + sVar1 = (*((s16 *) (s7 + 0xA))) + (*((s16 *) (s7 + 0x52))); \ + *((s16 *) (s6 + 0xA)) = sVar1; \ + *((s32 *) (buf + 0x88)) = (s32) sVar1; \ + sVar1 = (*((s16 *) (s7 + 0xE))) + (*((s16 *) (s7 + 0x54))); \ + *((s16 *) (s6 + 0xC)) = sVar1; \ + *((s32 *) (buf + 0x8C)) = (s32) sVar1; \ + { \ + __asm__ __volatile__( \ + "lw $12, 0(%0)\n" "lw $13, 4(%0)\n" \ + "ctc2 $12, $0\n" "ctc2 $13, $1\n" \ + "lw $12, 8(%0)\n" "lw $13, 12(%0)\n" "lw $14, 16(%0)\n" \ + "ctc2 $12, $2\n" "ctc2 $13, $3\n" "ctc2 $14, $4\n" \ + : : "r"((s32 *)(buf + 0x90)) : "$12", "$13", "$14", "memory"); \ + __asm__ __volatile__( \ + "lhu $12, 0(%0)\n" "lhu $13, 6(%0)\n" "lhu $14, 12(%0)\n" \ + "mtc2 $12, $9\n" "mtc2 $13, $10\n" "mtc2 $14, $11\n" \ + "nop\n" "nop\n" "mvmva 1, 0, 3, 3, 0\n" \ + : : "r"((s16 *)(buf + 0x70)) : "$12", "$13", "$14", "memory"); \ + __asm__ __volatile__( \ + "mfc2 $12, $9\n" "mfc2 $13, $10\n" "mfc2 $14, $11\n" \ + "sh $12, 0(%0)\n" "sh $13, 6(%0)\n" "sh $14, 12(%0)\n" \ + : : "r"((s16 *)(buf + 0x50)) : "$12", "$13", "$14", "memory"); \ + __asm__ __volatile__( \ + "lhu $12, 0(%0)\n" "lhu $13, 6(%0)\n" "lhu $14, 12(%0)\n" \ + "mtc2 $12, $9\n" "mtc2 $13, $10\n" "mtc2 $14, $11\n" \ + "nop\n" "nop\n" "mvmva 1, 0, 3, 3, 0\n" \ + : : "r"((s16 *)(buf + 0x72)) : "$12", "$13", "$14", "memory"); \ + __asm__ __volatile__( \ + "mfc2 $12, $9\n" "mfc2 $13, $10\n" "mfc2 $14, $11\n" \ + "sh $12, 0(%0)\n" "sh $13, 6(%0)\n" "sh $14, 12(%0)\n" \ + : : "r"((s16 *)(buf + 0x52)) : "$12", "$13", "$14", "memory"); \ + __asm__ __volatile__( \ + "lhu $12, 0(%0)\n" "lhu $13, 6(%0)\n" "lhu $14, 12(%0)\n" \ + "mtc2 $12, $9\n" "mtc2 $13, $10\n" "mtc2 $14, $11\n" \ + "nop\n" "nop\n" "mvmva 1, 0, 3, 3, 0\n" \ + : : "r"((s16 *)(buf + 0x74)) : "$12", "$13", "$14", "memory"); \ + __asm__ __volatile__( \ + "mfc2 $12, $9\n" "mfc2 $13, $10\n" "mfc2 $14, $11\n" \ + "sh $12, 0(%0)\n" "sh $13, 6(%0)\n" "sh $14, 12(%0)\n" \ + : : "r"((s16 *)(buf + 0x54)) : "$12", "$13", "$14", "memory"); \ + __asm__ __volatile__( \ + "lw $12, 20(%0)\n" "lw $13, 24(%0)\n" \ + "ctc2 $12, $5\n" "lw $14, 28(%0)\n" \ + "ctc2 $13, $6\n" "ctc2 $14, $7\n" \ + : : "r"((s32 *)(buf + 0x90)) : "$12", "$13", "$14", "memory"); \ + __asm__ __volatile__( \ + "lhu $13, 4(%0)\n" "lhu $12, 0(%0)\n" \ + "sll $13, $13, 16\n" "or $12, $12, $13\n" \ + "mtc2 $12, $0\n" "lwc2 $1, 8(%0)\n" \ + "nop\n" "nop\n" "mvmva 1, 0, 0, 0, 0\n" \ + : : "r"((s16 *)(buf + 0x84)) : "$12", "$13", "memory"); \ + __asm__ __volatile__( \ + "swc2 $25, 0(%0)\n" "swc2 $26, 4(%0)\n" "swc2 $27, 8(%0)\n" \ + : : "r"((s32 *)(buf + 0x64)) : "memory"); \ + } \ + *((Blk16 *) (s6 + 0x34)) = *((Blk16 *) (buf + 0x50)); \ + *((Blk16 *) (s6 + 0x44)) = *((Blk16 *) (buf + 0x60)); \ + s0p = 0x30; \ + *((Blk16 *) (s6 + 0x54)) = *((Blk16 *) (buf + 0x50)); \ + *((Blk16 *) (s6 + 0x64)) = *((Blk16 *) (buf + 0x60)); \ + *((s32 *) (s6 + s0p)) = 1; \ + *((u16 *) (s6 + 0x2C)) = (*((u16 *) (s6 + 0x2C))) | 1; \ + } \ + } \ + return; \ + } + #endif