diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index a6c85b9ef..7f946b91b 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -13312,3 +13312,17 @@ groups: func: DEFINE_func_801777BC vram: 0x801777BC 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_8014D4C0 + tier: h_exact + hash: acc0ee6da878d23d5c5f803c96e9c5d80bb4f708 + source: src/shared/engine_core.h + func: DEFINE_func_8014D4C0 + vram: 0x8014D4C0 + 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_8014F3E8 + tier: h_exact + hash: 2ccf344dee0320280c5e1866dd77e667ce2bde8c + source: src/shared/engine_core.h + func: DEFINE_func_8014F3E8 + vram: 0x8014F3E8 + binaries: [ov_SC07_006, ov_SC07_007, ov_SC07_010, ov_SC07_011] diff --git a/src/ov_SC01_000/ov_SC01_000_after.c b/src/ov_SC01_000/ov_SC01_000_after.c index e9f3de166..e8a16f891 100644 --- a/src/ov_SC01_000/ov_SC01_000_after.c +++ b/src/ov_SC01_000/ov_SC01_000_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000_after", func_8014D610); diff --git a/src/ov_SC01_001/ov_SC01_001_after.c b/src/ov_SC01_001/ov_SC01_001_after.c index df14b920a..ea2ea4d6c 100644 --- a/src/ov_SC01_001/ov_SC01_001_after.c +++ b/src/ov_SC01_001/ov_SC01_001_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001_after", func_8014D610); diff --git a/src/ov_SC01_004/ov_SC01_004_after.c b/src/ov_SC01_004/ov_SC01_004_after.c index 96f219a62..5886754f4 100644 --- a/src/ov_SC01_004/ov_SC01_004_after.c +++ b/src/ov_SC01_004/ov_SC01_004_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004_after", func_8014D610); diff --git a/src/ov_SC01_005/ov_SC01_005_after.c b/src/ov_SC01_005/ov_SC01_005_after.c index 338daac14..fed617ff5 100644 --- a/src/ov_SC01_005/ov_SC01_005_after.c +++ b/src/ov_SC01_005/ov_SC01_005_after.c @@ -1342,7 +1342,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005_after", func_8014D610); diff --git a/src/ov_SC01_006/ov_SC01_006_after.c b/src/ov_SC01_006/ov_SC01_006_after.c index 6985aef4b..115d931ae 100644 --- a/src/ov_SC01_006/ov_SC01_006_after.c +++ b/src/ov_SC01_006/ov_SC01_006_after.c @@ -1342,7 +1342,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006_after", func_8014D610); diff --git a/src/ov_SC01_008/ov_SC01_008_after.c b/src/ov_SC01_008/ov_SC01_008_after.c index d05809c5d..ffd9bddb2 100644 --- a/src/ov_SC01_008/ov_SC01_008_after.c +++ b/src/ov_SC01_008/ov_SC01_008_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008_after", func_8014D610); diff --git a/src/ov_SC01_009/ov_SC01_009_after.c b/src/ov_SC01_009/ov_SC01_009_after.c index 1bed81ab8..06eae9b88 100644 --- a/src/ov_SC01_009/ov_SC01_009_after.c +++ b/src/ov_SC01_009/ov_SC01_009_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009_after", func_8014D610); diff --git a/src/ov_SC01_074/ov_SC01_074_after.c b/src/ov_SC01_074/ov_SC01_074_after.c index 67991e3b4..7af80c132 100644 --- a/src/ov_SC01_074/ov_SC01_074_after.c +++ b/src/ov_SC01_074/ov_SC01_074_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074_after", func_8014D610); diff --git a/src/ov_SC01_077/ov_SC01_077_after.c b/src/ov_SC01_077/ov_SC01_077_after.c index 6c65208f4..56cba3742 100644 --- a/src/ov_SC01_077/ov_SC01_077_after.c +++ b/src/ov_SC01_077/ov_SC01_077_after.c @@ -1536,7 +1536,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077_after", func_8014D610); diff --git a/src/ov_SC01_080/ov_SC01_080_after.c b/src/ov_SC01_080/ov_SC01_080_after.c index 4796f8cda..9dea1e9f4 100644 --- a/src/ov_SC01_080/ov_SC01_080_after.c +++ b/src/ov_SC01_080/ov_SC01_080_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080_after", func_8014D610); diff --git a/src/ov_SC01_084/ov_SC01_084_after.c b/src/ov_SC01_084/ov_SC01_084_after.c index eab559852..17de8ec78 100644 --- a/src/ov_SC01_084/ov_SC01_084_after.c +++ b/src/ov_SC01_084/ov_SC01_084_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084_after", func_8014D610); diff --git a/src/ov_SC02_000/ov_SC02_000_after.c b/src/ov_SC02_000/ov_SC02_000_after.c index dc2846b72..c182972af 100644 --- a/src/ov_SC02_000/ov_SC02_000_after.c +++ b/src/ov_SC02_000/ov_SC02_000_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000_after", func_8014D610); diff --git a/src/ov_SC02_003/ov_SC02_003_after.c b/src/ov_SC02_003/ov_SC02_003_after.c index 39fe1ee38..617725f25 100644 --- a/src/ov_SC02_003/ov_SC02_003_after.c +++ b/src/ov_SC02_003/ov_SC02_003_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_after", func_8014D610); diff --git a/src/ov_SC02_004/ov_SC02_004_after.c b/src/ov_SC02_004/ov_SC02_004_after.c index 399c901d0..6b89d04ae 100644 --- a/src/ov_SC02_004/ov_SC02_004_after.c +++ b/src/ov_SC02_004/ov_SC02_004_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004_after", func_8014D610); diff --git a/src/ov_SC02_005/ov_SC02_005_after.c b/src/ov_SC02_005/ov_SC02_005_after.c index ba461ad49..dd62f5871 100644 --- a/src/ov_SC02_005/ov_SC02_005_after.c +++ b/src/ov_SC02_005/ov_SC02_005_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005_after", func_8014D610); diff --git a/src/ov_SC02_011/ov_SC02_011_after.c b/src/ov_SC02_011/ov_SC02_011_after.c index 321adbac2..7b223e119 100644 --- a/src/ov_SC02_011/ov_SC02_011_after.c +++ b/src/ov_SC02_011/ov_SC02_011_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_after", func_8014D610); diff --git a/src/ov_SC02_015/ov_SC02_015_after.c b/src/ov_SC02_015/ov_SC02_015_after.c index cb27b9615..451a713e3 100644 --- a/src/ov_SC02_015/ov_SC02_015_after.c +++ b/src/ov_SC02_015/ov_SC02_015_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015_after", func_8014D610); diff --git a/src/ov_SC02_016/ov_SC02_016_after.c b/src/ov_SC02_016/ov_SC02_016_after.c index a2192915f..e4652c954 100644 --- a/src/ov_SC02_016/ov_SC02_016_after.c +++ b/src/ov_SC02_016/ov_SC02_016_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016_after", func_8014D610); diff --git a/src/ov_SC02_017/ov_SC02_017_after.c b/src/ov_SC02_017/ov_SC02_017_after.c index 2aef0d92e..dd7243713 100644 --- a/src/ov_SC02_017/ov_SC02_017_after.c +++ b/src/ov_SC02_017/ov_SC02_017_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017_after", func_8014D610); diff --git a/src/ov_SC02_021/ov_SC02_021_after.c b/src/ov_SC02_021/ov_SC02_021_after.c index c698cc294..e69ee5db4 100644 --- a/src/ov_SC02_021/ov_SC02_021_after.c +++ b/src/ov_SC02_021/ov_SC02_021_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021_after", func_8014D610); diff --git a/src/ov_SC02_026/ov_SC02_026_after.c b/src/ov_SC02_026/ov_SC02_026_after.c index 668aa8c67..406049ec2 100644 --- a/src/ov_SC02_026/ov_SC02_026_after.c +++ b/src/ov_SC02_026/ov_SC02_026_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026_after", func_8014D610); diff --git a/src/ov_SC02_027/ov_SC02_027_after.c b/src/ov_SC02_027/ov_SC02_027_after.c index 9b2f3564e..7e3b0e3b9 100644 --- a/src/ov_SC02_027/ov_SC02_027_after.c +++ b/src/ov_SC02_027/ov_SC02_027_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027_after", func_8014D610); diff --git a/src/ov_SC02_028/ov_SC02_028_after.c b/src/ov_SC02_028/ov_SC02_028_after.c index 7ebe78a4a..9191a33a1 100644 --- a/src/ov_SC02_028/ov_SC02_028_after.c +++ b/src/ov_SC02_028/ov_SC02_028_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028_after", func_8014D610); diff --git a/src/ov_SC02_031/ov_SC02_031_after.c b/src/ov_SC02_031/ov_SC02_031_after.c index e11897c58..2e5eb9e8f 100644 --- a/src/ov_SC02_031/ov_SC02_031_after.c +++ b/src/ov_SC02_031/ov_SC02_031_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031_after", func_8014D610); diff --git a/src/ov_SC02_035/ov_SC02_035_after.c b/src/ov_SC02_035/ov_SC02_035_after.c index 0b0793bef..96667c346 100644 --- a/src/ov_SC02_035/ov_SC02_035_after.c +++ b/src/ov_SC02_035/ov_SC02_035_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035_after", func_8014D610); diff --git a/src/ov_SC02_039/ov_SC02_039_after.c b/src/ov_SC02_039/ov_SC02_039_after.c index 16f73a889..be38e471c 100644 --- a/src/ov_SC02_039/ov_SC02_039_after.c +++ b/src/ov_SC02_039/ov_SC02_039_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039_after", func_8014D610); diff --git a/src/ov_SC02_041/ov_SC02_041_after.c b/src/ov_SC02_041/ov_SC02_041_after.c index 75828bf2d..a46dbfbfc 100644 --- a/src/ov_SC02_041/ov_SC02_041_after.c +++ b/src/ov_SC02_041/ov_SC02_041_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041_after", func_8014D610); diff --git a/src/ov_SC03_001/ov_SC03_001_after.c b/src/ov_SC03_001/ov_SC03_001_after.c index baf562cc9..af46a6a0c 100644 --- a/src/ov_SC03_001/ov_SC03_001_after.c +++ b/src/ov_SC03_001/ov_SC03_001_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001_after", func_8014D610); diff --git a/src/ov_SC03_002/ov_SC03_002_after.c b/src/ov_SC03_002/ov_SC03_002_after.c index 0fb466b85..b2779cee5 100644 --- a/src/ov_SC03_002/ov_SC03_002_after.c +++ b/src/ov_SC03_002/ov_SC03_002_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002_after", func_8014D610); diff --git a/src/ov_SC03_003/ov_SC03_003_after.c b/src/ov_SC03_003/ov_SC03_003_after.c index 86ad39f3c..e4375302b 100644 --- a/src/ov_SC03_003/ov_SC03_003_after.c +++ b/src/ov_SC03_003/ov_SC03_003_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003_after", func_8014D610); diff --git a/src/ov_SC03_006/ov_SC03_006_after.c b/src/ov_SC03_006/ov_SC03_006_after.c index 1d0e55423..10c072d06 100644 --- a/src/ov_SC03_006/ov_SC03_006_after.c +++ b/src/ov_SC03_006/ov_SC03_006_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006_after", func_8014D610); diff --git a/src/ov_SC03_007/ov_SC03_007_after.c b/src/ov_SC03_007/ov_SC03_007_after.c index 9b4bd8695..61acaab3e 100644 --- a/src/ov_SC03_007/ov_SC03_007_after.c +++ b/src/ov_SC03_007/ov_SC03_007_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007_after", func_8014D610); diff --git a/src/ov_SC03_010/ov_SC03_010_after.c b/src/ov_SC03_010/ov_SC03_010_after.c index 25946b6a1..f026c42da 100644 --- a/src/ov_SC03_010/ov_SC03_010_after.c +++ b/src/ov_SC03_010/ov_SC03_010_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010_after", func_8014D610); diff --git a/src/ov_SC03_011/ov_SC03_011_after.c b/src/ov_SC03_011/ov_SC03_011_after.c index c08196a81..87a1da93c 100644 --- a/src/ov_SC03_011/ov_SC03_011_after.c +++ b/src/ov_SC03_011/ov_SC03_011_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011_after", func_8014D610); diff --git a/src/ov_SC03_012/ov_SC03_012_after.c b/src/ov_SC03_012/ov_SC03_012_after.c index e5f8499bf..85bff456d 100644 --- a/src/ov_SC03_012/ov_SC03_012_after.c +++ b/src/ov_SC03_012/ov_SC03_012_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012_after", func_8014D610); diff --git a/src/ov_SC03_013/ov_SC03_013_after.c b/src/ov_SC03_013/ov_SC03_013_after.c index 73cc871d6..a0d931843 100644 --- a/src/ov_SC03_013/ov_SC03_013_after.c +++ b/src/ov_SC03_013/ov_SC03_013_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013_after", func_8014D610); diff --git a/src/ov_SC03_014/ov_SC03_014_after.c b/src/ov_SC03_014/ov_SC03_014_after.c index ce773a831..839c2a7db 100644 --- a/src/ov_SC03_014/ov_SC03_014_after.c +++ b/src/ov_SC03_014/ov_SC03_014_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014_after", func_8014D610); diff --git a/src/ov_SC03_015/ov_SC03_015_after.c b/src/ov_SC03_015/ov_SC03_015_after.c index b6c4bb9b9..c126dd024 100644 --- a/src/ov_SC03_015/ov_SC03_015_after.c +++ b/src/ov_SC03_015/ov_SC03_015_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015_after", func_8014D610); diff --git a/src/ov_SC03_023/ov_SC03_023_after.c b/src/ov_SC03_023/ov_SC03_023_after.c index d94434ede..d8b4c8f62 100644 --- a/src/ov_SC03_023/ov_SC03_023_after.c +++ b/src/ov_SC03_023/ov_SC03_023_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023_after", func_8014D610); diff --git a/src/ov_SC03_024/ov_SC03_024_after.c b/src/ov_SC03_024/ov_SC03_024_after.c index cc33aec54..3e22ae43a 100644 --- a/src/ov_SC03_024/ov_SC03_024_after.c +++ b/src/ov_SC03_024/ov_SC03_024_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024_after", func_8014D610); diff --git a/src/ov_SC03_028/ov_SC03_028_after.c b/src/ov_SC03_028/ov_SC03_028_after.c index 26405fe50..6adfcb9eb 100644 --- a/src/ov_SC03_028/ov_SC03_028_after.c +++ b/src/ov_SC03_028/ov_SC03_028_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028_after", func_8014D610); diff --git a/src/ov_SC03_029/ov_SC03_029_after.c b/src/ov_SC03_029/ov_SC03_029_after.c index 6bfca1844..d2cf74744 100644 --- a/src/ov_SC03_029/ov_SC03_029_after.c +++ b/src/ov_SC03_029/ov_SC03_029_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029_after", func_8014D610); diff --git a/src/ov_SC03_030/ov_SC03_030_after.c b/src/ov_SC03_030/ov_SC03_030_after.c index 9c49d975b..e0b9d1b1a 100644 --- a/src/ov_SC03_030/ov_SC03_030_after.c +++ b/src/ov_SC03_030/ov_SC03_030_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030_after", func_8014D610); diff --git a/src/ov_SC03_031/ov_SC03_031_after.c b/src/ov_SC03_031/ov_SC03_031_after.c index d7d0e3e85..91c84146b 100644 --- a/src/ov_SC03_031/ov_SC03_031_after.c +++ b/src/ov_SC03_031/ov_SC03_031_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031_after", func_8014D610); diff --git a/src/ov_SC03_089/ov_SC03_089_after.c b/src/ov_SC03_089/ov_SC03_089_after.c index 274ed605f..dee22ccf6 100644 --- a/src/ov_SC03_089/ov_SC03_089_after.c +++ b/src/ov_SC03_089/ov_SC03_089_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089_after", func_8014D610); diff --git a/src/ov_SC03_090/ov_SC03_090_after.c b/src/ov_SC03_090/ov_SC03_090_after.c index 470639b5d..b1a513266 100644 --- a/src/ov_SC03_090/ov_SC03_090_after.c +++ b/src/ov_SC03_090/ov_SC03_090_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090_after", func_8014D610); diff --git a/src/ov_SC03_091/ov_SC03_091_after.c b/src/ov_SC03_091/ov_SC03_091_after.c index 74eb49756..2bc20306c 100644 --- a/src/ov_SC03_091/ov_SC03_091_after.c +++ b/src/ov_SC03_091/ov_SC03_091_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091_after", func_8014D610); diff --git a/src/ov_SC03_092/ov_SC03_092_after.c b/src/ov_SC03_092/ov_SC03_092_after.c index 46cae2abd..1b49ae60e 100644 --- a/src/ov_SC03_092/ov_SC03_092_after.c +++ b/src/ov_SC03_092/ov_SC03_092_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092_after", func_8014D610); diff --git a/src/ov_SC03_093/ov_SC03_093_after.c b/src/ov_SC03_093/ov_SC03_093_after.c index 4b3b18c84..53a8e1893 100644 --- a/src/ov_SC03_093/ov_SC03_093_after.c +++ b/src/ov_SC03_093/ov_SC03_093_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093_after", func_8014D610); diff --git a/src/ov_SC03_094/ov_SC03_094_after.c b/src/ov_SC03_094/ov_SC03_094_after.c index 31b760a04..4eef3e3b8 100644 --- a/src/ov_SC03_094/ov_SC03_094_after.c +++ b/src/ov_SC03_094/ov_SC03_094_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094_after", func_8014D610); diff --git a/src/ov_SC03_095/ov_SC03_095_after.c b/src/ov_SC03_095/ov_SC03_095_after.c index ea1aba7ed..ee3f86337 100644 --- a/src/ov_SC03_095/ov_SC03_095_after.c +++ b/src/ov_SC03_095/ov_SC03_095_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095_after", func_8014D610); diff --git a/src/ov_SC03_096/ov_SC03_096_after.c b/src/ov_SC03_096/ov_SC03_096_after.c index c2d8e698c..36990762a 100644 --- a/src/ov_SC03_096/ov_SC03_096_after.c +++ b/src/ov_SC03_096/ov_SC03_096_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096_after", func_8014D610); diff --git a/src/ov_SC03_097/ov_SC03_097_after.c b/src/ov_SC03_097/ov_SC03_097_after.c index f9cd0b3b1..37be373be 100644 --- a/src/ov_SC03_097/ov_SC03_097_after.c +++ b/src/ov_SC03_097/ov_SC03_097_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097_after", func_8014D610); diff --git a/src/ov_SC03_098/ov_SC03_098_after.c b/src/ov_SC03_098/ov_SC03_098_after.c index 4958e84cb..38265035f 100644 --- a/src/ov_SC03_098/ov_SC03_098_after.c +++ b/src/ov_SC03_098/ov_SC03_098_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098_after", func_8014D610); diff --git a/src/ov_SC03_099/ov_SC03_099_after.c b/src/ov_SC03_099/ov_SC03_099_after.c index bca3e6125..71458577c 100644 --- a/src/ov_SC03_099/ov_SC03_099_after.c +++ b/src/ov_SC03_099/ov_SC03_099_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099_after", func_8014D610); diff --git a/src/ov_SC03_100/ov_SC03_100_after.c b/src/ov_SC03_100/ov_SC03_100_after.c index bb9f61f20..2debbc172 100644 --- a/src/ov_SC03_100/ov_SC03_100_after.c +++ b/src/ov_SC03_100/ov_SC03_100_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100_after", func_8014D610); diff --git a/src/ov_SC03_101/ov_SC03_101_after.c b/src/ov_SC03_101/ov_SC03_101_after.c index e6d75661b..511d9b153 100644 --- a/src/ov_SC03_101/ov_SC03_101_after.c +++ b/src/ov_SC03_101/ov_SC03_101_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101_after", func_8014D610); diff --git a/src/ov_SC03_102/ov_SC03_102_after.c b/src/ov_SC03_102/ov_SC03_102_after.c index d4b52753f..a68679ebf 100644 --- a/src/ov_SC03_102/ov_SC03_102_after.c +++ b/src/ov_SC03_102/ov_SC03_102_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102_after", func_8014D610); diff --git a/src/ov_SC03_103/ov_SC03_103_after.c b/src/ov_SC03_103/ov_SC03_103_after.c index 622567ab7..bb3a44a86 100644 --- a/src/ov_SC03_103/ov_SC03_103_after.c +++ b/src/ov_SC03_103/ov_SC03_103_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103_after", func_8014D610); diff --git a/src/ov_SC03_104/ov_SC03_104_after.c b/src/ov_SC03_104/ov_SC03_104_after.c index 6d86c2145..c10d93ca9 100644 --- a/src/ov_SC03_104/ov_SC03_104_after.c +++ b/src/ov_SC03_104/ov_SC03_104_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104_after", func_8014D610); diff --git a/src/ov_SC03_105/ov_SC03_105_after.c b/src/ov_SC03_105/ov_SC03_105_after.c index 1a122a9c6..3b351dde2 100644 --- a/src/ov_SC03_105/ov_SC03_105_after.c +++ b/src/ov_SC03_105/ov_SC03_105_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105_after", func_8014D610); diff --git a/src/ov_SC03_108/ov_SC03_108_after.c b/src/ov_SC03_108/ov_SC03_108_after.c index 45aa8846d..93ac9bf10 100644 --- a/src/ov_SC03_108/ov_SC03_108_after.c +++ b/src/ov_SC03_108/ov_SC03_108_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108_after", func_8014D610); diff --git a/src/ov_SC03_109/ov_SC03_109_after.c b/src/ov_SC03_109/ov_SC03_109_after.c index 2cf26322d..ae20dfc3a 100644 --- a/src/ov_SC03_109/ov_SC03_109_after.c +++ b/src/ov_SC03_109/ov_SC03_109_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109_after", func_8014D610); diff --git a/src/ov_SC03_110/ov_SC03_110_after.c b/src/ov_SC03_110/ov_SC03_110_after.c index 3d645761e..b17298552 100644 --- a/src/ov_SC03_110/ov_SC03_110_after.c +++ b/src/ov_SC03_110/ov_SC03_110_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110_after", func_8014D610); diff --git a/src/ov_SC03_111/ov_SC03_111_after.c b/src/ov_SC03_111/ov_SC03_111_after.c index f2b31fdf4..75d9e4d32 100644 --- a/src/ov_SC03_111/ov_SC03_111_after.c +++ b/src/ov_SC03_111/ov_SC03_111_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111_after", func_8014D610); diff --git a/src/ov_SC03_112/ov_SC03_112_after.c b/src/ov_SC03_112/ov_SC03_112_after.c index 609f3540c..efd7ac21c 100644 --- a/src/ov_SC03_112/ov_SC03_112_after.c +++ b/src/ov_SC03_112/ov_SC03_112_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112_after", func_8014D610); diff --git a/src/ov_SC03_113/ov_SC03_113_after.c b/src/ov_SC03_113/ov_SC03_113_after.c index c54f63f02..c283f54c7 100644 --- a/src/ov_SC03_113/ov_SC03_113_after.c +++ b/src/ov_SC03_113/ov_SC03_113_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113_after", func_8014D610); diff --git a/src/ov_SC03_114/ov_SC03_114_after.c b/src/ov_SC03_114/ov_SC03_114_after.c index babd2bbce..e56bcf4f6 100644 --- a/src/ov_SC03_114/ov_SC03_114_after.c +++ b/src/ov_SC03_114/ov_SC03_114_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114_after", func_8014D610); diff --git a/src/ov_SC03_115/ov_SC03_115_after.c b/src/ov_SC03_115/ov_SC03_115_after.c index 8df820e30..92c878db3 100644 --- a/src/ov_SC03_115/ov_SC03_115_after.c +++ b/src/ov_SC03_115/ov_SC03_115_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115_after", func_8014D610); diff --git a/src/ov_SC03_116/ov_SC03_116_after.c b/src/ov_SC03_116/ov_SC03_116_after.c index 8cee2eb52..f3c6a025f 100644 --- a/src/ov_SC03_116/ov_SC03_116_after.c +++ b/src/ov_SC03_116/ov_SC03_116_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116_after", func_8014D610); diff --git a/src/ov_SC03_117/ov_SC03_117_after.c b/src/ov_SC03_117/ov_SC03_117_after.c index 77ebd38c0..89b12d112 100644 --- a/src/ov_SC03_117/ov_SC03_117_after.c +++ b/src/ov_SC03_117/ov_SC03_117_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117_after", func_8014D610); diff --git a/src/ov_SC03_118/ov_SC03_118_after.c b/src/ov_SC03_118/ov_SC03_118_after.c index ca27ca92f..594b8234a 100644 --- a/src/ov_SC03_118/ov_SC03_118_after.c +++ b/src/ov_SC03_118/ov_SC03_118_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118_after", func_8014D610); diff --git a/src/ov_SC03_119/ov_SC03_119_after.c b/src/ov_SC03_119/ov_SC03_119_after.c index f1b030e14..3461fa135 100644 --- a/src/ov_SC03_119/ov_SC03_119_after.c +++ b/src/ov_SC03_119/ov_SC03_119_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119_after", func_8014D610); diff --git a/src/ov_SC03_121/ov_SC03_121_after.c b/src/ov_SC03_121/ov_SC03_121_after.c index 902a8e9e8..bd9964cb4 100644 --- a/src/ov_SC03_121/ov_SC03_121_after.c +++ b/src/ov_SC03_121/ov_SC03_121_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121_after", func_8014D610); diff --git a/src/ov_SC03_124/ov_SC03_124_after.c b/src/ov_SC03_124/ov_SC03_124_after.c index adc67343e..e6aa30433 100644 --- a/src/ov_SC03_124/ov_SC03_124_after.c +++ b/src/ov_SC03_124/ov_SC03_124_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124_after", func_8014D610); diff --git a/src/ov_SC03_125/ov_SC03_125_after.c b/src/ov_SC03_125/ov_SC03_125_after.c index 739990da4..5ab343037 100644 --- a/src/ov_SC03_125/ov_SC03_125_after.c +++ b/src/ov_SC03_125/ov_SC03_125_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125_after", func_8014D610); diff --git a/src/ov_SC03_126/ov_SC03_126_after.c b/src/ov_SC03_126/ov_SC03_126_after.c index 467eea686..238d63e57 100644 --- a/src/ov_SC03_126/ov_SC03_126_after.c +++ b/src/ov_SC03_126/ov_SC03_126_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126_after", func_8014D610); diff --git a/src/ov_SC04_000/ov_SC04_000_after.c b/src/ov_SC04_000/ov_SC04_000_after.c index e4acf7c8c..e0863ff73 100644 --- a/src/ov_SC04_000/ov_SC04_000_after.c +++ b/src/ov_SC04_000/ov_SC04_000_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000_after", func_8014D610); diff --git a/src/ov_SC04_002/ov_SC04_002_after.c b/src/ov_SC04_002/ov_SC04_002_after.c index 6fc1dda84..451208246 100644 --- a/src/ov_SC04_002/ov_SC04_002_after.c +++ b/src/ov_SC04_002/ov_SC04_002_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002_after", func_8014D610); diff --git a/src/ov_SC04_003/ov_SC04_003_after.c b/src/ov_SC04_003/ov_SC04_003_after.c index a1a01859b..4f86d62bd 100644 --- a/src/ov_SC04_003/ov_SC04_003_after.c +++ b/src/ov_SC04_003/ov_SC04_003_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003_after", func_8014D610); diff --git a/src/ov_SC04_004/ov_SC04_004_after.c b/src/ov_SC04_004/ov_SC04_004_after.c index 35e2c6995..8f75f5a9a 100644 --- a/src/ov_SC04_004/ov_SC04_004_after.c +++ b/src/ov_SC04_004/ov_SC04_004_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004_after", func_8014D610); diff --git a/src/ov_SC04_005/ov_SC04_005_after.c b/src/ov_SC04_005/ov_SC04_005_after.c index 9e7dd2455..e784ae377 100644 --- a/src/ov_SC04_005/ov_SC04_005_after.c +++ b/src/ov_SC04_005/ov_SC04_005_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005_after", func_8014D610); diff --git a/src/ov_SC04_006/ov_SC04_006_after.c b/src/ov_SC04_006/ov_SC04_006_after.c index e04657ee7..ddc93b782 100644 --- a/src/ov_SC04_006/ov_SC04_006_after.c +++ b/src/ov_SC04_006/ov_SC04_006_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006_after", func_8014D610); diff --git a/src/ov_SC04_007/ov_SC04_007_after.c b/src/ov_SC04_007/ov_SC04_007_after.c index f7ca76e7b..00307800c 100644 --- a/src/ov_SC04_007/ov_SC04_007_after.c +++ b/src/ov_SC04_007/ov_SC04_007_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007_after", func_8014D610); diff --git a/src/ov_SC04_008/ov_SC04_008_after.c b/src/ov_SC04_008/ov_SC04_008_after.c index 4df0c686c..0e9ef206c 100644 --- a/src/ov_SC04_008/ov_SC04_008_after.c +++ b/src/ov_SC04_008/ov_SC04_008_after.c @@ -1339,7 +1339,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008_after", func_8014D610); diff --git a/src/ov_SC04_009/ov_SC04_009_after.c b/src/ov_SC04_009/ov_SC04_009_after.c index e33c9faef..35e822c91 100644 --- a/src/ov_SC04_009/ov_SC04_009_after.c +++ b/src/ov_SC04_009/ov_SC04_009_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009_after", func_8014D610); diff --git a/src/ov_SC04_010/ov_SC04_010_after.c b/src/ov_SC04_010/ov_SC04_010_after.c index 96a5f86e9..9162ff9f5 100644 --- a/src/ov_SC04_010/ov_SC04_010_after.c +++ b/src/ov_SC04_010/ov_SC04_010_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010_after", func_8014D610); diff --git a/src/ov_SC04_011/ov_SC04_011_after.c b/src/ov_SC04_011/ov_SC04_011_after.c index 90177a80a..591fbcf54 100644 --- a/src/ov_SC04_011/ov_SC04_011_after.c +++ b/src/ov_SC04_011/ov_SC04_011_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011_after", func_8014D610); diff --git a/src/ov_SC04_012/ov_SC04_012_after.c b/src/ov_SC04_012/ov_SC04_012_after.c index 509c9c11b..94ca4bf26 100644 --- a/src/ov_SC04_012/ov_SC04_012_after.c +++ b/src/ov_SC04_012/ov_SC04_012_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012_after", func_8014D610); diff --git a/src/ov_SC04_015/ov_SC04_015_after.c b/src/ov_SC04_015/ov_SC04_015_after.c index 9883d9d47..4e68b405c 100644 --- a/src/ov_SC04_015/ov_SC04_015_after.c +++ b/src/ov_SC04_015/ov_SC04_015_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015_after", func_8014D610); diff --git a/src/ov_SC04_016/ov_SC04_016_after.c b/src/ov_SC04_016/ov_SC04_016_after.c index d7caf9d01..2d4378184 100644 --- a/src/ov_SC04_016/ov_SC04_016_after.c +++ b/src/ov_SC04_016/ov_SC04_016_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016_after", func_8014D610); diff --git a/src/ov_SC04_018/ov_SC04_018_after.c b/src/ov_SC04_018/ov_SC04_018_after.c index 60fab97b1..f29ca28de 100644 --- a/src/ov_SC04_018/ov_SC04_018_after.c +++ b/src/ov_SC04_018/ov_SC04_018_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_after", func_8014D610); diff --git a/src/ov_SC04_019/ov_SC04_019_after.c b/src/ov_SC04_019/ov_SC04_019_after.c index e1282effe..e2ac6d6b3 100644 --- a/src/ov_SC04_019/ov_SC04_019_after.c +++ b/src/ov_SC04_019/ov_SC04_019_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_after", func_8014D610); diff --git a/src/ov_SC04_020/ov_SC04_020_after.c b/src/ov_SC04_020/ov_SC04_020_after.c index 78c04af14..56b4f3c5e 100644 --- a/src/ov_SC04_020/ov_SC04_020_after.c +++ b/src/ov_SC04_020/ov_SC04_020_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020_after", func_8014D610); diff --git a/src/ov_SC04_021/ov_SC04_021_after.c b/src/ov_SC04_021/ov_SC04_021_after.c index 881df702f..73f11bdd0 100644 --- a/src/ov_SC04_021/ov_SC04_021_after.c +++ b/src/ov_SC04_021/ov_SC04_021_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021_after", func_8014D610); diff --git a/src/ov_SC05_000/ov_SC05_000_after.c b/src/ov_SC05_000/ov_SC05_000_after.c index 545b3127f..f7b7f3dfb 100644 --- a/src/ov_SC05_000/ov_SC05_000_after.c +++ b/src/ov_SC05_000/ov_SC05_000_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000_after", func_8014D610); diff --git a/src/ov_SC05_001/ov_SC05_001_after.c b/src/ov_SC05_001/ov_SC05_001_after.c index 67a5d55c6..370db832e 100644 --- a/src/ov_SC05_001/ov_SC05_001_after.c +++ b/src/ov_SC05_001/ov_SC05_001_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001_after", func_8014D610); diff --git a/src/ov_SC05_002/ov_SC05_002_after.c b/src/ov_SC05_002/ov_SC05_002_after.c index 6ec973c57..09cba4f8e 100644 --- a/src/ov_SC05_002/ov_SC05_002_after.c +++ b/src/ov_SC05_002/ov_SC05_002_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002_after", func_8014D610); diff --git a/src/ov_SC05_003/ov_SC05_003_after.c b/src/ov_SC05_003/ov_SC05_003_after.c index 24466d987..906fa3790 100644 --- a/src/ov_SC05_003/ov_SC05_003_after.c +++ b/src/ov_SC05_003/ov_SC05_003_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003_after", func_8014D610); diff --git a/src/ov_SC05_004/ov_SC05_004_after.c b/src/ov_SC05_004/ov_SC05_004_after.c index 64576af4b..3b9452a07 100644 --- a/src/ov_SC05_004/ov_SC05_004_after.c +++ b/src/ov_SC05_004/ov_SC05_004_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004_after", func_8014D610); diff --git a/src/ov_SC05_005/ov_SC05_005_after.c b/src/ov_SC05_005/ov_SC05_005_after.c index 043f61eee..8e18047fb 100644 --- a/src/ov_SC05_005/ov_SC05_005_after.c +++ b/src/ov_SC05_005/ov_SC05_005_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005_after", func_8014D610); diff --git a/src/ov_SC05_006/ov_SC05_006_after.c b/src/ov_SC05_006/ov_SC05_006_after.c index 1a542cb4d..6ef9baa36 100644 --- a/src/ov_SC05_006/ov_SC05_006_after.c +++ b/src/ov_SC05_006/ov_SC05_006_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006_after", func_8014D610); diff --git a/src/ov_SC05_007/ov_SC05_007_after.c b/src/ov_SC05_007/ov_SC05_007_after.c index c28bb6066..8b1208a11 100644 --- a/src/ov_SC05_007/ov_SC05_007_after.c +++ b/src/ov_SC05_007/ov_SC05_007_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007_after", func_8014D610); diff --git a/src/ov_SC05_008/ov_SC05_008_after.c b/src/ov_SC05_008/ov_SC05_008_after.c index 70a717cbe..8367baed1 100644 --- a/src/ov_SC05_008/ov_SC05_008_after.c +++ b/src/ov_SC05_008/ov_SC05_008_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008_after", func_8014D610); diff --git a/src/ov_SC05_009/ov_SC05_009_after.c b/src/ov_SC05_009/ov_SC05_009_after.c index 7a6947d57..0c8febba0 100644 --- a/src/ov_SC05_009/ov_SC05_009_after.c +++ b/src/ov_SC05_009/ov_SC05_009_after.c @@ -1339,7 +1339,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009_after", func_8014D610); diff --git a/src/ov_SC05_010/ov_SC05_010_after.c b/src/ov_SC05_010/ov_SC05_010_after.c index 950e22a06..285a68cc7 100644 --- a/src/ov_SC05_010/ov_SC05_010_after.c +++ b/src/ov_SC05_010/ov_SC05_010_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010_after", func_8014D610); diff --git a/src/ov_SC05_011/ov_SC05_011_after.c b/src/ov_SC05_011/ov_SC05_011_after.c index d21bcaff9..2a28399a1 100644 --- a/src/ov_SC05_011/ov_SC05_011_after.c +++ b/src/ov_SC05_011/ov_SC05_011_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011_after", func_8014D610); diff --git a/src/ov_SC05_017/ov_SC05_017_after.c b/src/ov_SC05_017/ov_SC05_017_after.c index 2c78b0e70..5d8b626ba 100644 --- a/src/ov_SC05_017/ov_SC05_017_after.c +++ b/src/ov_SC05_017/ov_SC05_017_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_after", func_8014D610); diff --git a/src/ov_SC05_018/ov_SC05_018_after.c b/src/ov_SC05_018/ov_SC05_018_after.c index 3544c00a7..c6c36571d 100644 --- a/src/ov_SC05_018/ov_SC05_018_after.c +++ b/src/ov_SC05_018/ov_SC05_018_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018_after", func_8014D610); diff --git a/src/ov_SC05_019/ov_SC05_019_after.c b/src/ov_SC05_019/ov_SC05_019_after.c index ab9295423..a4d25e435 100644 --- a/src/ov_SC05_019/ov_SC05_019_after.c +++ b/src/ov_SC05_019/ov_SC05_019_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019_after", func_8014D610); diff --git a/src/ov_SC06_000/ov_SC06_000_after.c b/src/ov_SC06_000/ov_SC06_000_after.c index 2f694ee26..a8516e4c9 100644 --- a/src/ov_SC06_000/ov_SC06_000_after.c +++ b/src/ov_SC06_000/ov_SC06_000_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000_after", func_8014D610); diff --git a/src/ov_SC06_006/ov_SC06_006_after.c b/src/ov_SC06_006/ov_SC06_006_after.c index 96ca42231..b283856a2 100644 --- a/src/ov_SC06_006/ov_SC06_006_after.c +++ b/src/ov_SC06_006/ov_SC06_006_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006_after", func_8014D610); diff --git a/src/ov_SC06_008/ov_SC06_008_after.c b/src/ov_SC06_008/ov_SC06_008_after.c index d71a73302..ea7623785 100644 --- a/src/ov_SC06_008/ov_SC06_008_after.c +++ b/src/ov_SC06_008/ov_SC06_008_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008_after", func_8014D610); diff --git a/src/ov_SC06_010/ov_SC06_010_after.c b/src/ov_SC06_010/ov_SC06_010_after.c index 09b171b8d..c6af37b26 100644 --- a/src/ov_SC06_010/ov_SC06_010_after.c +++ b/src/ov_SC06_010/ov_SC06_010_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010_after", func_8014D610); diff --git a/src/ov_SC06_011/ov_SC06_011_after.c b/src/ov_SC06_011/ov_SC06_011_after.c index 01599435b..428965b96 100644 --- a/src/ov_SC06_011/ov_SC06_011_after.c +++ b/src/ov_SC06_011/ov_SC06_011_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011_after", func_8014D610); diff --git a/src/ov_SC06_013/ov_SC06_013_after.c b/src/ov_SC06_013/ov_SC06_013_after.c index 8ac92c1ff..5be50da9d 100644 --- a/src/ov_SC06_013/ov_SC06_013_after.c +++ b/src/ov_SC06_013/ov_SC06_013_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013_after", func_8014D610); diff --git a/src/ov_SC06_014/ov_SC06_014_after.c b/src/ov_SC06_014/ov_SC06_014_after.c index b6a006bd1..177e8b83c 100644 --- a/src/ov_SC06_014/ov_SC06_014_after.c +++ b/src/ov_SC06_014/ov_SC06_014_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014_after", func_8014D610); diff --git a/src/ov_SC06_015/ov_SC06_015_after.c b/src/ov_SC06_015/ov_SC06_015_after.c index 58e9320dd..4e563a3f4 100644 --- a/src/ov_SC06_015/ov_SC06_015_after.c +++ b/src/ov_SC06_015/ov_SC06_015_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015_after", func_8014D610); diff --git a/src/ov_SC06_016/ov_SC06_016_after.c b/src/ov_SC06_016/ov_SC06_016_after.c index 2fc4f0bda..b7a43d10d 100644 --- a/src/ov_SC06_016/ov_SC06_016_after.c +++ b/src/ov_SC06_016/ov_SC06_016_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016_after", func_8014D610); diff --git a/src/ov_SC06_018/ov_SC06_018_after.c b/src/ov_SC06_018/ov_SC06_018_after.c index cd176eabf..b59d61c51 100644 --- a/src/ov_SC06_018/ov_SC06_018_after.c +++ b/src/ov_SC06_018/ov_SC06_018_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018_after", func_8014D610); diff --git a/src/ov_SC06_020/ov_SC06_020_after.c b/src/ov_SC06_020/ov_SC06_020_after.c index f57c5149c..4816b89ed 100644 --- a/src/ov_SC06_020/ov_SC06_020_after.c +++ b/src/ov_SC06_020/ov_SC06_020_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020_after", func_8014D610); diff --git a/src/ov_SC06_022/ov_SC06_022_after.c b/src/ov_SC06_022/ov_SC06_022_after.c index 7132cf1e0..3928ac3e4 100644 --- a/src/ov_SC06_022/ov_SC06_022_after.c +++ b/src/ov_SC06_022/ov_SC06_022_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022_after", func_8014D610); diff --git a/src/ov_SC06_024/ov_SC06_024_after.c b/src/ov_SC06_024/ov_SC06_024_after.c index d012a243a..03128da2c 100644 --- a/src/ov_SC06_024/ov_SC06_024_after.c +++ b/src/ov_SC06_024/ov_SC06_024_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024_after", func_8014D610); diff --git a/src/ov_SC06_025/ov_SC06_025_after.c b/src/ov_SC06_025/ov_SC06_025_after.c index d61ddee10..2edd544f0 100644 --- a/src/ov_SC06_025/ov_SC06_025_after.c +++ b/src/ov_SC06_025/ov_SC06_025_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025_after", func_8014D610); diff --git a/src/ov_SC06_027/ov_SC06_027_after.c b/src/ov_SC06_027/ov_SC06_027_after.c index 4e20ab65e..efa01debd 100644 --- a/src/ov_SC06_027/ov_SC06_027_after.c +++ b/src/ov_SC06_027/ov_SC06_027_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027_after", func_8014D610); diff --git a/src/ov_SC06_029/ov_SC06_029_after.c b/src/ov_SC06_029/ov_SC06_029_after.c index ca6a87923..2445cb52c 100644 --- a/src/ov_SC06_029/ov_SC06_029_after.c +++ b/src/ov_SC06_029/ov_SC06_029_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029_after", func_8014D610); diff --git a/src/ov_SC06_030/ov_SC06_030_after.c b/src/ov_SC06_030/ov_SC06_030_after.c index 231ab134f..1c4b6bde3 100644 --- a/src/ov_SC06_030/ov_SC06_030_after.c +++ b/src/ov_SC06_030/ov_SC06_030_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030_after", func_8014D610); diff --git a/src/ov_SC06_032/ov_SC06_032_after.c b/src/ov_SC06_032/ov_SC06_032_after.c index 6a1065a32..bfef5e742 100644 --- a/src/ov_SC06_032/ov_SC06_032_after.c +++ b/src/ov_SC06_032/ov_SC06_032_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032_after", func_8014D610); diff --git a/src/ov_SC06_033/ov_SC06_033_after.c b/src/ov_SC06_033/ov_SC06_033_after.c index 672763dce..0785bea92 100644 --- a/src/ov_SC06_033/ov_SC06_033_after.c +++ b/src/ov_SC06_033/ov_SC06_033_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033_after", func_8014D610); diff --git a/src/ov_SC07_000/ov_SC07_000_after.c b/src/ov_SC07_000/ov_SC07_000_after.c index 9a0bddee4..6dd578c6c 100644 --- a/src/ov_SC07_000/ov_SC07_000_after.c +++ b/src/ov_SC07_000/ov_SC07_000_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000_after", func_8014D610); diff --git a/src/ov_SC07_001/ov_SC07_001_after.c b/src/ov_SC07_001/ov_SC07_001_after.c index be5355d0e..e1cb14bea 100644 --- a/src/ov_SC07_001/ov_SC07_001_after.c +++ b/src/ov_SC07_001/ov_SC07_001_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001_after", func_8014D610); diff --git a/src/ov_SC07_002/ov_SC07_002_after.c b/src/ov_SC07_002/ov_SC07_002_after.c index 5d1e908a5..0a9c300aa 100644 --- a/src/ov_SC07_002/ov_SC07_002_after.c +++ b/src/ov_SC07_002/ov_SC07_002_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002_after", func_8014D610); diff --git a/src/ov_SC07_006/ov_SC07_006_jr_80140608.c b/src/ov_SC07_006/ov_SC07_006_jr_80140608.c index e2799739c..46d4ebcb9 100644 --- a/src/ov_SC07_006/ov_SC07_006_jr_80140608.c +++ b/src/ov_SC07_006/ov_SC07_006_jr_80140608.c @@ -4144,43 +4144,7 @@ INCLUDE_ASM("asm/ov_SC07_006/nonmatchings/ov_SC07_006_jr_80140608", func_8014D3E // applied to the def's own signature (cf. func_80174CB0, SESSION-18). #include "common.h" -extern s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3); -extern s32 func_8014C918(s32 a0, s32 a1); - -s32 func_8014D4C0(s32 a0, void *a1, void *a2) { - s32 psVar3; - - ((u16 *)a1)[1] = ((u16 *)a1)[1] - 3; - ((u16 *)a2)[1] = ((u16 *)a2)[1] + 8; - psVar3 = *(s32 *)(a0 + 0x174); - if (*(u16 *)psVar3 != 0) { - if ((*(u16 *)(psVar3 + 0x5c) & 0x400) && - *(s32 *)(psVar3 + 0x58) != 0 && - *(s16 *)(psVar3 + 0xa) >= *(s16 *)(a0 + 0xa)) { - goto do_body; - } - if (*(u16 *)psVar3 != 0) { - *(s8 *)(psVar3 + 0x74) = 0; - } - } - *(s32 *)(a0 + 0x174) = 0; - return 0; -do_body: - *(u16 *)a1 = *(u16 *)(a0 + 0x98); - ((u16 *)a1)[1] = *(u16 *)(a0 + 0x9a) - 3; - ((u16 *)a1)[2] = *(u16 *)(a0 + 0x9c); - if (func_80135A4C(*(s32 *)(psVar3 + 0x20), *(s32 *)(psVar3 + 0x58), - (s32 *)a1, (s32)a2) != 0) { - *(u16 *)(a0 + 6) = ((u16 *)a2)[0]; - *(u16 *)(a0 + 0xa) = ((u16 *)a2)[1]; - *(u16 *)(a0 + 0xe) = ((u16 *)a2)[2]; - *(u16 *)(a0 + 0x16e) = func_8014C918(a0, *(u8 *)(psVar3 + 0x75)) & 0xff; - return 1; - } - *(s8 *)(psVar3 + 0x74) = 0; - *(s32 *)(a0 + 0x174) = 0; - return 0; -} +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ // @class: other @@ -4345,22 +4309,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014f2e0 (src/shared) */ // src/ov_SC07_006/ov_SC07_006_jr_80159C84.c:622) and is INCLUDE_ASM in this TU, so no conflict. #include "common.h" -extern void func_8014F468(void); -extern int func_8014F6F4(void); - -s32 func_8014F3E8(s32 param_1) -{ - if ((*(u32 *)(param_1 + 0x44) & 0x40000) == 0) { - if ((*(s16 *)(param_1 + 6) == *(s16 *)(param_1 + 0x88)) && - (*(s16 *)(param_1 + 10) == *(s16 *)(param_1 + 0x8a)) && - (*(s16 *)(param_1 + 0xe) == *(s16 *)(param_1 + 0x8c))) { - return ((s32 (*)(void))func_8014F468)(); - } else { - return func_8014F6F4(); - } - } - return 0; -} +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014F3E8 (src/shared) */ diff --git a/src/ov_SC07_007/ov_SC07_007_jr_80140608.c b/src/ov_SC07_007/ov_SC07_007_jr_80140608.c index 353866741..5abf1a5a3 100644 --- a/src/ov_SC07_007/ov_SC07_007_jr_80140608.c +++ b/src/ov_SC07_007/ov_SC07_007_jr_80140608.c @@ -3547,7 +3547,7 @@ INCLUDE_ASM("asm/ov_SC07_007/nonmatchings/ov_SC07_007_jr_80140608", func_8014D3E DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014d438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_007/nonmatchings/ov_SC07_007_jr_80140608", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_007/nonmatchings/ov_SC07_007_jr_80140608", func_8014D610); @@ -3619,7 +3619,7 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014f24c (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014f2e0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_007/nonmatchings/ov_SC07_007_jr_80140608", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014F3E8 (src/shared) */ extern void func_8014F4C0(u8 *a0); diff --git a/src/ov_SC07_008/ov_SC07_008_after.c b/src/ov_SC07_008/ov_SC07_008_after.c index c8c73ff91..2219721f2 100644 --- a/src/ov_SC07_008/ov_SC07_008_after.c +++ b/src/ov_SC07_008/ov_SC07_008_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008_after", func_8014D610); diff --git a/src/ov_SC07_009/ov_SC07_009_after.c b/src/ov_SC07_009/ov_SC07_009_after.c index ea59a5491..4384854d0 100644 --- a/src/ov_SC07_009/ov_SC07_009_after.c +++ b/src/ov_SC07_009/ov_SC07_009_after.c @@ -1341,7 +1341,7 @@ void func_8014D3E0(s32 _arg0) DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014D438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009_after", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009_after", func_8014D610); diff --git a/src/ov_SC07_010/ov_SC07_010_jr_80140608.c b/src/ov_SC07_010/ov_SC07_010_jr_80140608.c index 0ba16a1bb..55e5dcc67 100644 --- a/src/ov_SC07_010/ov_SC07_010_jr_80140608.c +++ b/src/ov_SC07_010/ov_SC07_010_jr_80140608.c @@ -3036,7 +3036,7 @@ INCLUDE_ASM("asm/ov_SC07_010/nonmatchings/ov_SC07_010_jr_80140608", func_8014D3E DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014d438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_010/nonmatchings/ov_SC07_010_jr_80140608", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_010/nonmatchings/ov_SC07_010_jr_80140608", func_8014D610); @@ -3108,7 +3108,7 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014f24c (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014f2e0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_010/nonmatchings/ov_SC07_010_jr_80140608", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014F3E8 (src/shared) */ extern void func_8014F4C0(u8 *a0); diff --git a/src/ov_SC07_011/ov_SC07_011_jr_80140608.c b/src/ov_SC07_011/ov_SC07_011_jr_80140608.c index d23e6140e..7d8590a49 100644 --- a/src/ov_SC07_011/ov_SC07_011_jr_80140608.c +++ b/src/ov_SC07_011/ov_SC07_011_jr_80140608.c @@ -3549,7 +3549,7 @@ INCLUDE_ASM("asm/ov_SC07_011/nonmatchings/ov_SC07_011_jr_80140608", func_8014D3E DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014d438 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_011/nonmatchings/ov_SC07_011_jr_80140608", func_8014D4C0); +DEFINE_func_8014D4C0() /* dedup: shared engine-core @0x8014D4C0 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_011/nonmatchings/ov_SC07_011_jr_80140608", func_8014D610); @@ -3621,7 +3621,7 @@ DEFINE_func_8014F24C() /* dedup: shared engine-core @0x8014f24c (src/shared) */ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014f2e0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC07_011/nonmatchings/ov_SC07_011_jr_80140608", func_8014F3E8); +DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014F3E8 (src/shared) */ extern void func_8014F4C0(u8 *a0); diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 82fdbcc19..574cdbad4 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -29258,4 +29258,58 @@ return a0; \ } +#define DEFINE_func_8014D4C0() \ + extern s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3); \ + extern s32 func_8014C918(s32 a0, s32 a1); \ + s32 func_8014D4C0(s32 a0, void *a1, void *a2) { \ + s32 psVar3; \ + ((u16 *)a1)[1] = ((u16 *)a1)[1] - 3; \ + ((u16 *)a2)[1] = ((u16 *)a2)[1] + 8; \ + psVar3 = *(s32 *)(a0 + 0x174); \ + if (*(u16 *)psVar3 != 0) { \ + if ((*(u16 *)(psVar3 + 0x5c) & 0x400) && \ + *(s32 *)(psVar3 + 0x58) != 0 && \ + *(s16 *)(psVar3 + 0xa) >= *(s16 *)(a0 + 0xa)) { \ + goto do_body; \ + } \ + if (*(u16 *)psVar3 != 0) { \ + *(s8 *)(psVar3 + 0x74) = 0; \ + } \ + } \ + *(s32 *)(a0 + 0x174) = 0; \ + return 0; \ + do_body: \ + *(u16 *)a1 = *(u16 *)(a0 + 0x98); \ + ((u16 *)a1)[1] = *(u16 *)(a0 + 0x9a) - 3; \ + ((u16 *)a1)[2] = *(u16 *)(a0 + 0x9c); \ + if (func_80135A4C(*(s32 *)(psVar3 + 0x20), *(s32 *)(psVar3 + 0x58), \ + (s32 *)a1, (s32)a2) != 0) { \ + *(u16 *)(a0 + 6) = ((u16 *)a2)[0]; \ + *(u16 *)(a0 + 0xa) = ((u16 *)a2)[1]; \ + *(u16 *)(a0 + 0xe) = ((u16 *)a2)[2]; \ + *(u16 *)(a0 + 0x16e) = func_8014C918(a0, *(u8 *)(psVar3 + 0x75)) & 0xff; \ + return 1; \ + } \ + *(s8 *)(psVar3 + 0x74) = 0; \ + *(s32 *)(a0 + 0x174) = 0; \ + return 0; \ + } + +#define DEFINE_func_8014F3E8() \ + extern void func_8014F468(void); \ + extern int func_8014F6F4(void); \ + s32 func_8014F3E8(s32 param_1) \ + { \ + if ((*(u32 *)(param_1 + 0x44) & 0x40000) == 0) { \ + if ((*(s16 *)(param_1 + 6) == *(s16 *)(param_1 + 0x88)) && \ + (*(s16 *)(param_1 + 10) == *(s16 *)(param_1 + 0x8a)) && \ + (*(s16 *)(param_1 + 0xe) == *(s16 *)(param_1 + 0x8c))) { \ + return ((s32 (*)(void))func_8014F468)(); \ + } else { \ + return func_8014F6F4(); \ + } \ + } \ + return 0; \ + } + #endif