From 8ea520213507458491eb4a7688eda283dbf01a60 Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Thu, 23 Jul 2026 22:58:47 -0600 Subject: [PATCH] =?UTF-8?q?feat(phase-29):=20propagate=201=20fresh=20core?= =?UTF-8?q?=20=C3=97138=20+=20the=20session's=20FIRST=20distinct-code=20ga?= =?UTF-8?q?in?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Of the 6 s14 fresh cracks, func_80136F3C propagated ×138 (func_801749C8 dropped as an ov_SC07_006 straggler; 4 are §20 local-type-capped — future uniquify fodder, low-value de-duplication per the SESSION-14 finding). THE POINT (byte-verified): distinct-code UNIQUE count rose 64832 -> 64837 (+5) — the FIRST distinct-code movement all session. Every other lever today (154-type lift, 6 uniquify cores, MATRIX rename) was de-duplication and moved distinct-code by 0. These 6 are genuinely UNMATCHED cores, so banking them ×1 is real new coverage. Percentage is flat (67.6%, denom 87459) but the direction and the count are the validation the pivot to fresh cracks was correct. Fleet: instr 79.3 -> 79.4% | fn-count 88.61 -> 88.65% | distinct-code count +5 | dedup 1873/0. R22 clean-fleet 140/140 BYTE-IDENTICAL. --- config/dedup.us.yaml | 7 ++++ src/ov_SC01_000/ov_SC01_000_jr_80135D20.c | 2 +- src/ov_SC01_001/ov_SC01_001_jr_80135D20.c | 2 +- src/ov_SC01_004/ov_SC01_004_jr_80135D20.c | 2 +- src/ov_SC01_005/ov_SC01_005_jr_80135D20.c | 2 +- src/ov_SC01_006/ov_SC01_006_jr_80135D20.c | 2 +- src/ov_SC01_008/ov_SC01_008_jr_80135D20.c | 2 +- src/ov_SC01_009/ov_SC01_009_jr_80135D20.c | 2 +- src/ov_SC01_074/ov_SC01_074_jr_80135D20.c | 2 +- src/ov_SC01_077/ov_SC01_077_jr_80135D20.c | 2 +- src/ov_SC01_080/ov_SC01_080_jr_80135D20.c | 2 +- src/ov_SC01_084/ov_SC01_084_jr_80135D20.c | 2 +- src/ov_SC02_000/ov_SC02_000_jr_80135D20.c | 2 +- src/ov_SC02_003/ov_SC02_003_jr_80135D20.c | 2 +- src/ov_SC02_004/ov_SC02_004_jr_80135D20.c | 2 +- src/ov_SC02_005/ov_SC02_005_jr_80135D20.c | 2 +- src/ov_SC02_011/ov_SC02_011_jr_80135D20.c | 2 +- src/ov_SC02_015/ov_SC02_015_jr_80135D20.c | 2 +- src/ov_SC02_016/ov_SC02_016_jr_80135D20.c | 2 +- src/ov_SC02_017/ov_SC02_017_jr_80135D20.c | 2 +- src/ov_SC02_021/ov_SC02_021_jr_80135D20.c | 2 +- src/ov_SC02_026/ov_SC02_026_jr_80135D20.c | 2 +- src/ov_SC02_027/ov_SC02_027_jr_80135D20.c | 2 +- src/ov_SC02_028/ov_SC02_028_jr_80135D20.c | 2 +- src/ov_SC02_031/ov_SC02_031_jr_80135D20.c | 2 +- src/ov_SC02_035/ov_SC02_035_jr_80135D20.c | 2 +- src/ov_SC02_039/ov_SC02_039_jr_80135D20.c | 2 +- src/ov_SC02_041/ov_SC02_041_jr_80135D20.c | 2 +- src/ov_SC03_001/ov_SC03_001_jr_80135D20.c | 2 +- src/ov_SC03_002/ov_SC03_002_jr_80135D20.c | 2 +- src/ov_SC03_003/ov_SC03_003_jr_80135D20.c | 2 +- src/ov_SC03_006/ov_SC03_006_jr_80135D20.c | 2 +- src/ov_SC03_007/ov_SC03_007_jr_80135D20.c | 2 +- src/ov_SC03_010/ov_SC03_010_jr_80135D20.c | 2 +- src/ov_SC03_011/ov_SC03_011_jr_80135D20.c | 2 +- src/ov_SC03_012/ov_SC03_012_jr_80135D20.c | 2 +- src/ov_SC03_013/ov_SC03_013_jr_80135D20.c | 2 +- src/ov_SC03_014/ov_SC03_014_jr_80135D20.c | 2 +- src/ov_SC03_015/ov_SC03_015_jr_80135D20.c | 2 +- src/ov_SC03_023/ov_SC03_023_jr_80135D20.c | 2 +- src/ov_SC03_024/ov_SC03_024_jr_80135D20.c | 2 +- src/ov_SC03_028/ov_SC03_028_jr_80135D20.c | 2 +- src/ov_SC03_029/ov_SC03_029_jr_80135D20.c | 2 +- src/ov_SC03_030/ov_SC03_030_jr_80135D20.c | 2 +- src/ov_SC03_031/ov_SC03_031_jr_80135D20.c | 2 +- src/ov_SC03_089/ov_SC03_089_jr_80135D20.c | 2 +- src/ov_SC03_090/ov_SC03_090_jr_80135D20.c | 2 +- src/ov_SC03_091/ov_SC03_091_jr_80135D20.c | 2 +- src/ov_SC03_092/ov_SC03_092_jr_80135D20.c | 2 +- src/ov_SC03_093/ov_SC03_093_jr_80135D20.c | 2 +- src/ov_SC03_094/ov_SC03_094_jr_80135D20.c | 2 +- src/ov_SC03_095/ov_SC03_095_jr_80135D20.c | 2 +- src/ov_SC03_096/ov_SC03_096_jr_80135D20.c | 2 +- src/ov_SC03_097/ov_SC03_097_jr_80135D20.c | 2 +- src/ov_SC03_098/ov_SC03_098_jr_80135D20.c | 2 +- src/ov_SC03_099/ov_SC03_099_jr_80135D20.c | 2 +- src/ov_SC03_100/ov_SC03_100_jr_80135D20.c | 2 +- src/ov_SC03_101/ov_SC03_101_jr_80135D20.c | 2 +- src/ov_SC03_102/ov_SC03_102_jr_80135D20.c | 2 +- src/ov_SC03_103/ov_SC03_103_jr_80135D20.c | 2 +- src/ov_SC03_104/ov_SC03_104_jr_80135D20.c | 2 +- src/ov_SC03_105/ov_SC03_105_jr_80135D20.c | 2 +- src/ov_SC03_108/ov_SC03_108_jr_80135D20.c | 2 +- src/ov_SC03_109/ov_SC03_109_jr_80135D20.c | 2 +- src/ov_SC03_110/ov_SC03_110_jr_80135D20.c | 2 +- src/ov_SC03_111/ov_SC03_111_jr_80135D20.c | 2 +- src/ov_SC03_112/ov_SC03_112_jr_80135D20.c | 2 +- src/ov_SC03_113/ov_SC03_113_jr_80135D20.c | 2 +- src/ov_SC03_114/ov_SC03_114_jr_80135D20.c | 2 +- src/ov_SC03_115/ov_SC03_115_jr_80135D20.c | 2 +- src/ov_SC03_116/ov_SC03_116_jr_80135D20.c | 2 +- src/ov_SC03_117/ov_SC03_117_jr_80135D20.c | 2 +- src/ov_SC03_118/ov_SC03_118_jr_80135D20.c | 2 +- src/ov_SC03_119/ov_SC03_119_jr_80135D20.c | 2 +- src/ov_SC03_121/ov_SC03_121_jr_80135D20.c | 2 +- src/ov_SC03_124/ov_SC03_124_jr_80135D20.c | 2 +- src/ov_SC03_125/ov_SC03_125_jr_80135D20.c | 2 +- src/ov_SC03_126/ov_SC03_126_jr_80135D20.c | 2 +- src/ov_SC04_000/ov_SC04_000_jr_80135D20.c | 2 +- src/ov_SC04_002/ov_SC04_002_jr_80135D20.c | 2 +- src/ov_SC04_003/ov_SC04_003_jr_80135D20.c | 2 +- src/ov_SC04_004/ov_SC04_004_jr_80135D20.c | 2 +- src/ov_SC04_005/ov_SC04_005_jr_80135D20.c | 2 +- src/ov_SC04_006/ov_SC04_006_jr_80135D20.c | 2 +- src/ov_SC04_007/ov_SC04_007_jr_80135D20.c | 2 +- src/ov_SC04_008/ov_SC04_008_jr_80135D20.c | 2 +- src/ov_SC04_009/ov_SC04_009_jr_80135D20.c | 2 +- src/ov_SC04_010/ov_SC04_010_jr_80135D20.c | 2 +- src/ov_SC04_011/ov_SC04_011_jr_80135D20.c | 2 +- src/ov_SC04_012/ov_SC04_012_jr_80135D20.c | 2 +- src/ov_SC04_015/ov_SC04_015_jr_80135D20.c | 2 +- src/ov_SC04_016/ov_SC04_016_jr_80135D20.c | 2 +- src/ov_SC04_018/ov_SC04_018_jr_80135D20.c | 2 +- src/ov_SC04_019/ov_SC04_019_jr_80135D20.c | 2 +- src/ov_SC04_020/ov_SC04_020_jr_80135D20.c | 2 +- src/ov_SC04_021/ov_SC04_021_jr_80135D20.c | 2 +- src/ov_SC05_000/ov_SC05_000_jr_80135D20.c | 2 +- src/ov_SC05_001/ov_SC05_001_jr_80135D20.c | 2 +- src/ov_SC05_002/ov_SC05_002_jr_80135D20.c | 2 +- src/ov_SC05_003/ov_SC05_003_jr_80135D20.c | 2 +- src/ov_SC05_004/ov_SC05_004_jr_80135D20.c | 2 +- src/ov_SC05_005/ov_SC05_005_jr_80135D20.c | 2 +- src/ov_SC05_006/ov_SC05_006_jr_80135D20.c | 2 +- src/ov_SC05_007/ov_SC05_007_jr_80135D20.c | 2 +- src/ov_SC05_008/ov_SC05_008_jr_80135D20.c | 2 +- src/ov_SC05_009/ov_SC05_009_jr_80135D20.c | 2 +- src/ov_SC05_010/ov_SC05_010_jr_80135D20.c | 2 +- src/ov_SC05_011/ov_SC05_011_jr_80135D20.c | 2 +- src/ov_SC05_017/ov_SC05_017_jr_80135D20.c | 2 +- src/ov_SC05_018/ov_SC05_018_jr_80135D20.c | 2 +- src/ov_SC05_019/ov_SC05_019_jr_80135D20.c | 2 +- src/ov_SC06_000/ov_SC06_000_jr_80135D20.c | 2 +- src/ov_SC06_006/ov_SC06_006_jr_80135D20.c | 2 +- src/ov_SC06_008/ov_SC06_008_jr_80135D20.c | 2 +- src/ov_SC06_010/ov_SC06_010_jr_80135D20.c | 2 +- src/ov_SC06_011/ov_SC06_011_jr_80135D20.c | 2 +- src/ov_SC06_013/ov_SC06_013_jr_80135D20.c | 2 +- src/ov_SC06_014/ov_SC06_014_jr_80135D20.c | 2 +- src/ov_SC06_015/ov_SC06_015_jr_80135D20.c | 2 +- src/ov_SC06_016/ov_SC06_016_jr_80135D20.c | 2 +- src/ov_SC06_018/ov_SC06_018_jr_80135D20.c | 2 +- src/ov_SC06_020/ov_SC06_020_jr_80135D20.c | 2 +- src/ov_SC06_022/ov_SC06_022_jr_80135D20.c | 2 +- src/ov_SC06_024/ov_SC06_024_jr_80135D20.c | 2 +- src/ov_SC06_025/ov_SC06_025_jr_80135D20.c | 2 +- src/ov_SC06_027/ov_SC06_027_jr_80135D20.c | 2 +- src/ov_SC06_029/ov_SC06_029_jr_80135D20.c | 2 +- src/ov_SC06_030/ov_SC06_030_jr_80135D20.c | 2 +- src/ov_SC06_032/ov_SC06_032_jr_80135D20.c | 2 +- src/ov_SC06_033/ov_SC06_033_jr_80135D20.c | 2 +- src/ov_SC07_000/ov_SC07_000_jr_80135D20.c | 2 +- src/ov_SC07_001/ov_SC07_001_jr_80135D20.c | 2 +- src/ov_SC07_002/ov_SC07_002_jr_80135D20.c | 2 +- src/ov_SC07_006/ov_SC07_006_jr_80135D20.c | 49 +---------------------- src/ov_SC07_007/ov_SC07_007_jr_80135D20.c | 2 +- src/ov_SC07_008/ov_SC07_008_jr_80135D20.c | 2 +- src/ov_SC07_009/ov_SC07_009_jr_80135D20.c | 2 +- src/ov_SC07_010/ov_SC07_010_jr_80135D20.c | 2 +- src/ov_SC07_011/ov_SC07_011_jr_80135D20.c | 2 +- src/shared/engine_core.h | 48 ++++++++++++++++++++++ 140 files changed, 193 insertions(+), 185 deletions(-) diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index f4ac41eed..9c2e855dc 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -13228,3 +13228,10 @@ groups: func: DEFINE_func_801502EC vram: 0x801502EC binaries: [ov_SC01_077, ov_SC01_005, ov_SC01_006, ov_SC03_001, ov_SC01_000, ov_SC01_001, ov_SC02_000, ov_SC02_003, ov_SC03_002, ov_SC03_006, ov_SC04_000, ov_SC04_018, ov_SC04_019, ov_SC05_000, ov_SC06_000, ov_SC07_000, ov_SC01_004, ov_SC01_008, ov_SC01_009, ov_SC01_074, ov_SC01_080, ov_SC01_084, ov_SC02_004, ov_SC02_005, ov_SC02_011, ov_SC02_015, ov_SC02_016, ov_SC02_017, ov_SC02_021, ov_SC02_026, ov_SC02_027, ov_SC02_028, ov_SC02_031, ov_SC02_035, ov_SC02_039, ov_SC02_041, ov_SC03_003, ov_SC03_007, ov_SC03_010, ov_SC03_011, ov_SC03_012, ov_SC03_013, ov_SC03_014, ov_SC03_015, ov_SC03_023, ov_SC03_024, ov_SC03_028, ov_SC03_029, ov_SC03_030, ov_SC03_031, ov_SC03_089, ov_SC03_090, ov_SC03_091, ov_SC03_092, ov_SC03_093, ov_SC03_094, ov_SC03_095, ov_SC03_096, ov_SC03_097, ov_SC03_098, ov_SC03_099, ov_SC03_100, ov_SC03_101, ov_SC03_102, ov_SC03_103, ov_SC03_104, ov_SC03_105, ov_SC03_108, ov_SC03_109, ov_SC03_110, ov_SC03_111, ov_SC03_112, ov_SC03_113, ov_SC03_114, ov_SC03_115, ov_SC03_116, ov_SC03_117, ov_SC03_118, ov_SC03_119, ov_SC03_121, ov_SC03_124, ov_SC03_125, ov_SC03_126, ov_SC04_002, ov_SC04_003, ov_SC04_004, ov_SC04_005, ov_SC04_006, ov_SC04_007, ov_SC04_008, ov_SC04_009, ov_SC04_010, ov_SC04_011, ov_SC04_012, ov_SC04_015, ov_SC04_016, ov_SC04_020, ov_SC04_021, ov_SC05_001, ov_SC05_002, ov_SC05_003, ov_SC05_004, ov_SC05_005, ov_SC05_006, ov_SC05_007, ov_SC05_008, ov_SC05_009, ov_SC05_010, ov_SC05_011, ov_SC05_017, ov_SC05_018, ov_SC05_019, ov_SC06_006, ov_SC06_008, ov_SC06_010, ov_SC06_011, ov_SC06_013, ov_SC06_014, ov_SC06_015, ov_SC06_016, ov_SC06_018, ov_SC06_020, ov_SC06_022, ov_SC06_024, ov_SC06_025, ov_SC06_027, ov_SC06_029, ov_SC06_030, ov_SC06_032, ov_SC06_033, ov_SC07_001, ov_SC07_002, ov_SC07_008, ov_SC07_009, ov_SC07_006, ov_SC07_007, ov_SC07_010, ov_SC07_011] + - id: E_func_80136F3C + tier: h_exact + hash: d6334f65a52e6e201624b5753ddf16c2a902512e + source: src/shared/engine_core.h + func: DEFINE_func_80136F3C + vram: 0x80136F3C + binaries: [ov_SC01_077, ov_SC01_005, ov_SC01_006, ov_SC03_001, ov_SC01_000, ov_SC01_001, ov_SC02_000, ov_SC02_003, ov_SC03_002, ov_SC03_006, ov_SC04_000, ov_SC04_018, ov_SC04_019, ov_SC05_000, ov_SC06_000, ov_SC07_000, ov_SC01_004, ov_SC01_008, ov_SC01_009, ov_SC01_074, ov_SC01_080, ov_SC01_084, ov_SC02_004, ov_SC02_005, ov_SC02_011, ov_SC02_015, ov_SC02_016, ov_SC02_017, ov_SC02_021, ov_SC02_026, ov_SC02_027, ov_SC02_028, ov_SC02_031, ov_SC02_035, ov_SC02_039, ov_SC02_041, ov_SC03_003, ov_SC03_007, ov_SC03_010, ov_SC03_011, ov_SC03_012, ov_SC03_013, ov_SC03_014, ov_SC03_015, ov_SC03_023, ov_SC03_024, ov_SC03_028, ov_SC03_029, ov_SC03_030, ov_SC03_031, ov_SC03_089, ov_SC03_090, ov_SC03_091, ov_SC03_092, ov_SC03_093, ov_SC03_094, ov_SC03_095, ov_SC03_096, ov_SC03_097, ov_SC03_098, ov_SC03_099, ov_SC03_100, ov_SC03_101, ov_SC03_102, ov_SC03_103, ov_SC03_104, ov_SC03_105, ov_SC03_108, ov_SC03_109, ov_SC03_110, ov_SC03_111, ov_SC03_112, ov_SC03_113, ov_SC03_114, ov_SC03_115, ov_SC03_116, ov_SC03_117, ov_SC03_118, ov_SC03_119, ov_SC03_121, ov_SC03_124, ov_SC03_125, ov_SC03_126, ov_SC04_002, ov_SC04_003, ov_SC04_004, ov_SC04_005, ov_SC04_006, ov_SC04_007, ov_SC04_008, ov_SC04_009, ov_SC04_010, ov_SC04_011, ov_SC04_012, ov_SC04_015, ov_SC04_016, ov_SC04_020, ov_SC04_021, ov_SC05_001, ov_SC05_002, ov_SC05_003, ov_SC05_004, ov_SC05_005, ov_SC05_006, ov_SC05_007, ov_SC05_008, ov_SC05_009, ov_SC05_010, ov_SC05_011, ov_SC05_017, ov_SC05_018, ov_SC05_019, ov_SC06_006, ov_SC06_008, ov_SC06_010, ov_SC06_011, ov_SC06_013, ov_SC06_014, ov_SC06_015, ov_SC06_016, ov_SC06_018, ov_SC06_020, ov_SC06_022, ov_SC06_024, ov_SC06_025, ov_SC06_027, ov_SC06_029, ov_SC06_030, ov_SC06_032, ov_SC06_033, ov_SC07_001, ov_SC07_002, ov_SC07_008, ov_SC07_009, ov_SC07_006, ov_SC07_007, ov_SC07_010, ov_SC07_011] diff --git a/src/ov_SC01_000/ov_SC01_000_jr_80135D20.c b/src/ov_SC01_000/ov_SC01_000_jr_80135D20.c index 0231a8ade..42a68b6da 100644 --- a/src/ov_SC01_000/ov_SC01_000_jr_80135D20.c +++ b/src/ov_SC01_000/ov_SC01_000_jr_80135D20.c @@ -1077,7 +1077,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC01_001/ov_SC01_001_jr_80135D20.c b/src/ov_SC01_001/ov_SC01_001_jr_80135D20.c index 32dba3523..3b3380b0c 100644 --- a/src/ov_SC01_001/ov_SC01_001_jr_80135D20.c +++ b/src/ov_SC01_001/ov_SC01_001_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC01_004/ov_SC01_004_jr_80135D20.c b/src/ov_SC01_004/ov_SC01_004_jr_80135D20.c index bd92bb796..244ea2cce 100644 --- a/src/ov_SC01_004/ov_SC01_004_jr_80135D20.c +++ b/src/ov_SC01_004/ov_SC01_004_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC01_005/ov_SC01_005_jr_80135D20.c b/src/ov_SC01_005/ov_SC01_005_jr_80135D20.c index 5d6c8bfdf..8539e6209 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_80135D20.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_80135D20.c @@ -1077,7 +1077,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC01_006/ov_SC01_006_jr_80135D20.c b/src/ov_SC01_006/ov_SC01_006_jr_80135D20.c index f2c44ae6c..c7b1bb761 100644 --- a/src/ov_SC01_006/ov_SC01_006_jr_80135D20.c +++ b/src/ov_SC01_006/ov_SC01_006_jr_80135D20.c @@ -1077,7 +1077,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC01_008/ov_SC01_008_jr_80135D20.c b/src/ov_SC01_008/ov_SC01_008_jr_80135D20.c index 6e6e8848e..ec4e1aeb6 100644 --- a/src/ov_SC01_008/ov_SC01_008_jr_80135D20.c +++ b/src/ov_SC01_008/ov_SC01_008_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC01_009/ov_SC01_009_jr_80135D20.c b/src/ov_SC01_009/ov_SC01_009_jr_80135D20.c index 1b0a261ef..83cdeae94 100644 --- a/src/ov_SC01_009/ov_SC01_009_jr_80135D20.c +++ b/src/ov_SC01_009/ov_SC01_009_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC01_074/ov_SC01_074_jr_80135D20.c b/src/ov_SC01_074/ov_SC01_074_jr_80135D20.c index ec89fe96c..4cbf58139 100644 --- a/src/ov_SC01_074/ov_SC01_074_jr_80135D20.c +++ b/src/ov_SC01_074/ov_SC01_074_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC01_077/ov_SC01_077_jr_80135D20.c b/src/ov_SC01_077/ov_SC01_077_jr_80135D20.c index 64e88e420..fde258c1a 100644 --- a/src/ov_SC01_077/ov_SC01_077_jr_80135D20.c +++ b/src/ov_SC01_077/ov_SC01_077_jr_80135D20.c @@ -1110,7 +1110,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ // @class: schedule // @stuck: none — MATCH diff --git a/src/ov_SC01_080/ov_SC01_080_jr_80135D20.c b/src/ov_SC01_080/ov_SC01_080_jr_80135D20.c index 820cc5f48..3876e688c 100644 --- a/src/ov_SC01_080/ov_SC01_080_jr_80135D20.c +++ b/src/ov_SC01_080/ov_SC01_080_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC01_084/ov_SC01_084_jr_80135D20.c b/src/ov_SC01_084/ov_SC01_084_jr_80135D20.c index 1243267f6..5c313e5b9 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_80135D20.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC02_000/ov_SC02_000_jr_80135D20.c b/src/ov_SC02_000/ov_SC02_000_jr_80135D20.c index baa206718..1a4f538ab 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_80135D20.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC02_003/ov_SC02_003_jr_80135D20.c b/src/ov_SC02_003/ov_SC02_003_jr_80135D20.c index ba6d72aeb..b5fbbecd3 100644 --- a/src/ov_SC02_003/ov_SC02_003_jr_80135D20.c +++ b/src/ov_SC02_003/ov_SC02_003_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC02_004/ov_SC02_004_jr_80135D20.c b/src/ov_SC02_004/ov_SC02_004_jr_80135D20.c index 4f3b96391..2dbd07dae 100644 --- a/src/ov_SC02_004/ov_SC02_004_jr_80135D20.c +++ b/src/ov_SC02_004/ov_SC02_004_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC02_005/ov_SC02_005_jr_80135D20.c b/src/ov_SC02_005/ov_SC02_005_jr_80135D20.c index 8c22d6285..f77012d05 100644 --- a/src/ov_SC02_005/ov_SC02_005_jr_80135D20.c +++ b/src/ov_SC02_005/ov_SC02_005_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC02_011/ov_SC02_011_jr_80135D20.c b/src/ov_SC02_011/ov_SC02_011_jr_80135D20.c index b9836ec2e..3b7e512fb 100644 --- a/src/ov_SC02_011/ov_SC02_011_jr_80135D20.c +++ b/src/ov_SC02_011/ov_SC02_011_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC02_015/ov_SC02_015_jr_80135D20.c b/src/ov_SC02_015/ov_SC02_015_jr_80135D20.c index a8e9653d1..888396997 100644 --- a/src/ov_SC02_015/ov_SC02_015_jr_80135D20.c +++ b/src/ov_SC02_015/ov_SC02_015_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC02_016/ov_SC02_016_jr_80135D20.c b/src/ov_SC02_016/ov_SC02_016_jr_80135D20.c index 0d2953acf..42b3abfbb 100644 --- a/src/ov_SC02_016/ov_SC02_016_jr_80135D20.c +++ b/src/ov_SC02_016/ov_SC02_016_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC02_017/ov_SC02_017_jr_80135D20.c b/src/ov_SC02_017/ov_SC02_017_jr_80135D20.c index d56cb7c73..d01b03520 100644 --- a/src/ov_SC02_017/ov_SC02_017_jr_80135D20.c +++ b/src/ov_SC02_017/ov_SC02_017_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC02_021/ov_SC02_021_jr_80135D20.c b/src/ov_SC02_021/ov_SC02_021_jr_80135D20.c index 4ebdccef1..4fa4fce72 100644 --- a/src/ov_SC02_021/ov_SC02_021_jr_80135D20.c +++ b/src/ov_SC02_021/ov_SC02_021_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC02_026/ov_SC02_026_jr_80135D20.c b/src/ov_SC02_026/ov_SC02_026_jr_80135D20.c index cc86bd1e4..07a28ab13 100644 --- a/src/ov_SC02_026/ov_SC02_026_jr_80135D20.c +++ b/src/ov_SC02_026/ov_SC02_026_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC02_027/ov_SC02_027_jr_80135D20.c b/src/ov_SC02_027/ov_SC02_027_jr_80135D20.c index 4a7fae75c..856e01c75 100644 --- a/src/ov_SC02_027/ov_SC02_027_jr_80135D20.c +++ b/src/ov_SC02_027/ov_SC02_027_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC02_028/ov_SC02_028_jr_80135D20.c b/src/ov_SC02_028/ov_SC02_028_jr_80135D20.c index 69bfbc8b5..87746293c 100644 --- a/src/ov_SC02_028/ov_SC02_028_jr_80135D20.c +++ b/src/ov_SC02_028/ov_SC02_028_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC02_031/ov_SC02_031_jr_80135D20.c b/src/ov_SC02_031/ov_SC02_031_jr_80135D20.c index 3e6e0cb4f..eb9da3b49 100644 --- a/src/ov_SC02_031/ov_SC02_031_jr_80135D20.c +++ b/src/ov_SC02_031/ov_SC02_031_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC02_035/ov_SC02_035_jr_80135D20.c b/src/ov_SC02_035/ov_SC02_035_jr_80135D20.c index 0dd6454f4..94b6f5876 100644 --- a/src/ov_SC02_035/ov_SC02_035_jr_80135D20.c +++ b/src/ov_SC02_035/ov_SC02_035_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC02_039/ov_SC02_039_jr_80135D20.c b/src/ov_SC02_039/ov_SC02_039_jr_80135D20.c index b4738d9b6..ac73f48fa 100644 --- a/src/ov_SC02_039/ov_SC02_039_jr_80135D20.c +++ b/src/ov_SC02_039/ov_SC02_039_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC02_041/ov_SC02_041_jr_80135D20.c b/src/ov_SC02_041/ov_SC02_041_jr_80135D20.c index 5c548e5c7..6fccde8d7 100644 --- a/src/ov_SC02_041/ov_SC02_041_jr_80135D20.c +++ b/src/ov_SC02_041/ov_SC02_041_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_001/ov_SC03_001_jr_80135D20.c b/src/ov_SC03_001/ov_SC03_001_jr_80135D20.c index bb98821ec..7e6c8a8e1 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_80135D20.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_002/ov_SC03_002_jr_80135D20.c b/src/ov_SC03_002/ov_SC03_002_jr_80135D20.c index 6f4614e38..4434bc7d8 100644 --- a/src/ov_SC03_002/ov_SC03_002_jr_80135D20.c +++ b/src/ov_SC03_002/ov_SC03_002_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_003/ov_SC03_003_jr_80135D20.c b/src/ov_SC03_003/ov_SC03_003_jr_80135D20.c index 8542eb907..b3a9da466 100644 --- a/src/ov_SC03_003/ov_SC03_003_jr_80135D20.c +++ b/src/ov_SC03_003/ov_SC03_003_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_006/ov_SC03_006_jr_80135D20.c b/src/ov_SC03_006/ov_SC03_006_jr_80135D20.c index e52de7d97..37a38ad37 100644 --- a/src/ov_SC03_006/ov_SC03_006_jr_80135D20.c +++ b/src/ov_SC03_006/ov_SC03_006_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_007/ov_SC03_007_jr_80135D20.c b/src/ov_SC03_007/ov_SC03_007_jr_80135D20.c index 87c7876c6..2da9a2b3e 100644 --- a/src/ov_SC03_007/ov_SC03_007_jr_80135D20.c +++ b/src/ov_SC03_007/ov_SC03_007_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_010/ov_SC03_010_jr_80135D20.c b/src/ov_SC03_010/ov_SC03_010_jr_80135D20.c index bf43ca363..392f8bfc3 100644 --- a/src/ov_SC03_010/ov_SC03_010_jr_80135D20.c +++ b/src/ov_SC03_010/ov_SC03_010_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_011/ov_SC03_011_jr_80135D20.c b/src/ov_SC03_011/ov_SC03_011_jr_80135D20.c index 6f24c4a15..18f004246 100644 --- a/src/ov_SC03_011/ov_SC03_011_jr_80135D20.c +++ b/src/ov_SC03_011/ov_SC03_011_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_012/ov_SC03_012_jr_80135D20.c b/src/ov_SC03_012/ov_SC03_012_jr_80135D20.c index 6519b97d6..f134cbddb 100644 --- a/src/ov_SC03_012/ov_SC03_012_jr_80135D20.c +++ b/src/ov_SC03_012/ov_SC03_012_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_013/ov_SC03_013_jr_80135D20.c b/src/ov_SC03_013/ov_SC03_013_jr_80135D20.c index 99ab8ec9a..963413b62 100644 --- a/src/ov_SC03_013/ov_SC03_013_jr_80135D20.c +++ b/src/ov_SC03_013/ov_SC03_013_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_014/ov_SC03_014_jr_80135D20.c b/src/ov_SC03_014/ov_SC03_014_jr_80135D20.c index 276dcd7fa..fb1f51594 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_80135D20.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_015/ov_SC03_015_jr_80135D20.c b/src/ov_SC03_015/ov_SC03_015_jr_80135D20.c index 65f67d334..6907afae0 100644 --- a/src/ov_SC03_015/ov_SC03_015_jr_80135D20.c +++ b/src/ov_SC03_015/ov_SC03_015_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_023/ov_SC03_023_jr_80135D20.c b/src/ov_SC03_023/ov_SC03_023_jr_80135D20.c index 294aa3aad..64e4b6c63 100644 --- a/src/ov_SC03_023/ov_SC03_023_jr_80135D20.c +++ b/src/ov_SC03_023/ov_SC03_023_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_024/ov_SC03_024_jr_80135D20.c b/src/ov_SC03_024/ov_SC03_024_jr_80135D20.c index 6a0e6e084..476f3dce9 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_80135D20.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_028/ov_SC03_028_jr_80135D20.c b/src/ov_SC03_028/ov_SC03_028_jr_80135D20.c index 4813eaccb..3a977bf86 100644 --- a/src/ov_SC03_028/ov_SC03_028_jr_80135D20.c +++ b/src/ov_SC03_028/ov_SC03_028_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_029/ov_SC03_029_jr_80135D20.c b/src/ov_SC03_029/ov_SC03_029_jr_80135D20.c index fc00f2299..107460078 100644 --- a/src/ov_SC03_029/ov_SC03_029_jr_80135D20.c +++ b/src/ov_SC03_029/ov_SC03_029_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_030/ov_SC03_030_jr_80135D20.c b/src/ov_SC03_030/ov_SC03_030_jr_80135D20.c index 2b649dc28..fe950a48f 100644 --- a/src/ov_SC03_030/ov_SC03_030_jr_80135D20.c +++ b/src/ov_SC03_030/ov_SC03_030_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_031/ov_SC03_031_jr_80135D20.c b/src/ov_SC03_031/ov_SC03_031_jr_80135D20.c index 4eb4af330..5fb8b5536 100644 --- a/src/ov_SC03_031/ov_SC03_031_jr_80135D20.c +++ b/src/ov_SC03_031/ov_SC03_031_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_089/ov_SC03_089_jr_80135D20.c b/src/ov_SC03_089/ov_SC03_089_jr_80135D20.c index f8272e25a..639448ca0 100644 --- a/src/ov_SC03_089/ov_SC03_089_jr_80135D20.c +++ b/src/ov_SC03_089/ov_SC03_089_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_090/ov_SC03_090_jr_80135D20.c b/src/ov_SC03_090/ov_SC03_090_jr_80135D20.c index c88b52742..9e657b28e 100644 --- a/src/ov_SC03_090/ov_SC03_090_jr_80135D20.c +++ b/src/ov_SC03_090/ov_SC03_090_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_091/ov_SC03_091_jr_80135D20.c b/src/ov_SC03_091/ov_SC03_091_jr_80135D20.c index 599ec40ac..1dc9194b2 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_80135D20.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_092/ov_SC03_092_jr_80135D20.c b/src/ov_SC03_092/ov_SC03_092_jr_80135D20.c index 7c6d7418e..f936a142d 100644 --- a/src/ov_SC03_092/ov_SC03_092_jr_80135D20.c +++ b/src/ov_SC03_092/ov_SC03_092_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_093/ov_SC03_093_jr_80135D20.c b/src/ov_SC03_093/ov_SC03_093_jr_80135D20.c index 64460c510..a5c92de95 100644 --- a/src/ov_SC03_093/ov_SC03_093_jr_80135D20.c +++ b/src/ov_SC03_093/ov_SC03_093_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_094/ov_SC03_094_jr_80135D20.c b/src/ov_SC03_094/ov_SC03_094_jr_80135D20.c index 76ade2e31..a46ba3906 100644 --- a/src/ov_SC03_094/ov_SC03_094_jr_80135D20.c +++ b/src/ov_SC03_094/ov_SC03_094_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_095/ov_SC03_095_jr_80135D20.c b/src/ov_SC03_095/ov_SC03_095_jr_80135D20.c index 9b4641145..f5b633c42 100644 --- a/src/ov_SC03_095/ov_SC03_095_jr_80135D20.c +++ b/src/ov_SC03_095/ov_SC03_095_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_096/ov_SC03_096_jr_80135D20.c b/src/ov_SC03_096/ov_SC03_096_jr_80135D20.c index d39be5ec5..360eefc76 100644 --- a/src/ov_SC03_096/ov_SC03_096_jr_80135D20.c +++ b/src/ov_SC03_096/ov_SC03_096_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_097/ov_SC03_097_jr_80135D20.c b/src/ov_SC03_097/ov_SC03_097_jr_80135D20.c index a409f71a2..a65ff9ecf 100644 --- a/src/ov_SC03_097/ov_SC03_097_jr_80135D20.c +++ b/src/ov_SC03_097/ov_SC03_097_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_098/ov_SC03_098_jr_80135D20.c b/src/ov_SC03_098/ov_SC03_098_jr_80135D20.c index f9ef8216b..e57f27531 100644 --- a/src/ov_SC03_098/ov_SC03_098_jr_80135D20.c +++ b/src/ov_SC03_098/ov_SC03_098_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_099/ov_SC03_099_jr_80135D20.c b/src/ov_SC03_099/ov_SC03_099_jr_80135D20.c index 8ee948a52..03753603b 100644 --- a/src/ov_SC03_099/ov_SC03_099_jr_80135D20.c +++ b/src/ov_SC03_099/ov_SC03_099_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_100/ov_SC03_100_jr_80135D20.c b/src/ov_SC03_100/ov_SC03_100_jr_80135D20.c index 7c5978959..95b65e60b 100644 --- a/src/ov_SC03_100/ov_SC03_100_jr_80135D20.c +++ b/src/ov_SC03_100/ov_SC03_100_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_101/ov_SC03_101_jr_80135D20.c b/src/ov_SC03_101/ov_SC03_101_jr_80135D20.c index 4bc1e6354..c97b80f48 100644 --- a/src/ov_SC03_101/ov_SC03_101_jr_80135D20.c +++ b/src/ov_SC03_101/ov_SC03_101_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_102/ov_SC03_102_jr_80135D20.c b/src/ov_SC03_102/ov_SC03_102_jr_80135D20.c index dfd7ae8ec..0968a8701 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_80135D20.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_103/ov_SC03_103_jr_80135D20.c b/src/ov_SC03_103/ov_SC03_103_jr_80135D20.c index a7c97c0b6..509b2a90d 100644 --- a/src/ov_SC03_103/ov_SC03_103_jr_80135D20.c +++ b/src/ov_SC03_103/ov_SC03_103_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_104/ov_SC03_104_jr_80135D20.c b/src/ov_SC03_104/ov_SC03_104_jr_80135D20.c index 3b9142633..eb9261fd6 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_80135D20.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_105/ov_SC03_105_jr_80135D20.c b/src/ov_SC03_105/ov_SC03_105_jr_80135D20.c index 17c6f0981..1706c493d 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_80135D20.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_108/ov_SC03_108_jr_80135D20.c b/src/ov_SC03_108/ov_SC03_108_jr_80135D20.c index 168e2d9aa..7117c9b17 100644 --- a/src/ov_SC03_108/ov_SC03_108_jr_80135D20.c +++ b/src/ov_SC03_108/ov_SC03_108_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_109/ov_SC03_109_jr_80135D20.c b/src/ov_SC03_109/ov_SC03_109_jr_80135D20.c index 992bd5e33..9143e1a1e 100644 --- a/src/ov_SC03_109/ov_SC03_109_jr_80135D20.c +++ b/src/ov_SC03_109/ov_SC03_109_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_110/ov_SC03_110_jr_80135D20.c b/src/ov_SC03_110/ov_SC03_110_jr_80135D20.c index f34fc62a6..638b05df0 100644 --- a/src/ov_SC03_110/ov_SC03_110_jr_80135D20.c +++ b/src/ov_SC03_110/ov_SC03_110_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_111/ov_SC03_111_jr_80135D20.c b/src/ov_SC03_111/ov_SC03_111_jr_80135D20.c index d41b83996..e3a85f992 100644 --- a/src/ov_SC03_111/ov_SC03_111_jr_80135D20.c +++ b/src/ov_SC03_111/ov_SC03_111_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_112/ov_SC03_112_jr_80135D20.c b/src/ov_SC03_112/ov_SC03_112_jr_80135D20.c index c119773c8..ec0388270 100644 --- a/src/ov_SC03_112/ov_SC03_112_jr_80135D20.c +++ b/src/ov_SC03_112/ov_SC03_112_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_113/ov_SC03_113_jr_80135D20.c b/src/ov_SC03_113/ov_SC03_113_jr_80135D20.c index 187b22b8d..554f07156 100644 --- a/src/ov_SC03_113/ov_SC03_113_jr_80135D20.c +++ b/src/ov_SC03_113/ov_SC03_113_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_114/ov_SC03_114_jr_80135D20.c b/src/ov_SC03_114/ov_SC03_114_jr_80135D20.c index f3f3bd43a..2d4ed53c1 100644 --- a/src/ov_SC03_114/ov_SC03_114_jr_80135D20.c +++ b/src/ov_SC03_114/ov_SC03_114_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_115/ov_SC03_115_jr_80135D20.c b/src/ov_SC03_115/ov_SC03_115_jr_80135D20.c index f330ab7bd..76fa89a3d 100644 --- a/src/ov_SC03_115/ov_SC03_115_jr_80135D20.c +++ b/src/ov_SC03_115/ov_SC03_115_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_116/ov_SC03_116_jr_80135D20.c b/src/ov_SC03_116/ov_SC03_116_jr_80135D20.c index c7b1c36c2..b41d7667d 100644 --- a/src/ov_SC03_116/ov_SC03_116_jr_80135D20.c +++ b/src/ov_SC03_116/ov_SC03_116_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_117/ov_SC03_117_jr_80135D20.c b/src/ov_SC03_117/ov_SC03_117_jr_80135D20.c index 07c3a2873..4e203a07b 100644 --- a/src/ov_SC03_117/ov_SC03_117_jr_80135D20.c +++ b/src/ov_SC03_117/ov_SC03_117_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_118/ov_SC03_118_jr_80135D20.c b/src/ov_SC03_118/ov_SC03_118_jr_80135D20.c index e3fe1c8f1..83099d543 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_80135D20.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_119/ov_SC03_119_jr_80135D20.c b/src/ov_SC03_119/ov_SC03_119_jr_80135D20.c index c91dd0a6a..dde161554 100644 --- a/src/ov_SC03_119/ov_SC03_119_jr_80135D20.c +++ b/src/ov_SC03_119/ov_SC03_119_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_121/ov_SC03_121_jr_80135D20.c b/src/ov_SC03_121/ov_SC03_121_jr_80135D20.c index f5961a683..c284d6839 100644 --- a/src/ov_SC03_121/ov_SC03_121_jr_80135D20.c +++ b/src/ov_SC03_121/ov_SC03_121_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_124/ov_SC03_124_jr_80135D20.c b/src/ov_SC03_124/ov_SC03_124_jr_80135D20.c index a329535c0..983530ef7 100644 --- a/src/ov_SC03_124/ov_SC03_124_jr_80135D20.c +++ b/src/ov_SC03_124/ov_SC03_124_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_125/ov_SC03_125_jr_80135D20.c b/src/ov_SC03_125/ov_SC03_125_jr_80135D20.c index 2a5714ac6..9522199d9 100644 --- a/src/ov_SC03_125/ov_SC03_125_jr_80135D20.c +++ b/src/ov_SC03_125/ov_SC03_125_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC03_126/ov_SC03_126_jr_80135D20.c b/src/ov_SC03_126/ov_SC03_126_jr_80135D20.c index 27615425b..3099defec 100644 --- a/src/ov_SC03_126/ov_SC03_126_jr_80135D20.c +++ b/src/ov_SC03_126/ov_SC03_126_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC04_000/ov_SC04_000_jr_80135D20.c b/src/ov_SC04_000/ov_SC04_000_jr_80135D20.c index 5c72d6ff4..9f2f3dc0e 100644 --- a/src/ov_SC04_000/ov_SC04_000_jr_80135D20.c +++ b/src/ov_SC04_000/ov_SC04_000_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC04_002/ov_SC04_002_jr_80135D20.c b/src/ov_SC04_002/ov_SC04_002_jr_80135D20.c index 6a03b0787..1c85f7836 100644 --- a/src/ov_SC04_002/ov_SC04_002_jr_80135D20.c +++ b/src/ov_SC04_002/ov_SC04_002_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC04_003/ov_SC04_003_jr_80135D20.c b/src/ov_SC04_003/ov_SC04_003_jr_80135D20.c index 629cd62d4..4e8020318 100644 --- a/src/ov_SC04_003/ov_SC04_003_jr_80135D20.c +++ b/src/ov_SC04_003/ov_SC04_003_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC04_004/ov_SC04_004_jr_80135D20.c b/src/ov_SC04_004/ov_SC04_004_jr_80135D20.c index 889c9cdbf..67ee1d300 100644 --- a/src/ov_SC04_004/ov_SC04_004_jr_80135D20.c +++ b/src/ov_SC04_004/ov_SC04_004_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC04_005/ov_SC04_005_jr_80135D20.c b/src/ov_SC04_005/ov_SC04_005_jr_80135D20.c index 193ce9ca3..122dbf346 100644 --- a/src/ov_SC04_005/ov_SC04_005_jr_80135D20.c +++ b/src/ov_SC04_005/ov_SC04_005_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC04_006/ov_SC04_006_jr_80135D20.c b/src/ov_SC04_006/ov_SC04_006_jr_80135D20.c index e0aeba3b5..2bd344220 100644 --- a/src/ov_SC04_006/ov_SC04_006_jr_80135D20.c +++ b/src/ov_SC04_006/ov_SC04_006_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC04_007/ov_SC04_007_jr_80135D20.c b/src/ov_SC04_007/ov_SC04_007_jr_80135D20.c index ad5ec6c9a..80c1d82a2 100644 --- a/src/ov_SC04_007/ov_SC04_007_jr_80135D20.c +++ b/src/ov_SC04_007/ov_SC04_007_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC04_008/ov_SC04_008_jr_80135D20.c b/src/ov_SC04_008/ov_SC04_008_jr_80135D20.c index 765aee8ae..e6cf16cb6 100644 --- a/src/ov_SC04_008/ov_SC04_008_jr_80135D20.c +++ b/src/ov_SC04_008/ov_SC04_008_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC04_009/ov_SC04_009_jr_80135D20.c b/src/ov_SC04_009/ov_SC04_009_jr_80135D20.c index 47f2ae8e9..5444ca13b 100644 --- a/src/ov_SC04_009/ov_SC04_009_jr_80135D20.c +++ b/src/ov_SC04_009/ov_SC04_009_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC04_010/ov_SC04_010_jr_80135D20.c b/src/ov_SC04_010/ov_SC04_010_jr_80135D20.c index 06493de9c..76e421f0c 100644 --- a/src/ov_SC04_010/ov_SC04_010_jr_80135D20.c +++ b/src/ov_SC04_010/ov_SC04_010_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC04_011/ov_SC04_011_jr_80135D20.c b/src/ov_SC04_011/ov_SC04_011_jr_80135D20.c index 88682224d..5baf015eb 100644 --- a/src/ov_SC04_011/ov_SC04_011_jr_80135D20.c +++ b/src/ov_SC04_011/ov_SC04_011_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC04_012/ov_SC04_012_jr_80135D20.c b/src/ov_SC04_012/ov_SC04_012_jr_80135D20.c index 78e8a1f61..66e749c43 100644 --- a/src/ov_SC04_012/ov_SC04_012_jr_80135D20.c +++ b/src/ov_SC04_012/ov_SC04_012_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC04_015/ov_SC04_015_jr_80135D20.c b/src/ov_SC04_015/ov_SC04_015_jr_80135D20.c index 09104ecce..5cc69632f 100644 --- a/src/ov_SC04_015/ov_SC04_015_jr_80135D20.c +++ b/src/ov_SC04_015/ov_SC04_015_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC04_016/ov_SC04_016_jr_80135D20.c b/src/ov_SC04_016/ov_SC04_016_jr_80135D20.c index b62b950c5..14c917bbf 100644 --- a/src/ov_SC04_016/ov_SC04_016_jr_80135D20.c +++ b/src/ov_SC04_016/ov_SC04_016_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC04_018/ov_SC04_018_jr_80135D20.c b/src/ov_SC04_018/ov_SC04_018_jr_80135D20.c index b46c565e8..e35e05a96 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_80135D20.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC04_019/ov_SC04_019_jr_80135D20.c b/src/ov_SC04_019/ov_SC04_019_jr_80135D20.c index ea6317af0..13338b5ef 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_80135D20.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC04_020/ov_SC04_020_jr_80135D20.c b/src/ov_SC04_020/ov_SC04_020_jr_80135D20.c index 627786f19..d39221e56 100644 --- a/src/ov_SC04_020/ov_SC04_020_jr_80135D20.c +++ b/src/ov_SC04_020/ov_SC04_020_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC04_021/ov_SC04_021_jr_80135D20.c b/src/ov_SC04_021/ov_SC04_021_jr_80135D20.c index 6c2a60963..e059abb2d 100644 --- a/src/ov_SC04_021/ov_SC04_021_jr_80135D20.c +++ b/src/ov_SC04_021/ov_SC04_021_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC05_000/ov_SC05_000_jr_80135D20.c b/src/ov_SC05_000/ov_SC05_000_jr_80135D20.c index 0391dbe30..47f371d0f 100644 --- a/src/ov_SC05_000/ov_SC05_000_jr_80135D20.c +++ b/src/ov_SC05_000/ov_SC05_000_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC05_001/ov_SC05_001_jr_80135D20.c b/src/ov_SC05_001/ov_SC05_001_jr_80135D20.c index 4c7d7eb88..d2928d0fc 100644 --- a/src/ov_SC05_001/ov_SC05_001_jr_80135D20.c +++ b/src/ov_SC05_001/ov_SC05_001_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC05_002/ov_SC05_002_jr_80135D20.c b/src/ov_SC05_002/ov_SC05_002_jr_80135D20.c index e3ec6dfbd..1a4772616 100644 --- a/src/ov_SC05_002/ov_SC05_002_jr_80135D20.c +++ b/src/ov_SC05_002/ov_SC05_002_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC05_003/ov_SC05_003_jr_80135D20.c b/src/ov_SC05_003/ov_SC05_003_jr_80135D20.c index f9f338cff..abe22ff20 100644 --- a/src/ov_SC05_003/ov_SC05_003_jr_80135D20.c +++ b/src/ov_SC05_003/ov_SC05_003_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC05_004/ov_SC05_004_jr_80135D20.c b/src/ov_SC05_004/ov_SC05_004_jr_80135D20.c index 4529c6ee8..6b7b29ee7 100644 --- a/src/ov_SC05_004/ov_SC05_004_jr_80135D20.c +++ b/src/ov_SC05_004/ov_SC05_004_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC05_005/ov_SC05_005_jr_80135D20.c b/src/ov_SC05_005/ov_SC05_005_jr_80135D20.c index 49fcfa409..6157a88d0 100644 --- a/src/ov_SC05_005/ov_SC05_005_jr_80135D20.c +++ b/src/ov_SC05_005/ov_SC05_005_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC05_006/ov_SC05_006_jr_80135D20.c b/src/ov_SC05_006/ov_SC05_006_jr_80135D20.c index d5dc722ec..8b4a38734 100644 --- a/src/ov_SC05_006/ov_SC05_006_jr_80135D20.c +++ b/src/ov_SC05_006/ov_SC05_006_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC05_007/ov_SC05_007_jr_80135D20.c b/src/ov_SC05_007/ov_SC05_007_jr_80135D20.c index 3c1590f8a..8323812f9 100644 --- a/src/ov_SC05_007/ov_SC05_007_jr_80135D20.c +++ b/src/ov_SC05_007/ov_SC05_007_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC05_008/ov_SC05_008_jr_80135D20.c b/src/ov_SC05_008/ov_SC05_008_jr_80135D20.c index c9f0e0980..61d98dcff 100644 --- a/src/ov_SC05_008/ov_SC05_008_jr_80135D20.c +++ b/src/ov_SC05_008/ov_SC05_008_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC05_009/ov_SC05_009_jr_80135D20.c b/src/ov_SC05_009/ov_SC05_009_jr_80135D20.c index abe731776..9142f28b3 100644 --- a/src/ov_SC05_009/ov_SC05_009_jr_80135D20.c +++ b/src/ov_SC05_009/ov_SC05_009_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC05_010/ov_SC05_010_jr_80135D20.c b/src/ov_SC05_010/ov_SC05_010_jr_80135D20.c index 0403564ae..5335c03eb 100644 --- a/src/ov_SC05_010/ov_SC05_010_jr_80135D20.c +++ b/src/ov_SC05_010/ov_SC05_010_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC05_011/ov_SC05_011_jr_80135D20.c b/src/ov_SC05_011/ov_SC05_011_jr_80135D20.c index 527012cbb..800a077e1 100644 --- a/src/ov_SC05_011/ov_SC05_011_jr_80135D20.c +++ b/src/ov_SC05_011/ov_SC05_011_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC05_017/ov_SC05_017_jr_80135D20.c b/src/ov_SC05_017/ov_SC05_017_jr_80135D20.c index c25c99e6d..e688770a7 100644 --- a/src/ov_SC05_017/ov_SC05_017_jr_80135D20.c +++ b/src/ov_SC05_017/ov_SC05_017_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC05_018/ov_SC05_018_jr_80135D20.c b/src/ov_SC05_018/ov_SC05_018_jr_80135D20.c index c72e94407..1d7ce90e4 100644 --- a/src/ov_SC05_018/ov_SC05_018_jr_80135D20.c +++ b/src/ov_SC05_018/ov_SC05_018_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC05_019/ov_SC05_019_jr_80135D20.c b/src/ov_SC05_019/ov_SC05_019_jr_80135D20.c index f53b3a986..7ae9b3dd6 100644 --- a/src/ov_SC05_019/ov_SC05_019_jr_80135D20.c +++ b/src/ov_SC05_019/ov_SC05_019_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC06_000/ov_SC06_000_jr_80135D20.c b/src/ov_SC06_000/ov_SC06_000_jr_80135D20.c index f05734330..4e4e29b35 100644 --- a/src/ov_SC06_000/ov_SC06_000_jr_80135D20.c +++ b/src/ov_SC06_000/ov_SC06_000_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC06_006/ov_SC06_006_jr_80135D20.c b/src/ov_SC06_006/ov_SC06_006_jr_80135D20.c index ad2bc19fe..f7777406a 100644 --- a/src/ov_SC06_006/ov_SC06_006_jr_80135D20.c +++ b/src/ov_SC06_006/ov_SC06_006_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC06_008/ov_SC06_008_jr_80135D20.c b/src/ov_SC06_008/ov_SC06_008_jr_80135D20.c index 39896e9bf..2736d9011 100644 --- a/src/ov_SC06_008/ov_SC06_008_jr_80135D20.c +++ b/src/ov_SC06_008/ov_SC06_008_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC06_010/ov_SC06_010_jr_80135D20.c b/src/ov_SC06_010/ov_SC06_010_jr_80135D20.c index 32de655a3..dad92aafb 100644 --- a/src/ov_SC06_010/ov_SC06_010_jr_80135D20.c +++ b/src/ov_SC06_010/ov_SC06_010_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC06_011/ov_SC06_011_jr_80135D20.c b/src/ov_SC06_011/ov_SC06_011_jr_80135D20.c index 4748c3861..523a5ee68 100644 --- a/src/ov_SC06_011/ov_SC06_011_jr_80135D20.c +++ b/src/ov_SC06_011/ov_SC06_011_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC06_013/ov_SC06_013_jr_80135D20.c b/src/ov_SC06_013/ov_SC06_013_jr_80135D20.c index 94c2c9dae..c2a360520 100644 --- a/src/ov_SC06_013/ov_SC06_013_jr_80135D20.c +++ b/src/ov_SC06_013/ov_SC06_013_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC06_014/ov_SC06_014_jr_80135D20.c b/src/ov_SC06_014/ov_SC06_014_jr_80135D20.c index a24cbf935..f430a6c4b 100644 --- a/src/ov_SC06_014/ov_SC06_014_jr_80135D20.c +++ b/src/ov_SC06_014/ov_SC06_014_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC06_015/ov_SC06_015_jr_80135D20.c b/src/ov_SC06_015/ov_SC06_015_jr_80135D20.c index 6e72188c8..e03bf4be0 100644 --- a/src/ov_SC06_015/ov_SC06_015_jr_80135D20.c +++ b/src/ov_SC06_015/ov_SC06_015_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC06_016/ov_SC06_016_jr_80135D20.c b/src/ov_SC06_016/ov_SC06_016_jr_80135D20.c index ae1edda6a..43d560125 100644 --- a/src/ov_SC06_016/ov_SC06_016_jr_80135D20.c +++ b/src/ov_SC06_016/ov_SC06_016_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC06_018/ov_SC06_018_jr_80135D20.c b/src/ov_SC06_018/ov_SC06_018_jr_80135D20.c index 7d84100a2..e143b587d 100644 --- a/src/ov_SC06_018/ov_SC06_018_jr_80135D20.c +++ b/src/ov_SC06_018/ov_SC06_018_jr_80135D20.c @@ -1232,7 +1232,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC06_020/ov_SC06_020_jr_80135D20.c b/src/ov_SC06_020/ov_SC06_020_jr_80135D20.c index 2d8472f55..20cc51ef4 100644 --- a/src/ov_SC06_020/ov_SC06_020_jr_80135D20.c +++ b/src/ov_SC06_020/ov_SC06_020_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC06_022/ov_SC06_022_jr_80135D20.c b/src/ov_SC06_022/ov_SC06_022_jr_80135D20.c index 8d0ae4179..582a1bd2f 100644 --- a/src/ov_SC06_022/ov_SC06_022_jr_80135D20.c +++ b/src/ov_SC06_022/ov_SC06_022_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC06_024/ov_SC06_024_jr_80135D20.c b/src/ov_SC06_024/ov_SC06_024_jr_80135D20.c index 6b9787177..e70e893c8 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_80135D20.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC06_025/ov_SC06_025_jr_80135D20.c b/src/ov_SC06_025/ov_SC06_025_jr_80135D20.c index d72c6ec8b..45da363b2 100644 --- a/src/ov_SC06_025/ov_SC06_025_jr_80135D20.c +++ b/src/ov_SC06_025/ov_SC06_025_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC06_027/ov_SC06_027_jr_80135D20.c b/src/ov_SC06_027/ov_SC06_027_jr_80135D20.c index 94ec3c860..8fb1d7bb8 100644 --- a/src/ov_SC06_027/ov_SC06_027_jr_80135D20.c +++ b/src/ov_SC06_027/ov_SC06_027_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC06_029/ov_SC06_029_jr_80135D20.c b/src/ov_SC06_029/ov_SC06_029_jr_80135D20.c index 06197463d..906b32bca 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_80135D20.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC06_030/ov_SC06_030_jr_80135D20.c b/src/ov_SC06_030/ov_SC06_030_jr_80135D20.c index 8e49ae654..6ed4f192a 100644 --- a/src/ov_SC06_030/ov_SC06_030_jr_80135D20.c +++ b/src/ov_SC06_030/ov_SC06_030_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC06_032/ov_SC06_032_jr_80135D20.c b/src/ov_SC06_032/ov_SC06_032_jr_80135D20.c index 6987ec48f..1d1a27c84 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_80135D20.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC06_033/ov_SC06_033_jr_80135D20.c b/src/ov_SC06_033/ov_SC06_033_jr_80135D20.c index 9ee2d0482..4dbb072dc 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_80135D20.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC07_000/ov_SC07_000_jr_80135D20.c b/src/ov_SC07_000/ov_SC07_000_jr_80135D20.c index ebf260564..6e887cd6c 100644 --- a/src/ov_SC07_000/ov_SC07_000_jr_80135D20.c +++ b/src/ov_SC07_000/ov_SC07_000_jr_80135D20.c @@ -1076,7 +1076,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC07_001/ov_SC07_001_jr_80135D20.c b/src/ov_SC07_001/ov_SC07_001_jr_80135D20.c index cd4e5ab0b..56c296ad4 100644 --- a/src/ov_SC07_001/ov_SC07_001_jr_80135D20.c +++ b/src/ov_SC07_001/ov_SC07_001_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC07_002/ov_SC07_002_jr_80135D20.c b/src/ov_SC07_002/ov_SC07_002_jr_80135D20.c index 0e181939a..7e3f856e3 100644 --- a/src/ov_SC07_002/ov_SC07_002_jr_80135D20.c +++ b/src/ov_SC07_002/ov_SC07_002_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC07_006/ov_SC07_006_jr_80135D20.c b/src/ov_SC07_006/ov_SC07_006_jr_80135D20.c index 708b4e4de..2882cac4e 100644 --- a/src/ov_SC07_006/ov_SC07_006_jr_80135D20.c +++ b/src/ov_SC07_006/ov_SC07_006_jr_80135D20.c @@ -1031,54 +1031,7 @@ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ecc (src/shared) */ // call's $a0/$a2 argument setup (the last 4-mismatch schedule residual). Leaving white // un-anchored lets the scheduler emit `addiu $a0,$sp,0x10` / `addu $a2,$zero,$zero` first, // exactly as the target does. -extern short D_800B9A02; -extern u8 D_800A6518[]; -extern void GsSortLine(void *a0, void *a1, s32 a2); - -void func_80136F3C(s32 a0, s32 a1) -{ - struct { - u32 tag; - s16 x0; - s16 y0; - s16 x1; - s16 y1; - u8 r; - u8 g; - u8 b; - } line; - register s16 x1 __asm__("$16"); /* $s0 */ - register s16 x0 __asm__("$17"); /* $s1 */ - register u8 *base __asm__("$19") = D_800A6518; /* $s3 */ - register s16 white __asm__("$20"); /* $s4 */ - s16 y0; - s16 y1; - - y0 = a1 - 3; - x1 = a0 + 3; - __asm__("" : "=r"(x1) : "0"(x1)); - y1 = a1 + 3; - white = 0xFF; - x0 = a0 - 3; - line.tag = 0; - line.r = white; - line.g = 0; - line.b = 0; - line.x0 = x0; - line.y0 = y0; - line.x1 = x1; - line.y1 = y1; - GsSortLine(&line, &base[(u16)D_800B9A02 * 20], 0); - line.tag = 0; - line.r = white; - line.g = 0; - line.b = 0; - line.x0 = x1; - line.y0 = y0; - line.x1 = x0; - line.y1 = y1; - GsSortLine(&line, &base[(u16)D_800B9A02 * 20], 0); -} +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC07_007/ov_SC07_007_jr_80135D20.c b/src/ov_SC07_007/ov_SC07_007_jr_80135D20.c index 2a46e6638..87df1ee34 100644 --- a/src/ov_SC07_007/ov_SC07_007_jr_80135D20.c +++ b/src/ov_SC07_007/ov_SC07_007_jr_80135D20.c @@ -1006,7 +1006,7 @@ void func_80136EC4(void) { DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ecc (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_007/nonmatchings/ov_SC07_007_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC07_008/ov_SC07_008_jr_80135D20.c b/src/ov_SC07_008/ov_SC07_008_jr_80135D20.c index ac886c470..505627812 100644 --- a/src/ov_SC07_008/ov_SC07_008_jr_80135D20.c +++ b/src/ov_SC07_008/ov_SC07_008_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC07_009/ov_SC07_009_jr_80135D20.c b/src/ov_SC07_009/ov_SC07_009_jr_80135D20.c index bee36cdd4..3792160cf 100644 --- a/src/ov_SC07_009/ov_SC07_009_jr_80135D20.c +++ b/src/ov_SC07_009/ov_SC07_009_jr_80135D20.c @@ -1074,7 +1074,7 @@ DEFINE_func_80136EC4() /* dedup: shared engine-core @0x80136EC4 (src/shared) */ DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ECC (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC07_010/ov_SC07_010_jr_80135D20.c b/src/ov_SC07_010/ov_SC07_010_jr_80135D20.c index 5b2e861ae..126c4b976 100644 --- a/src/ov_SC07_010/ov_SC07_010_jr_80135D20.c +++ b/src/ov_SC07_010/ov_SC07_010_jr_80135D20.c @@ -1011,7 +1011,7 @@ void func_80136EC4(void) { DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ecc (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_010/nonmatchings/ov_SC07_010_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/ov_SC07_011/ov_SC07_011_jr_80135D20.c b/src/ov_SC07_011/ov_SC07_011_jr_80135D20.c index cf42b5b6d..a599c5874 100644 --- a/src/ov_SC07_011/ov_SC07_011_jr_80135D20.c +++ b/src/ov_SC07_011/ov_SC07_011_jr_80135D20.c @@ -1006,7 +1006,7 @@ void func_80136EC4(void) { DEFINE_func_80136ECC() /* dedup: shared engine-core @0x80136ecc (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_011/nonmatchings/ov_SC07_011_jr_80135D20", func_80136F3C); +DEFINE_func_80136F3C() /* dedup: shared engine-core @0x80136F3C (src/shared) */ DEFINE_func_80137030() /* dedup: shared engine-core @0x80137030 (src/shared) */ diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 35c36081c..e0a121426 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -28828,4 +28828,52 @@ return found; \ } +#define DEFINE_func_80136F3C() \ + extern short D_800B9A02; \ + extern u8 D_800A6518[]; \ + extern void GsSortLine(void *a0, void *a1, s32 a2); \ + void func_80136F3C(s32 a0, s32 a1) \ + { \ + struct { \ + u32 tag; \ + s16 x0; \ + s16 y0; \ + s16 x1; \ + s16 y1; \ + u8 r; \ + u8 g; \ + u8 b; \ + } line; \ + register s16 x1 __asm__("$16"); /* $s0 */ \ + register s16 x0 __asm__("$17"); /* $s1 */ \ + register u8 *base __asm__("$19") = D_800A6518; /* $s3 */ \ + register s16 white __asm__("$20"); /* $s4 */ \ + s16 y0; \ + s16 y1; \ + y0 = a1 - 3; \ + x1 = a0 + 3; \ + __asm__("" : "=r"(x1) : "0"(x1)); \ + y1 = a1 + 3; \ + white = 0xFF; \ + x0 = a0 - 3; \ + line.tag = 0; \ + line.r = white; \ + line.g = 0; \ + line.b = 0; \ + line.x0 = x0; \ + line.y0 = y0; \ + line.x1 = x1; \ + line.y1 = y1; \ + GsSortLine(&line, &base[(u16)D_800B9A02 * 20], 0); \ + line.tag = 0; \ + line.r = white; \ + line.g = 0; \ + line.b = 0; \ + line.x0 = x1; \ + line.y0 = y0; \ + line.x1 = x0; \ + line.y1 = y1; \ + GsSortLine(&line, &base[(u16)D_800B9A02 * 20], 0); \ + } + #endif