diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 5340afeeb..da709fbec 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -13025,3 +13025,10 @@ groups: func: DEFINE_func_801387B8 vram: 0x801387B8 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_8014F4C0 + tier: h_exact + hash: c378aa0123ea7e70aa008557dcbc7d2cecf92ffb + source: src/shared/engine_core.h + func: DEFINE_func_8014F4C0 + vram: 0x8014F4C0 + binaries: [ov_SC01_077, ov_SC01_005, ov_SC01_006, ov_SC03_001, ov_SC01_000, ov_SC01_001, ov_SC02_000, ov_SC02_003, ov_SC03_002, ov_SC03_006, ov_SC04_000, ov_SC04_018, ov_SC04_019, ov_SC05_000, ov_SC06_000, ov_SC07_000, ov_SC01_004, ov_SC01_008, ov_SC01_009, ov_SC01_074, ov_SC01_080, ov_SC01_084, ov_SC02_004, ov_SC02_005, ov_SC02_011, ov_SC02_015, ov_SC02_016, ov_SC02_017, ov_SC02_021, ov_SC02_026, ov_SC02_027, ov_SC02_028, ov_SC02_031, ov_SC02_035, ov_SC02_039, ov_SC02_041, ov_SC03_003, ov_SC03_007, ov_SC03_010, ov_SC03_011, ov_SC03_012, ov_SC03_013, ov_SC03_014, ov_SC03_015, ov_SC03_023, ov_SC03_024, ov_SC03_028, ov_SC03_029, ov_SC03_030, ov_SC03_031, ov_SC03_089, ov_SC03_090, ov_SC03_091, ov_SC03_092, ov_SC03_093, ov_SC03_094, ov_SC03_095, ov_SC03_096, ov_SC03_097, ov_SC03_098, ov_SC03_099, ov_SC03_100, ov_SC03_101, ov_SC03_102, ov_SC03_103, ov_SC03_104, ov_SC03_105, ov_SC03_108, ov_SC03_109, ov_SC03_110, ov_SC03_111, ov_SC03_112, ov_SC03_113, ov_SC03_114, ov_SC03_115, ov_SC03_116, ov_SC03_117, ov_SC03_118, ov_SC03_119, ov_SC03_121, ov_SC03_124, ov_SC03_125, ov_SC03_126, ov_SC04_002, ov_SC04_003, ov_SC04_004, ov_SC04_005, ov_SC04_006, ov_SC04_007, ov_SC04_008, ov_SC04_009, ov_SC04_010, ov_SC04_011, ov_SC04_012, ov_SC04_015, ov_SC04_016, ov_SC04_020, ov_SC04_021, ov_SC05_001, ov_SC05_002, ov_SC05_003, ov_SC05_004, ov_SC05_005, ov_SC05_006, ov_SC05_007, ov_SC05_008, ov_SC05_009, ov_SC05_010, ov_SC05_011, ov_SC05_017, ov_SC05_018, ov_SC05_019, ov_SC06_006, ov_SC06_008, ov_SC06_010, ov_SC06_011, ov_SC06_013, ov_SC06_014, ov_SC06_015, ov_SC06_016, ov_SC06_018, ov_SC06_020, ov_SC06_022, ov_SC06_024, ov_SC06_025, ov_SC06_027, ov_SC06_029, ov_SC06_030, ov_SC06_032, ov_SC06_033, ov_SC07_001, ov_SC07_002, ov_SC07_008, ov_SC07_009] diff --git a/phase-ends/CURRENT_PHASE.md b/phase-ends/CURRENT_PHASE.md index 8497e8da6..fe0bdd960 100644 --- a/phase-ends/CURRENT_PHASE.md +++ b/phase-ends/CURRENT_PHASE.md @@ -175,6 +175,18 @@ conditional) · main-EXE/B9 + GLM/B6 + resident's 14 walls (P30) · behemoths B7 fleet **instr 70.4→71.0% · distinct 52.3→53.2% · fn-count 84.94→86.30%**; dedup 1840/0; 0 NON_MATCHING. §54 cookbook + R31 decision-log. The 4th "reproduce the build step" instance (§53-carve, -O0-flag, now the member's canonical DECLARATION). `--fix-def-sig` likely should be default-on for the h_seq path. +- **✅ 2026-07-17 — Task 4 giants #2 (func_8014F4C0) BANKED + PROPAGATED ×134.** func_8014F4C0 (141) banked + ×1 in ov_SC01_077_after.c (its earlier "gate reject" was pure §55b propagate-damage — it gated clean on the + healthy tree, no fleet change needed). h_exact family → `dedup_propagate --addr 0x8014F4C0 --recover` + (ov_SC01_000 straggler; --recover reconciled conflicting caller externs, kept it) = **134 overlays byte-identical + after propagation**, +1 dedup group registered. R22 clean-fleet **140/140**; ~+19k ins. §55b honored (targeted + --addr, fail-closed, committed as its own batch). **GIANT TAXONOMY (the session's key finding):** the 12 giants + split into **NON-jtbl** (func_8013FAF8, func_8014F4C0 — bank clean once the tree is healthy + propagate ×137 via + macro/h_seq alone) and **jtbl** (func_80131340/func_80159C84/func_8013C414/func_8013F350 — each needs a per-overlay + jtbl carve ×137 AND hits an 8-align tooling gap). **func_80131340 DEFERRED with a precise root cause:** gcc emits a + non-first jump table `.align 3` (8-aligned) but the original island packs it 4-aligned → +4B padding → island +4 → + every downstream data symbol shifts → %lo relocs break image-wide (+5B, 3077 diffs, byte-proven). A jtbl_carve + 8-align/isolation fix would unlock ~4 giants × ~137 members — a real lever, flagged as a distinct tooling task. - **2026-07-17 — Task 3 core-crack wave: 13 agents → 7 MATCH → 5 BANKED ×1.** Ultracode `worker_wave` (13 xHigh drafters over 6 cores 260–371 ins + 7 B3 near-misses 100–141 ins; all had cached Ghidra-C). Wave hit a usage limit at 2/13, **resumed cleanly** (cached agents replay) → **13/13 done: 7 match / 6 near**. diff --git a/src/ov_SC01_000/ov_SC01_000_after.c b/src/ov_SC01_000/ov_SC01_000_after.c index af0e9e158..56d1c0d17 100644 --- a/src/ov_SC01_000/ov_SC01_000_after.c +++ b/src/ov_SC01_000/ov_SC01_000_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC01_000/nonmatchings/ov_SC01_000_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC01_000/ov_SC01_000_jr_8015444C.c b/src/ov_SC01_000/ov_SC01_000_jr_8015444C.c index 76b01c00a..4ec565080 100644 --- a/src/ov_SC01_000/ov_SC01_000_jr_8015444C.c +++ b/src/ov_SC01_000/ov_SC01_000_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_000/ov_SC01_000_jr_8015A3C8.c b/src/ov_SC01_000/ov_SC01_000_jr_8015A3C8.c index c498e2cb4..5eb94157f 100644 --- a/src/ov_SC01_000/ov_SC01_000_jr_8015A3C8.c +++ b/src/ov_SC01_000/ov_SC01_000_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_000/ov_SC01_000_jr_8015AE2C.c b/src/ov_SC01_000/ov_SC01_000_jr_8015AE2C.c index 2bdf148fc..e59eb2746 100644 --- a/src/ov_SC01_000/ov_SC01_000_jr_8015AE2C.c +++ b/src/ov_SC01_000/ov_SC01_000_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_000/ov_SC01_000_jr_8016AB6C.c b/src/ov_SC01_000/ov_SC01_000_jr_8016AB6C.c index 4e2a6c036..2e1d40189 100644 --- a/src/ov_SC01_000/ov_SC01_000_jr_8016AB6C.c +++ b/src/ov_SC01_000/ov_SC01_000_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_000/ov_SC01_000_jr_801734BC.c b/src/ov_SC01_000/ov_SC01_000_jr_801734BC.c index f4e5a3bc5..d9b3ae35d 100644 --- a/src/ov_SC01_000/ov_SC01_000_jr_801734BC.c +++ b/src/ov_SC01_000/ov_SC01_000_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_000/ov_SC01_000_jr_80178D40.c b/src/ov_SC01_000/ov_SC01_000_jr_80178D40.c index 48bced4f1..bda2be00a 100644 --- a/src/ov_SC01_000/ov_SC01_000_jr_80178D40.c +++ b/src/ov_SC01_000/ov_SC01_000_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_000/ov_SC01_000_jr_8017A4AC.c b/src/ov_SC01_000/ov_SC01_000_jr_8017A4AC.c index 73cdc5c62..8f4fffc1c 100644 --- a/src/ov_SC01_000/ov_SC01_000_jr_8017A4AC.c +++ b/src/ov_SC01_000/ov_SC01_000_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_000/ov_SC01_000_jr_8017BEBC.c b/src/ov_SC01_000/ov_SC01_000_jr_8017BEBC.c index 5db9093ec..0905d3809 100644 --- a/src/ov_SC01_000/ov_SC01_000_jr_8017BEBC.c +++ b/src/ov_SC01_000/ov_SC01_000_jr_8017BEBC.c @@ -785,7 +785,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_001/ov_SC01_001_after.c b/src/ov_SC01_001/ov_SC01_001_after.c index c52e94189..8e6587508 100644 --- a/src/ov_SC01_001/ov_SC01_001_after.c +++ b/src/ov_SC01_001/ov_SC01_001_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC01_001/ov_SC01_001_jr_8015444C.c b/src/ov_SC01_001/ov_SC01_001_jr_8015444C.c index 3056628f7..e18012a7b 100644 --- a/src/ov_SC01_001/ov_SC01_001_jr_8015444C.c +++ b/src/ov_SC01_001/ov_SC01_001_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_001/ov_SC01_001_jr_8015A3C8.c b/src/ov_SC01_001/ov_SC01_001_jr_8015A3C8.c index 66b37722d..1e663a795 100644 --- a/src/ov_SC01_001/ov_SC01_001_jr_8015A3C8.c +++ b/src/ov_SC01_001/ov_SC01_001_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_001/ov_SC01_001_jr_8015AE2C.c b/src/ov_SC01_001/ov_SC01_001_jr_8015AE2C.c index 6a27e8613..f4e94f155 100644 --- a/src/ov_SC01_001/ov_SC01_001_jr_8015AE2C.c +++ b/src/ov_SC01_001/ov_SC01_001_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_001/ov_SC01_001_jr_8016AB6C.c b/src/ov_SC01_001/ov_SC01_001_jr_8016AB6C.c index b263c2b1b..6fcbf9b4b 100644 --- a/src/ov_SC01_001/ov_SC01_001_jr_8016AB6C.c +++ b/src/ov_SC01_001/ov_SC01_001_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_001/ov_SC01_001_jr_801734BC.c b/src/ov_SC01_001/ov_SC01_001_jr_801734BC.c index 071ab8d1d..95340a1f2 100644 --- a/src/ov_SC01_001/ov_SC01_001_jr_801734BC.c +++ b/src/ov_SC01_001/ov_SC01_001_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_001/ov_SC01_001_jr_80178D40.c b/src/ov_SC01_001/ov_SC01_001_jr_80178D40.c index 0e32c506c..6700e986e 100644 --- a/src/ov_SC01_001/ov_SC01_001_jr_80178D40.c +++ b/src/ov_SC01_001/ov_SC01_001_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_001/ov_SC01_001_jr_8017A4AC.c b/src/ov_SC01_001/ov_SC01_001_jr_8017A4AC.c index 3aabe8215..43c553d60 100644 --- a/src/ov_SC01_001/ov_SC01_001_jr_8017A4AC.c +++ b/src/ov_SC01_001/ov_SC01_001_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_001/ov_SC01_001_jr_8017BEBC.c b/src/ov_SC01_001/ov_SC01_001_jr_8017BEBC.c index f275f7e44..ff3fafb71 100644 --- a/src/ov_SC01_001/ov_SC01_001_jr_8017BEBC.c +++ b/src/ov_SC01_001/ov_SC01_001_jr_8017BEBC.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_004/ov_SC01_004_after.c b/src/ov_SC01_004/ov_SC01_004_after.c index 66b2e15b8..13c434bab 100644 --- a/src/ov_SC01_004/ov_SC01_004_after.c +++ b/src/ov_SC01_004/ov_SC01_004_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC01_004/nonmatchings/ov_SC01_004_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC01_004/ov_SC01_004_jr_8015444C.c b/src/ov_SC01_004/ov_SC01_004_jr_8015444C.c index 36d01253b..d56641007 100644 --- a/src/ov_SC01_004/ov_SC01_004_jr_8015444C.c +++ b/src/ov_SC01_004/ov_SC01_004_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_004/ov_SC01_004_jr_8015A3C8.c b/src/ov_SC01_004/ov_SC01_004_jr_8015A3C8.c index 8875fade1..8e48ec403 100644 --- a/src/ov_SC01_004/ov_SC01_004_jr_8015A3C8.c +++ b/src/ov_SC01_004/ov_SC01_004_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_004/ov_SC01_004_jr_8015AE2C.c b/src/ov_SC01_004/ov_SC01_004_jr_8015AE2C.c index 3cab907e1..8e92772a6 100644 --- a/src/ov_SC01_004/ov_SC01_004_jr_8015AE2C.c +++ b/src/ov_SC01_004/ov_SC01_004_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_004/ov_SC01_004_jr_8016AB6C.c b/src/ov_SC01_004/ov_SC01_004_jr_8016AB6C.c index fc334b54e..10dea4781 100644 --- a/src/ov_SC01_004/ov_SC01_004_jr_8016AB6C.c +++ b/src/ov_SC01_004/ov_SC01_004_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_004/ov_SC01_004_jr_801734BC.c b/src/ov_SC01_004/ov_SC01_004_jr_801734BC.c index 1f5ed2e3c..9904b092f 100644 --- a/src/ov_SC01_004/ov_SC01_004_jr_801734BC.c +++ b/src/ov_SC01_004/ov_SC01_004_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_004/ov_SC01_004_jr_80178D40.c b/src/ov_SC01_004/ov_SC01_004_jr_80178D40.c index af63bde5e..9f3cd2edb 100644 --- a/src/ov_SC01_004/ov_SC01_004_jr_80178D40.c +++ b/src/ov_SC01_004/ov_SC01_004_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_004/ov_SC01_004_jr_8017A4AC.c b/src/ov_SC01_004/ov_SC01_004_jr_8017A4AC.c index 14e1553a2..c0c9e4e4b 100644 --- a/src/ov_SC01_004/ov_SC01_004_jr_8017A4AC.c +++ b/src/ov_SC01_004/ov_SC01_004_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_004/ov_SC01_004_jr_8017BE9C.c b/src/ov_SC01_004/ov_SC01_004_jr_8017BE9C.c index bfd979563..ea06d220f 100644 --- a/src/ov_SC01_004/ov_SC01_004_jr_8017BE9C.c +++ b/src/ov_SC01_004/ov_SC01_004_jr_8017BE9C.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_005/ov_SC01_005_after.c b/src/ov_SC01_005/ov_SC01_005_after.c index 0b67b9078..9522ee93c 100644 --- a/src/ov_SC01_005/ov_SC01_005_after.c +++ b/src/ov_SC01_005/ov_SC01_005_after.c @@ -1636,7 +1636,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1665,7 +1665,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC01_005/ov_SC01_005_jr_8015444C.c b/src/ov_SC01_005/ov_SC01_005_jr_8015444C.c index 402694ddb..257678740 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_8015444C.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_8015444C.c @@ -624,7 +624,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_005/ov_SC01_005_jr_8015A3C8.c b/src/ov_SC01_005/ov_SC01_005_jr_8015A3C8.c index 403889a04..fb346a17a 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_8015A3C8.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_8015A3C8.c @@ -644,7 +644,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_005/ov_SC01_005_jr_8015AE2C.c b/src/ov_SC01_005/ov_SC01_005_jr_8015AE2C.c index 9d9dbefb2..ac2a5b02f 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_8015AE2C.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_8015AE2C.c @@ -644,7 +644,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_005/ov_SC01_005_jr_8016AB6C.c b/src/ov_SC01_005/ov_SC01_005_jr_8016AB6C.c index bd481ced5..592d6951b 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_8016AB6C.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_8016AB6C.c @@ -753,7 +753,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_005/ov_SC01_005_jr_801734BC.c b/src/ov_SC01_005/ov_SC01_005_jr_801734BC.c index 0ab3b82b2..72e7096b0 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_801734BC.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_801734BC.c @@ -780,7 +780,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_005/ov_SC01_005_jr_80178D40.c b/src/ov_SC01_005/ov_SC01_005_jr_80178D40.c index 85276a637..29f7d3efa 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_80178D40.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_80178D40.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_005/ov_SC01_005_jr_8017A4AC.c b/src/ov_SC01_005/ov_SC01_005_jr_8017A4AC.c index bb87e8aed..2c6db93df 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_8017A4AC.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_8017A4AC.c @@ -812,7 +812,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_005/ov_SC01_005_jr_8017C340.c b/src/ov_SC01_005/ov_SC01_005_jr_8017C340.c index c0cb3ff18..855d02576 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_8017C340.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_8017C340.c @@ -823,7 +823,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_006/ov_SC01_006_after.c b/src/ov_SC01_006/ov_SC01_006_after.c index fbfe3dd7d..c75f122a1 100644 --- a/src/ov_SC01_006/ov_SC01_006_after.c +++ b/src/ov_SC01_006/ov_SC01_006_after.c @@ -1636,7 +1636,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1665,7 +1665,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC01_006/ov_SC01_006_jr_8015444C.c b/src/ov_SC01_006/ov_SC01_006_jr_8015444C.c index 32c9827de..79b434c75 100644 --- a/src/ov_SC01_006/ov_SC01_006_jr_8015444C.c +++ b/src/ov_SC01_006/ov_SC01_006_jr_8015444C.c @@ -624,7 +624,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_006/ov_SC01_006_jr_8015A3C8.c b/src/ov_SC01_006/ov_SC01_006_jr_8015A3C8.c index 403889a04..fb346a17a 100644 --- a/src/ov_SC01_006/ov_SC01_006_jr_8015A3C8.c +++ b/src/ov_SC01_006/ov_SC01_006_jr_8015A3C8.c @@ -644,7 +644,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_006/ov_SC01_006_jr_8015AE2C.c b/src/ov_SC01_006/ov_SC01_006_jr_8015AE2C.c index bff3cea7b..083ceb195 100644 --- a/src/ov_SC01_006/ov_SC01_006_jr_8015AE2C.c +++ b/src/ov_SC01_006/ov_SC01_006_jr_8015AE2C.c @@ -644,7 +644,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_006/ov_SC01_006_jr_8016AB6C.c b/src/ov_SC01_006/ov_SC01_006_jr_8016AB6C.c index 1b10bf4ae..81543ecc6 100644 --- a/src/ov_SC01_006/ov_SC01_006_jr_8016AB6C.c +++ b/src/ov_SC01_006/ov_SC01_006_jr_8016AB6C.c @@ -753,7 +753,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_006/ov_SC01_006_jr_801734BC.c b/src/ov_SC01_006/ov_SC01_006_jr_801734BC.c index 40abbde5a..93e61db07 100644 --- a/src/ov_SC01_006/ov_SC01_006_jr_801734BC.c +++ b/src/ov_SC01_006/ov_SC01_006_jr_801734BC.c @@ -780,7 +780,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_006/ov_SC01_006_jr_80178D40.c b/src/ov_SC01_006/ov_SC01_006_jr_80178D40.c index 473fce3be..f400076b2 100644 --- a/src/ov_SC01_006/ov_SC01_006_jr_80178D40.c +++ b/src/ov_SC01_006/ov_SC01_006_jr_80178D40.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_006/ov_SC01_006_jr_8017A4AC.c b/src/ov_SC01_006/ov_SC01_006_jr_8017A4AC.c index a14b4a861..c98446fe2 100644 --- a/src/ov_SC01_006/ov_SC01_006_jr_8017A4AC.c +++ b/src/ov_SC01_006/ov_SC01_006_jr_8017A4AC.c @@ -812,7 +812,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_006/ov_SC01_006_jr_8017C340.c b/src/ov_SC01_006/ov_SC01_006_jr_8017C340.c index 8d61fd70c..b26360827 100644 --- a/src/ov_SC01_006/ov_SC01_006_jr_8017C340.c +++ b/src/ov_SC01_006/ov_SC01_006_jr_8017C340.c @@ -823,7 +823,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_008/ov_SC01_008_after.c b/src/ov_SC01_008/ov_SC01_008_after.c index d01f8efa5..a365f05a6 100644 --- a/src/ov_SC01_008/ov_SC01_008_after.c +++ b/src/ov_SC01_008/ov_SC01_008_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC01_008/nonmatchings/ov_SC01_008_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC01_008/ov_SC01_008_jr_8015444C.c b/src/ov_SC01_008/ov_SC01_008_jr_8015444C.c index fac89c47d..a22ba1103 100644 --- a/src/ov_SC01_008/ov_SC01_008_jr_8015444C.c +++ b/src/ov_SC01_008/ov_SC01_008_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_008/ov_SC01_008_jr_8015A3C8.c b/src/ov_SC01_008/ov_SC01_008_jr_8015A3C8.c index 109259f28..40a03024c 100644 --- a/src/ov_SC01_008/ov_SC01_008_jr_8015A3C8.c +++ b/src/ov_SC01_008/ov_SC01_008_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_008/ov_SC01_008_jr_8015AE2C.c b/src/ov_SC01_008/ov_SC01_008_jr_8015AE2C.c index e3f813bae..2b73515c7 100644 --- a/src/ov_SC01_008/ov_SC01_008_jr_8015AE2C.c +++ b/src/ov_SC01_008/ov_SC01_008_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_008/ov_SC01_008_jr_8016AB6C.c b/src/ov_SC01_008/ov_SC01_008_jr_8016AB6C.c index a6b07d16e..a730ec037 100644 --- a/src/ov_SC01_008/ov_SC01_008_jr_8016AB6C.c +++ b/src/ov_SC01_008/ov_SC01_008_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_008/ov_SC01_008_jr_801734BC.c b/src/ov_SC01_008/ov_SC01_008_jr_801734BC.c index a9e426f30..71371178b 100644 --- a/src/ov_SC01_008/ov_SC01_008_jr_801734BC.c +++ b/src/ov_SC01_008/ov_SC01_008_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_008/ov_SC01_008_jr_80178D40.c b/src/ov_SC01_008/ov_SC01_008_jr_80178D40.c index f96dae6d2..d4dedb4bf 100644 --- a/src/ov_SC01_008/ov_SC01_008_jr_80178D40.c +++ b/src/ov_SC01_008/ov_SC01_008_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_008/ov_SC01_008_jr_8017A4AC.c b/src/ov_SC01_008/ov_SC01_008_jr_8017A4AC.c index 227752ebb..c6c0e6e46 100644 --- a/src/ov_SC01_008/ov_SC01_008_jr_8017A4AC.c +++ b/src/ov_SC01_008/ov_SC01_008_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_008/ov_SC01_008_jr_8017BE9C.c b/src/ov_SC01_008/ov_SC01_008_jr_8017BE9C.c index 2dda1e919..f3ea10b0c 100644 --- a/src/ov_SC01_008/ov_SC01_008_jr_8017BE9C.c +++ b/src/ov_SC01_008/ov_SC01_008_jr_8017BE9C.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_009/ov_SC01_009_after.c b/src/ov_SC01_009/ov_SC01_009_after.c index 5d14dbbc3..73ab9c035 100644 --- a/src/ov_SC01_009/ov_SC01_009_after.c +++ b/src/ov_SC01_009/ov_SC01_009_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC01_009/nonmatchings/ov_SC01_009_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC01_009/ov_SC01_009_jr_8015444C.c b/src/ov_SC01_009/ov_SC01_009_jr_8015444C.c index e3f310d25..c064efc26 100644 --- a/src/ov_SC01_009/ov_SC01_009_jr_8015444C.c +++ b/src/ov_SC01_009/ov_SC01_009_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_009/ov_SC01_009_jr_8015A3C8.c b/src/ov_SC01_009/ov_SC01_009_jr_8015A3C8.c index 6e3b9b00e..5e86e6cef 100644 --- a/src/ov_SC01_009/ov_SC01_009_jr_8015A3C8.c +++ b/src/ov_SC01_009/ov_SC01_009_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_009/ov_SC01_009_jr_8015AE2C.c b/src/ov_SC01_009/ov_SC01_009_jr_8015AE2C.c index a45476a24..e14c7da1d 100644 --- a/src/ov_SC01_009/ov_SC01_009_jr_8015AE2C.c +++ b/src/ov_SC01_009/ov_SC01_009_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_009/ov_SC01_009_jr_8016AB6C.c b/src/ov_SC01_009/ov_SC01_009_jr_8016AB6C.c index 6ef707a68..c4cf0254e 100644 --- a/src/ov_SC01_009/ov_SC01_009_jr_8016AB6C.c +++ b/src/ov_SC01_009/ov_SC01_009_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_009/ov_SC01_009_jr_801734BC.c b/src/ov_SC01_009/ov_SC01_009_jr_801734BC.c index 09992e167..fa2e1effb 100644 --- a/src/ov_SC01_009/ov_SC01_009_jr_801734BC.c +++ b/src/ov_SC01_009/ov_SC01_009_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_009/ov_SC01_009_jr_80178D40.c b/src/ov_SC01_009/ov_SC01_009_jr_80178D40.c index 111c3f327..0a4e8f7ea 100644 --- a/src/ov_SC01_009/ov_SC01_009_jr_80178D40.c +++ b/src/ov_SC01_009/ov_SC01_009_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_009/ov_SC01_009_jr_8017A4AC.c b/src/ov_SC01_009/ov_SC01_009_jr_8017A4AC.c index 329988a14..8d93f2f75 100644 --- a/src/ov_SC01_009/ov_SC01_009_jr_8017A4AC.c +++ b/src/ov_SC01_009/ov_SC01_009_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_009/ov_SC01_009_jr_8017BE9C.c b/src/ov_SC01_009/ov_SC01_009_jr_8017BE9C.c index 834577ce0..b4bc20979 100644 --- a/src/ov_SC01_009/ov_SC01_009_jr_8017BE9C.c +++ b/src/ov_SC01_009/ov_SC01_009_jr_8017BE9C.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_074/ov_SC01_074_after.c b/src/ov_SC01_074/ov_SC01_074_after.c index aa5540caf..4b5d6fb3d 100644 --- a/src/ov_SC01_074/ov_SC01_074_after.c +++ b/src/ov_SC01_074/ov_SC01_074_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC01_074/ov_SC01_074_jr_8015444C.c b/src/ov_SC01_074/ov_SC01_074_jr_8015444C.c index 10e87dd30..0f381a368 100644 --- a/src/ov_SC01_074/ov_SC01_074_jr_8015444C.c +++ b/src/ov_SC01_074/ov_SC01_074_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_074/ov_SC01_074_jr_8015A3C8.c b/src/ov_SC01_074/ov_SC01_074_jr_8015A3C8.c index 0cb428066..6645d33bf 100644 --- a/src/ov_SC01_074/ov_SC01_074_jr_8015A3C8.c +++ b/src/ov_SC01_074/ov_SC01_074_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_074/ov_SC01_074_jr_8015AE2C.c b/src/ov_SC01_074/ov_SC01_074_jr_8015AE2C.c index 5572757a1..cce97c474 100644 --- a/src/ov_SC01_074/ov_SC01_074_jr_8015AE2C.c +++ b/src/ov_SC01_074/ov_SC01_074_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_074/ov_SC01_074_jr_8016AB6C.c b/src/ov_SC01_074/ov_SC01_074_jr_8016AB6C.c index dc3d3a757..e504b03ae 100644 --- a/src/ov_SC01_074/ov_SC01_074_jr_8016AB6C.c +++ b/src/ov_SC01_074/ov_SC01_074_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_074/ov_SC01_074_jr_801734BC.c b/src/ov_SC01_074/ov_SC01_074_jr_801734BC.c index 5d491ab03..7284cf9cc 100644 --- a/src/ov_SC01_074/ov_SC01_074_jr_801734BC.c +++ b/src/ov_SC01_074/ov_SC01_074_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_074/ov_SC01_074_jr_80178D40.c b/src/ov_SC01_074/ov_SC01_074_jr_80178D40.c index 15d8cc3a8..af76b0cb6 100644 --- a/src/ov_SC01_074/ov_SC01_074_jr_80178D40.c +++ b/src/ov_SC01_074/ov_SC01_074_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_074/ov_SC01_074_jr_8017A4AC.c b/src/ov_SC01_074/ov_SC01_074_jr_8017A4AC.c index e70906bab..e0310a7d5 100644 --- a/src/ov_SC01_074/ov_SC01_074_jr_8017A4AC.c +++ b/src/ov_SC01_074/ov_SC01_074_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_074/ov_SC01_074_jr_8017BE9C.c b/src/ov_SC01_074/ov_SC01_074_jr_8017BE9C.c index 2db70b7b5..12d444097 100644 --- a/src/ov_SC01_074/ov_SC01_074_jr_8017BE9C.c +++ b/src/ov_SC01_074/ov_SC01_074_jr_8017BE9C.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_077/ov_SC01_077_after.c b/src/ov_SC01_077/ov_SC01_077_after.c index 495bbc812..da30e810d 100644 --- a/src/ov_SC01_077/ov_SC01_077_after.c +++ b/src/ov_SC01_077/ov_SC01_077_after.c @@ -2056,7 +2056,48 @@ s32 func_8014F468(void) : : : "memory"); } -INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077_after", func_8014F4C0); +// @class: plumbing +// @stuck: none — MATCH 141/141 both standalone (match_one) AND byte-verified IN-TU (draft +// substituted into the real src/ov_SC01_077/ov_SC01_077_after.c, full cpp+cc1+maspsx+as: +// 0 mismatched). Needs ONE byte-neutral decl fix the drafter may not touch: +// tools/fix_arity_callers.py --apply --funcs func_8014F4C0 --binary ov_SC01_077 \ +// --drafts .run/drafts-t3-wave +// (rewrites ov_SC01_077_after.c:1898 `extern s32 func_8014F4C0(void);` -> `(...)();`. +// --binary is REQUIRED: the tool defaults to engine_core.h only, but this caller decl +// lives in the overlay's own .c.) Without it the TU fails `conflicting types for +// func_8014F4C0` — that lone error is the whole B3 gate gap; with it the TU compiles +// clean and the bytes are identical. + +/* func_8014F4C0 — the simpler twin of the already-banked DEFINE_func_8014F74C() + * (src/shared/engine_core.h:25443). Same shape: build a PosT probe + a MoveT move vector from + * the entity, call the collision query func_80133784, then splat one of three canned 8-byte + * blobs into e+0x120 per the returned hit mask. Every idiom below (PosT/MoveT locals, the + * x6/xA/xE forwarding temps, *(u8*)&w / (u32)w>>13, __builtin_memcpy for the byte-aligned + * 8-byte blob copies) is lifted verbatim from that byte-proven sibling, and every extern uses + * that sibling's canonical type — in particular `extern s16 D_801152B0;` (NOT `u8 D_801152B0[]`), + * because DEFINE_func_8014F74C() is instantiated later in this same TU + * (src/ov_SC01_077/ov_SC01_077_after.c:1973) and re-declares it at block scope. + * + * NOTE: func_8014F74C is called with NO argument — the asm has a bare `jal func_8014F74C; nop` + * with no $a0 setup (it inherits the incoming $a0). Declared no-proto to stay compatible with + * the DEFINE_func_8014F74C() def `int func_8014F74C(s32 arg0)` instantiated later in the TU. + * + * DEF-SIG / GATE NOTE: this TU already carries a file-scope `extern s32 func_8014F4C0(void);` at + * ov_SC01_077_after.c:1898, written only so the inline-asm caller func_8014F468 has a name in + * scope (its `jal` is inside __asm__, so the decl emits nothing and is byte-neutral). It + * conflicts with this def's parameter. Return type is s32 and the param is s32 (promotion-safe), + * so the §17a-3b no-proto rewrite `extern s32 func_8014F4C0();` (fix_arity_callers.py) resolves + * it; deleting line 1898 outright is equally byte-neutral. */ + +#include "common.h" + +#ifndef BFM_ENGINE_TYPES_H + + +#endif + +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ + // @class: plumbing // @stuck: none — MATCH (22 ins, relocation-masked). Handwritten scratchpad-stack-switch diff --git a/src/ov_SC01_080/ov_SC01_080_after.c b/src/ov_SC01_080/ov_SC01_080_after.c index 016852e9c..e1f72bcb1 100644 --- a/src/ov_SC01_080/ov_SC01_080_after.c +++ b/src/ov_SC01_080/ov_SC01_080_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC01_080/nonmatchings/ov_SC01_080_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC01_080/ov_SC01_080_jr_8015444C.c b/src/ov_SC01_080/ov_SC01_080_jr_8015444C.c index 567a1542d..aec7dba1e 100644 --- a/src/ov_SC01_080/ov_SC01_080_jr_8015444C.c +++ b/src/ov_SC01_080/ov_SC01_080_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_080/ov_SC01_080_jr_8015A3C8.c b/src/ov_SC01_080/ov_SC01_080_jr_8015A3C8.c index 0611298fc..d2108ca6a 100644 --- a/src/ov_SC01_080/ov_SC01_080_jr_8015A3C8.c +++ b/src/ov_SC01_080/ov_SC01_080_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_080/ov_SC01_080_jr_8015AE2C.c b/src/ov_SC01_080/ov_SC01_080_jr_8015AE2C.c index 1450ca031..f2405d7d8 100644 --- a/src/ov_SC01_080/ov_SC01_080_jr_8015AE2C.c +++ b/src/ov_SC01_080/ov_SC01_080_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_080/ov_SC01_080_jr_8016AB6C.c b/src/ov_SC01_080/ov_SC01_080_jr_8016AB6C.c index 0e472a89d..9b8e389be 100644 --- a/src/ov_SC01_080/ov_SC01_080_jr_8016AB6C.c +++ b/src/ov_SC01_080/ov_SC01_080_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_080/ov_SC01_080_jr_801734BC.c b/src/ov_SC01_080/ov_SC01_080_jr_801734BC.c index 7f20d1075..107a74b07 100644 --- a/src/ov_SC01_080/ov_SC01_080_jr_801734BC.c +++ b/src/ov_SC01_080/ov_SC01_080_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_080/ov_SC01_080_jr_80178D40.c b/src/ov_SC01_080/ov_SC01_080_jr_80178D40.c index a4e83167a..681b16a38 100644 --- a/src/ov_SC01_080/ov_SC01_080_jr_80178D40.c +++ b/src/ov_SC01_080/ov_SC01_080_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_080/ov_SC01_080_jr_8017A4AC.c b/src/ov_SC01_080/ov_SC01_080_jr_8017A4AC.c index 0f5815b92..6f67a8755 100644 --- a/src/ov_SC01_080/ov_SC01_080_jr_8017A4AC.c +++ b/src/ov_SC01_080/ov_SC01_080_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_084/ov_SC01_084_after.c b/src/ov_SC01_084/ov_SC01_084_after.c index 4cf2f3292..48414841a 100644 --- a/src/ov_SC01_084/ov_SC01_084_after.c +++ b/src/ov_SC01_084/ov_SC01_084_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC01_084/nonmatchings/ov_SC01_084_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC01_084/ov_SC01_084_jr_8015444C.c b/src/ov_SC01_084/ov_SC01_084_jr_8015444C.c index 72102c0c7..febf4db17 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_8015444C.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_084/ov_SC01_084_jr_8015A3C8.c b/src/ov_SC01_084/ov_SC01_084_jr_8015A3C8.c index 2f8601b0d..0343c04e5 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_8015A3C8.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_084/ov_SC01_084_jr_8015AE2C.c b/src/ov_SC01_084/ov_SC01_084_jr_8015AE2C.c index 6eb649bf7..9ec794a58 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_8015AE2C.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_084/ov_SC01_084_jr_8016AB6C.c b/src/ov_SC01_084/ov_SC01_084_jr_8016AB6C.c index 8c1594d57..7515087b4 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_8016AB6C.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_084/ov_SC01_084_jr_801734BC.c b/src/ov_SC01_084/ov_SC01_084_jr_801734BC.c index 955256cac..941b6eeb1 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_801734BC.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_084/ov_SC01_084_jr_80178D40.c b/src/ov_SC01_084/ov_SC01_084_jr_80178D40.c index 5a70aca58..266cb48c1 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_80178D40.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_084/ov_SC01_084_jr_8017A4AC.c b/src/ov_SC01_084/ov_SC01_084_jr_8017A4AC.c index 52c45bdf8..c050e69e7 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_8017A4AC.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC01_084/ov_SC01_084_jr_8017CA80.c b/src/ov_SC01_084/ov_SC01_084_jr_8017CA80.c index f7ccaf15d..f8fd34e86 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_8017CA80.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_8017CA80.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_000/ov_SC02_000_after.c b/src/ov_SC02_000/ov_SC02_000_after.c index c50e88f53..038851f9b 100644 --- a/src/ov_SC02_000/ov_SC02_000_after.c +++ b/src/ov_SC02_000/ov_SC02_000_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC02_000/ov_SC02_000_jr_8015444C.c b/src/ov_SC02_000/ov_SC02_000_jr_8015444C.c index 9ddb3f80e..fb2be7ddc 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_8015444C.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_000/ov_SC02_000_jr_8015A3C8.c b/src/ov_SC02_000/ov_SC02_000_jr_8015A3C8.c index 7a509df85..68afaa0a6 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_8015A3C8.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_000/ov_SC02_000_jr_8015AE2C.c b/src/ov_SC02_000/ov_SC02_000_jr_8015AE2C.c index e94ab8402..a3c4b3829 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_8015AE2C.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_000/ov_SC02_000_jr_8016AB6C.c b/src/ov_SC02_000/ov_SC02_000_jr_8016AB6C.c index c1752e7cf..3c58365f4 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_8016AB6C.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_000/ov_SC02_000_jr_801734BC.c b/src/ov_SC02_000/ov_SC02_000_jr_801734BC.c index 70e73bac5..4c4cb8515 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_801734BC.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_000/ov_SC02_000_jr_80178D40.c b/src/ov_SC02_000/ov_SC02_000_jr_80178D40.c index 917a28267..94fc14367 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_80178D40.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_000/ov_SC02_000_jr_8017A4AC.c b/src/ov_SC02_000/ov_SC02_000_jr_8017A4AC.c index 9458ff138..17e9b3bfc 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_8017A4AC.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_000/ov_SC02_000_jr_8017FCB0.c b/src/ov_SC02_000/ov_SC02_000_jr_8017FCB0.c index ce934bdf5..afb1dfddd 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_8017FCB0.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_8017FCB0.c @@ -786,7 +786,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_003/ov_SC02_003_after.c b/src/ov_SC02_003/ov_SC02_003_after.c index 65ba9a3e7..75999ffba 100644 --- a/src/ov_SC02_003/ov_SC02_003_after.c +++ b/src/ov_SC02_003/ov_SC02_003_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC02_003/ov_SC02_003_jr_8015444C.c b/src/ov_SC02_003/ov_SC02_003_jr_8015444C.c index 5e6d55973..89ae27353 100644 --- a/src/ov_SC02_003/ov_SC02_003_jr_8015444C.c +++ b/src/ov_SC02_003/ov_SC02_003_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_003/ov_SC02_003_jr_8015A3C8.c b/src/ov_SC02_003/ov_SC02_003_jr_8015A3C8.c index 7a509df85..68afaa0a6 100644 --- a/src/ov_SC02_003/ov_SC02_003_jr_8015A3C8.c +++ b/src/ov_SC02_003/ov_SC02_003_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_003/ov_SC02_003_jr_8015AE2C.c b/src/ov_SC02_003/ov_SC02_003_jr_8015AE2C.c index c0ab9c0a6..dd2e806fa 100644 --- a/src/ov_SC02_003/ov_SC02_003_jr_8015AE2C.c +++ b/src/ov_SC02_003/ov_SC02_003_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_003/ov_SC02_003_jr_8016AB6C.c b/src/ov_SC02_003/ov_SC02_003_jr_8016AB6C.c index 6a012b739..5e20f94ad 100644 --- a/src/ov_SC02_003/ov_SC02_003_jr_8016AB6C.c +++ b/src/ov_SC02_003/ov_SC02_003_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_003/ov_SC02_003_jr_801734BC.c b/src/ov_SC02_003/ov_SC02_003_jr_801734BC.c index 8d51b6ba6..c106c2329 100644 --- a/src/ov_SC02_003/ov_SC02_003_jr_801734BC.c +++ b/src/ov_SC02_003/ov_SC02_003_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_003/ov_SC02_003_jr_80178D40.c b/src/ov_SC02_003/ov_SC02_003_jr_80178D40.c index b60076bbd..afb28c43c 100644 --- a/src/ov_SC02_003/ov_SC02_003_jr_80178D40.c +++ b/src/ov_SC02_003/ov_SC02_003_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_003/ov_SC02_003_jr_8017A4AC.c b/src/ov_SC02_003/ov_SC02_003_jr_8017A4AC.c index db71dbe2a..a4e412fd0 100644 --- a/src/ov_SC02_003/ov_SC02_003_jr_8017A4AC.c +++ b/src/ov_SC02_003/ov_SC02_003_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_003/ov_SC02_003_jr_8017FCB0.c b/src/ov_SC02_003/ov_SC02_003_jr_8017FCB0.c index 8047cd0f4..d73e24d2b 100644 --- a/src/ov_SC02_003/ov_SC02_003_jr_8017FCB0.c +++ b/src/ov_SC02_003/ov_SC02_003_jr_8017FCB0.c @@ -786,7 +786,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_004/ov_SC02_004_after.c b/src/ov_SC02_004/ov_SC02_004_after.c index 66fe9be0e..c03b502d4 100644 --- a/src/ov_SC02_004/ov_SC02_004_after.c +++ b/src/ov_SC02_004/ov_SC02_004_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC02_004/nonmatchings/ov_SC02_004_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC02_004/ov_SC02_004_jr_8015444C.c b/src/ov_SC02_004/ov_SC02_004_jr_8015444C.c index bdce28d8e..7ce6da6b8 100644 --- a/src/ov_SC02_004/ov_SC02_004_jr_8015444C.c +++ b/src/ov_SC02_004/ov_SC02_004_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_004/ov_SC02_004_jr_8015A3C8.c b/src/ov_SC02_004/ov_SC02_004_jr_8015A3C8.c index a8e291dea..7cf98df0b 100644 --- a/src/ov_SC02_004/ov_SC02_004_jr_8015A3C8.c +++ b/src/ov_SC02_004/ov_SC02_004_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_004/ov_SC02_004_jr_8015AE2C.c b/src/ov_SC02_004/ov_SC02_004_jr_8015AE2C.c index e9757104a..bfabf0257 100644 --- a/src/ov_SC02_004/ov_SC02_004_jr_8015AE2C.c +++ b/src/ov_SC02_004/ov_SC02_004_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_004/ov_SC02_004_jr_8016AB6C.c b/src/ov_SC02_004/ov_SC02_004_jr_8016AB6C.c index bdb446e5f..44028b353 100644 --- a/src/ov_SC02_004/ov_SC02_004_jr_8016AB6C.c +++ b/src/ov_SC02_004/ov_SC02_004_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_004/ov_SC02_004_jr_801734BC.c b/src/ov_SC02_004/ov_SC02_004_jr_801734BC.c index dd0515a7d..c0bfb19df 100644 --- a/src/ov_SC02_004/ov_SC02_004_jr_801734BC.c +++ b/src/ov_SC02_004/ov_SC02_004_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_004/ov_SC02_004_jr_80178D40.c b/src/ov_SC02_004/ov_SC02_004_jr_80178D40.c index 4e2311905..eb05b9ec8 100644 --- a/src/ov_SC02_004/ov_SC02_004_jr_80178D40.c +++ b/src/ov_SC02_004/ov_SC02_004_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_004/ov_SC02_004_jr_8017A4AC.c b/src/ov_SC02_004/ov_SC02_004_jr_8017A4AC.c index dc077384c..00c6f8eba 100644 --- a/src/ov_SC02_004/ov_SC02_004_jr_8017A4AC.c +++ b/src/ov_SC02_004/ov_SC02_004_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_005/ov_SC02_005_after.c b/src/ov_SC02_005/ov_SC02_005_after.c index a2670bca6..7429155a7 100644 --- a/src/ov_SC02_005/ov_SC02_005_after.c +++ b/src/ov_SC02_005/ov_SC02_005_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC02_005/ov_SC02_005_jr_8015444C.c b/src/ov_SC02_005/ov_SC02_005_jr_8015444C.c index 4464557f4..e7978117e 100644 --- a/src/ov_SC02_005/ov_SC02_005_jr_8015444C.c +++ b/src/ov_SC02_005/ov_SC02_005_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_005/ov_SC02_005_jr_8015A3C8.c b/src/ov_SC02_005/ov_SC02_005_jr_8015A3C8.c index a4bc0e18d..c6a36d993 100644 --- a/src/ov_SC02_005/ov_SC02_005_jr_8015A3C8.c +++ b/src/ov_SC02_005/ov_SC02_005_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_005/ov_SC02_005_jr_8015AE2C.c b/src/ov_SC02_005/ov_SC02_005_jr_8015AE2C.c index da1872257..10f89df02 100644 --- a/src/ov_SC02_005/ov_SC02_005_jr_8015AE2C.c +++ b/src/ov_SC02_005/ov_SC02_005_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_005/ov_SC02_005_jr_8016AB6C.c b/src/ov_SC02_005/ov_SC02_005_jr_8016AB6C.c index 4a14a02ce..4aa734c6a 100644 --- a/src/ov_SC02_005/ov_SC02_005_jr_8016AB6C.c +++ b/src/ov_SC02_005/ov_SC02_005_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_005/ov_SC02_005_jr_801734BC.c b/src/ov_SC02_005/ov_SC02_005_jr_801734BC.c index f0ed6455b..526146141 100644 --- a/src/ov_SC02_005/ov_SC02_005_jr_801734BC.c +++ b/src/ov_SC02_005/ov_SC02_005_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_005/ov_SC02_005_jr_80178D40.c b/src/ov_SC02_005/ov_SC02_005_jr_80178D40.c index 4c4851936..b78e88cc3 100644 --- a/src/ov_SC02_005/ov_SC02_005_jr_80178D40.c +++ b/src/ov_SC02_005/ov_SC02_005_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_005/ov_SC02_005_jr_8017A4AC.c b/src/ov_SC02_005/ov_SC02_005_jr_8017A4AC.c index 7ab4a5e97..82e02823b 100644 --- a/src/ov_SC02_005/ov_SC02_005_jr_8017A4AC.c +++ b/src/ov_SC02_005/ov_SC02_005_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_011/ov_SC02_011_after.c b/src/ov_SC02_011/ov_SC02_011_after.c index 434de6326..ab9d6fc1e 100644 --- a/src/ov_SC02_011/ov_SC02_011_after.c +++ b/src/ov_SC02_011/ov_SC02_011_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC02_011/ov_SC02_011_jr_8015444C.c b/src/ov_SC02_011/ov_SC02_011_jr_8015444C.c index 59015e42e..aa759e7da 100644 --- a/src/ov_SC02_011/ov_SC02_011_jr_8015444C.c +++ b/src/ov_SC02_011/ov_SC02_011_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_011/ov_SC02_011_jr_8015A3C8.c b/src/ov_SC02_011/ov_SC02_011_jr_8015A3C8.c index ccf86397b..d98af01ab 100644 --- a/src/ov_SC02_011/ov_SC02_011_jr_8015A3C8.c +++ b/src/ov_SC02_011/ov_SC02_011_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_011/ov_SC02_011_jr_8015AE2C.c b/src/ov_SC02_011/ov_SC02_011_jr_8015AE2C.c index 19e2eebca..2e638af29 100644 --- a/src/ov_SC02_011/ov_SC02_011_jr_8015AE2C.c +++ b/src/ov_SC02_011/ov_SC02_011_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_011/ov_SC02_011_jr_8016AB6C.c b/src/ov_SC02_011/ov_SC02_011_jr_8016AB6C.c index a61fcf804..508a0b5ae 100644 --- a/src/ov_SC02_011/ov_SC02_011_jr_8016AB6C.c +++ b/src/ov_SC02_011/ov_SC02_011_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_011/ov_SC02_011_jr_801734BC.c b/src/ov_SC02_011/ov_SC02_011_jr_801734BC.c index a187a0ecc..f2354f6fc 100644 --- a/src/ov_SC02_011/ov_SC02_011_jr_801734BC.c +++ b/src/ov_SC02_011/ov_SC02_011_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_011/ov_SC02_011_jr_80178D40.c b/src/ov_SC02_011/ov_SC02_011_jr_80178D40.c index 18c989035..eef5d9056 100644 --- a/src/ov_SC02_011/ov_SC02_011_jr_80178D40.c +++ b/src/ov_SC02_011/ov_SC02_011_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_011/ov_SC02_011_jr_8017A4AC.c b/src/ov_SC02_011/ov_SC02_011_jr_8017A4AC.c index 8645990cc..4410f47f6 100644 --- a/src/ov_SC02_011/ov_SC02_011_jr_8017A4AC.c +++ b/src/ov_SC02_011/ov_SC02_011_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_015/ov_SC02_015_after.c b/src/ov_SC02_015/ov_SC02_015_after.c index beb2f1c86..caaea3c0f 100644 --- a/src/ov_SC02_015/ov_SC02_015_after.c +++ b/src/ov_SC02_015/ov_SC02_015_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC02_015/nonmatchings/ov_SC02_015_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC02_015/ov_SC02_015_jr_8015444C.c b/src/ov_SC02_015/ov_SC02_015_jr_8015444C.c index e09a029ed..9ef5dd6fb 100644 --- a/src/ov_SC02_015/ov_SC02_015_jr_8015444C.c +++ b/src/ov_SC02_015/ov_SC02_015_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_015/ov_SC02_015_jr_8015A3C8.c b/src/ov_SC02_015/ov_SC02_015_jr_8015A3C8.c index c68f72653..ed3b5e3c2 100644 --- a/src/ov_SC02_015/ov_SC02_015_jr_8015A3C8.c +++ b/src/ov_SC02_015/ov_SC02_015_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_015/ov_SC02_015_jr_8015AE2C.c b/src/ov_SC02_015/ov_SC02_015_jr_8015AE2C.c index b31905c3b..1b363836f 100644 --- a/src/ov_SC02_015/ov_SC02_015_jr_8015AE2C.c +++ b/src/ov_SC02_015/ov_SC02_015_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_015/ov_SC02_015_jr_8016AB6C.c b/src/ov_SC02_015/ov_SC02_015_jr_8016AB6C.c index 417711b6b..b575941d4 100644 --- a/src/ov_SC02_015/ov_SC02_015_jr_8016AB6C.c +++ b/src/ov_SC02_015/ov_SC02_015_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_015/ov_SC02_015_jr_801734BC.c b/src/ov_SC02_015/ov_SC02_015_jr_801734BC.c index c0f6a48c7..8cfde9ebd 100644 --- a/src/ov_SC02_015/ov_SC02_015_jr_801734BC.c +++ b/src/ov_SC02_015/ov_SC02_015_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_015/ov_SC02_015_jr_80178D40.c b/src/ov_SC02_015/ov_SC02_015_jr_80178D40.c index 460089dbb..254ff626e 100644 --- a/src/ov_SC02_015/ov_SC02_015_jr_80178D40.c +++ b/src/ov_SC02_015/ov_SC02_015_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_015/ov_SC02_015_jr_8017A4AC.c b/src/ov_SC02_015/ov_SC02_015_jr_8017A4AC.c index 334875273..3fbb797c0 100644 --- a/src/ov_SC02_015/ov_SC02_015_jr_8017A4AC.c +++ b/src/ov_SC02_015/ov_SC02_015_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_016/ov_SC02_016_after.c b/src/ov_SC02_016/ov_SC02_016_after.c index 8cd2e286a..2ae9a4ab9 100644 --- a/src/ov_SC02_016/ov_SC02_016_after.c +++ b/src/ov_SC02_016/ov_SC02_016_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC02_016/ov_SC02_016_jr_8015444C.c b/src/ov_SC02_016/ov_SC02_016_jr_8015444C.c index 8fe79fb5d..219c41551 100644 --- a/src/ov_SC02_016/ov_SC02_016_jr_8015444C.c +++ b/src/ov_SC02_016/ov_SC02_016_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_016/ov_SC02_016_jr_8015A3C8.c b/src/ov_SC02_016/ov_SC02_016_jr_8015A3C8.c index 036bc66aa..0890864ae 100644 --- a/src/ov_SC02_016/ov_SC02_016_jr_8015A3C8.c +++ b/src/ov_SC02_016/ov_SC02_016_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_016/ov_SC02_016_jr_8015AE2C.c b/src/ov_SC02_016/ov_SC02_016_jr_8015AE2C.c index 407b5fb6d..45358c649 100644 --- a/src/ov_SC02_016/ov_SC02_016_jr_8015AE2C.c +++ b/src/ov_SC02_016/ov_SC02_016_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_016/ov_SC02_016_jr_8016AB6C.c b/src/ov_SC02_016/ov_SC02_016_jr_8016AB6C.c index e62b0cc21..69544fc4a 100644 --- a/src/ov_SC02_016/ov_SC02_016_jr_8016AB6C.c +++ b/src/ov_SC02_016/ov_SC02_016_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_016/ov_SC02_016_jr_801734BC.c b/src/ov_SC02_016/ov_SC02_016_jr_801734BC.c index 85fff9941..48b3db340 100644 --- a/src/ov_SC02_016/ov_SC02_016_jr_801734BC.c +++ b/src/ov_SC02_016/ov_SC02_016_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_016/ov_SC02_016_jr_80178D40.c b/src/ov_SC02_016/ov_SC02_016_jr_80178D40.c index 41fa899ef..ee050e2f3 100644 --- a/src/ov_SC02_016/ov_SC02_016_jr_80178D40.c +++ b/src/ov_SC02_016/ov_SC02_016_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_016/ov_SC02_016_jr_8017A4AC.c b/src/ov_SC02_016/ov_SC02_016_jr_8017A4AC.c index 9d7b07a01..1958eaa88 100644 --- a/src/ov_SC02_016/ov_SC02_016_jr_8017A4AC.c +++ b/src/ov_SC02_016/ov_SC02_016_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_016/ov_SC02_016_jr_8017DC70.c b/src/ov_SC02_016/ov_SC02_016_jr_8017DC70.c index d4f1dbc7f..588d1bf5f 100644 --- a/src/ov_SC02_016/ov_SC02_016_jr_8017DC70.c +++ b/src/ov_SC02_016/ov_SC02_016_jr_8017DC70.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_017/ov_SC02_017_after.c b/src/ov_SC02_017/ov_SC02_017_after.c index 65c0f92bf..a9f96abaa 100644 --- a/src/ov_SC02_017/ov_SC02_017_after.c +++ b/src/ov_SC02_017/ov_SC02_017_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC02_017/ov_SC02_017_jr_8015444C.c b/src/ov_SC02_017/ov_SC02_017_jr_8015444C.c index aa1bb72d1..0ace4dc90 100644 --- a/src/ov_SC02_017/ov_SC02_017_jr_8015444C.c +++ b/src/ov_SC02_017/ov_SC02_017_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_017/ov_SC02_017_jr_8015A3C8.c b/src/ov_SC02_017/ov_SC02_017_jr_8015A3C8.c index 76a37be33..e0057e0f0 100644 --- a/src/ov_SC02_017/ov_SC02_017_jr_8015A3C8.c +++ b/src/ov_SC02_017/ov_SC02_017_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_017/ov_SC02_017_jr_8015AE2C.c b/src/ov_SC02_017/ov_SC02_017_jr_8015AE2C.c index ffcb3bd8d..513580d8d 100644 --- a/src/ov_SC02_017/ov_SC02_017_jr_8015AE2C.c +++ b/src/ov_SC02_017/ov_SC02_017_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_017/ov_SC02_017_jr_8016AB6C.c b/src/ov_SC02_017/ov_SC02_017_jr_8016AB6C.c index 1705d3db3..35e826ec7 100644 --- a/src/ov_SC02_017/ov_SC02_017_jr_8016AB6C.c +++ b/src/ov_SC02_017/ov_SC02_017_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_017/ov_SC02_017_jr_801734BC.c b/src/ov_SC02_017/ov_SC02_017_jr_801734BC.c index 244e9caef..10b8e5dbe 100644 --- a/src/ov_SC02_017/ov_SC02_017_jr_801734BC.c +++ b/src/ov_SC02_017/ov_SC02_017_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_017/ov_SC02_017_jr_80178D40.c b/src/ov_SC02_017/ov_SC02_017_jr_80178D40.c index 99a2b9985..2fd12c0cc 100644 --- a/src/ov_SC02_017/ov_SC02_017_jr_80178D40.c +++ b/src/ov_SC02_017/ov_SC02_017_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_017/ov_SC02_017_jr_8017A4AC.c b/src/ov_SC02_017/ov_SC02_017_jr_8017A4AC.c index 7422a0541..3965a7ed9 100644 --- a/src/ov_SC02_017/ov_SC02_017_jr_8017A4AC.c +++ b/src/ov_SC02_017/ov_SC02_017_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_017/ov_SC02_017_jr_8017DF34.c b/src/ov_SC02_017/ov_SC02_017_jr_8017DF34.c index f055cf355..91b539605 100644 --- a/src/ov_SC02_017/ov_SC02_017_jr_8017DF34.c +++ b/src/ov_SC02_017/ov_SC02_017_jr_8017DF34.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_021/ov_SC02_021_after.c b/src/ov_SC02_021/ov_SC02_021_after.c index dc81a21c5..39becec36 100644 --- a/src/ov_SC02_021/ov_SC02_021_after.c +++ b/src/ov_SC02_021/ov_SC02_021_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC02_021/ov_SC02_021_jr_8015444C.c b/src/ov_SC02_021/ov_SC02_021_jr_8015444C.c index 0eb904438..49fa77ebd 100644 --- a/src/ov_SC02_021/ov_SC02_021_jr_8015444C.c +++ b/src/ov_SC02_021/ov_SC02_021_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_021/ov_SC02_021_jr_8015A3C8.c b/src/ov_SC02_021/ov_SC02_021_jr_8015A3C8.c index 57f63420c..006609306 100644 --- a/src/ov_SC02_021/ov_SC02_021_jr_8015A3C8.c +++ b/src/ov_SC02_021/ov_SC02_021_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_021/ov_SC02_021_jr_8015AE2C.c b/src/ov_SC02_021/ov_SC02_021_jr_8015AE2C.c index 29434be05..cd84c8aca 100644 --- a/src/ov_SC02_021/ov_SC02_021_jr_8015AE2C.c +++ b/src/ov_SC02_021/ov_SC02_021_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_021/ov_SC02_021_jr_8016AB6C.c b/src/ov_SC02_021/ov_SC02_021_jr_8016AB6C.c index d2fa4ec90..ba8679531 100644 --- a/src/ov_SC02_021/ov_SC02_021_jr_8016AB6C.c +++ b/src/ov_SC02_021/ov_SC02_021_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_021/ov_SC02_021_jr_801734BC.c b/src/ov_SC02_021/ov_SC02_021_jr_801734BC.c index 1b65662a2..f6ae40ece 100644 --- a/src/ov_SC02_021/ov_SC02_021_jr_801734BC.c +++ b/src/ov_SC02_021/ov_SC02_021_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_021/ov_SC02_021_jr_80178D40.c b/src/ov_SC02_021/ov_SC02_021_jr_80178D40.c index 274baeb67..47d3baf11 100644 --- a/src/ov_SC02_021/ov_SC02_021_jr_80178D40.c +++ b/src/ov_SC02_021/ov_SC02_021_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_021/ov_SC02_021_jr_8017A4AC.c b/src/ov_SC02_021/ov_SC02_021_jr_8017A4AC.c index de5f53c58..fbb130b87 100644 --- a/src/ov_SC02_021/ov_SC02_021_jr_8017A4AC.c +++ b/src/ov_SC02_021/ov_SC02_021_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_021/ov_SC02_021_jr_8017C294.c b/src/ov_SC02_021/ov_SC02_021_jr_8017C294.c index 51d370465..15da6a3c9 100644 --- a/src/ov_SC02_021/ov_SC02_021_jr_8017C294.c +++ b/src/ov_SC02_021/ov_SC02_021_jr_8017C294.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_026/ov_SC02_026_after.c b/src/ov_SC02_026/ov_SC02_026_after.c index ee7e8a41f..76b426126 100644 --- a/src/ov_SC02_026/ov_SC02_026_after.c +++ b/src/ov_SC02_026/ov_SC02_026_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC02_026/nonmatchings/ov_SC02_026_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC02_026/ov_SC02_026_jr_8015444C.c b/src/ov_SC02_026/ov_SC02_026_jr_8015444C.c index 2e284dc54..bbc39cad9 100644 --- a/src/ov_SC02_026/ov_SC02_026_jr_8015444C.c +++ b/src/ov_SC02_026/ov_SC02_026_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_026/ov_SC02_026_jr_8015A3C8.c b/src/ov_SC02_026/ov_SC02_026_jr_8015A3C8.c index 08ee155ad..a582a14e5 100644 --- a/src/ov_SC02_026/ov_SC02_026_jr_8015A3C8.c +++ b/src/ov_SC02_026/ov_SC02_026_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_026/ov_SC02_026_jr_8015AE2C.c b/src/ov_SC02_026/ov_SC02_026_jr_8015AE2C.c index 39d92b545..5374b77a8 100644 --- a/src/ov_SC02_026/ov_SC02_026_jr_8015AE2C.c +++ b/src/ov_SC02_026/ov_SC02_026_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_026/ov_SC02_026_jr_8016AB6C.c b/src/ov_SC02_026/ov_SC02_026_jr_8016AB6C.c index a6ba96c45..df7f083db 100644 --- a/src/ov_SC02_026/ov_SC02_026_jr_8016AB6C.c +++ b/src/ov_SC02_026/ov_SC02_026_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_026/ov_SC02_026_jr_801734BC.c b/src/ov_SC02_026/ov_SC02_026_jr_801734BC.c index 988364f92..d2a183a61 100644 --- a/src/ov_SC02_026/ov_SC02_026_jr_801734BC.c +++ b/src/ov_SC02_026/ov_SC02_026_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_026/ov_SC02_026_jr_80178D40.c b/src/ov_SC02_026/ov_SC02_026_jr_80178D40.c index 426883e48..0af6ca80f 100644 --- a/src/ov_SC02_026/ov_SC02_026_jr_80178D40.c +++ b/src/ov_SC02_026/ov_SC02_026_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_026/ov_SC02_026_jr_8017A4AC.c b/src/ov_SC02_026/ov_SC02_026_jr_8017A4AC.c index a0058616f..8a834ebd7 100644 --- a/src/ov_SC02_026/ov_SC02_026_jr_8017A4AC.c +++ b/src/ov_SC02_026/ov_SC02_026_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_026/ov_SC02_026_jr_8017C180.c b/src/ov_SC02_026/ov_SC02_026_jr_8017C180.c index 47828c182..0dc4eaa43 100644 --- a/src/ov_SC02_026/ov_SC02_026_jr_8017C180.c +++ b/src/ov_SC02_026/ov_SC02_026_jr_8017C180.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_027/ov_SC02_027_after.c b/src/ov_SC02_027/ov_SC02_027_after.c index 58cb51137..917ec5a5c 100644 --- a/src/ov_SC02_027/ov_SC02_027_after.c +++ b/src/ov_SC02_027/ov_SC02_027_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC02_027/nonmatchings/ov_SC02_027_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC02_027/ov_SC02_027_jr_8015444C.c b/src/ov_SC02_027/ov_SC02_027_jr_8015444C.c index 8e3d94539..149cdf0b7 100644 --- a/src/ov_SC02_027/ov_SC02_027_jr_8015444C.c +++ b/src/ov_SC02_027/ov_SC02_027_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_027/ov_SC02_027_jr_8015A3C8.c b/src/ov_SC02_027/ov_SC02_027_jr_8015A3C8.c index 0b60c1265..f7d9394bd 100644 --- a/src/ov_SC02_027/ov_SC02_027_jr_8015A3C8.c +++ b/src/ov_SC02_027/ov_SC02_027_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_027/ov_SC02_027_jr_8015AE2C.c b/src/ov_SC02_027/ov_SC02_027_jr_8015AE2C.c index 80fd84808..939ca3639 100644 --- a/src/ov_SC02_027/ov_SC02_027_jr_8015AE2C.c +++ b/src/ov_SC02_027/ov_SC02_027_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_027/ov_SC02_027_jr_8016AB6C.c b/src/ov_SC02_027/ov_SC02_027_jr_8016AB6C.c index 98c72d1ec..a6cd3611a 100644 --- a/src/ov_SC02_027/ov_SC02_027_jr_8016AB6C.c +++ b/src/ov_SC02_027/ov_SC02_027_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_027/ov_SC02_027_jr_801734BC.c b/src/ov_SC02_027/ov_SC02_027_jr_801734BC.c index 7acd037df..ab123247f 100644 --- a/src/ov_SC02_027/ov_SC02_027_jr_801734BC.c +++ b/src/ov_SC02_027/ov_SC02_027_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_027/ov_SC02_027_jr_80178D40.c b/src/ov_SC02_027/ov_SC02_027_jr_80178D40.c index d68144185..ed768a46d 100644 --- a/src/ov_SC02_027/ov_SC02_027_jr_80178D40.c +++ b/src/ov_SC02_027/ov_SC02_027_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_027/ov_SC02_027_jr_8017A4AC.c b/src/ov_SC02_027/ov_SC02_027_jr_8017A4AC.c index a2c092e05..efc255622 100644 --- a/src/ov_SC02_027/ov_SC02_027_jr_8017A4AC.c +++ b/src/ov_SC02_027/ov_SC02_027_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_027/ov_SC02_027_jr_8017D898.c b/src/ov_SC02_027/ov_SC02_027_jr_8017D898.c index d52abbd31..f1b0637e1 100644 --- a/src/ov_SC02_027/ov_SC02_027_jr_8017D898.c +++ b/src/ov_SC02_027/ov_SC02_027_jr_8017D898.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_028/ov_SC02_028_after.c b/src/ov_SC02_028/ov_SC02_028_after.c index c0ec6c1ea..0be795924 100644 --- a/src/ov_SC02_028/ov_SC02_028_after.c +++ b/src/ov_SC02_028/ov_SC02_028_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC02_028/nonmatchings/ov_SC02_028_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC02_028/ov_SC02_028_jr_8015444C.c b/src/ov_SC02_028/ov_SC02_028_jr_8015444C.c index 0ea7378d9..6b318db6f 100644 --- a/src/ov_SC02_028/ov_SC02_028_jr_8015444C.c +++ b/src/ov_SC02_028/ov_SC02_028_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_028/ov_SC02_028_jr_8015A3C8.c b/src/ov_SC02_028/ov_SC02_028_jr_8015A3C8.c index 9e38293bc..c13963265 100644 --- a/src/ov_SC02_028/ov_SC02_028_jr_8015A3C8.c +++ b/src/ov_SC02_028/ov_SC02_028_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_028/ov_SC02_028_jr_8015AE2C.c b/src/ov_SC02_028/ov_SC02_028_jr_8015AE2C.c index 2c996bd4f..cc38b3560 100644 --- a/src/ov_SC02_028/ov_SC02_028_jr_8015AE2C.c +++ b/src/ov_SC02_028/ov_SC02_028_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_028/ov_SC02_028_jr_8016AB6C.c b/src/ov_SC02_028/ov_SC02_028_jr_8016AB6C.c index c4e1e082b..30fbbf7ec 100644 --- a/src/ov_SC02_028/ov_SC02_028_jr_8016AB6C.c +++ b/src/ov_SC02_028/ov_SC02_028_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_028/ov_SC02_028_jr_801734BC.c b/src/ov_SC02_028/ov_SC02_028_jr_801734BC.c index 33ce473bf..890602798 100644 --- a/src/ov_SC02_028/ov_SC02_028_jr_801734BC.c +++ b/src/ov_SC02_028/ov_SC02_028_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_028/ov_SC02_028_jr_80178D40.c b/src/ov_SC02_028/ov_SC02_028_jr_80178D40.c index afdcde17e..399cc48de 100644 --- a/src/ov_SC02_028/ov_SC02_028_jr_80178D40.c +++ b/src/ov_SC02_028/ov_SC02_028_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_028/ov_SC02_028_jr_8017A4AC.c b/src/ov_SC02_028/ov_SC02_028_jr_8017A4AC.c index a51f55e8f..ebb606629 100644 --- a/src/ov_SC02_028/ov_SC02_028_jr_8017A4AC.c +++ b/src/ov_SC02_028/ov_SC02_028_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_028/ov_SC02_028_jr_8017D898.c b/src/ov_SC02_028/ov_SC02_028_jr_8017D898.c index d20b756e9..1b4c7c4fb 100644 --- a/src/ov_SC02_028/ov_SC02_028_jr_8017D898.c +++ b/src/ov_SC02_028/ov_SC02_028_jr_8017D898.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_031/ov_SC02_031_after.c b/src/ov_SC02_031/ov_SC02_031_after.c index 0576c26cc..c702dd895 100644 --- a/src/ov_SC02_031/ov_SC02_031_after.c +++ b/src/ov_SC02_031/ov_SC02_031_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC02_031/ov_SC02_031_jr_8015444C.c b/src/ov_SC02_031/ov_SC02_031_jr_8015444C.c index f3acd59d3..1eb4821ec 100644 --- a/src/ov_SC02_031/ov_SC02_031_jr_8015444C.c +++ b/src/ov_SC02_031/ov_SC02_031_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_031/ov_SC02_031_jr_8015A3C8.c b/src/ov_SC02_031/ov_SC02_031_jr_8015A3C8.c index a6377fc78..21f5b2f13 100644 --- a/src/ov_SC02_031/ov_SC02_031_jr_8015A3C8.c +++ b/src/ov_SC02_031/ov_SC02_031_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_031/ov_SC02_031_jr_8015AE2C.c b/src/ov_SC02_031/ov_SC02_031_jr_8015AE2C.c index 86d018159..aa9a537cb 100644 --- a/src/ov_SC02_031/ov_SC02_031_jr_8015AE2C.c +++ b/src/ov_SC02_031/ov_SC02_031_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_031/ov_SC02_031_jr_8016AB6C.c b/src/ov_SC02_031/ov_SC02_031_jr_8016AB6C.c index 4960c1b6d..c52d1177b 100644 --- a/src/ov_SC02_031/ov_SC02_031_jr_8016AB6C.c +++ b/src/ov_SC02_031/ov_SC02_031_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_031/ov_SC02_031_jr_801734BC.c b/src/ov_SC02_031/ov_SC02_031_jr_801734BC.c index 8a3c8ba87..27ed476b1 100644 --- a/src/ov_SC02_031/ov_SC02_031_jr_801734BC.c +++ b/src/ov_SC02_031/ov_SC02_031_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_031/ov_SC02_031_jr_80178D40.c b/src/ov_SC02_031/ov_SC02_031_jr_80178D40.c index 33e997867..3178464e1 100644 --- a/src/ov_SC02_031/ov_SC02_031_jr_80178D40.c +++ b/src/ov_SC02_031/ov_SC02_031_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_031/ov_SC02_031_jr_8017A4AC.c b/src/ov_SC02_031/ov_SC02_031_jr_8017A4AC.c index f670e1f69..6da114326 100644 --- a/src/ov_SC02_031/ov_SC02_031_jr_8017A4AC.c +++ b/src/ov_SC02_031/ov_SC02_031_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_035/ov_SC02_035_after.c b/src/ov_SC02_035/ov_SC02_035_after.c index 0d1dfd041..23c61b67d 100644 --- a/src/ov_SC02_035/ov_SC02_035_after.c +++ b/src/ov_SC02_035/ov_SC02_035_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC02_035/nonmatchings/ov_SC02_035_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC02_035/ov_SC02_035_jr_8015444C.c b/src/ov_SC02_035/ov_SC02_035_jr_8015444C.c index deb2ea4cc..394927607 100644 --- a/src/ov_SC02_035/ov_SC02_035_jr_8015444C.c +++ b/src/ov_SC02_035/ov_SC02_035_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_035/ov_SC02_035_jr_8015A3C8.c b/src/ov_SC02_035/ov_SC02_035_jr_8015A3C8.c index 3aa866286..43edb2ecb 100644 --- a/src/ov_SC02_035/ov_SC02_035_jr_8015A3C8.c +++ b/src/ov_SC02_035/ov_SC02_035_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_035/ov_SC02_035_jr_8015AE2C.c b/src/ov_SC02_035/ov_SC02_035_jr_8015AE2C.c index 18795b9fc..970a46bd5 100644 --- a/src/ov_SC02_035/ov_SC02_035_jr_8015AE2C.c +++ b/src/ov_SC02_035/ov_SC02_035_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_035/ov_SC02_035_jr_8016AB6C.c b/src/ov_SC02_035/ov_SC02_035_jr_8016AB6C.c index 8c7a52108..de182de08 100644 --- a/src/ov_SC02_035/ov_SC02_035_jr_8016AB6C.c +++ b/src/ov_SC02_035/ov_SC02_035_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_035/ov_SC02_035_jr_801734BC.c b/src/ov_SC02_035/ov_SC02_035_jr_801734BC.c index ee311f330..f316fc3bc 100644 --- a/src/ov_SC02_035/ov_SC02_035_jr_801734BC.c +++ b/src/ov_SC02_035/ov_SC02_035_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_035/ov_SC02_035_jr_80178D40.c b/src/ov_SC02_035/ov_SC02_035_jr_80178D40.c index 7af2f971d..9831e0648 100644 --- a/src/ov_SC02_035/ov_SC02_035_jr_80178D40.c +++ b/src/ov_SC02_035/ov_SC02_035_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_035/ov_SC02_035_jr_8017A4AC.c b/src/ov_SC02_035/ov_SC02_035_jr_8017A4AC.c index 46f782692..8e181439f 100644 --- a/src/ov_SC02_035/ov_SC02_035_jr_8017A4AC.c +++ b/src/ov_SC02_035/ov_SC02_035_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_035/ov_SC02_035_jr_8017BEBC.c b/src/ov_SC02_035/ov_SC02_035_jr_8017BEBC.c index 6afe36f6d..c1890989b 100644 --- a/src/ov_SC02_035/ov_SC02_035_jr_8017BEBC.c +++ b/src/ov_SC02_035/ov_SC02_035_jr_8017BEBC.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_039/ov_SC02_039_after.c b/src/ov_SC02_039/ov_SC02_039_after.c index 1dee1fae7..14136f26b 100644 --- a/src/ov_SC02_039/ov_SC02_039_after.c +++ b/src/ov_SC02_039/ov_SC02_039_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC02_039/nonmatchings/ov_SC02_039_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC02_039/ov_SC02_039_jr_8015444C.c b/src/ov_SC02_039/ov_SC02_039_jr_8015444C.c index 55e06716c..4df468757 100644 --- a/src/ov_SC02_039/ov_SC02_039_jr_8015444C.c +++ b/src/ov_SC02_039/ov_SC02_039_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_039/ov_SC02_039_jr_8015A3C8.c b/src/ov_SC02_039/ov_SC02_039_jr_8015A3C8.c index c416e3a35..10871415a 100644 --- a/src/ov_SC02_039/ov_SC02_039_jr_8015A3C8.c +++ b/src/ov_SC02_039/ov_SC02_039_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_039/ov_SC02_039_jr_8015AE2C.c b/src/ov_SC02_039/ov_SC02_039_jr_8015AE2C.c index 3de0511b8..7633513b0 100644 --- a/src/ov_SC02_039/ov_SC02_039_jr_8015AE2C.c +++ b/src/ov_SC02_039/ov_SC02_039_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_039/ov_SC02_039_jr_8016AB6C.c b/src/ov_SC02_039/ov_SC02_039_jr_8016AB6C.c index e11ab8291..072be450d 100644 --- a/src/ov_SC02_039/ov_SC02_039_jr_8016AB6C.c +++ b/src/ov_SC02_039/ov_SC02_039_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_039/ov_SC02_039_jr_801734BC.c b/src/ov_SC02_039/ov_SC02_039_jr_801734BC.c index ea598e150..d103f7be7 100644 --- a/src/ov_SC02_039/ov_SC02_039_jr_801734BC.c +++ b/src/ov_SC02_039/ov_SC02_039_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_039/ov_SC02_039_jr_80178D40.c b/src/ov_SC02_039/ov_SC02_039_jr_80178D40.c index 247920e52..2643b1545 100644 --- a/src/ov_SC02_039/ov_SC02_039_jr_80178D40.c +++ b/src/ov_SC02_039/ov_SC02_039_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_039/ov_SC02_039_jr_8017A4AC.c b/src/ov_SC02_039/ov_SC02_039_jr_8017A4AC.c index 570ef551c..13d3130c7 100644 --- a/src/ov_SC02_039/ov_SC02_039_jr_8017A4AC.c +++ b/src/ov_SC02_039/ov_SC02_039_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_039/ov_SC02_039_jr_8017BEBC.c b/src/ov_SC02_039/ov_SC02_039_jr_8017BEBC.c index c792e7102..b14169c89 100644 --- a/src/ov_SC02_039/ov_SC02_039_jr_8017BEBC.c +++ b/src/ov_SC02_039/ov_SC02_039_jr_8017BEBC.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_041/ov_SC02_041_after.c b/src/ov_SC02_041/ov_SC02_041_after.c index cc947cfff..6100da317 100644 --- a/src/ov_SC02_041/ov_SC02_041_after.c +++ b/src/ov_SC02_041/ov_SC02_041_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC02_041/nonmatchings/ov_SC02_041_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC02_041/ov_SC02_041_jr_8015444C.c b/src/ov_SC02_041/ov_SC02_041_jr_8015444C.c index 38f6a039d..ae27df4a1 100644 --- a/src/ov_SC02_041/ov_SC02_041_jr_8015444C.c +++ b/src/ov_SC02_041/ov_SC02_041_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_041/ov_SC02_041_jr_8015A3C8.c b/src/ov_SC02_041/ov_SC02_041_jr_8015A3C8.c index 8b9956ddb..19f85c5e0 100644 --- a/src/ov_SC02_041/ov_SC02_041_jr_8015A3C8.c +++ b/src/ov_SC02_041/ov_SC02_041_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_041/ov_SC02_041_jr_8015AE2C.c b/src/ov_SC02_041/ov_SC02_041_jr_8015AE2C.c index 20955ec13..9808755aa 100644 --- a/src/ov_SC02_041/ov_SC02_041_jr_8015AE2C.c +++ b/src/ov_SC02_041/ov_SC02_041_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_041/ov_SC02_041_jr_8016AB6C.c b/src/ov_SC02_041/ov_SC02_041_jr_8016AB6C.c index bb5094aa9..a7e00d006 100644 --- a/src/ov_SC02_041/ov_SC02_041_jr_8016AB6C.c +++ b/src/ov_SC02_041/ov_SC02_041_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_041/ov_SC02_041_jr_801734BC.c b/src/ov_SC02_041/ov_SC02_041_jr_801734BC.c index 0eedaf60f..bbcddb0f1 100644 --- a/src/ov_SC02_041/ov_SC02_041_jr_801734BC.c +++ b/src/ov_SC02_041/ov_SC02_041_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_041/ov_SC02_041_jr_80178D40.c b/src/ov_SC02_041/ov_SC02_041_jr_80178D40.c index fa75e5aa6..4786e2fa7 100644 --- a/src/ov_SC02_041/ov_SC02_041_jr_80178D40.c +++ b/src/ov_SC02_041/ov_SC02_041_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_041/ov_SC02_041_jr_8017A4AC.c b/src/ov_SC02_041/ov_SC02_041_jr_8017A4AC.c index e74b6a58a..7de09b68b 100644 --- a/src/ov_SC02_041/ov_SC02_041_jr_8017A4AC.c +++ b/src/ov_SC02_041/ov_SC02_041_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC02_041/ov_SC02_041_jr_8017BEBC.c b/src/ov_SC02_041/ov_SC02_041_jr_8017BEBC.c index 03e94bbab..6f1afc61a 100644 --- a/src/ov_SC02_041/ov_SC02_041_jr_8017BEBC.c +++ b/src/ov_SC02_041/ov_SC02_041_jr_8017BEBC.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_001/ov_SC03_001_after.c b/src/ov_SC03_001/ov_SC03_001_after.c index 31407fed7..f98ede75a 100644 --- a/src/ov_SC03_001/ov_SC03_001_after.c +++ b/src/ov_SC03_001/ov_SC03_001_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_001/ov_SC03_001_jr_8015444C.c b/src/ov_SC03_001/ov_SC03_001_jr_8015444C.c index d802d4fcd..07ca77572 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_8015444C.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_001/ov_SC03_001_jr_8015A3C8.c b/src/ov_SC03_001/ov_SC03_001_jr_8015A3C8.c index 1ff66c9de..be2b3a0dc 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_8015A3C8.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_001/ov_SC03_001_jr_8015AE2C.c b/src/ov_SC03_001/ov_SC03_001_jr_8015AE2C.c index abebc9d1a..f3b424960 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_8015AE2C.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_001/ov_SC03_001_jr_8016AB6C.c b/src/ov_SC03_001/ov_SC03_001_jr_8016AB6C.c index a9f1923c0..c2624be64 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_8016AB6C.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_001/ov_SC03_001_jr_801734BC.c b/src/ov_SC03_001/ov_SC03_001_jr_801734BC.c index 0e5e11f14..8319dd426 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_801734BC.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_001/ov_SC03_001_jr_80178D40.c b/src/ov_SC03_001/ov_SC03_001_jr_80178D40.c index 47f01d5dc..b475dd29f 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_80178D40.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_001/ov_SC03_001_jr_8017A4AC.c b/src/ov_SC03_001/ov_SC03_001_jr_8017A4AC.c index f586bb232..446aa2e7e 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_8017A4AC.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_002/ov_SC03_002_after.c b/src/ov_SC03_002/ov_SC03_002_after.c index 3bddc8d80..5864d555b 100644 --- a/src/ov_SC03_002/ov_SC03_002_after.c +++ b/src/ov_SC03_002/ov_SC03_002_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_002/ov_SC03_002_jr_8015444C.c b/src/ov_SC03_002/ov_SC03_002_jr_8015444C.c index 691b42d34..2a978b715 100644 --- a/src/ov_SC03_002/ov_SC03_002_jr_8015444C.c +++ b/src/ov_SC03_002/ov_SC03_002_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_002/ov_SC03_002_jr_8015A3C8.c b/src/ov_SC03_002/ov_SC03_002_jr_8015A3C8.c index 1bb03a270..7958f31e6 100644 --- a/src/ov_SC03_002/ov_SC03_002_jr_8015A3C8.c +++ b/src/ov_SC03_002/ov_SC03_002_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_002/ov_SC03_002_jr_8015AE2C.c b/src/ov_SC03_002/ov_SC03_002_jr_8015AE2C.c index 073b90a77..ed0c7ceb1 100644 --- a/src/ov_SC03_002/ov_SC03_002_jr_8015AE2C.c +++ b/src/ov_SC03_002/ov_SC03_002_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_002/ov_SC03_002_jr_8016AB6C.c b/src/ov_SC03_002/ov_SC03_002_jr_8016AB6C.c index 5099b2968..7a001a12b 100644 --- a/src/ov_SC03_002/ov_SC03_002_jr_8016AB6C.c +++ b/src/ov_SC03_002/ov_SC03_002_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_002/ov_SC03_002_jr_801734BC.c b/src/ov_SC03_002/ov_SC03_002_jr_801734BC.c index 4520a8090..8b7fbd5a1 100644 --- a/src/ov_SC03_002/ov_SC03_002_jr_801734BC.c +++ b/src/ov_SC03_002/ov_SC03_002_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_002/ov_SC03_002_jr_80178D40.c b/src/ov_SC03_002/ov_SC03_002_jr_80178D40.c index 006a6c0d7..05333e2a4 100644 --- a/src/ov_SC03_002/ov_SC03_002_jr_80178D40.c +++ b/src/ov_SC03_002/ov_SC03_002_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_002/ov_SC03_002_jr_8017A4AC.c b/src/ov_SC03_002/ov_SC03_002_jr_8017A4AC.c index 4cdba76ed..77b7fe86a 100644 --- a/src/ov_SC03_002/ov_SC03_002_jr_8017A4AC.c +++ b/src/ov_SC03_002/ov_SC03_002_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_002/ov_SC03_002_jr_8017D604.c b/src/ov_SC03_002/ov_SC03_002_jr_8017D604.c index b5adbc6af..cc49ef5f3 100644 --- a/src/ov_SC03_002/ov_SC03_002_jr_8017D604.c +++ b/src/ov_SC03_002/ov_SC03_002_jr_8017D604.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_003/ov_SC03_003_after.c b/src/ov_SC03_003/ov_SC03_003_after.c index 43da79747..8469f3dc1 100644 --- a/src/ov_SC03_003/ov_SC03_003_after.c +++ b/src/ov_SC03_003/ov_SC03_003_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_003/nonmatchings/ov_SC03_003_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_003/ov_SC03_003_jr_8015444C.c b/src/ov_SC03_003/ov_SC03_003_jr_8015444C.c index 3998b2369..2736819db 100644 --- a/src/ov_SC03_003/ov_SC03_003_jr_8015444C.c +++ b/src/ov_SC03_003/ov_SC03_003_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_003/ov_SC03_003_jr_8015A3C8.c b/src/ov_SC03_003/ov_SC03_003_jr_8015A3C8.c index 58d8071f4..5fb177f0a 100644 --- a/src/ov_SC03_003/ov_SC03_003_jr_8015A3C8.c +++ b/src/ov_SC03_003/ov_SC03_003_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_003/ov_SC03_003_jr_8015AE2C.c b/src/ov_SC03_003/ov_SC03_003_jr_8015AE2C.c index 122b4b1c1..babc575f9 100644 --- a/src/ov_SC03_003/ov_SC03_003_jr_8015AE2C.c +++ b/src/ov_SC03_003/ov_SC03_003_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_003/ov_SC03_003_jr_8016AB6C.c b/src/ov_SC03_003/ov_SC03_003_jr_8016AB6C.c index 5fa0d62e8..d7e8b6ad6 100644 --- a/src/ov_SC03_003/ov_SC03_003_jr_8016AB6C.c +++ b/src/ov_SC03_003/ov_SC03_003_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_003/ov_SC03_003_jr_801734BC.c b/src/ov_SC03_003/ov_SC03_003_jr_801734BC.c index 7e45a57a1..adb2ede76 100644 --- a/src/ov_SC03_003/ov_SC03_003_jr_801734BC.c +++ b/src/ov_SC03_003/ov_SC03_003_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_003/ov_SC03_003_jr_80178D40.c b/src/ov_SC03_003/ov_SC03_003_jr_80178D40.c index ed19dcd2a..f65b601a7 100644 --- a/src/ov_SC03_003/ov_SC03_003_jr_80178D40.c +++ b/src/ov_SC03_003/ov_SC03_003_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_003/ov_SC03_003_jr_8017A4AC.c b/src/ov_SC03_003/ov_SC03_003_jr_8017A4AC.c index b2dd48dc9..4062c0b03 100644 --- a/src/ov_SC03_003/ov_SC03_003_jr_8017A4AC.c +++ b/src/ov_SC03_003/ov_SC03_003_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_006/ov_SC03_006_after.c b/src/ov_SC03_006/ov_SC03_006_after.c index ca660f099..5321c9728 100644 --- a/src/ov_SC03_006/ov_SC03_006_after.c +++ b/src/ov_SC03_006/ov_SC03_006_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_006/nonmatchings/ov_SC03_006_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_006/ov_SC03_006_jr_8015444C.c b/src/ov_SC03_006/ov_SC03_006_jr_8015444C.c index 9786aa504..48f00f69a 100644 --- a/src/ov_SC03_006/ov_SC03_006_jr_8015444C.c +++ b/src/ov_SC03_006/ov_SC03_006_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_006/ov_SC03_006_jr_8015A3C8.c b/src/ov_SC03_006/ov_SC03_006_jr_8015A3C8.c index 56767f1d3..672b93260 100644 --- a/src/ov_SC03_006/ov_SC03_006_jr_8015A3C8.c +++ b/src/ov_SC03_006/ov_SC03_006_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_006/ov_SC03_006_jr_8015AE2C.c b/src/ov_SC03_006/ov_SC03_006_jr_8015AE2C.c index 5e414e8b2..e3d3e14d9 100644 --- a/src/ov_SC03_006/ov_SC03_006_jr_8015AE2C.c +++ b/src/ov_SC03_006/ov_SC03_006_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_006/ov_SC03_006_jr_8016AB6C.c b/src/ov_SC03_006/ov_SC03_006_jr_8016AB6C.c index e76b31301..f9478122a 100644 --- a/src/ov_SC03_006/ov_SC03_006_jr_8016AB6C.c +++ b/src/ov_SC03_006/ov_SC03_006_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_006/ov_SC03_006_jr_801734BC.c b/src/ov_SC03_006/ov_SC03_006_jr_801734BC.c index 6189e0889..f2681f566 100644 --- a/src/ov_SC03_006/ov_SC03_006_jr_801734BC.c +++ b/src/ov_SC03_006/ov_SC03_006_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_006/ov_SC03_006_jr_80178D40.c b/src/ov_SC03_006/ov_SC03_006_jr_80178D40.c index 7b1e54958..04aed8872 100644 --- a/src/ov_SC03_006/ov_SC03_006_jr_80178D40.c +++ b/src/ov_SC03_006/ov_SC03_006_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_006/ov_SC03_006_jr_8017A4AC.c b/src/ov_SC03_006/ov_SC03_006_jr_8017A4AC.c index f4de1e86d..a3541253f 100644 --- a/src/ov_SC03_006/ov_SC03_006_jr_8017A4AC.c +++ b/src/ov_SC03_006/ov_SC03_006_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_007/ov_SC03_007_after.c b/src/ov_SC03_007/ov_SC03_007_after.c index 487aa6a77..f9d26c773 100644 --- a/src/ov_SC03_007/ov_SC03_007_after.c +++ b/src/ov_SC03_007/ov_SC03_007_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_007/ov_SC03_007_jr_8015444C.c b/src/ov_SC03_007/ov_SC03_007_jr_8015444C.c index 695025a9a..a01a40e95 100644 --- a/src/ov_SC03_007/ov_SC03_007_jr_8015444C.c +++ b/src/ov_SC03_007/ov_SC03_007_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_007/ov_SC03_007_jr_8015A3C8.c b/src/ov_SC03_007/ov_SC03_007_jr_8015A3C8.c index db21fcc5a..0f005e0c9 100644 --- a/src/ov_SC03_007/ov_SC03_007_jr_8015A3C8.c +++ b/src/ov_SC03_007/ov_SC03_007_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_007/ov_SC03_007_jr_8015AE2C.c b/src/ov_SC03_007/ov_SC03_007_jr_8015AE2C.c index adca01d14..3691fef2c 100644 --- a/src/ov_SC03_007/ov_SC03_007_jr_8015AE2C.c +++ b/src/ov_SC03_007/ov_SC03_007_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_007/ov_SC03_007_jr_8016AB6C.c b/src/ov_SC03_007/ov_SC03_007_jr_8016AB6C.c index d91121abf..de515da56 100644 --- a/src/ov_SC03_007/ov_SC03_007_jr_8016AB6C.c +++ b/src/ov_SC03_007/ov_SC03_007_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_007/ov_SC03_007_jr_801734BC.c b/src/ov_SC03_007/ov_SC03_007_jr_801734BC.c index d27b91a5f..3a9b595bb 100644 --- a/src/ov_SC03_007/ov_SC03_007_jr_801734BC.c +++ b/src/ov_SC03_007/ov_SC03_007_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_007/ov_SC03_007_jr_80178D40.c b/src/ov_SC03_007/ov_SC03_007_jr_80178D40.c index d18212c97..fc0f7ebaf 100644 --- a/src/ov_SC03_007/ov_SC03_007_jr_80178D40.c +++ b/src/ov_SC03_007/ov_SC03_007_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_007/ov_SC03_007_jr_8017A4AC.c b/src/ov_SC03_007/ov_SC03_007_jr_8017A4AC.c index 8464cad0f..34a7de3cb 100644 --- a/src/ov_SC03_007/ov_SC03_007_jr_8017A4AC.c +++ b/src/ov_SC03_007/ov_SC03_007_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_010/ov_SC03_010_after.c b/src/ov_SC03_010/ov_SC03_010_after.c index 9333d17a2..f6e4c954f 100644 --- a/src/ov_SC03_010/ov_SC03_010_after.c +++ b/src/ov_SC03_010/ov_SC03_010_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_010/ov_SC03_010_jr_8015444C.c b/src/ov_SC03_010/ov_SC03_010_jr_8015444C.c index 88be92992..3ae1629d4 100644 --- a/src/ov_SC03_010/ov_SC03_010_jr_8015444C.c +++ b/src/ov_SC03_010/ov_SC03_010_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_010/ov_SC03_010_jr_8015A3C8.c b/src/ov_SC03_010/ov_SC03_010_jr_8015A3C8.c index e0945dcb7..13d354654 100644 --- a/src/ov_SC03_010/ov_SC03_010_jr_8015A3C8.c +++ b/src/ov_SC03_010/ov_SC03_010_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_010/ov_SC03_010_jr_8015AE2C.c b/src/ov_SC03_010/ov_SC03_010_jr_8015AE2C.c index 71e67307f..90f3bfd06 100644 --- a/src/ov_SC03_010/ov_SC03_010_jr_8015AE2C.c +++ b/src/ov_SC03_010/ov_SC03_010_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_010/ov_SC03_010_jr_8016AB6C.c b/src/ov_SC03_010/ov_SC03_010_jr_8016AB6C.c index 9e6a123c1..6decc6922 100644 --- a/src/ov_SC03_010/ov_SC03_010_jr_8016AB6C.c +++ b/src/ov_SC03_010/ov_SC03_010_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_010/ov_SC03_010_jr_801734BC.c b/src/ov_SC03_010/ov_SC03_010_jr_801734BC.c index 204c52521..a087429ea 100644 --- a/src/ov_SC03_010/ov_SC03_010_jr_801734BC.c +++ b/src/ov_SC03_010/ov_SC03_010_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_010/ov_SC03_010_jr_80178D40.c b/src/ov_SC03_010/ov_SC03_010_jr_80178D40.c index 0c14fef85..132c183b1 100644 --- a/src/ov_SC03_010/ov_SC03_010_jr_80178D40.c +++ b/src/ov_SC03_010/ov_SC03_010_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_010/ov_SC03_010_jr_8017A4AC.c b/src/ov_SC03_010/ov_SC03_010_jr_8017A4AC.c index 26ba8746f..eabafc9a9 100644 --- a/src/ov_SC03_010/ov_SC03_010_jr_8017A4AC.c +++ b/src/ov_SC03_010/ov_SC03_010_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_011/ov_SC03_011_after.c b/src/ov_SC03_011/ov_SC03_011_after.c index 85d4d8e55..d8d2c5a69 100644 --- a/src/ov_SC03_011/ov_SC03_011_after.c +++ b/src/ov_SC03_011/ov_SC03_011_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_011/nonmatchings/ov_SC03_011_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_011/ov_SC03_011_jr_8015444C.c b/src/ov_SC03_011/ov_SC03_011_jr_8015444C.c index c2efa2af7..ebccc0803 100644 --- a/src/ov_SC03_011/ov_SC03_011_jr_8015444C.c +++ b/src/ov_SC03_011/ov_SC03_011_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_011/ov_SC03_011_jr_8015A3C8.c b/src/ov_SC03_011/ov_SC03_011_jr_8015A3C8.c index 10d2930ab..3439a6a07 100644 --- a/src/ov_SC03_011/ov_SC03_011_jr_8015A3C8.c +++ b/src/ov_SC03_011/ov_SC03_011_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_011/ov_SC03_011_jr_8015AE2C.c b/src/ov_SC03_011/ov_SC03_011_jr_8015AE2C.c index 12928887b..c927fd99d 100644 --- a/src/ov_SC03_011/ov_SC03_011_jr_8015AE2C.c +++ b/src/ov_SC03_011/ov_SC03_011_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_011/ov_SC03_011_jr_8016AB6C.c b/src/ov_SC03_011/ov_SC03_011_jr_8016AB6C.c index ed7b569d6..af4c3df74 100644 --- a/src/ov_SC03_011/ov_SC03_011_jr_8016AB6C.c +++ b/src/ov_SC03_011/ov_SC03_011_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_011/ov_SC03_011_jr_801734BC.c b/src/ov_SC03_011/ov_SC03_011_jr_801734BC.c index a29504eb8..2fdcea205 100644 --- a/src/ov_SC03_011/ov_SC03_011_jr_801734BC.c +++ b/src/ov_SC03_011/ov_SC03_011_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_011/ov_SC03_011_jr_80178D40.c b/src/ov_SC03_011/ov_SC03_011_jr_80178D40.c index b655a3200..3a748b78f 100644 --- a/src/ov_SC03_011/ov_SC03_011_jr_80178D40.c +++ b/src/ov_SC03_011/ov_SC03_011_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_011/ov_SC03_011_jr_8017A4AC.c b/src/ov_SC03_011/ov_SC03_011_jr_8017A4AC.c index c4678c416..977191aad 100644 --- a/src/ov_SC03_011/ov_SC03_011_jr_8017A4AC.c +++ b/src/ov_SC03_011/ov_SC03_011_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_011/ov_SC03_011_jr_8017C730.c b/src/ov_SC03_011/ov_SC03_011_jr_8017C730.c index 02a4417f0..9103d8c43 100644 --- a/src/ov_SC03_011/ov_SC03_011_jr_8017C730.c +++ b/src/ov_SC03_011/ov_SC03_011_jr_8017C730.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_012/ov_SC03_012_after.c b/src/ov_SC03_012/ov_SC03_012_after.c index 95936056b..9b5f2c4ba 100644 --- a/src/ov_SC03_012/ov_SC03_012_after.c +++ b/src/ov_SC03_012/ov_SC03_012_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_012/nonmatchings/ov_SC03_012_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_012/ov_SC03_012_jr_8015444C.c b/src/ov_SC03_012/ov_SC03_012_jr_8015444C.c index bbbf8ee48..640ef01fc 100644 --- a/src/ov_SC03_012/ov_SC03_012_jr_8015444C.c +++ b/src/ov_SC03_012/ov_SC03_012_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_012/ov_SC03_012_jr_8015A3C8.c b/src/ov_SC03_012/ov_SC03_012_jr_8015A3C8.c index 01d30ade4..59c02adc2 100644 --- a/src/ov_SC03_012/ov_SC03_012_jr_8015A3C8.c +++ b/src/ov_SC03_012/ov_SC03_012_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_012/ov_SC03_012_jr_8015AE2C.c b/src/ov_SC03_012/ov_SC03_012_jr_8015AE2C.c index d2085655f..e2cf6f247 100644 --- a/src/ov_SC03_012/ov_SC03_012_jr_8015AE2C.c +++ b/src/ov_SC03_012/ov_SC03_012_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_012/ov_SC03_012_jr_8016AB6C.c b/src/ov_SC03_012/ov_SC03_012_jr_8016AB6C.c index 3d9cf6812..0718c94ee 100644 --- a/src/ov_SC03_012/ov_SC03_012_jr_8016AB6C.c +++ b/src/ov_SC03_012/ov_SC03_012_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_012/ov_SC03_012_jr_801734BC.c b/src/ov_SC03_012/ov_SC03_012_jr_801734BC.c index cdbf665ee..44397bcbe 100644 --- a/src/ov_SC03_012/ov_SC03_012_jr_801734BC.c +++ b/src/ov_SC03_012/ov_SC03_012_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_012/ov_SC03_012_jr_80178D40.c b/src/ov_SC03_012/ov_SC03_012_jr_80178D40.c index 033b3081b..c992da7c8 100644 --- a/src/ov_SC03_012/ov_SC03_012_jr_80178D40.c +++ b/src/ov_SC03_012/ov_SC03_012_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_012/ov_SC03_012_jr_8017A4AC.c b/src/ov_SC03_012/ov_SC03_012_jr_8017A4AC.c index 2922ad2a7..d68162fc3 100644 --- a/src/ov_SC03_012/ov_SC03_012_jr_8017A4AC.c +++ b/src/ov_SC03_012/ov_SC03_012_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_013/ov_SC03_013_after.c b/src/ov_SC03_013/ov_SC03_013_after.c index b0f9eafad..0323a0e23 100644 --- a/src/ov_SC03_013/ov_SC03_013_after.c +++ b/src/ov_SC03_013/ov_SC03_013_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_013/ov_SC03_013_jr_8015444C.c b/src/ov_SC03_013/ov_SC03_013_jr_8015444C.c index 17fb2bdd1..a61aa784b 100644 --- a/src/ov_SC03_013/ov_SC03_013_jr_8015444C.c +++ b/src/ov_SC03_013/ov_SC03_013_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_013/ov_SC03_013_jr_8015A3C8.c b/src/ov_SC03_013/ov_SC03_013_jr_8015A3C8.c index b14deadf1..ad0509f10 100644 --- a/src/ov_SC03_013/ov_SC03_013_jr_8015A3C8.c +++ b/src/ov_SC03_013/ov_SC03_013_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_013/ov_SC03_013_jr_8015AE2C.c b/src/ov_SC03_013/ov_SC03_013_jr_8015AE2C.c index a3dec19e3..271c7396f 100644 --- a/src/ov_SC03_013/ov_SC03_013_jr_8015AE2C.c +++ b/src/ov_SC03_013/ov_SC03_013_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_013/ov_SC03_013_jr_8016AB6C.c b/src/ov_SC03_013/ov_SC03_013_jr_8016AB6C.c index 8e7367800..4edde2ada 100644 --- a/src/ov_SC03_013/ov_SC03_013_jr_8016AB6C.c +++ b/src/ov_SC03_013/ov_SC03_013_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_013/ov_SC03_013_jr_801734BC.c b/src/ov_SC03_013/ov_SC03_013_jr_801734BC.c index 2cd5a4dcb..abd6b13b3 100644 --- a/src/ov_SC03_013/ov_SC03_013_jr_801734BC.c +++ b/src/ov_SC03_013/ov_SC03_013_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_013/ov_SC03_013_jr_80178D40.c b/src/ov_SC03_013/ov_SC03_013_jr_80178D40.c index 3692fce2f..6e6ca044a 100644 --- a/src/ov_SC03_013/ov_SC03_013_jr_80178D40.c +++ b/src/ov_SC03_013/ov_SC03_013_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_013/ov_SC03_013_jr_8017A4AC.c b/src/ov_SC03_013/ov_SC03_013_jr_8017A4AC.c index bbeb02ae4..d1fa47cea 100644 --- a/src/ov_SC03_013/ov_SC03_013_jr_8017A4AC.c +++ b/src/ov_SC03_013/ov_SC03_013_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_014/ov_SC03_014_after.c b/src/ov_SC03_014/ov_SC03_014_after.c index d9a26e074..e9ae78641 100644 --- a/src/ov_SC03_014/ov_SC03_014_after.c +++ b/src/ov_SC03_014/ov_SC03_014_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_014/ov_SC03_014_jr_8015444C.c b/src/ov_SC03_014/ov_SC03_014_jr_8015444C.c index a7b5f4022..d8ddc4874 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_8015444C.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_014/ov_SC03_014_jr_8015A3C8.c b/src/ov_SC03_014/ov_SC03_014_jr_8015A3C8.c index 337e5d1fc..099fd3525 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_8015A3C8.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_014/ov_SC03_014_jr_8015AE2C.c b/src/ov_SC03_014/ov_SC03_014_jr_8015AE2C.c index 4aa7e7a89..ca53127eb 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_8015AE2C.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_014/ov_SC03_014_jr_8016AB6C.c b/src/ov_SC03_014/ov_SC03_014_jr_8016AB6C.c index f5a0fe8ba..826ed84dc 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_8016AB6C.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_014/ov_SC03_014_jr_801734BC.c b/src/ov_SC03_014/ov_SC03_014_jr_801734BC.c index 40b396f0d..75ad440ef 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_801734BC.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_014/ov_SC03_014_jr_80178D40.c b/src/ov_SC03_014/ov_SC03_014_jr_80178D40.c index b9c6a2ca1..d460328e4 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_80178D40.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_014/ov_SC03_014_jr_8017A4AC.c b/src/ov_SC03_014/ov_SC03_014_jr_8017A4AC.c index b4edf7257..4517f575d 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_8017A4AC.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_014/ov_SC03_014_jr_8017EB7C.c b/src/ov_SC03_014/ov_SC03_014_jr_8017EB7C.c index 6826eb6b5..e0729b4dd 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_8017EB7C.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_8017EB7C.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_015/ov_SC03_015_after.c b/src/ov_SC03_015/ov_SC03_015_after.c index a73173128..1fa68b99e 100644 --- a/src/ov_SC03_015/ov_SC03_015_after.c +++ b/src/ov_SC03_015/ov_SC03_015_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_015/nonmatchings/ov_SC03_015_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_015/ov_SC03_015_jr_8015444C.c b/src/ov_SC03_015/ov_SC03_015_jr_8015444C.c index b3b35f52e..ee3f85339 100644 --- a/src/ov_SC03_015/ov_SC03_015_jr_8015444C.c +++ b/src/ov_SC03_015/ov_SC03_015_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_015/ov_SC03_015_jr_8015A3C8.c b/src/ov_SC03_015/ov_SC03_015_jr_8015A3C8.c index 337e5d1fc..099fd3525 100644 --- a/src/ov_SC03_015/ov_SC03_015_jr_8015A3C8.c +++ b/src/ov_SC03_015/ov_SC03_015_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_015/ov_SC03_015_jr_8015AE2C.c b/src/ov_SC03_015/ov_SC03_015_jr_8015AE2C.c index de8ded715..abd5e9177 100644 --- a/src/ov_SC03_015/ov_SC03_015_jr_8015AE2C.c +++ b/src/ov_SC03_015/ov_SC03_015_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_015/ov_SC03_015_jr_8016AB6C.c b/src/ov_SC03_015/ov_SC03_015_jr_8016AB6C.c index 06a2663d1..44dad9519 100644 --- a/src/ov_SC03_015/ov_SC03_015_jr_8016AB6C.c +++ b/src/ov_SC03_015/ov_SC03_015_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_015/ov_SC03_015_jr_801734BC.c b/src/ov_SC03_015/ov_SC03_015_jr_801734BC.c index c2a47c8fd..e59f90c32 100644 --- a/src/ov_SC03_015/ov_SC03_015_jr_801734BC.c +++ b/src/ov_SC03_015/ov_SC03_015_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_015/ov_SC03_015_jr_80178D40.c b/src/ov_SC03_015/ov_SC03_015_jr_80178D40.c index bba2d6674..d7466c5bb 100644 --- a/src/ov_SC03_015/ov_SC03_015_jr_80178D40.c +++ b/src/ov_SC03_015/ov_SC03_015_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_015/ov_SC03_015_jr_8017A4AC.c b/src/ov_SC03_015/ov_SC03_015_jr_8017A4AC.c index 0e3856621..be66ad337 100644 --- a/src/ov_SC03_015/ov_SC03_015_jr_8017A4AC.c +++ b/src/ov_SC03_015/ov_SC03_015_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_015/ov_SC03_015_jr_8017EB7C.c b/src/ov_SC03_015/ov_SC03_015_jr_8017EB7C.c index eeaf378c6..3a4df77b4 100644 --- a/src/ov_SC03_015/ov_SC03_015_jr_8017EB7C.c +++ b/src/ov_SC03_015/ov_SC03_015_jr_8017EB7C.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_023/ov_SC03_023_after.c b/src/ov_SC03_023/ov_SC03_023_after.c index 617c56151..638446415 100644 --- a/src/ov_SC03_023/ov_SC03_023_after.c +++ b/src/ov_SC03_023/ov_SC03_023_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_023/nonmatchings/ov_SC03_023_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_023/ov_SC03_023_jr_8015444C.c b/src/ov_SC03_023/ov_SC03_023_jr_8015444C.c index 1aa69eeab..639b708aa 100644 --- a/src/ov_SC03_023/ov_SC03_023_jr_8015444C.c +++ b/src/ov_SC03_023/ov_SC03_023_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_023/ov_SC03_023_jr_8015A3C8.c b/src/ov_SC03_023/ov_SC03_023_jr_8015A3C8.c index babd5135a..25a484587 100644 --- a/src/ov_SC03_023/ov_SC03_023_jr_8015A3C8.c +++ b/src/ov_SC03_023/ov_SC03_023_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_023/ov_SC03_023_jr_8015AE2C.c b/src/ov_SC03_023/ov_SC03_023_jr_8015AE2C.c index 601a2df8a..41abb86bb 100644 --- a/src/ov_SC03_023/ov_SC03_023_jr_8015AE2C.c +++ b/src/ov_SC03_023/ov_SC03_023_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_023/ov_SC03_023_jr_8016AB6C.c b/src/ov_SC03_023/ov_SC03_023_jr_8016AB6C.c index a3f8bd1bc..505d23deb 100644 --- a/src/ov_SC03_023/ov_SC03_023_jr_8016AB6C.c +++ b/src/ov_SC03_023/ov_SC03_023_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_023/ov_SC03_023_jr_801734BC.c b/src/ov_SC03_023/ov_SC03_023_jr_801734BC.c index 2ba829d70..7c0a96d5a 100644 --- a/src/ov_SC03_023/ov_SC03_023_jr_801734BC.c +++ b/src/ov_SC03_023/ov_SC03_023_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_023/ov_SC03_023_jr_80178D40.c b/src/ov_SC03_023/ov_SC03_023_jr_80178D40.c index 8dc0902bf..29e7b56a4 100644 --- a/src/ov_SC03_023/ov_SC03_023_jr_80178D40.c +++ b/src/ov_SC03_023/ov_SC03_023_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_023/ov_SC03_023_jr_8017A4AC.c b/src/ov_SC03_023/ov_SC03_023_jr_8017A4AC.c index 63da069a8..a9626472c 100644 --- a/src/ov_SC03_023/ov_SC03_023_jr_8017A4AC.c +++ b/src/ov_SC03_023/ov_SC03_023_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_024/ov_SC03_024_after.c b/src/ov_SC03_024/ov_SC03_024_after.c index ae62d0a6a..efdd9e42d 100644 --- a/src/ov_SC03_024/ov_SC03_024_after.c +++ b/src/ov_SC03_024/ov_SC03_024_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_024/ov_SC03_024_jr_8015444C.c b/src/ov_SC03_024/ov_SC03_024_jr_8015444C.c index 95ab6804c..fee421ed0 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_8015444C.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_024/ov_SC03_024_jr_8015A3C8.c b/src/ov_SC03_024/ov_SC03_024_jr_8015A3C8.c index 2a4fc910e..39d174e81 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_8015A3C8.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_024/ov_SC03_024_jr_8015AE2C.c b/src/ov_SC03_024/ov_SC03_024_jr_8015AE2C.c index abc426fca..0c57ca515 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_8015AE2C.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_024/ov_SC03_024_jr_8016AB6C.c b/src/ov_SC03_024/ov_SC03_024_jr_8016AB6C.c index e3802c98f..c76bf8d4c 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_8016AB6C.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_024/ov_SC03_024_jr_801734BC.c b/src/ov_SC03_024/ov_SC03_024_jr_801734BC.c index 846d1f3d6..238f95040 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_801734BC.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_024/ov_SC03_024_jr_80178D40.c b/src/ov_SC03_024/ov_SC03_024_jr_80178D40.c index 4a6c808a1..b6153b028 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_80178D40.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_024/ov_SC03_024_jr_8017A4AC.c b/src/ov_SC03_024/ov_SC03_024_jr_8017A4AC.c index 90f527e90..a6cf768dd 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_8017A4AC.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_024/ov_SC03_024_jr_8017DF84.c b/src/ov_SC03_024/ov_SC03_024_jr_8017DF84.c index 46c6c6956..42ba7a55c 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_8017DF84.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_8017DF84.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_028/ov_SC03_028_after.c b/src/ov_SC03_028/ov_SC03_028_after.c index 9fb27d895..b82428302 100644 --- a/src/ov_SC03_028/ov_SC03_028_after.c +++ b/src/ov_SC03_028/ov_SC03_028_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_028/nonmatchings/ov_SC03_028_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_028/ov_SC03_028_jr_8015444C.c b/src/ov_SC03_028/ov_SC03_028_jr_8015444C.c index 0ebd17528..90f9a0f17 100644 --- a/src/ov_SC03_028/ov_SC03_028_jr_8015444C.c +++ b/src/ov_SC03_028/ov_SC03_028_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_028/ov_SC03_028_jr_8015A3C8.c b/src/ov_SC03_028/ov_SC03_028_jr_8015A3C8.c index d85d62f95..eee8fda2f 100644 --- a/src/ov_SC03_028/ov_SC03_028_jr_8015A3C8.c +++ b/src/ov_SC03_028/ov_SC03_028_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_028/ov_SC03_028_jr_8015AE2C.c b/src/ov_SC03_028/ov_SC03_028_jr_8015AE2C.c index 073abd84f..b97079007 100644 --- a/src/ov_SC03_028/ov_SC03_028_jr_8015AE2C.c +++ b/src/ov_SC03_028/ov_SC03_028_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_028/ov_SC03_028_jr_8016AB6C.c b/src/ov_SC03_028/ov_SC03_028_jr_8016AB6C.c index 886e8eaf4..d6212dc61 100644 --- a/src/ov_SC03_028/ov_SC03_028_jr_8016AB6C.c +++ b/src/ov_SC03_028/ov_SC03_028_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_028/ov_SC03_028_jr_801734BC.c b/src/ov_SC03_028/ov_SC03_028_jr_801734BC.c index ff36beedf..0a58cc1e4 100644 --- a/src/ov_SC03_028/ov_SC03_028_jr_801734BC.c +++ b/src/ov_SC03_028/ov_SC03_028_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_028/ov_SC03_028_jr_80178D40.c b/src/ov_SC03_028/ov_SC03_028_jr_80178D40.c index 2bf4a5e59..7d4e41507 100644 --- a/src/ov_SC03_028/ov_SC03_028_jr_80178D40.c +++ b/src/ov_SC03_028/ov_SC03_028_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_028/ov_SC03_028_jr_8017A4AC.c b/src/ov_SC03_028/ov_SC03_028_jr_8017A4AC.c index 922ae5209..8e0c1ce00 100644 --- a/src/ov_SC03_028/ov_SC03_028_jr_8017A4AC.c +++ b/src/ov_SC03_028/ov_SC03_028_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_029/ov_SC03_029_after.c b/src/ov_SC03_029/ov_SC03_029_after.c index 6e5f7a7ac..551e292a0 100644 --- a/src/ov_SC03_029/ov_SC03_029_after.c +++ b/src/ov_SC03_029/ov_SC03_029_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_029/ov_SC03_029_jr_8015444C.c b/src/ov_SC03_029/ov_SC03_029_jr_8015444C.c index caa17bb61..841739b54 100644 --- a/src/ov_SC03_029/ov_SC03_029_jr_8015444C.c +++ b/src/ov_SC03_029/ov_SC03_029_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_029/ov_SC03_029_jr_8015A3C8.c b/src/ov_SC03_029/ov_SC03_029_jr_8015A3C8.c index 0b121ee61..c49170f8c 100644 --- a/src/ov_SC03_029/ov_SC03_029_jr_8015A3C8.c +++ b/src/ov_SC03_029/ov_SC03_029_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_029/ov_SC03_029_jr_8015AE2C.c b/src/ov_SC03_029/ov_SC03_029_jr_8015AE2C.c index 243130bd0..30efffe77 100644 --- a/src/ov_SC03_029/ov_SC03_029_jr_8015AE2C.c +++ b/src/ov_SC03_029/ov_SC03_029_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_029/ov_SC03_029_jr_8016AB6C.c b/src/ov_SC03_029/ov_SC03_029_jr_8016AB6C.c index 43829ccbb..889c84335 100644 --- a/src/ov_SC03_029/ov_SC03_029_jr_8016AB6C.c +++ b/src/ov_SC03_029/ov_SC03_029_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_029/ov_SC03_029_jr_801734BC.c b/src/ov_SC03_029/ov_SC03_029_jr_801734BC.c index fa1b6723d..76e49f452 100644 --- a/src/ov_SC03_029/ov_SC03_029_jr_801734BC.c +++ b/src/ov_SC03_029/ov_SC03_029_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_029/ov_SC03_029_jr_80178D40.c b/src/ov_SC03_029/ov_SC03_029_jr_80178D40.c index a35a1684e..6fd815f29 100644 --- a/src/ov_SC03_029/ov_SC03_029_jr_80178D40.c +++ b/src/ov_SC03_029/ov_SC03_029_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_029/ov_SC03_029_jr_8017A4AC.c b/src/ov_SC03_029/ov_SC03_029_jr_8017A4AC.c index 31d62ea6f..489dd6460 100644 --- a/src/ov_SC03_029/ov_SC03_029_jr_8017A4AC.c +++ b/src/ov_SC03_029/ov_SC03_029_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_029/ov_SC03_029_jr_8017DC70.c b/src/ov_SC03_029/ov_SC03_029_jr_8017DC70.c index 3203ea2dd..5920dc6f2 100644 --- a/src/ov_SC03_029/ov_SC03_029_jr_8017DC70.c +++ b/src/ov_SC03_029/ov_SC03_029_jr_8017DC70.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_030/ov_SC03_030_after.c b/src/ov_SC03_030/ov_SC03_030_after.c index 6a2b3d3d1..cb454d9ca 100644 --- a/src/ov_SC03_030/ov_SC03_030_after.c +++ b/src/ov_SC03_030/ov_SC03_030_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_030/nonmatchings/ov_SC03_030_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_030/ov_SC03_030_jr_8015444C.c b/src/ov_SC03_030/ov_SC03_030_jr_8015444C.c index f8b358138..486b23cb5 100644 --- a/src/ov_SC03_030/ov_SC03_030_jr_8015444C.c +++ b/src/ov_SC03_030/ov_SC03_030_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_030/ov_SC03_030_jr_8015A3C8.c b/src/ov_SC03_030/ov_SC03_030_jr_8015A3C8.c index 98f3376e4..d05a9b5d7 100644 --- a/src/ov_SC03_030/ov_SC03_030_jr_8015A3C8.c +++ b/src/ov_SC03_030/ov_SC03_030_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_030/ov_SC03_030_jr_8015AE2C.c b/src/ov_SC03_030/ov_SC03_030_jr_8015AE2C.c index df501a160..9e5b02751 100644 --- a/src/ov_SC03_030/ov_SC03_030_jr_8015AE2C.c +++ b/src/ov_SC03_030/ov_SC03_030_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_030/ov_SC03_030_jr_8016AB6C.c b/src/ov_SC03_030/ov_SC03_030_jr_8016AB6C.c index 7830e35ca..048c41f1a 100644 --- a/src/ov_SC03_030/ov_SC03_030_jr_8016AB6C.c +++ b/src/ov_SC03_030/ov_SC03_030_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_030/ov_SC03_030_jr_801734BC.c b/src/ov_SC03_030/ov_SC03_030_jr_801734BC.c index 56226b1ec..6508b9a4b 100644 --- a/src/ov_SC03_030/ov_SC03_030_jr_801734BC.c +++ b/src/ov_SC03_030/ov_SC03_030_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_030/ov_SC03_030_jr_80178D40.c b/src/ov_SC03_030/ov_SC03_030_jr_80178D40.c index c6856f0ad..c192f0b44 100644 --- a/src/ov_SC03_030/ov_SC03_030_jr_80178D40.c +++ b/src/ov_SC03_030/ov_SC03_030_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_030/ov_SC03_030_jr_8017A4AC.c b/src/ov_SC03_030/ov_SC03_030_jr_8017A4AC.c index db23657a4..00898866b 100644 --- a/src/ov_SC03_030/ov_SC03_030_jr_8017A4AC.c +++ b/src/ov_SC03_030/ov_SC03_030_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_031/ov_SC03_031_after.c b/src/ov_SC03_031/ov_SC03_031_after.c index 3164b38b1..130f6f8b2 100644 --- a/src/ov_SC03_031/ov_SC03_031_after.c +++ b/src/ov_SC03_031/ov_SC03_031_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_031/ov_SC03_031_jr_8015444C.c b/src/ov_SC03_031/ov_SC03_031_jr_8015444C.c index 307f97e23..fcd2b6476 100644 --- a/src/ov_SC03_031/ov_SC03_031_jr_8015444C.c +++ b/src/ov_SC03_031/ov_SC03_031_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_031/ov_SC03_031_jr_8015A3C8.c b/src/ov_SC03_031/ov_SC03_031_jr_8015A3C8.c index d831220e5..56c1199a6 100644 --- a/src/ov_SC03_031/ov_SC03_031_jr_8015A3C8.c +++ b/src/ov_SC03_031/ov_SC03_031_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_031/ov_SC03_031_jr_8015AE2C.c b/src/ov_SC03_031/ov_SC03_031_jr_8015AE2C.c index adfedcaa3..618e1e199 100644 --- a/src/ov_SC03_031/ov_SC03_031_jr_8015AE2C.c +++ b/src/ov_SC03_031/ov_SC03_031_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_031/ov_SC03_031_jr_8016AB6C.c b/src/ov_SC03_031/ov_SC03_031_jr_8016AB6C.c index 27e3c6148..930024210 100644 --- a/src/ov_SC03_031/ov_SC03_031_jr_8016AB6C.c +++ b/src/ov_SC03_031/ov_SC03_031_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_031/ov_SC03_031_jr_801734BC.c b/src/ov_SC03_031/ov_SC03_031_jr_801734BC.c index 8576045d8..2fe9c7b9e 100644 --- a/src/ov_SC03_031/ov_SC03_031_jr_801734BC.c +++ b/src/ov_SC03_031/ov_SC03_031_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_031/ov_SC03_031_jr_80178D40.c b/src/ov_SC03_031/ov_SC03_031_jr_80178D40.c index 40714a462..01d7684a7 100644 --- a/src/ov_SC03_031/ov_SC03_031_jr_80178D40.c +++ b/src/ov_SC03_031/ov_SC03_031_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_031/ov_SC03_031_jr_8017A4AC.c b/src/ov_SC03_031/ov_SC03_031_jr_8017A4AC.c index b155dbaa0..07d174e35 100644 --- a/src/ov_SC03_031/ov_SC03_031_jr_8017A4AC.c +++ b/src/ov_SC03_031/ov_SC03_031_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_031/ov_SC03_031_jr_8017DB5C.c b/src/ov_SC03_031/ov_SC03_031_jr_8017DB5C.c index 0fa0a8703..8e47b3cbd 100644 --- a/src/ov_SC03_031/ov_SC03_031_jr_8017DB5C.c +++ b/src/ov_SC03_031/ov_SC03_031_jr_8017DB5C.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_089/ov_SC03_089_after.c b/src/ov_SC03_089/ov_SC03_089_after.c index 84c594e90..2909706da 100644 --- a/src/ov_SC03_089/ov_SC03_089_after.c +++ b/src/ov_SC03_089/ov_SC03_089_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_089/nonmatchings/ov_SC03_089_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_089/ov_SC03_089_jr_8015444C.c b/src/ov_SC03_089/ov_SC03_089_jr_8015444C.c index ae442668f..efd6e03ac 100644 --- a/src/ov_SC03_089/ov_SC03_089_jr_8015444C.c +++ b/src/ov_SC03_089/ov_SC03_089_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_089/ov_SC03_089_jr_8015A3C8.c b/src/ov_SC03_089/ov_SC03_089_jr_8015A3C8.c index dcf97377a..d1c90ec75 100644 --- a/src/ov_SC03_089/ov_SC03_089_jr_8015A3C8.c +++ b/src/ov_SC03_089/ov_SC03_089_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_089/ov_SC03_089_jr_8015AE2C.c b/src/ov_SC03_089/ov_SC03_089_jr_8015AE2C.c index 107723ebe..9d44d903a 100644 --- a/src/ov_SC03_089/ov_SC03_089_jr_8015AE2C.c +++ b/src/ov_SC03_089/ov_SC03_089_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_089/ov_SC03_089_jr_8016AB6C.c b/src/ov_SC03_089/ov_SC03_089_jr_8016AB6C.c index 88e2a4fbb..851f6b8e2 100644 --- a/src/ov_SC03_089/ov_SC03_089_jr_8016AB6C.c +++ b/src/ov_SC03_089/ov_SC03_089_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_089/ov_SC03_089_jr_801734BC.c b/src/ov_SC03_089/ov_SC03_089_jr_801734BC.c index 594cc0b6c..2163e7c31 100644 --- a/src/ov_SC03_089/ov_SC03_089_jr_801734BC.c +++ b/src/ov_SC03_089/ov_SC03_089_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_089/ov_SC03_089_jr_80178D40.c b/src/ov_SC03_089/ov_SC03_089_jr_80178D40.c index cb45a2104..3699b4df9 100644 --- a/src/ov_SC03_089/ov_SC03_089_jr_80178D40.c +++ b/src/ov_SC03_089/ov_SC03_089_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_089/ov_SC03_089_jr_8017A4AC.c b/src/ov_SC03_089/ov_SC03_089_jr_8017A4AC.c index ed153ce7a..08b06be86 100644 --- a/src/ov_SC03_089/ov_SC03_089_jr_8017A4AC.c +++ b/src/ov_SC03_089/ov_SC03_089_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_089/ov_SC03_089_jr_8017CA80.c b/src/ov_SC03_089/ov_SC03_089_jr_8017CA80.c index 20dffc9da..bcbd8a7ff 100644 --- a/src/ov_SC03_089/ov_SC03_089_jr_8017CA80.c +++ b/src/ov_SC03_089/ov_SC03_089_jr_8017CA80.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_090/ov_SC03_090_after.c b/src/ov_SC03_090/ov_SC03_090_after.c index 3598b7ec2..31d52046b 100644 --- a/src/ov_SC03_090/ov_SC03_090_after.c +++ b/src/ov_SC03_090/ov_SC03_090_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_090/nonmatchings/ov_SC03_090_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_090/ov_SC03_090_jr_8015444C.c b/src/ov_SC03_090/ov_SC03_090_jr_8015444C.c index f8434be34..042bb33ae 100644 --- a/src/ov_SC03_090/ov_SC03_090_jr_8015444C.c +++ b/src/ov_SC03_090/ov_SC03_090_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_090/ov_SC03_090_jr_8015A3C8.c b/src/ov_SC03_090/ov_SC03_090_jr_8015A3C8.c index a2507a0bf..9567185b9 100644 --- a/src/ov_SC03_090/ov_SC03_090_jr_8015A3C8.c +++ b/src/ov_SC03_090/ov_SC03_090_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_090/ov_SC03_090_jr_8015AE2C.c b/src/ov_SC03_090/ov_SC03_090_jr_8015AE2C.c index 149ab9ede..b877d3ec3 100644 --- a/src/ov_SC03_090/ov_SC03_090_jr_8015AE2C.c +++ b/src/ov_SC03_090/ov_SC03_090_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_090/ov_SC03_090_jr_8016AB6C.c b/src/ov_SC03_090/ov_SC03_090_jr_8016AB6C.c index 9d3cefc94..0ce9af0a4 100644 --- a/src/ov_SC03_090/ov_SC03_090_jr_8016AB6C.c +++ b/src/ov_SC03_090/ov_SC03_090_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_090/ov_SC03_090_jr_801734BC.c b/src/ov_SC03_090/ov_SC03_090_jr_801734BC.c index a5cb0834b..04f803d98 100644 --- a/src/ov_SC03_090/ov_SC03_090_jr_801734BC.c +++ b/src/ov_SC03_090/ov_SC03_090_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_090/ov_SC03_090_jr_80178D40.c b/src/ov_SC03_090/ov_SC03_090_jr_80178D40.c index 7c8490fb6..5fd4f1eef 100644 --- a/src/ov_SC03_090/ov_SC03_090_jr_80178D40.c +++ b/src/ov_SC03_090/ov_SC03_090_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_090/ov_SC03_090_jr_8017A4AC.c b/src/ov_SC03_090/ov_SC03_090_jr_8017A4AC.c index c9b64b43e..697ac5a4f 100644 --- a/src/ov_SC03_090/ov_SC03_090_jr_8017A4AC.c +++ b/src/ov_SC03_090/ov_SC03_090_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_090/ov_SC03_090_jr_8017CA80.c b/src/ov_SC03_090/ov_SC03_090_jr_8017CA80.c index 750bf218c..2ebeac800 100644 --- a/src/ov_SC03_090/ov_SC03_090_jr_8017CA80.c +++ b/src/ov_SC03_090/ov_SC03_090_jr_8017CA80.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_091/ov_SC03_091_after.c b/src/ov_SC03_091/ov_SC03_091_after.c index bcda1b62b..04e0c63bf 100644 --- a/src/ov_SC03_091/ov_SC03_091_after.c +++ b/src/ov_SC03_091/ov_SC03_091_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_091/nonmatchings/ov_SC03_091_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_091/ov_SC03_091_jr_8015444C.c b/src/ov_SC03_091/ov_SC03_091_jr_8015444C.c index a4b895741..b21daa6af 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_8015444C.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_091/ov_SC03_091_jr_8015A3C8.c b/src/ov_SC03_091/ov_SC03_091_jr_8015A3C8.c index 5b73b32f3..f895448b5 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_8015A3C8.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_091/ov_SC03_091_jr_8015AE2C.c b/src/ov_SC03_091/ov_SC03_091_jr_8015AE2C.c index e882a6a52..4998d9005 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_8015AE2C.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_091/ov_SC03_091_jr_8016AB6C.c b/src/ov_SC03_091/ov_SC03_091_jr_8016AB6C.c index 9d0b89820..71ed27714 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_8016AB6C.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_091/ov_SC03_091_jr_801734BC.c b/src/ov_SC03_091/ov_SC03_091_jr_801734BC.c index 5c6746b51..b095f6b52 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_801734BC.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_091/ov_SC03_091_jr_80178D40.c b/src/ov_SC03_091/ov_SC03_091_jr_80178D40.c index 1a34ae892..305954ad6 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_80178D40.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_091/ov_SC03_091_jr_8017A4AC.c b/src/ov_SC03_091/ov_SC03_091_jr_8017A4AC.c index bd866f2f0..f024e3038 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_8017A4AC.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_091/ov_SC03_091_jr_8017D898.c b/src/ov_SC03_091/ov_SC03_091_jr_8017D898.c index d57a691c5..0eead600e 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_8017D898.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_8017D898.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_091/ov_SC03_091_jr_80182268.c b/src/ov_SC03_091/ov_SC03_091_jr_80182268.c index 2b6b0ac34..ea5393fd9 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_80182268.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_80182268.c @@ -786,7 +786,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_092/ov_SC03_092_after.c b/src/ov_SC03_092/ov_SC03_092_after.c index 0ca9b543f..49efc3b03 100644 --- a/src/ov_SC03_092/ov_SC03_092_after.c +++ b/src/ov_SC03_092/ov_SC03_092_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_092/nonmatchings/ov_SC03_092_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_092/ov_SC03_092_jr_8015444C.c b/src/ov_SC03_092/ov_SC03_092_jr_8015444C.c index d9507dede..516f5c2df 100644 --- a/src/ov_SC03_092/ov_SC03_092_jr_8015444C.c +++ b/src/ov_SC03_092/ov_SC03_092_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_092/ov_SC03_092_jr_8015A3C8.c b/src/ov_SC03_092/ov_SC03_092_jr_8015A3C8.c index 472b3170c..f66e134ee 100644 --- a/src/ov_SC03_092/ov_SC03_092_jr_8015A3C8.c +++ b/src/ov_SC03_092/ov_SC03_092_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_092/ov_SC03_092_jr_8015AE2C.c b/src/ov_SC03_092/ov_SC03_092_jr_8015AE2C.c index fd69e82d4..6312c0db0 100644 --- a/src/ov_SC03_092/ov_SC03_092_jr_8015AE2C.c +++ b/src/ov_SC03_092/ov_SC03_092_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_092/ov_SC03_092_jr_8016AB6C.c b/src/ov_SC03_092/ov_SC03_092_jr_8016AB6C.c index 1c38541d9..5251ece8a 100644 --- a/src/ov_SC03_092/ov_SC03_092_jr_8016AB6C.c +++ b/src/ov_SC03_092/ov_SC03_092_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_092/ov_SC03_092_jr_801734BC.c b/src/ov_SC03_092/ov_SC03_092_jr_801734BC.c index f4ab03ddc..596d8020a 100644 --- a/src/ov_SC03_092/ov_SC03_092_jr_801734BC.c +++ b/src/ov_SC03_092/ov_SC03_092_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_092/ov_SC03_092_jr_80178D40.c b/src/ov_SC03_092/ov_SC03_092_jr_80178D40.c index b03ae62d3..cbf0cf7f8 100644 --- a/src/ov_SC03_092/ov_SC03_092_jr_80178D40.c +++ b/src/ov_SC03_092/ov_SC03_092_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_092/ov_SC03_092_jr_8017A4AC.c b/src/ov_SC03_092/ov_SC03_092_jr_8017A4AC.c index 05600532d..7ebb929ee 100644 --- a/src/ov_SC03_092/ov_SC03_092_jr_8017A4AC.c +++ b/src/ov_SC03_092/ov_SC03_092_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_093/ov_SC03_093_after.c b/src/ov_SC03_093/ov_SC03_093_after.c index 01d9c875d..9b3cdce5f 100644 --- a/src/ov_SC03_093/ov_SC03_093_after.c +++ b/src/ov_SC03_093/ov_SC03_093_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_093/nonmatchings/ov_SC03_093_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_093/ov_SC03_093_jr_8015444C.c b/src/ov_SC03_093/ov_SC03_093_jr_8015444C.c index 1587cb20c..7f95649a2 100644 --- a/src/ov_SC03_093/ov_SC03_093_jr_8015444C.c +++ b/src/ov_SC03_093/ov_SC03_093_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_093/ov_SC03_093_jr_8015A3C8.c b/src/ov_SC03_093/ov_SC03_093_jr_8015A3C8.c index 18e38793b..4052c1cfe 100644 --- a/src/ov_SC03_093/ov_SC03_093_jr_8015A3C8.c +++ b/src/ov_SC03_093/ov_SC03_093_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_093/ov_SC03_093_jr_8015AE2C.c b/src/ov_SC03_093/ov_SC03_093_jr_8015AE2C.c index c0f0dd9dc..9505b95b4 100644 --- a/src/ov_SC03_093/ov_SC03_093_jr_8015AE2C.c +++ b/src/ov_SC03_093/ov_SC03_093_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_093/ov_SC03_093_jr_8016AB6C.c b/src/ov_SC03_093/ov_SC03_093_jr_8016AB6C.c index 0b6464056..e08bfec2d 100644 --- a/src/ov_SC03_093/ov_SC03_093_jr_8016AB6C.c +++ b/src/ov_SC03_093/ov_SC03_093_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_093/ov_SC03_093_jr_801734BC.c b/src/ov_SC03_093/ov_SC03_093_jr_801734BC.c index c6fa9c5a3..716ef8fb6 100644 --- a/src/ov_SC03_093/ov_SC03_093_jr_801734BC.c +++ b/src/ov_SC03_093/ov_SC03_093_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_093/ov_SC03_093_jr_80178D40.c b/src/ov_SC03_093/ov_SC03_093_jr_80178D40.c index 4a3976ad6..3487e1e0a 100644 --- a/src/ov_SC03_093/ov_SC03_093_jr_80178D40.c +++ b/src/ov_SC03_093/ov_SC03_093_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_093/ov_SC03_093_jr_8017A4AC.c b/src/ov_SC03_093/ov_SC03_093_jr_8017A4AC.c index 1e118badf..920bea073 100644 --- a/src/ov_SC03_093/ov_SC03_093_jr_8017A4AC.c +++ b/src/ov_SC03_093/ov_SC03_093_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_093/ov_SC03_093_jr_8017D898.c b/src/ov_SC03_093/ov_SC03_093_jr_8017D898.c index fa2e2ecb5..35f36e498 100644 --- a/src/ov_SC03_093/ov_SC03_093_jr_8017D898.c +++ b/src/ov_SC03_093/ov_SC03_093_jr_8017D898.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_094/ov_SC03_094_after.c b/src/ov_SC03_094/ov_SC03_094_after.c index eb141e1be..e16cce28e 100644 --- a/src/ov_SC03_094/ov_SC03_094_after.c +++ b/src/ov_SC03_094/ov_SC03_094_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_094/nonmatchings/ov_SC03_094_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_094/ov_SC03_094_jr_8015444C.c b/src/ov_SC03_094/ov_SC03_094_jr_8015444C.c index 5bccd46ae..dc4137a59 100644 --- a/src/ov_SC03_094/ov_SC03_094_jr_8015444C.c +++ b/src/ov_SC03_094/ov_SC03_094_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_094/ov_SC03_094_jr_8015A3C8.c b/src/ov_SC03_094/ov_SC03_094_jr_8015A3C8.c index ab4870320..80288beec 100644 --- a/src/ov_SC03_094/ov_SC03_094_jr_8015A3C8.c +++ b/src/ov_SC03_094/ov_SC03_094_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_094/ov_SC03_094_jr_8015AE2C.c b/src/ov_SC03_094/ov_SC03_094_jr_8015AE2C.c index 9151554f9..c5d400652 100644 --- a/src/ov_SC03_094/ov_SC03_094_jr_8015AE2C.c +++ b/src/ov_SC03_094/ov_SC03_094_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_094/ov_SC03_094_jr_8016AB6C.c b/src/ov_SC03_094/ov_SC03_094_jr_8016AB6C.c index 8debc44a0..7b29f0f45 100644 --- a/src/ov_SC03_094/ov_SC03_094_jr_8016AB6C.c +++ b/src/ov_SC03_094/ov_SC03_094_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_094/ov_SC03_094_jr_801734BC.c b/src/ov_SC03_094/ov_SC03_094_jr_801734BC.c index 3a9f8f0ec..0e3fe63ce 100644 --- a/src/ov_SC03_094/ov_SC03_094_jr_801734BC.c +++ b/src/ov_SC03_094/ov_SC03_094_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_094/ov_SC03_094_jr_80178D40.c b/src/ov_SC03_094/ov_SC03_094_jr_80178D40.c index bd53643ad..4f529f12d 100644 --- a/src/ov_SC03_094/ov_SC03_094_jr_80178D40.c +++ b/src/ov_SC03_094/ov_SC03_094_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_094/ov_SC03_094_jr_8017A4AC.c b/src/ov_SC03_094/ov_SC03_094_jr_8017A4AC.c index 0d3f84d9d..42fe134ff 100644 --- a/src/ov_SC03_094/ov_SC03_094_jr_8017A4AC.c +++ b/src/ov_SC03_094/ov_SC03_094_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_094/ov_SC03_094_jr_8017BEBC.c b/src/ov_SC03_094/ov_SC03_094_jr_8017BEBC.c index d51bf37c4..b87511853 100644 --- a/src/ov_SC03_094/ov_SC03_094_jr_8017BEBC.c +++ b/src/ov_SC03_094/ov_SC03_094_jr_8017BEBC.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_095/ov_SC03_095_after.c b/src/ov_SC03_095/ov_SC03_095_after.c index 6a4bbfc99..4c480167f 100644 --- a/src/ov_SC03_095/ov_SC03_095_after.c +++ b/src/ov_SC03_095/ov_SC03_095_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_095/ov_SC03_095_jr_8015444C.c b/src/ov_SC03_095/ov_SC03_095_jr_8015444C.c index 02ebba2bd..76363f450 100644 --- a/src/ov_SC03_095/ov_SC03_095_jr_8015444C.c +++ b/src/ov_SC03_095/ov_SC03_095_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_095/ov_SC03_095_jr_8015A3C8.c b/src/ov_SC03_095/ov_SC03_095_jr_8015A3C8.c index b2c158833..6719c6528 100644 --- a/src/ov_SC03_095/ov_SC03_095_jr_8015A3C8.c +++ b/src/ov_SC03_095/ov_SC03_095_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_095/ov_SC03_095_jr_8015AE2C.c b/src/ov_SC03_095/ov_SC03_095_jr_8015AE2C.c index 2ed7c255c..c8cd8e506 100644 --- a/src/ov_SC03_095/ov_SC03_095_jr_8015AE2C.c +++ b/src/ov_SC03_095/ov_SC03_095_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_095/ov_SC03_095_jr_8016AB6C.c b/src/ov_SC03_095/ov_SC03_095_jr_8016AB6C.c index d4eb763f3..c3b65875d 100644 --- a/src/ov_SC03_095/ov_SC03_095_jr_8016AB6C.c +++ b/src/ov_SC03_095/ov_SC03_095_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_095/ov_SC03_095_jr_801734BC.c b/src/ov_SC03_095/ov_SC03_095_jr_801734BC.c index f862b2b0d..00a0f32cb 100644 --- a/src/ov_SC03_095/ov_SC03_095_jr_801734BC.c +++ b/src/ov_SC03_095/ov_SC03_095_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_095/ov_SC03_095_jr_80178D40.c b/src/ov_SC03_095/ov_SC03_095_jr_80178D40.c index d7789f0eb..3b37ea18c 100644 --- a/src/ov_SC03_095/ov_SC03_095_jr_80178D40.c +++ b/src/ov_SC03_095/ov_SC03_095_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_095/ov_SC03_095_jr_8017A4AC.c b/src/ov_SC03_095/ov_SC03_095_jr_8017A4AC.c index a9b7dc2b2..8a2bea3ea 100644 --- a/src/ov_SC03_095/ov_SC03_095_jr_8017A4AC.c +++ b/src/ov_SC03_095/ov_SC03_095_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_095/ov_SC03_095_jr_8017BEBC.c b/src/ov_SC03_095/ov_SC03_095_jr_8017BEBC.c index cd6de276a..23349ef8b 100644 --- a/src/ov_SC03_095/ov_SC03_095_jr_8017BEBC.c +++ b/src/ov_SC03_095/ov_SC03_095_jr_8017BEBC.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_096/ov_SC03_096_after.c b/src/ov_SC03_096/ov_SC03_096_after.c index afacddae3..a9acbb632 100644 --- a/src/ov_SC03_096/ov_SC03_096_after.c +++ b/src/ov_SC03_096/ov_SC03_096_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_096/nonmatchings/ov_SC03_096_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_096/ov_SC03_096_jr_8015444C.c b/src/ov_SC03_096/ov_SC03_096_jr_8015444C.c index d19422f5a..02f8b6b59 100644 --- a/src/ov_SC03_096/ov_SC03_096_jr_8015444C.c +++ b/src/ov_SC03_096/ov_SC03_096_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_096/ov_SC03_096_jr_8015A3C8.c b/src/ov_SC03_096/ov_SC03_096_jr_8015A3C8.c index 675c7ad3c..ee716f162 100644 --- a/src/ov_SC03_096/ov_SC03_096_jr_8015A3C8.c +++ b/src/ov_SC03_096/ov_SC03_096_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_096/ov_SC03_096_jr_8015AE2C.c b/src/ov_SC03_096/ov_SC03_096_jr_8015AE2C.c index 83a623fc5..7a53133b6 100644 --- a/src/ov_SC03_096/ov_SC03_096_jr_8015AE2C.c +++ b/src/ov_SC03_096/ov_SC03_096_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_096/ov_SC03_096_jr_8016AB6C.c b/src/ov_SC03_096/ov_SC03_096_jr_8016AB6C.c index 23da14fe9..3e2e3c894 100644 --- a/src/ov_SC03_096/ov_SC03_096_jr_8016AB6C.c +++ b/src/ov_SC03_096/ov_SC03_096_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_096/ov_SC03_096_jr_801734BC.c b/src/ov_SC03_096/ov_SC03_096_jr_801734BC.c index 065e4b462..ace5ae724 100644 --- a/src/ov_SC03_096/ov_SC03_096_jr_801734BC.c +++ b/src/ov_SC03_096/ov_SC03_096_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_096/ov_SC03_096_jr_80178D40.c b/src/ov_SC03_096/ov_SC03_096_jr_80178D40.c index e5fb8db29..5cb67477e 100644 --- a/src/ov_SC03_096/ov_SC03_096_jr_80178D40.c +++ b/src/ov_SC03_096/ov_SC03_096_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_096/ov_SC03_096_jr_8017A4AC.c b/src/ov_SC03_096/ov_SC03_096_jr_8017A4AC.c index c1e0d2e92..86a01597a 100644 --- a/src/ov_SC03_096/ov_SC03_096_jr_8017A4AC.c +++ b/src/ov_SC03_096/ov_SC03_096_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_096/ov_SC03_096_jr_8017BEBC.c b/src/ov_SC03_096/ov_SC03_096_jr_8017BEBC.c index e7e6f3a48..d1ed6385e 100644 --- a/src/ov_SC03_096/ov_SC03_096_jr_8017BEBC.c +++ b/src/ov_SC03_096/ov_SC03_096_jr_8017BEBC.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_097/ov_SC03_097_after.c b/src/ov_SC03_097/ov_SC03_097_after.c index 8f26e2c03..be9ec872a 100644 --- a/src/ov_SC03_097/ov_SC03_097_after.c +++ b/src/ov_SC03_097/ov_SC03_097_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_097/ov_SC03_097_jr_8015444C.c b/src/ov_SC03_097/ov_SC03_097_jr_8015444C.c index a77a27be6..97d997243 100644 --- a/src/ov_SC03_097/ov_SC03_097_jr_8015444C.c +++ b/src/ov_SC03_097/ov_SC03_097_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_097/ov_SC03_097_jr_8015A3C8.c b/src/ov_SC03_097/ov_SC03_097_jr_8015A3C8.c index 9791f55b4..f50b9a276 100644 --- a/src/ov_SC03_097/ov_SC03_097_jr_8015A3C8.c +++ b/src/ov_SC03_097/ov_SC03_097_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_097/ov_SC03_097_jr_8015AE2C.c b/src/ov_SC03_097/ov_SC03_097_jr_8015AE2C.c index 336922308..f2d155518 100644 --- a/src/ov_SC03_097/ov_SC03_097_jr_8015AE2C.c +++ b/src/ov_SC03_097/ov_SC03_097_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_097/ov_SC03_097_jr_8016AB6C.c b/src/ov_SC03_097/ov_SC03_097_jr_8016AB6C.c index 51e2b6863..0ae52f019 100644 --- a/src/ov_SC03_097/ov_SC03_097_jr_8016AB6C.c +++ b/src/ov_SC03_097/ov_SC03_097_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_097/ov_SC03_097_jr_801734BC.c b/src/ov_SC03_097/ov_SC03_097_jr_801734BC.c index c6ce3fc0f..55b61fb58 100644 --- a/src/ov_SC03_097/ov_SC03_097_jr_801734BC.c +++ b/src/ov_SC03_097/ov_SC03_097_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_097/ov_SC03_097_jr_80178D40.c b/src/ov_SC03_097/ov_SC03_097_jr_80178D40.c index 6ae25a66f..8f2fb149e 100644 --- a/src/ov_SC03_097/ov_SC03_097_jr_80178D40.c +++ b/src/ov_SC03_097/ov_SC03_097_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_097/ov_SC03_097_jr_8017A4AC.c b/src/ov_SC03_097/ov_SC03_097_jr_8017A4AC.c index f15ab7eda..6871308c0 100644 --- a/src/ov_SC03_097/ov_SC03_097_jr_8017A4AC.c +++ b/src/ov_SC03_097/ov_SC03_097_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_097/ov_SC03_097_jr_8017D898.c b/src/ov_SC03_097/ov_SC03_097_jr_8017D898.c index 50c629e5e..f92ab454a 100644 --- a/src/ov_SC03_097/ov_SC03_097_jr_8017D898.c +++ b/src/ov_SC03_097/ov_SC03_097_jr_8017D898.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_098/ov_SC03_098_after.c b/src/ov_SC03_098/ov_SC03_098_after.c index 99a7b8284..e29cc6278 100644 --- a/src/ov_SC03_098/ov_SC03_098_after.c +++ b/src/ov_SC03_098/ov_SC03_098_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_098/nonmatchings/ov_SC03_098_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_098/ov_SC03_098_jr_8015444C.c b/src/ov_SC03_098/ov_SC03_098_jr_8015444C.c index d3da10f0c..344913e37 100644 --- a/src/ov_SC03_098/ov_SC03_098_jr_8015444C.c +++ b/src/ov_SC03_098/ov_SC03_098_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_098/ov_SC03_098_jr_8015A3C8.c b/src/ov_SC03_098/ov_SC03_098_jr_8015A3C8.c index 992886766..455743a78 100644 --- a/src/ov_SC03_098/ov_SC03_098_jr_8015A3C8.c +++ b/src/ov_SC03_098/ov_SC03_098_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_098/ov_SC03_098_jr_8015AE2C.c b/src/ov_SC03_098/ov_SC03_098_jr_8015AE2C.c index 6fe6fee22..a36e09897 100644 --- a/src/ov_SC03_098/ov_SC03_098_jr_8015AE2C.c +++ b/src/ov_SC03_098/ov_SC03_098_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_098/ov_SC03_098_jr_8016AB6C.c b/src/ov_SC03_098/ov_SC03_098_jr_8016AB6C.c index 2a82ca0de..e7e697922 100644 --- a/src/ov_SC03_098/ov_SC03_098_jr_8016AB6C.c +++ b/src/ov_SC03_098/ov_SC03_098_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_098/ov_SC03_098_jr_801734BC.c b/src/ov_SC03_098/ov_SC03_098_jr_801734BC.c index 1cc2a674a..bb04f292b 100644 --- a/src/ov_SC03_098/ov_SC03_098_jr_801734BC.c +++ b/src/ov_SC03_098/ov_SC03_098_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_098/ov_SC03_098_jr_80178D40.c b/src/ov_SC03_098/ov_SC03_098_jr_80178D40.c index 404501471..554f63410 100644 --- a/src/ov_SC03_098/ov_SC03_098_jr_80178D40.c +++ b/src/ov_SC03_098/ov_SC03_098_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_098/ov_SC03_098_jr_8017A4AC.c b/src/ov_SC03_098/ov_SC03_098_jr_8017A4AC.c index 141007b8f..cad9c954f 100644 --- a/src/ov_SC03_098/ov_SC03_098_jr_8017A4AC.c +++ b/src/ov_SC03_098/ov_SC03_098_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_098/ov_SC03_098_jr_8017D898.c b/src/ov_SC03_098/ov_SC03_098_jr_8017D898.c index b6f453a41..6f91679c5 100644 --- a/src/ov_SC03_098/ov_SC03_098_jr_8017D898.c +++ b/src/ov_SC03_098/ov_SC03_098_jr_8017D898.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_099/ov_SC03_099_after.c b/src/ov_SC03_099/ov_SC03_099_after.c index e60bec5cb..400bc9df1 100644 --- a/src/ov_SC03_099/ov_SC03_099_after.c +++ b/src/ov_SC03_099/ov_SC03_099_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_099/nonmatchings/ov_SC03_099_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_099/ov_SC03_099_jr_8015444C.c b/src/ov_SC03_099/ov_SC03_099_jr_8015444C.c index 062b1f7e4..da5a7b61e 100644 --- a/src/ov_SC03_099/ov_SC03_099_jr_8015444C.c +++ b/src/ov_SC03_099/ov_SC03_099_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_099/ov_SC03_099_jr_8015A3C8.c b/src/ov_SC03_099/ov_SC03_099_jr_8015A3C8.c index 3e6deaecf..72d0f8ce3 100644 --- a/src/ov_SC03_099/ov_SC03_099_jr_8015A3C8.c +++ b/src/ov_SC03_099/ov_SC03_099_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_099/ov_SC03_099_jr_8015AE2C.c b/src/ov_SC03_099/ov_SC03_099_jr_8015AE2C.c index 98aa329cb..ca63c1ff7 100644 --- a/src/ov_SC03_099/ov_SC03_099_jr_8015AE2C.c +++ b/src/ov_SC03_099/ov_SC03_099_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_099/ov_SC03_099_jr_8016AB6C.c b/src/ov_SC03_099/ov_SC03_099_jr_8016AB6C.c index cc021918f..0c42f04ae 100644 --- a/src/ov_SC03_099/ov_SC03_099_jr_8016AB6C.c +++ b/src/ov_SC03_099/ov_SC03_099_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_099/ov_SC03_099_jr_801734BC.c b/src/ov_SC03_099/ov_SC03_099_jr_801734BC.c index cb26968fa..64f7c23ce 100644 --- a/src/ov_SC03_099/ov_SC03_099_jr_801734BC.c +++ b/src/ov_SC03_099/ov_SC03_099_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_099/ov_SC03_099_jr_80178D40.c b/src/ov_SC03_099/ov_SC03_099_jr_80178D40.c index 44f9564ea..6f430edc6 100644 --- a/src/ov_SC03_099/ov_SC03_099_jr_80178D40.c +++ b/src/ov_SC03_099/ov_SC03_099_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_099/ov_SC03_099_jr_8017A4AC.c b/src/ov_SC03_099/ov_SC03_099_jr_8017A4AC.c index 62df74e96..3bfb2cb61 100644 --- a/src/ov_SC03_099/ov_SC03_099_jr_8017A4AC.c +++ b/src/ov_SC03_099/ov_SC03_099_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_099/ov_SC03_099_jr_8017BEBC.c b/src/ov_SC03_099/ov_SC03_099_jr_8017BEBC.c index b6c8460fa..2e01b9060 100644 --- a/src/ov_SC03_099/ov_SC03_099_jr_8017BEBC.c +++ b/src/ov_SC03_099/ov_SC03_099_jr_8017BEBC.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_100/ov_SC03_100_after.c b/src/ov_SC03_100/ov_SC03_100_after.c index 2efd7b41e..0e381bccf 100644 --- a/src/ov_SC03_100/ov_SC03_100_after.c +++ b/src/ov_SC03_100/ov_SC03_100_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_100/nonmatchings/ov_SC03_100_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_100/ov_SC03_100_jr_8015444C.c b/src/ov_SC03_100/ov_SC03_100_jr_8015444C.c index 8503206a3..868d4d62f 100644 --- a/src/ov_SC03_100/ov_SC03_100_jr_8015444C.c +++ b/src/ov_SC03_100/ov_SC03_100_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_100/ov_SC03_100_jr_8015A3C8.c b/src/ov_SC03_100/ov_SC03_100_jr_8015A3C8.c index 4980f3f0f..bb4a1e602 100644 --- a/src/ov_SC03_100/ov_SC03_100_jr_8015A3C8.c +++ b/src/ov_SC03_100/ov_SC03_100_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_100/ov_SC03_100_jr_8015AE2C.c b/src/ov_SC03_100/ov_SC03_100_jr_8015AE2C.c index 24357168c..f086583f0 100644 --- a/src/ov_SC03_100/ov_SC03_100_jr_8015AE2C.c +++ b/src/ov_SC03_100/ov_SC03_100_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_100/ov_SC03_100_jr_8016AB6C.c b/src/ov_SC03_100/ov_SC03_100_jr_8016AB6C.c index e11a9eccb..3fad8fd2c 100644 --- a/src/ov_SC03_100/ov_SC03_100_jr_8016AB6C.c +++ b/src/ov_SC03_100/ov_SC03_100_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_100/ov_SC03_100_jr_801734BC.c b/src/ov_SC03_100/ov_SC03_100_jr_801734BC.c index 17fd68436..34ea2b709 100644 --- a/src/ov_SC03_100/ov_SC03_100_jr_801734BC.c +++ b/src/ov_SC03_100/ov_SC03_100_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_100/ov_SC03_100_jr_80178D40.c b/src/ov_SC03_100/ov_SC03_100_jr_80178D40.c index 7cb8cce31..2895f78ad 100644 --- a/src/ov_SC03_100/ov_SC03_100_jr_80178D40.c +++ b/src/ov_SC03_100/ov_SC03_100_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_100/ov_SC03_100_jr_8017A4AC.c b/src/ov_SC03_100/ov_SC03_100_jr_8017A4AC.c index ea0bdf2c7..62684034d 100644 --- a/src/ov_SC03_100/ov_SC03_100_jr_8017A4AC.c +++ b/src/ov_SC03_100/ov_SC03_100_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_100/ov_SC03_100_jr_8017D898.c b/src/ov_SC03_100/ov_SC03_100_jr_8017D898.c index e5cf53fb2..fc36b57cc 100644 --- a/src/ov_SC03_100/ov_SC03_100_jr_8017D898.c +++ b/src/ov_SC03_100/ov_SC03_100_jr_8017D898.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_101/ov_SC03_101_after.c b/src/ov_SC03_101/ov_SC03_101_after.c index 7d5bb8794..518ea58b6 100644 --- a/src/ov_SC03_101/ov_SC03_101_after.c +++ b/src/ov_SC03_101/ov_SC03_101_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_101/nonmatchings/ov_SC03_101_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_101/ov_SC03_101_jr_8015444C.c b/src/ov_SC03_101/ov_SC03_101_jr_8015444C.c index 854de609f..500c72c43 100644 --- a/src/ov_SC03_101/ov_SC03_101_jr_8015444C.c +++ b/src/ov_SC03_101/ov_SC03_101_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_101/ov_SC03_101_jr_8015A3C8.c b/src/ov_SC03_101/ov_SC03_101_jr_8015A3C8.c index ae19f6ece..4a2591046 100644 --- a/src/ov_SC03_101/ov_SC03_101_jr_8015A3C8.c +++ b/src/ov_SC03_101/ov_SC03_101_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_101/ov_SC03_101_jr_8015AE2C.c b/src/ov_SC03_101/ov_SC03_101_jr_8015AE2C.c index 5a189b6a8..887743b5e 100644 --- a/src/ov_SC03_101/ov_SC03_101_jr_8015AE2C.c +++ b/src/ov_SC03_101/ov_SC03_101_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_101/ov_SC03_101_jr_8016AB6C.c b/src/ov_SC03_101/ov_SC03_101_jr_8016AB6C.c index 0f83856ab..e815f92d1 100644 --- a/src/ov_SC03_101/ov_SC03_101_jr_8016AB6C.c +++ b/src/ov_SC03_101/ov_SC03_101_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_101/ov_SC03_101_jr_801734BC.c b/src/ov_SC03_101/ov_SC03_101_jr_801734BC.c index 0dae69063..624ffc42b 100644 --- a/src/ov_SC03_101/ov_SC03_101_jr_801734BC.c +++ b/src/ov_SC03_101/ov_SC03_101_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_101/ov_SC03_101_jr_80178D40.c b/src/ov_SC03_101/ov_SC03_101_jr_80178D40.c index 84db757db..405bd8f7c 100644 --- a/src/ov_SC03_101/ov_SC03_101_jr_80178D40.c +++ b/src/ov_SC03_101/ov_SC03_101_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_101/ov_SC03_101_jr_8017A4AC.c b/src/ov_SC03_101/ov_SC03_101_jr_8017A4AC.c index 56b477770..2a12aeff2 100644 --- a/src/ov_SC03_101/ov_SC03_101_jr_8017A4AC.c +++ b/src/ov_SC03_101/ov_SC03_101_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_101/ov_SC03_101_jr_8017CA80.c b/src/ov_SC03_101/ov_SC03_101_jr_8017CA80.c index ac577d3e8..d92ed2aa5 100644 --- a/src/ov_SC03_101/ov_SC03_101_jr_8017CA80.c +++ b/src/ov_SC03_101/ov_SC03_101_jr_8017CA80.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_102/ov_SC03_102_after.c b/src/ov_SC03_102/ov_SC03_102_after.c index 16737b9a8..b13053d50 100644 --- a/src/ov_SC03_102/ov_SC03_102_after.c +++ b/src/ov_SC03_102/ov_SC03_102_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_102/nonmatchings/ov_SC03_102_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_102/ov_SC03_102_jr_8015444C.c b/src/ov_SC03_102/ov_SC03_102_jr_8015444C.c index 8daee0c1f..f7ae28463 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_8015444C.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_102/ov_SC03_102_jr_8015A3C8.c b/src/ov_SC03_102/ov_SC03_102_jr_8015A3C8.c index c238976d1..c7f05bd69 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_8015A3C8.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_102/ov_SC03_102_jr_8015AE2C.c b/src/ov_SC03_102/ov_SC03_102_jr_8015AE2C.c index 570d3d682..81968eed8 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_8015AE2C.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_102/ov_SC03_102_jr_8016AB6C.c b/src/ov_SC03_102/ov_SC03_102_jr_8016AB6C.c index c4c37e24f..db1e8ac3b 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_8016AB6C.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_102/ov_SC03_102_jr_801734BC.c b/src/ov_SC03_102/ov_SC03_102_jr_801734BC.c index 956d80426..49a64cf4e 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_801734BC.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_102/ov_SC03_102_jr_80178D40.c b/src/ov_SC03_102/ov_SC03_102_jr_80178D40.c index 05d440b43..8c43ae743 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_80178D40.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_102/ov_SC03_102_jr_8017A4AC.c b/src/ov_SC03_102/ov_SC03_102_jr_8017A4AC.c index 984aa64b9..aed564de2 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_8017A4AC.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_102/ov_SC03_102_jr_8017BEBC.c b/src/ov_SC03_102/ov_SC03_102_jr_8017BEBC.c index f5e8dd030..2df22b665 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_8017BEBC.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_8017BEBC.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_103/ov_SC03_103_after.c b/src/ov_SC03_103/ov_SC03_103_after.c index 999299ff2..15d1abaf6 100644 --- a/src/ov_SC03_103/ov_SC03_103_after.c +++ b/src/ov_SC03_103/ov_SC03_103_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_103/nonmatchings/ov_SC03_103_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_103/ov_SC03_103_jr_8015444C.c b/src/ov_SC03_103/ov_SC03_103_jr_8015444C.c index cdccc6a0e..d2fcf0d81 100644 --- a/src/ov_SC03_103/ov_SC03_103_jr_8015444C.c +++ b/src/ov_SC03_103/ov_SC03_103_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_103/ov_SC03_103_jr_8015A3C8.c b/src/ov_SC03_103/ov_SC03_103_jr_8015A3C8.c index c251fde9f..dc4fceb8c 100644 --- a/src/ov_SC03_103/ov_SC03_103_jr_8015A3C8.c +++ b/src/ov_SC03_103/ov_SC03_103_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_103/ov_SC03_103_jr_8015AE2C.c b/src/ov_SC03_103/ov_SC03_103_jr_8015AE2C.c index 981c044fb..f8eb52ef8 100644 --- a/src/ov_SC03_103/ov_SC03_103_jr_8015AE2C.c +++ b/src/ov_SC03_103/ov_SC03_103_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_103/ov_SC03_103_jr_8016AB6C.c b/src/ov_SC03_103/ov_SC03_103_jr_8016AB6C.c index 57e13b25c..fbc917fe6 100644 --- a/src/ov_SC03_103/ov_SC03_103_jr_8016AB6C.c +++ b/src/ov_SC03_103/ov_SC03_103_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_103/ov_SC03_103_jr_801734BC.c b/src/ov_SC03_103/ov_SC03_103_jr_801734BC.c index 75fb5c78d..5be72b0f1 100644 --- a/src/ov_SC03_103/ov_SC03_103_jr_801734BC.c +++ b/src/ov_SC03_103/ov_SC03_103_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_103/ov_SC03_103_jr_80178D40.c b/src/ov_SC03_103/ov_SC03_103_jr_80178D40.c index c0412baa0..375e16487 100644 --- a/src/ov_SC03_103/ov_SC03_103_jr_80178D40.c +++ b/src/ov_SC03_103/ov_SC03_103_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_103/ov_SC03_103_jr_8017A4AC.c b/src/ov_SC03_103/ov_SC03_103_jr_8017A4AC.c index 41ea5c0f3..22063ebc6 100644 --- a/src/ov_SC03_103/ov_SC03_103_jr_8017A4AC.c +++ b/src/ov_SC03_103/ov_SC03_103_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_103/ov_SC03_103_jr_8017C294.c b/src/ov_SC03_103/ov_SC03_103_jr_8017C294.c index f1d26c8ea..8bbb05b51 100644 --- a/src/ov_SC03_103/ov_SC03_103_jr_8017C294.c +++ b/src/ov_SC03_103/ov_SC03_103_jr_8017C294.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_104/ov_SC03_104_after.c b/src/ov_SC03_104/ov_SC03_104_after.c index 4a8d7062f..e7074c848 100644 --- a/src/ov_SC03_104/ov_SC03_104_after.c +++ b/src/ov_SC03_104/ov_SC03_104_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_104/nonmatchings/ov_SC03_104_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_104/ov_SC03_104_jr_8015444C.c b/src/ov_SC03_104/ov_SC03_104_jr_8015444C.c index aa9f457f5..2eea91813 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_8015444C.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_104/ov_SC03_104_jr_8015A3C8.c b/src/ov_SC03_104/ov_SC03_104_jr_8015A3C8.c index 6b73bef59..b9fbb99b8 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_8015A3C8.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_104/ov_SC03_104_jr_8015AE2C.c b/src/ov_SC03_104/ov_SC03_104_jr_8015AE2C.c index f7aa28852..b25f5f522 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_8015AE2C.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_104/ov_SC03_104_jr_8016AB6C.c b/src/ov_SC03_104/ov_SC03_104_jr_8016AB6C.c index bf0e36f9b..23fcb33a0 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_8016AB6C.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_104/ov_SC03_104_jr_801734BC.c b/src/ov_SC03_104/ov_SC03_104_jr_801734BC.c index 679bb5033..bb54492aa 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_801734BC.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_104/ov_SC03_104_jr_80178D40.c b/src/ov_SC03_104/ov_SC03_104_jr_80178D40.c index 47bbaae92..7fce69e00 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_80178D40.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_104/ov_SC03_104_jr_8017A4AC.c b/src/ov_SC03_104/ov_SC03_104_jr_8017A4AC.c index 67b2d2740..f690a354c 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_8017A4AC.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_104/ov_SC03_104_jr_8017CA80.c b/src/ov_SC03_104/ov_SC03_104_jr_8017CA80.c index 64894475e..b197f1d1a 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_8017CA80.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_8017CA80.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_105/ov_SC03_105_after.c b/src/ov_SC03_105/ov_SC03_105_after.c index cb2c8fa7b..a8f15fee9 100644 --- a/src/ov_SC03_105/ov_SC03_105_after.c +++ b/src/ov_SC03_105/ov_SC03_105_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_105/nonmatchings/ov_SC03_105_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_105/ov_SC03_105_jr_8015444C.c b/src/ov_SC03_105/ov_SC03_105_jr_8015444C.c index 46f5fcaf5..79c5d6baf 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_8015444C.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_105/ov_SC03_105_jr_8015A3C8.c b/src/ov_SC03_105/ov_SC03_105_jr_8015A3C8.c index 726182235..db7fb1921 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_8015A3C8.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_105/ov_SC03_105_jr_8015AE2C.c b/src/ov_SC03_105/ov_SC03_105_jr_8015AE2C.c index d4e0ef600..9c4ddf0de 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_8015AE2C.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_105/ov_SC03_105_jr_8016AB6C.c b/src/ov_SC03_105/ov_SC03_105_jr_8016AB6C.c index 7a2d75b1d..3600eecd5 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_8016AB6C.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_105/ov_SC03_105_jr_801734BC.c b/src/ov_SC03_105/ov_SC03_105_jr_801734BC.c index dc628ba33..a360c7297 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_801734BC.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_105/ov_SC03_105_jr_80178D40.c b/src/ov_SC03_105/ov_SC03_105_jr_80178D40.c index c35d3387c..0a4a3f256 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_80178D40.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_105/ov_SC03_105_jr_8017A4AC.c b/src/ov_SC03_105/ov_SC03_105_jr_8017A4AC.c index a5d4d5b64..987b09646 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_8017A4AC.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_105/ov_SC03_105_jr_8017C8D0.c b/src/ov_SC03_105/ov_SC03_105_jr_8017C8D0.c index 2d209e30e..ff9e3e876 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_8017C8D0.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_8017C8D0.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_108/ov_SC03_108_after.c b/src/ov_SC03_108/ov_SC03_108_after.c index 5c8f3fc9c..b55b0629d 100644 --- a/src/ov_SC03_108/ov_SC03_108_after.c +++ b/src/ov_SC03_108/ov_SC03_108_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_108/nonmatchings/ov_SC03_108_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_108/ov_SC03_108_jr_8015444C.c b/src/ov_SC03_108/ov_SC03_108_jr_8015444C.c index 869a384d4..439accbc1 100644 --- a/src/ov_SC03_108/ov_SC03_108_jr_8015444C.c +++ b/src/ov_SC03_108/ov_SC03_108_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_108/ov_SC03_108_jr_8015A3C8.c b/src/ov_SC03_108/ov_SC03_108_jr_8015A3C8.c index 33d995c5e..f3979a951 100644 --- a/src/ov_SC03_108/ov_SC03_108_jr_8015A3C8.c +++ b/src/ov_SC03_108/ov_SC03_108_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_108/ov_SC03_108_jr_8015AE2C.c b/src/ov_SC03_108/ov_SC03_108_jr_8015AE2C.c index 669e7926b..d4d2ce27e 100644 --- a/src/ov_SC03_108/ov_SC03_108_jr_8015AE2C.c +++ b/src/ov_SC03_108/ov_SC03_108_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_108/ov_SC03_108_jr_8016AB6C.c b/src/ov_SC03_108/ov_SC03_108_jr_8016AB6C.c index a5239bb1c..438ce9dad 100644 --- a/src/ov_SC03_108/ov_SC03_108_jr_8016AB6C.c +++ b/src/ov_SC03_108/ov_SC03_108_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_108/ov_SC03_108_jr_801734BC.c b/src/ov_SC03_108/ov_SC03_108_jr_801734BC.c index a3fcd2e69..a475bff4e 100644 --- a/src/ov_SC03_108/ov_SC03_108_jr_801734BC.c +++ b/src/ov_SC03_108/ov_SC03_108_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_108/ov_SC03_108_jr_80178D40.c b/src/ov_SC03_108/ov_SC03_108_jr_80178D40.c index b8a8bf77e..c612583fc 100644 --- a/src/ov_SC03_108/ov_SC03_108_jr_80178D40.c +++ b/src/ov_SC03_108/ov_SC03_108_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_108/ov_SC03_108_jr_8017A4AC.c b/src/ov_SC03_108/ov_SC03_108_jr_8017A4AC.c index 016f40ff8..7b44f951a 100644 --- a/src/ov_SC03_108/ov_SC03_108_jr_8017A4AC.c +++ b/src/ov_SC03_108/ov_SC03_108_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_108/ov_SC03_108_jr_8017BEBC.c b/src/ov_SC03_108/ov_SC03_108_jr_8017BEBC.c index 401de74f2..f02c92d0b 100644 --- a/src/ov_SC03_108/ov_SC03_108_jr_8017BEBC.c +++ b/src/ov_SC03_108/ov_SC03_108_jr_8017BEBC.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_109/ov_SC03_109_after.c b/src/ov_SC03_109/ov_SC03_109_after.c index 92a52da46..6a632c8c9 100644 --- a/src/ov_SC03_109/ov_SC03_109_after.c +++ b/src/ov_SC03_109/ov_SC03_109_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_109/nonmatchings/ov_SC03_109_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_109/ov_SC03_109_jr_8015444C.c b/src/ov_SC03_109/ov_SC03_109_jr_8015444C.c index 4efbaee6f..697905427 100644 --- a/src/ov_SC03_109/ov_SC03_109_jr_8015444C.c +++ b/src/ov_SC03_109/ov_SC03_109_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_109/ov_SC03_109_jr_8015A3C8.c b/src/ov_SC03_109/ov_SC03_109_jr_8015A3C8.c index 4f820e3c3..16f970b4c 100644 --- a/src/ov_SC03_109/ov_SC03_109_jr_8015A3C8.c +++ b/src/ov_SC03_109/ov_SC03_109_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_109/ov_SC03_109_jr_8015AE2C.c b/src/ov_SC03_109/ov_SC03_109_jr_8015AE2C.c index d8b2eb692..6ece9d4a1 100644 --- a/src/ov_SC03_109/ov_SC03_109_jr_8015AE2C.c +++ b/src/ov_SC03_109/ov_SC03_109_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_109/ov_SC03_109_jr_8016AB6C.c b/src/ov_SC03_109/ov_SC03_109_jr_8016AB6C.c index 265d43849..42cb7aab8 100644 --- a/src/ov_SC03_109/ov_SC03_109_jr_8016AB6C.c +++ b/src/ov_SC03_109/ov_SC03_109_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_109/ov_SC03_109_jr_801734BC.c b/src/ov_SC03_109/ov_SC03_109_jr_801734BC.c index 8fb48a34f..331d5f7b7 100644 --- a/src/ov_SC03_109/ov_SC03_109_jr_801734BC.c +++ b/src/ov_SC03_109/ov_SC03_109_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_109/ov_SC03_109_jr_80178D40.c b/src/ov_SC03_109/ov_SC03_109_jr_80178D40.c index 989738ada..555dfc216 100644 --- a/src/ov_SC03_109/ov_SC03_109_jr_80178D40.c +++ b/src/ov_SC03_109/ov_SC03_109_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_109/ov_SC03_109_jr_8017A4AC.c b/src/ov_SC03_109/ov_SC03_109_jr_8017A4AC.c index 9f2f6a31c..0591bf32b 100644 --- a/src/ov_SC03_109/ov_SC03_109_jr_8017A4AC.c +++ b/src/ov_SC03_109/ov_SC03_109_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_109/ov_SC03_109_jr_8017C180.c b/src/ov_SC03_109/ov_SC03_109_jr_8017C180.c index ae485c613..f5a293cdd 100644 --- a/src/ov_SC03_109/ov_SC03_109_jr_8017C180.c +++ b/src/ov_SC03_109/ov_SC03_109_jr_8017C180.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_110/ov_SC03_110_after.c b/src/ov_SC03_110/ov_SC03_110_after.c index 4f270cf55..247f92537 100644 --- a/src/ov_SC03_110/ov_SC03_110_after.c +++ b/src/ov_SC03_110/ov_SC03_110_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_110/nonmatchings/ov_SC03_110_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_110/ov_SC03_110_jr_8015444C.c b/src/ov_SC03_110/ov_SC03_110_jr_8015444C.c index bb4d9d252..3f9493b62 100644 --- a/src/ov_SC03_110/ov_SC03_110_jr_8015444C.c +++ b/src/ov_SC03_110/ov_SC03_110_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_110/ov_SC03_110_jr_8015A3C8.c b/src/ov_SC03_110/ov_SC03_110_jr_8015A3C8.c index 49a25fe90..ffa9151fa 100644 --- a/src/ov_SC03_110/ov_SC03_110_jr_8015A3C8.c +++ b/src/ov_SC03_110/ov_SC03_110_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_110/ov_SC03_110_jr_8015AE2C.c b/src/ov_SC03_110/ov_SC03_110_jr_8015AE2C.c index ca3d5e02f..25303f64b 100644 --- a/src/ov_SC03_110/ov_SC03_110_jr_8015AE2C.c +++ b/src/ov_SC03_110/ov_SC03_110_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_110/ov_SC03_110_jr_8016AB6C.c b/src/ov_SC03_110/ov_SC03_110_jr_8016AB6C.c index dcdab0feb..abf57b686 100644 --- a/src/ov_SC03_110/ov_SC03_110_jr_8016AB6C.c +++ b/src/ov_SC03_110/ov_SC03_110_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_110/ov_SC03_110_jr_801734BC.c b/src/ov_SC03_110/ov_SC03_110_jr_801734BC.c index db1bce8dd..f007e02a4 100644 --- a/src/ov_SC03_110/ov_SC03_110_jr_801734BC.c +++ b/src/ov_SC03_110/ov_SC03_110_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_110/ov_SC03_110_jr_80178D40.c b/src/ov_SC03_110/ov_SC03_110_jr_80178D40.c index 6d070ebc6..b1de1f786 100644 --- a/src/ov_SC03_110/ov_SC03_110_jr_80178D40.c +++ b/src/ov_SC03_110/ov_SC03_110_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_110/ov_SC03_110_jr_8017A4AC.c b/src/ov_SC03_110/ov_SC03_110_jr_8017A4AC.c index 59c1891b0..d02169d52 100644 --- a/src/ov_SC03_110/ov_SC03_110_jr_8017A4AC.c +++ b/src/ov_SC03_110/ov_SC03_110_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_110/ov_SC03_110_jr_8017D898.c b/src/ov_SC03_110/ov_SC03_110_jr_8017D898.c index ab328b4c8..27891f524 100644 --- a/src/ov_SC03_110/ov_SC03_110_jr_8017D898.c +++ b/src/ov_SC03_110/ov_SC03_110_jr_8017D898.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_111/ov_SC03_111_after.c b/src/ov_SC03_111/ov_SC03_111_after.c index 09bd0b83a..397bc4965 100644 --- a/src/ov_SC03_111/ov_SC03_111_after.c +++ b/src/ov_SC03_111/ov_SC03_111_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_111/nonmatchings/ov_SC03_111_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_111/ov_SC03_111_jr_8015444C.c b/src/ov_SC03_111/ov_SC03_111_jr_8015444C.c index 0f55207ce..1c1b9feeb 100644 --- a/src/ov_SC03_111/ov_SC03_111_jr_8015444C.c +++ b/src/ov_SC03_111/ov_SC03_111_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_111/ov_SC03_111_jr_8015A3C8.c b/src/ov_SC03_111/ov_SC03_111_jr_8015A3C8.c index a20118d20..c3c44a768 100644 --- a/src/ov_SC03_111/ov_SC03_111_jr_8015A3C8.c +++ b/src/ov_SC03_111/ov_SC03_111_jr_8015A3C8.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_111/ov_SC03_111_jr_8015AE2C.c b/src/ov_SC03_111/ov_SC03_111_jr_8015AE2C.c index a18fdba7c..b24563995 100644 --- a/src/ov_SC03_111/ov_SC03_111_jr_8015AE2C.c +++ b/src/ov_SC03_111/ov_SC03_111_jr_8015AE2C.c @@ -643,7 +643,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_111/ov_SC03_111_jr_8016AB6C.c b/src/ov_SC03_111/ov_SC03_111_jr_8016AB6C.c index e83f316fb..cef9e1fe4 100644 --- a/src/ov_SC03_111/ov_SC03_111_jr_8016AB6C.c +++ b/src/ov_SC03_111/ov_SC03_111_jr_8016AB6C.c @@ -752,7 +752,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_111/ov_SC03_111_jr_801734BC.c b/src/ov_SC03_111/ov_SC03_111_jr_801734BC.c index 233ddca68..0d24f8dd8 100644 --- a/src/ov_SC03_111/ov_SC03_111_jr_801734BC.c +++ b/src/ov_SC03_111/ov_SC03_111_jr_801734BC.c @@ -779,7 +779,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_111/ov_SC03_111_jr_80178D40.c b/src/ov_SC03_111/ov_SC03_111_jr_80178D40.c index df61c6b52..5dd487f7c 100644 --- a/src/ov_SC03_111/ov_SC03_111_jr_80178D40.c +++ b/src/ov_SC03_111/ov_SC03_111_jr_80178D40.c @@ -778,7 +778,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_111/ov_SC03_111_jr_8017A4AC.c b/src/ov_SC03_111/ov_SC03_111_jr_8017A4AC.c index c918a6eb2..4b22e2b9a 100644 --- a/src/ov_SC03_111/ov_SC03_111_jr_8017A4AC.c +++ b/src/ov_SC03_111/ov_SC03_111_jr_8017A4AC.c @@ -811,7 +811,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_111/ov_SC03_111_jr_8017EC58.c b/src/ov_SC03_111/ov_SC03_111_jr_8017EC58.c index 4095f6b5d..22225ffa7 100644 --- a/src/ov_SC03_111/ov_SC03_111_jr_8017EC58.c +++ b/src/ov_SC03_111/ov_SC03_111_jr_8017EC58.c @@ -822,7 +822,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_112/ov_SC03_112_after.c b/src/ov_SC03_112/ov_SC03_112_after.c index 7522e86c4..2bfbf13f5 100644 --- a/src/ov_SC03_112/ov_SC03_112_after.c +++ b/src/ov_SC03_112/ov_SC03_112_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_112/nonmatchings/ov_SC03_112_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_112/ov_SC03_112_jr_8015444C.c b/src/ov_SC03_112/ov_SC03_112_jr_8015444C.c index c4466ae15..5dbaf0308 100644 --- a/src/ov_SC03_112/ov_SC03_112_jr_8015444C.c +++ b/src/ov_SC03_112/ov_SC03_112_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_112/ov_SC03_112_jr_8015A3C8.c b/src/ov_SC03_112/ov_SC03_112_jr_8015A3C8.c index ee616772b..403ed2942 100644 --- a/src/ov_SC03_112/ov_SC03_112_jr_8015A3C8.c +++ b/src/ov_SC03_112/ov_SC03_112_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_112/ov_SC03_112_jr_8015AE2C.c b/src/ov_SC03_112/ov_SC03_112_jr_8015AE2C.c index cd83da01f..d83fb258b 100644 --- a/src/ov_SC03_112/ov_SC03_112_jr_8015AE2C.c +++ b/src/ov_SC03_112/ov_SC03_112_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_112/ov_SC03_112_jr_8016AB6C.c b/src/ov_SC03_112/ov_SC03_112_jr_8016AB6C.c index c2510cdb9..2209a7aec 100644 --- a/src/ov_SC03_112/ov_SC03_112_jr_8016AB6C.c +++ b/src/ov_SC03_112/ov_SC03_112_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_112/ov_SC03_112_jr_801734BC.c b/src/ov_SC03_112/ov_SC03_112_jr_801734BC.c index d7ef888ec..a8578d0b3 100644 --- a/src/ov_SC03_112/ov_SC03_112_jr_801734BC.c +++ b/src/ov_SC03_112/ov_SC03_112_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_112/ov_SC03_112_jr_80178D40.c b/src/ov_SC03_112/ov_SC03_112_jr_80178D40.c index ff39df1da..95a8f4ad0 100644 --- a/src/ov_SC03_112/ov_SC03_112_jr_80178D40.c +++ b/src/ov_SC03_112/ov_SC03_112_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_112/ov_SC03_112_jr_8017A4AC.c b/src/ov_SC03_112/ov_SC03_112_jr_8017A4AC.c index 2ea140d41..b22b7156f 100644 --- a/src/ov_SC03_112/ov_SC03_112_jr_8017A4AC.c +++ b/src/ov_SC03_112/ov_SC03_112_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_112/ov_SC03_112_jr_8017C294.c b/src/ov_SC03_112/ov_SC03_112_jr_8017C294.c index 296b96b3f..7dd5953e3 100644 --- a/src/ov_SC03_112/ov_SC03_112_jr_8017C294.c +++ b/src/ov_SC03_112/ov_SC03_112_jr_8017C294.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_113/ov_SC03_113_after.c b/src/ov_SC03_113/ov_SC03_113_after.c index 9d611ff00..eced7f6b0 100644 --- a/src/ov_SC03_113/ov_SC03_113_after.c +++ b/src/ov_SC03_113/ov_SC03_113_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_113/nonmatchings/ov_SC03_113_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_113/ov_SC03_113_jr_8015444C.c b/src/ov_SC03_113/ov_SC03_113_jr_8015444C.c index 6efa23e7f..f797052d4 100644 --- a/src/ov_SC03_113/ov_SC03_113_jr_8015444C.c +++ b/src/ov_SC03_113/ov_SC03_113_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_113/ov_SC03_113_jr_8015A3C8.c b/src/ov_SC03_113/ov_SC03_113_jr_8015A3C8.c index b7ba6dbb9..429f0bcd9 100644 --- a/src/ov_SC03_113/ov_SC03_113_jr_8015A3C8.c +++ b/src/ov_SC03_113/ov_SC03_113_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_113/ov_SC03_113_jr_8015AE2C.c b/src/ov_SC03_113/ov_SC03_113_jr_8015AE2C.c index 2f9d6d235..b543e5e91 100644 --- a/src/ov_SC03_113/ov_SC03_113_jr_8015AE2C.c +++ b/src/ov_SC03_113/ov_SC03_113_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_113/ov_SC03_113_jr_8016AB6C.c b/src/ov_SC03_113/ov_SC03_113_jr_8016AB6C.c index 33d06b06b..552b98a1c 100644 --- a/src/ov_SC03_113/ov_SC03_113_jr_8016AB6C.c +++ b/src/ov_SC03_113/ov_SC03_113_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_113/ov_SC03_113_jr_801734BC.c b/src/ov_SC03_113/ov_SC03_113_jr_801734BC.c index 60f261f9a..edb8b2137 100644 --- a/src/ov_SC03_113/ov_SC03_113_jr_801734BC.c +++ b/src/ov_SC03_113/ov_SC03_113_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_113/ov_SC03_113_jr_80178D40.c b/src/ov_SC03_113/ov_SC03_113_jr_80178D40.c index b56e17637..fabeb63fe 100644 --- a/src/ov_SC03_113/ov_SC03_113_jr_80178D40.c +++ b/src/ov_SC03_113/ov_SC03_113_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_113/ov_SC03_113_jr_8017A4AC.c b/src/ov_SC03_113/ov_SC03_113_jr_8017A4AC.c index 093ebd66b..8fa5e255b 100644 --- a/src/ov_SC03_113/ov_SC03_113_jr_8017A4AC.c +++ b/src/ov_SC03_113/ov_SC03_113_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_113/ov_SC03_113_jr_8017C294.c b/src/ov_SC03_113/ov_SC03_113_jr_8017C294.c index ba7b201e2..9e5af61e8 100644 --- a/src/ov_SC03_113/ov_SC03_113_jr_8017C294.c +++ b/src/ov_SC03_113/ov_SC03_113_jr_8017C294.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_114/ov_SC03_114_after.c b/src/ov_SC03_114/ov_SC03_114_after.c index ec99d1cdf..21547cf8f 100644 --- a/src/ov_SC03_114/ov_SC03_114_after.c +++ b/src/ov_SC03_114/ov_SC03_114_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_114/nonmatchings/ov_SC03_114_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_114/ov_SC03_114_jr_8015444C.c b/src/ov_SC03_114/ov_SC03_114_jr_8015444C.c index 05fb188c0..45234bbcf 100644 --- a/src/ov_SC03_114/ov_SC03_114_jr_8015444C.c +++ b/src/ov_SC03_114/ov_SC03_114_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_114/ov_SC03_114_jr_8015A3C8.c b/src/ov_SC03_114/ov_SC03_114_jr_8015A3C8.c index c2673cfda..f1e87ebf8 100644 --- a/src/ov_SC03_114/ov_SC03_114_jr_8015A3C8.c +++ b/src/ov_SC03_114/ov_SC03_114_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_114/ov_SC03_114_jr_8015AE2C.c b/src/ov_SC03_114/ov_SC03_114_jr_8015AE2C.c index d19b1bc40..5d10598bd 100644 --- a/src/ov_SC03_114/ov_SC03_114_jr_8015AE2C.c +++ b/src/ov_SC03_114/ov_SC03_114_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_114/ov_SC03_114_jr_8016AB6C.c b/src/ov_SC03_114/ov_SC03_114_jr_8016AB6C.c index 96226c133..61083d3f2 100644 --- a/src/ov_SC03_114/ov_SC03_114_jr_8016AB6C.c +++ b/src/ov_SC03_114/ov_SC03_114_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_114/ov_SC03_114_jr_801734BC.c b/src/ov_SC03_114/ov_SC03_114_jr_801734BC.c index 4861f18b6..4c9d02902 100644 --- a/src/ov_SC03_114/ov_SC03_114_jr_801734BC.c +++ b/src/ov_SC03_114/ov_SC03_114_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_114/ov_SC03_114_jr_80178D40.c b/src/ov_SC03_114/ov_SC03_114_jr_80178D40.c index b508a01aa..023df220a 100644 --- a/src/ov_SC03_114/ov_SC03_114_jr_80178D40.c +++ b/src/ov_SC03_114/ov_SC03_114_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_114/ov_SC03_114_jr_8017A4AC.c b/src/ov_SC03_114/ov_SC03_114_jr_8017A4AC.c index de8396654..6f7799df5 100644 --- a/src/ov_SC03_114/ov_SC03_114_jr_8017A4AC.c +++ b/src/ov_SC03_114/ov_SC03_114_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_114/ov_SC03_114_jr_8017BEBC.c b/src/ov_SC03_114/ov_SC03_114_jr_8017BEBC.c index 2497b09f0..64c8887f4 100644 --- a/src/ov_SC03_114/ov_SC03_114_jr_8017BEBC.c +++ b/src/ov_SC03_114/ov_SC03_114_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_115/ov_SC03_115_after.c b/src/ov_SC03_115/ov_SC03_115_after.c index 80a9aa8ef..3bdb330a9 100644 --- a/src/ov_SC03_115/ov_SC03_115_after.c +++ b/src/ov_SC03_115/ov_SC03_115_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_115/nonmatchings/ov_SC03_115_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_115/ov_SC03_115_jr_8015444C.c b/src/ov_SC03_115/ov_SC03_115_jr_8015444C.c index 0ab938815..d58236571 100644 --- a/src/ov_SC03_115/ov_SC03_115_jr_8015444C.c +++ b/src/ov_SC03_115/ov_SC03_115_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_115/ov_SC03_115_jr_8015A3C8.c b/src/ov_SC03_115/ov_SC03_115_jr_8015A3C8.c index c0c8fac79..33f141217 100644 --- a/src/ov_SC03_115/ov_SC03_115_jr_8015A3C8.c +++ b/src/ov_SC03_115/ov_SC03_115_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_115/ov_SC03_115_jr_8015AE2C.c b/src/ov_SC03_115/ov_SC03_115_jr_8015AE2C.c index 5f1f3b723..754479c2f 100644 --- a/src/ov_SC03_115/ov_SC03_115_jr_8015AE2C.c +++ b/src/ov_SC03_115/ov_SC03_115_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_115/ov_SC03_115_jr_8016AB6C.c b/src/ov_SC03_115/ov_SC03_115_jr_8016AB6C.c index 46a961651..c02c5cde3 100644 --- a/src/ov_SC03_115/ov_SC03_115_jr_8016AB6C.c +++ b/src/ov_SC03_115/ov_SC03_115_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_115/ov_SC03_115_jr_801734BC.c b/src/ov_SC03_115/ov_SC03_115_jr_801734BC.c index 0890fecca..c365cb6da 100644 --- a/src/ov_SC03_115/ov_SC03_115_jr_801734BC.c +++ b/src/ov_SC03_115/ov_SC03_115_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_115/ov_SC03_115_jr_80178D40.c b/src/ov_SC03_115/ov_SC03_115_jr_80178D40.c index 04550f61a..f35ef3a1f 100644 --- a/src/ov_SC03_115/ov_SC03_115_jr_80178D40.c +++ b/src/ov_SC03_115/ov_SC03_115_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_115/ov_SC03_115_jr_8017A4AC.c b/src/ov_SC03_115/ov_SC03_115_jr_8017A4AC.c index 004e796a8..00de106bb 100644 --- a/src/ov_SC03_115/ov_SC03_115_jr_8017A4AC.c +++ b/src/ov_SC03_115/ov_SC03_115_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_115/ov_SC03_115_jr_8017BEBC.c b/src/ov_SC03_115/ov_SC03_115_jr_8017BEBC.c index fa530eabb..d25842e25 100644 --- a/src/ov_SC03_115/ov_SC03_115_jr_8017BEBC.c +++ b/src/ov_SC03_115/ov_SC03_115_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_116/ov_SC03_116_after.c b/src/ov_SC03_116/ov_SC03_116_after.c index b8bb8d1f3..1f6368b06 100644 --- a/src/ov_SC03_116/ov_SC03_116_after.c +++ b/src/ov_SC03_116/ov_SC03_116_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_116/ov_SC03_116_jr_8015444C.c b/src/ov_SC03_116/ov_SC03_116_jr_8015444C.c index 7d8133b23..edcceca20 100644 --- a/src/ov_SC03_116/ov_SC03_116_jr_8015444C.c +++ b/src/ov_SC03_116/ov_SC03_116_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_116/ov_SC03_116_jr_8015A3C8.c b/src/ov_SC03_116/ov_SC03_116_jr_8015A3C8.c index d7ef2466c..b600875ef 100644 --- a/src/ov_SC03_116/ov_SC03_116_jr_8015A3C8.c +++ b/src/ov_SC03_116/ov_SC03_116_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_116/ov_SC03_116_jr_8015AE2C.c b/src/ov_SC03_116/ov_SC03_116_jr_8015AE2C.c index c546148f3..4bd32a8a8 100644 --- a/src/ov_SC03_116/ov_SC03_116_jr_8015AE2C.c +++ b/src/ov_SC03_116/ov_SC03_116_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_116/ov_SC03_116_jr_8016AB6C.c b/src/ov_SC03_116/ov_SC03_116_jr_8016AB6C.c index 8a55827f7..d0f28bfe4 100644 --- a/src/ov_SC03_116/ov_SC03_116_jr_8016AB6C.c +++ b/src/ov_SC03_116/ov_SC03_116_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_116/ov_SC03_116_jr_801734BC.c b/src/ov_SC03_116/ov_SC03_116_jr_801734BC.c index 60dbabd64..227fcaa98 100644 --- a/src/ov_SC03_116/ov_SC03_116_jr_801734BC.c +++ b/src/ov_SC03_116/ov_SC03_116_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_116/ov_SC03_116_jr_80178D40.c b/src/ov_SC03_116/ov_SC03_116_jr_80178D40.c index aabc6dcc1..6a0718b9e 100644 --- a/src/ov_SC03_116/ov_SC03_116_jr_80178D40.c +++ b/src/ov_SC03_116/ov_SC03_116_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_116/ov_SC03_116_jr_8017A4AC.c b/src/ov_SC03_116/ov_SC03_116_jr_8017A4AC.c index 2ca2580eb..d76a92b55 100644 --- a/src/ov_SC03_116/ov_SC03_116_jr_8017A4AC.c +++ b/src/ov_SC03_116/ov_SC03_116_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_117/ov_SC03_117_after.c b/src/ov_SC03_117/ov_SC03_117_after.c index 8f6752365..035bd6736 100644 --- a/src/ov_SC03_117/ov_SC03_117_after.c +++ b/src/ov_SC03_117/ov_SC03_117_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_117/nonmatchings/ov_SC03_117_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_117/ov_SC03_117_jr_8015444C.c b/src/ov_SC03_117/ov_SC03_117_jr_8015444C.c index efde8a359..9f713d3fb 100644 --- a/src/ov_SC03_117/ov_SC03_117_jr_8015444C.c +++ b/src/ov_SC03_117/ov_SC03_117_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_117/ov_SC03_117_jr_8015A3C8.c b/src/ov_SC03_117/ov_SC03_117_jr_8015A3C8.c index eb8ee844d..7c84de34d 100644 --- a/src/ov_SC03_117/ov_SC03_117_jr_8015A3C8.c +++ b/src/ov_SC03_117/ov_SC03_117_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_117/ov_SC03_117_jr_8015AE2C.c b/src/ov_SC03_117/ov_SC03_117_jr_8015AE2C.c index 5eb543f7d..9cba7c0b9 100644 --- a/src/ov_SC03_117/ov_SC03_117_jr_8015AE2C.c +++ b/src/ov_SC03_117/ov_SC03_117_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_117/ov_SC03_117_jr_8016AB6C.c b/src/ov_SC03_117/ov_SC03_117_jr_8016AB6C.c index 8b6124520..16a9eeecb 100644 --- a/src/ov_SC03_117/ov_SC03_117_jr_8016AB6C.c +++ b/src/ov_SC03_117/ov_SC03_117_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_117/ov_SC03_117_jr_801734BC.c b/src/ov_SC03_117/ov_SC03_117_jr_801734BC.c index 5d2732856..f13f85301 100644 --- a/src/ov_SC03_117/ov_SC03_117_jr_801734BC.c +++ b/src/ov_SC03_117/ov_SC03_117_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_117/ov_SC03_117_jr_80178D40.c b/src/ov_SC03_117/ov_SC03_117_jr_80178D40.c index 2a4cebf47..2340ddaea 100644 --- a/src/ov_SC03_117/ov_SC03_117_jr_80178D40.c +++ b/src/ov_SC03_117/ov_SC03_117_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_117/ov_SC03_117_jr_8017A4AC.c b/src/ov_SC03_117/ov_SC03_117_jr_8017A4AC.c index 2e4d24be0..dcf733566 100644 --- a/src/ov_SC03_117/ov_SC03_117_jr_8017A4AC.c +++ b/src/ov_SC03_117/ov_SC03_117_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_117/ov_SC03_117_jr_8017BEBC.c b/src/ov_SC03_117/ov_SC03_117_jr_8017BEBC.c index 9a1556733..95100aedc 100644 --- a/src/ov_SC03_117/ov_SC03_117_jr_8017BEBC.c +++ b/src/ov_SC03_117/ov_SC03_117_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_118/ov_SC03_118_after.c b/src/ov_SC03_118/ov_SC03_118_after.c index cbde5cd30..9ed786ee7 100644 --- a/src/ov_SC03_118/ov_SC03_118_after.c +++ b/src/ov_SC03_118/ov_SC03_118_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_118/nonmatchings/ov_SC03_118_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_118/ov_SC03_118_jr_8015444C.c b/src/ov_SC03_118/ov_SC03_118_jr_8015444C.c index 6e5bcb85b..17c223658 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_8015444C.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_118/ov_SC03_118_jr_8015A3C8.c b/src/ov_SC03_118/ov_SC03_118_jr_8015A3C8.c index 6e1dbce72..3a6f8420e 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_8015A3C8.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_118/ov_SC03_118_jr_8015AE2C.c b/src/ov_SC03_118/ov_SC03_118_jr_8015AE2C.c index 53ef866bc..053432488 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_8015AE2C.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_118/ov_SC03_118_jr_8016AB6C.c b/src/ov_SC03_118/ov_SC03_118_jr_8016AB6C.c index 1309ebbe9..e238039ee 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_8016AB6C.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_118/ov_SC03_118_jr_801734BC.c b/src/ov_SC03_118/ov_SC03_118_jr_801734BC.c index 78b775ea6..d89624fb5 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_801734BC.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_118/ov_SC03_118_jr_80178D40.c b/src/ov_SC03_118/ov_SC03_118_jr_80178D40.c index 91ec03fab..a52f2e7ea 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_80178D40.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_118/ov_SC03_118_jr_8017A4AC.c b/src/ov_SC03_118/ov_SC03_118_jr_8017A4AC.c index 4cb3c177d..07478cc14 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_8017A4AC.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_118/ov_SC03_118_jr_8017FB84.c b/src/ov_SC03_118/ov_SC03_118_jr_8017FB84.c index ae81c57e6..ce57cb025 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_8017FB84.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_8017FB84.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_119/ov_SC03_119_after.c b/src/ov_SC03_119/ov_SC03_119_after.c index ed60bf1a6..b64dac123 100644 --- a/src/ov_SC03_119/ov_SC03_119_after.c +++ b/src/ov_SC03_119/ov_SC03_119_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_119/ov_SC03_119_jr_8015444C.c b/src/ov_SC03_119/ov_SC03_119_jr_8015444C.c index 1c83e6340..46fa479ae 100644 --- a/src/ov_SC03_119/ov_SC03_119_jr_8015444C.c +++ b/src/ov_SC03_119/ov_SC03_119_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_119/ov_SC03_119_jr_8015A3C8.c b/src/ov_SC03_119/ov_SC03_119_jr_8015A3C8.c index 6e1dbce72..3a6f8420e 100644 --- a/src/ov_SC03_119/ov_SC03_119_jr_8015A3C8.c +++ b/src/ov_SC03_119/ov_SC03_119_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_119/ov_SC03_119_jr_8015AE2C.c b/src/ov_SC03_119/ov_SC03_119_jr_8015AE2C.c index bd080543c..aa2f60b31 100644 --- a/src/ov_SC03_119/ov_SC03_119_jr_8015AE2C.c +++ b/src/ov_SC03_119/ov_SC03_119_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_119/ov_SC03_119_jr_8016AB6C.c b/src/ov_SC03_119/ov_SC03_119_jr_8016AB6C.c index 7ff99a6f6..559cd0240 100644 --- a/src/ov_SC03_119/ov_SC03_119_jr_8016AB6C.c +++ b/src/ov_SC03_119/ov_SC03_119_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_119/ov_SC03_119_jr_801734BC.c b/src/ov_SC03_119/ov_SC03_119_jr_801734BC.c index 332b8a3af..e3dcbed94 100644 --- a/src/ov_SC03_119/ov_SC03_119_jr_801734BC.c +++ b/src/ov_SC03_119/ov_SC03_119_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_119/ov_SC03_119_jr_80178D40.c b/src/ov_SC03_119/ov_SC03_119_jr_80178D40.c index 0708cc5f2..e0d814dbd 100644 --- a/src/ov_SC03_119/ov_SC03_119_jr_80178D40.c +++ b/src/ov_SC03_119/ov_SC03_119_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_119/ov_SC03_119_jr_8017A4AC.c b/src/ov_SC03_119/ov_SC03_119_jr_8017A4AC.c index c2d3014b1..de27b5747 100644 --- a/src/ov_SC03_119/ov_SC03_119_jr_8017A4AC.c +++ b/src/ov_SC03_119/ov_SC03_119_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_119/ov_SC03_119_jr_8017FB84.c b/src/ov_SC03_119/ov_SC03_119_jr_8017FB84.c index 8069a0076..cfd453fa4 100644 --- a/src/ov_SC03_119/ov_SC03_119_jr_8017FB84.c +++ b/src/ov_SC03_119/ov_SC03_119_jr_8017FB84.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_121/ov_SC03_121_after.c b/src/ov_SC03_121/ov_SC03_121_after.c index 8dcf4915f..ab3dc6cf9 100644 --- a/src/ov_SC03_121/ov_SC03_121_after.c +++ b/src/ov_SC03_121/ov_SC03_121_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_121/nonmatchings/ov_SC03_121_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_121/ov_SC03_121_jr_8015444C.c b/src/ov_SC03_121/ov_SC03_121_jr_8015444C.c index 318b2a5f1..9ce219285 100644 --- a/src/ov_SC03_121/ov_SC03_121_jr_8015444C.c +++ b/src/ov_SC03_121/ov_SC03_121_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_121/ov_SC03_121_jr_8015A3C8.c b/src/ov_SC03_121/ov_SC03_121_jr_8015A3C8.c index d588523a3..056a4b01d 100644 --- a/src/ov_SC03_121/ov_SC03_121_jr_8015A3C8.c +++ b/src/ov_SC03_121/ov_SC03_121_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_121/ov_SC03_121_jr_8015AE2C.c b/src/ov_SC03_121/ov_SC03_121_jr_8015AE2C.c index e349eff39..caa5aa939 100644 --- a/src/ov_SC03_121/ov_SC03_121_jr_8015AE2C.c +++ b/src/ov_SC03_121/ov_SC03_121_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_121/ov_SC03_121_jr_8016AB6C.c b/src/ov_SC03_121/ov_SC03_121_jr_8016AB6C.c index a81c9407a..0e716f82c 100644 --- a/src/ov_SC03_121/ov_SC03_121_jr_8016AB6C.c +++ b/src/ov_SC03_121/ov_SC03_121_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_121/ov_SC03_121_jr_801734BC.c b/src/ov_SC03_121/ov_SC03_121_jr_801734BC.c index fb4116bd8..03bf5724d 100644 --- a/src/ov_SC03_121/ov_SC03_121_jr_801734BC.c +++ b/src/ov_SC03_121/ov_SC03_121_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_121/ov_SC03_121_jr_80178D40.c b/src/ov_SC03_121/ov_SC03_121_jr_80178D40.c index fc0e62daa..311886951 100644 --- a/src/ov_SC03_121/ov_SC03_121_jr_80178D40.c +++ b/src/ov_SC03_121/ov_SC03_121_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_121/ov_SC03_121_jr_8017A4AC.c b/src/ov_SC03_121/ov_SC03_121_jr_8017A4AC.c index 137f294de..4138fbdbc 100644 --- a/src/ov_SC03_121/ov_SC03_121_jr_8017A4AC.c +++ b/src/ov_SC03_121/ov_SC03_121_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_121/ov_SC03_121_jr_8017BEBC.c b/src/ov_SC03_121/ov_SC03_121_jr_8017BEBC.c index 22d4093ae..9dfc29e60 100644 --- a/src/ov_SC03_121/ov_SC03_121_jr_8017BEBC.c +++ b/src/ov_SC03_121/ov_SC03_121_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_124/ov_SC03_124_after.c b/src/ov_SC03_124/ov_SC03_124_after.c index 76c294741..ef02ec824 100644 --- a/src/ov_SC03_124/ov_SC03_124_after.c +++ b/src/ov_SC03_124/ov_SC03_124_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_124/ov_SC03_124_jr_8015444C.c b/src/ov_SC03_124/ov_SC03_124_jr_8015444C.c index f88f5cb93..6342f25af 100644 --- a/src/ov_SC03_124/ov_SC03_124_jr_8015444C.c +++ b/src/ov_SC03_124/ov_SC03_124_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_124/ov_SC03_124_jr_8015A3C8.c b/src/ov_SC03_124/ov_SC03_124_jr_8015A3C8.c index eaaee8710..aac509a29 100644 --- a/src/ov_SC03_124/ov_SC03_124_jr_8015A3C8.c +++ b/src/ov_SC03_124/ov_SC03_124_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_124/ov_SC03_124_jr_8015AE2C.c b/src/ov_SC03_124/ov_SC03_124_jr_8015AE2C.c index c99f3f317..08cd221ce 100644 --- a/src/ov_SC03_124/ov_SC03_124_jr_8015AE2C.c +++ b/src/ov_SC03_124/ov_SC03_124_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_124/ov_SC03_124_jr_8016AB6C.c b/src/ov_SC03_124/ov_SC03_124_jr_8016AB6C.c index 5758d0da5..ecc16b547 100644 --- a/src/ov_SC03_124/ov_SC03_124_jr_8016AB6C.c +++ b/src/ov_SC03_124/ov_SC03_124_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_124/ov_SC03_124_jr_801734BC.c b/src/ov_SC03_124/ov_SC03_124_jr_801734BC.c index f5b7a4e2a..cf21f7ef4 100644 --- a/src/ov_SC03_124/ov_SC03_124_jr_801734BC.c +++ b/src/ov_SC03_124/ov_SC03_124_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_124/ov_SC03_124_jr_80178D40.c b/src/ov_SC03_124/ov_SC03_124_jr_80178D40.c index afb22f85a..e3d60ebef 100644 --- a/src/ov_SC03_124/ov_SC03_124_jr_80178D40.c +++ b/src/ov_SC03_124/ov_SC03_124_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_124/ov_SC03_124_jr_8017A4AC.c b/src/ov_SC03_124/ov_SC03_124_jr_8017A4AC.c index 1dd926aa5..00fe553f3 100644 --- a/src/ov_SC03_124/ov_SC03_124_jr_8017A4AC.c +++ b/src/ov_SC03_124/ov_SC03_124_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_125/ov_SC03_125_after.c b/src/ov_SC03_125/ov_SC03_125_after.c index 914ccf2b6..c34f66977 100644 --- a/src/ov_SC03_125/ov_SC03_125_after.c +++ b/src/ov_SC03_125/ov_SC03_125_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_125/nonmatchings/ov_SC03_125_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_125/ov_SC03_125_jr_8015444C.c b/src/ov_SC03_125/ov_SC03_125_jr_8015444C.c index 3fe82cac4..a855a98eb 100644 --- a/src/ov_SC03_125/ov_SC03_125_jr_8015444C.c +++ b/src/ov_SC03_125/ov_SC03_125_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_125/ov_SC03_125_jr_8015A3C8.c b/src/ov_SC03_125/ov_SC03_125_jr_8015A3C8.c index 72a4dfba3..e6dfd2263 100644 --- a/src/ov_SC03_125/ov_SC03_125_jr_8015A3C8.c +++ b/src/ov_SC03_125/ov_SC03_125_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_125/ov_SC03_125_jr_8015AE2C.c b/src/ov_SC03_125/ov_SC03_125_jr_8015AE2C.c index 2d7a43aef..27195639e 100644 --- a/src/ov_SC03_125/ov_SC03_125_jr_8015AE2C.c +++ b/src/ov_SC03_125/ov_SC03_125_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_125/ov_SC03_125_jr_8016AB6C.c b/src/ov_SC03_125/ov_SC03_125_jr_8016AB6C.c index 373223eaf..4cde6fac1 100644 --- a/src/ov_SC03_125/ov_SC03_125_jr_8016AB6C.c +++ b/src/ov_SC03_125/ov_SC03_125_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_125/ov_SC03_125_jr_801734BC.c b/src/ov_SC03_125/ov_SC03_125_jr_801734BC.c index aba39d34d..1b7b57dc6 100644 --- a/src/ov_SC03_125/ov_SC03_125_jr_801734BC.c +++ b/src/ov_SC03_125/ov_SC03_125_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_125/ov_SC03_125_jr_80178D40.c b/src/ov_SC03_125/ov_SC03_125_jr_80178D40.c index 6d27fc099..c23f01d5e 100644 --- a/src/ov_SC03_125/ov_SC03_125_jr_80178D40.c +++ b/src/ov_SC03_125/ov_SC03_125_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_125/ov_SC03_125_jr_8017A4AC.c b/src/ov_SC03_125/ov_SC03_125_jr_8017A4AC.c index 4ab4752ce..dec95b031 100644 --- a/src/ov_SC03_125/ov_SC03_125_jr_8017A4AC.c +++ b/src/ov_SC03_125/ov_SC03_125_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_125/ov_SC03_125_jr_8017D604.c b/src/ov_SC03_125/ov_SC03_125_jr_8017D604.c index 80ed89a27..f08c0da4d 100644 --- a/src/ov_SC03_125/ov_SC03_125_jr_8017D604.c +++ b/src/ov_SC03_125/ov_SC03_125_jr_8017D604.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_126/ov_SC03_126_after.c b/src/ov_SC03_126/ov_SC03_126_after.c index 49e638d1c..7b75cdccc 100644 --- a/src/ov_SC03_126/ov_SC03_126_after.c +++ b/src/ov_SC03_126/ov_SC03_126_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC03_126/nonmatchings/ov_SC03_126_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC03_126/ov_SC03_126_jr_8015444C.c b/src/ov_SC03_126/ov_SC03_126_jr_8015444C.c index d50a88a10..7739d0db7 100644 --- a/src/ov_SC03_126/ov_SC03_126_jr_8015444C.c +++ b/src/ov_SC03_126/ov_SC03_126_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_126/ov_SC03_126_jr_8015A3C8.c b/src/ov_SC03_126/ov_SC03_126_jr_8015A3C8.c index 43cb291ad..5522f97be 100644 --- a/src/ov_SC03_126/ov_SC03_126_jr_8015A3C8.c +++ b/src/ov_SC03_126/ov_SC03_126_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_126/ov_SC03_126_jr_8015AE2C.c b/src/ov_SC03_126/ov_SC03_126_jr_8015AE2C.c index 3189dd0c7..e6c66043a 100644 --- a/src/ov_SC03_126/ov_SC03_126_jr_8015AE2C.c +++ b/src/ov_SC03_126/ov_SC03_126_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_126/ov_SC03_126_jr_8016AB6C.c b/src/ov_SC03_126/ov_SC03_126_jr_8016AB6C.c index df50baaa1..358d6469d 100644 --- a/src/ov_SC03_126/ov_SC03_126_jr_8016AB6C.c +++ b/src/ov_SC03_126/ov_SC03_126_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_126/ov_SC03_126_jr_801734BC.c b/src/ov_SC03_126/ov_SC03_126_jr_801734BC.c index 6536e1011..9ea988201 100644 --- a/src/ov_SC03_126/ov_SC03_126_jr_801734BC.c +++ b/src/ov_SC03_126/ov_SC03_126_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_126/ov_SC03_126_jr_80178D40.c b/src/ov_SC03_126/ov_SC03_126_jr_80178D40.c index 830e23d31..bcef6d9a6 100644 --- a/src/ov_SC03_126/ov_SC03_126_jr_80178D40.c +++ b/src/ov_SC03_126/ov_SC03_126_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_126/ov_SC03_126_jr_8017A4AC.c b/src/ov_SC03_126/ov_SC03_126_jr_8017A4AC.c index d6c353162..d99941bbb 100644 --- a/src/ov_SC03_126/ov_SC03_126_jr_8017A4AC.c +++ b/src/ov_SC03_126/ov_SC03_126_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC03_126/ov_SC03_126_jr_8017D5C0.c b/src/ov_SC03_126/ov_SC03_126_jr_8017D5C0.c index 8efafb02b..33dd9b9b4 100644 --- a/src/ov_SC03_126/ov_SC03_126_jr_8017D5C0.c +++ b/src/ov_SC03_126/ov_SC03_126_jr_8017D5C0.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_000/ov_SC04_000_after.c b/src/ov_SC04_000/ov_SC04_000_after.c index b6f5e20ad..b6872f3d0 100644 --- a/src/ov_SC04_000/ov_SC04_000_after.c +++ b/src/ov_SC04_000/ov_SC04_000_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC04_000/ov_SC04_000_jr_8015444C.c b/src/ov_SC04_000/ov_SC04_000_jr_8015444C.c index 2ffd88708..86a402eba 100644 --- a/src/ov_SC04_000/ov_SC04_000_jr_8015444C.c +++ b/src/ov_SC04_000/ov_SC04_000_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_000/ov_SC04_000_jr_8015A3C8.c b/src/ov_SC04_000/ov_SC04_000_jr_8015A3C8.c index edd769488..511ef1538 100644 --- a/src/ov_SC04_000/ov_SC04_000_jr_8015A3C8.c +++ b/src/ov_SC04_000/ov_SC04_000_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_000/ov_SC04_000_jr_8015AE2C.c b/src/ov_SC04_000/ov_SC04_000_jr_8015AE2C.c index 66c1691c6..864e6e4fe 100644 --- a/src/ov_SC04_000/ov_SC04_000_jr_8015AE2C.c +++ b/src/ov_SC04_000/ov_SC04_000_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_000/ov_SC04_000_jr_8016AB6C.c b/src/ov_SC04_000/ov_SC04_000_jr_8016AB6C.c index 59144916b..3086ab1c7 100644 --- a/src/ov_SC04_000/ov_SC04_000_jr_8016AB6C.c +++ b/src/ov_SC04_000/ov_SC04_000_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_000/ov_SC04_000_jr_801734BC.c b/src/ov_SC04_000/ov_SC04_000_jr_801734BC.c index 15b9d5442..036e7584b 100644 --- a/src/ov_SC04_000/ov_SC04_000_jr_801734BC.c +++ b/src/ov_SC04_000/ov_SC04_000_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_000/ov_SC04_000_jr_80178D40.c b/src/ov_SC04_000/ov_SC04_000_jr_80178D40.c index 8e356a1f8..eea801cca 100644 --- a/src/ov_SC04_000/ov_SC04_000_jr_80178D40.c +++ b/src/ov_SC04_000/ov_SC04_000_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_000/ov_SC04_000_jr_8017A4AC.c b/src/ov_SC04_000/ov_SC04_000_jr_8017A4AC.c index 9af7d3653..70fee7b4e 100644 --- a/src/ov_SC04_000/ov_SC04_000_jr_8017A4AC.c +++ b/src/ov_SC04_000/ov_SC04_000_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_000/ov_SC04_000_jr_8017BEBC.c b/src/ov_SC04_000/ov_SC04_000_jr_8017BEBC.c index 7c9055aaf..504ccc256 100644 --- a/src/ov_SC04_000/ov_SC04_000_jr_8017BEBC.c +++ b/src/ov_SC04_000/ov_SC04_000_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_002/ov_SC04_002_after.c b/src/ov_SC04_002/ov_SC04_002_after.c index 501bc449d..9e395fa90 100644 --- a/src/ov_SC04_002/ov_SC04_002_after.c +++ b/src/ov_SC04_002/ov_SC04_002_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC04_002/ov_SC04_002_jr_8015444C.c b/src/ov_SC04_002/ov_SC04_002_jr_8015444C.c index bc0e2f227..86cfc7c3b 100644 --- a/src/ov_SC04_002/ov_SC04_002_jr_8015444C.c +++ b/src/ov_SC04_002/ov_SC04_002_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_002/ov_SC04_002_jr_8015A3C8.c b/src/ov_SC04_002/ov_SC04_002_jr_8015A3C8.c index a390024f8..869553c2b 100644 --- a/src/ov_SC04_002/ov_SC04_002_jr_8015A3C8.c +++ b/src/ov_SC04_002/ov_SC04_002_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_002/ov_SC04_002_jr_8015AE2C.c b/src/ov_SC04_002/ov_SC04_002_jr_8015AE2C.c index 32e532605..c3f36ce94 100644 --- a/src/ov_SC04_002/ov_SC04_002_jr_8015AE2C.c +++ b/src/ov_SC04_002/ov_SC04_002_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_002/ov_SC04_002_jr_8016AB6C.c b/src/ov_SC04_002/ov_SC04_002_jr_8016AB6C.c index 8998b3a7b..bdae89197 100644 --- a/src/ov_SC04_002/ov_SC04_002_jr_8016AB6C.c +++ b/src/ov_SC04_002/ov_SC04_002_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_002/ov_SC04_002_jr_801734BC.c b/src/ov_SC04_002/ov_SC04_002_jr_801734BC.c index 1eaafaba0..08bf738fd 100644 --- a/src/ov_SC04_002/ov_SC04_002_jr_801734BC.c +++ b/src/ov_SC04_002/ov_SC04_002_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_002/ov_SC04_002_jr_80178D40.c b/src/ov_SC04_002/ov_SC04_002_jr_80178D40.c index 29a67bde4..0dc3f8713 100644 --- a/src/ov_SC04_002/ov_SC04_002_jr_80178D40.c +++ b/src/ov_SC04_002/ov_SC04_002_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_002/ov_SC04_002_jr_8017A4AC.c b/src/ov_SC04_002/ov_SC04_002_jr_8017A4AC.c index 326e8fe46..b9ce3cb91 100644 --- a/src/ov_SC04_002/ov_SC04_002_jr_8017A4AC.c +++ b/src/ov_SC04_002/ov_SC04_002_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_002/ov_SC04_002_jr_8017BEBC.c b/src/ov_SC04_002/ov_SC04_002_jr_8017BEBC.c index f53363071..e6960d676 100644 --- a/src/ov_SC04_002/ov_SC04_002_jr_8017BEBC.c +++ b/src/ov_SC04_002/ov_SC04_002_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_003/ov_SC04_003_after.c b/src/ov_SC04_003/ov_SC04_003_after.c index d6eccbe9b..9d3a44de4 100644 --- a/src/ov_SC04_003/ov_SC04_003_after.c +++ b/src/ov_SC04_003/ov_SC04_003_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC04_003/nonmatchings/ov_SC04_003_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC04_003/ov_SC04_003_jr_8015444C.c b/src/ov_SC04_003/ov_SC04_003_jr_8015444C.c index f04518ce7..585250bff 100644 --- a/src/ov_SC04_003/ov_SC04_003_jr_8015444C.c +++ b/src/ov_SC04_003/ov_SC04_003_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_003/ov_SC04_003_jr_8015A3C8.c b/src/ov_SC04_003/ov_SC04_003_jr_8015A3C8.c index 51626989f..fde17e03b 100644 --- a/src/ov_SC04_003/ov_SC04_003_jr_8015A3C8.c +++ b/src/ov_SC04_003/ov_SC04_003_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_003/ov_SC04_003_jr_8015AE2C.c b/src/ov_SC04_003/ov_SC04_003_jr_8015AE2C.c index 03eaae084..b4465816e 100644 --- a/src/ov_SC04_003/ov_SC04_003_jr_8015AE2C.c +++ b/src/ov_SC04_003/ov_SC04_003_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_003/ov_SC04_003_jr_8016AB6C.c b/src/ov_SC04_003/ov_SC04_003_jr_8016AB6C.c index 49fd07001..1b117997d 100644 --- a/src/ov_SC04_003/ov_SC04_003_jr_8016AB6C.c +++ b/src/ov_SC04_003/ov_SC04_003_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_003/ov_SC04_003_jr_801734BC.c b/src/ov_SC04_003/ov_SC04_003_jr_801734BC.c index cb54cb517..2a41a336b 100644 --- a/src/ov_SC04_003/ov_SC04_003_jr_801734BC.c +++ b/src/ov_SC04_003/ov_SC04_003_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_003/ov_SC04_003_jr_80178D40.c b/src/ov_SC04_003/ov_SC04_003_jr_80178D40.c index 898739952..ba0102253 100644 --- a/src/ov_SC04_003/ov_SC04_003_jr_80178D40.c +++ b/src/ov_SC04_003/ov_SC04_003_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_003/ov_SC04_003_jr_8017A4AC.c b/src/ov_SC04_003/ov_SC04_003_jr_8017A4AC.c index 224b355ef..1c87174a2 100644 --- a/src/ov_SC04_003/ov_SC04_003_jr_8017A4AC.c +++ b/src/ov_SC04_003/ov_SC04_003_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_003/ov_SC04_003_jr_8017BEBC.c b/src/ov_SC04_003/ov_SC04_003_jr_8017BEBC.c index 69d900bd0..994110d11 100644 --- a/src/ov_SC04_003/ov_SC04_003_jr_8017BEBC.c +++ b/src/ov_SC04_003/ov_SC04_003_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_004/ov_SC04_004_after.c b/src/ov_SC04_004/ov_SC04_004_after.c index 963e1deac..8fe7c11e6 100644 --- a/src/ov_SC04_004/ov_SC04_004_after.c +++ b/src/ov_SC04_004/ov_SC04_004_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC04_004/nonmatchings/ov_SC04_004_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC04_004/ov_SC04_004_jr_8015444C.c b/src/ov_SC04_004/ov_SC04_004_jr_8015444C.c index 5d6e002ba..5ad861683 100644 --- a/src/ov_SC04_004/ov_SC04_004_jr_8015444C.c +++ b/src/ov_SC04_004/ov_SC04_004_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_004/ov_SC04_004_jr_8015A3C8.c b/src/ov_SC04_004/ov_SC04_004_jr_8015A3C8.c index 37de73633..a5681fabe 100644 --- a/src/ov_SC04_004/ov_SC04_004_jr_8015A3C8.c +++ b/src/ov_SC04_004/ov_SC04_004_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_004/ov_SC04_004_jr_8015AE2C.c b/src/ov_SC04_004/ov_SC04_004_jr_8015AE2C.c index 53d752901..159907187 100644 --- a/src/ov_SC04_004/ov_SC04_004_jr_8015AE2C.c +++ b/src/ov_SC04_004/ov_SC04_004_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_004/ov_SC04_004_jr_8016AB6C.c b/src/ov_SC04_004/ov_SC04_004_jr_8016AB6C.c index 56691c623..661176eb6 100644 --- a/src/ov_SC04_004/ov_SC04_004_jr_8016AB6C.c +++ b/src/ov_SC04_004/ov_SC04_004_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_004/ov_SC04_004_jr_801734BC.c b/src/ov_SC04_004/ov_SC04_004_jr_801734BC.c index d6fc26095..16a153c83 100644 --- a/src/ov_SC04_004/ov_SC04_004_jr_801734BC.c +++ b/src/ov_SC04_004/ov_SC04_004_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_004/ov_SC04_004_jr_80178D40.c b/src/ov_SC04_004/ov_SC04_004_jr_80178D40.c index d030ea21b..15fb6fb1d 100644 --- a/src/ov_SC04_004/ov_SC04_004_jr_80178D40.c +++ b/src/ov_SC04_004/ov_SC04_004_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_004/ov_SC04_004_jr_8017A4AC.c b/src/ov_SC04_004/ov_SC04_004_jr_8017A4AC.c index b01167340..6b1e154ea 100644 --- a/src/ov_SC04_004/ov_SC04_004_jr_8017A4AC.c +++ b/src/ov_SC04_004/ov_SC04_004_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_005/ov_SC04_005_after.c b/src/ov_SC04_005/ov_SC04_005_after.c index 8aa03a402..908c3ac94 100644 --- a/src/ov_SC04_005/ov_SC04_005_after.c +++ b/src/ov_SC04_005/ov_SC04_005_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC04_005/ov_SC04_005_jr_8015444C.c b/src/ov_SC04_005/ov_SC04_005_jr_8015444C.c index fc394bf2b..94dcae50a 100644 --- a/src/ov_SC04_005/ov_SC04_005_jr_8015444C.c +++ b/src/ov_SC04_005/ov_SC04_005_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_005/ov_SC04_005_jr_8015A3C8.c b/src/ov_SC04_005/ov_SC04_005_jr_8015A3C8.c index 0d51b2320..b3e61656c 100644 --- a/src/ov_SC04_005/ov_SC04_005_jr_8015A3C8.c +++ b/src/ov_SC04_005/ov_SC04_005_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_005/ov_SC04_005_jr_8015AE2C.c b/src/ov_SC04_005/ov_SC04_005_jr_8015AE2C.c index f8dbed8ae..ac43a9474 100644 --- a/src/ov_SC04_005/ov_SC04_005_jr_8015AE2C.c +++ b/src/ov_SC04_005/ov_SC04_005_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_005/ov_SC04_005_jr_8016AB6C.c b/src/ov_SC04_005/ov_SC04_005_jr_8016AB6C.c index bce8e9e16..41dd9cf8f 100644 --- a/src/ov_SC04_005/ov_SC04_005_jr_8016AB6C.c +++ b/src/ov_SC04_005/ov_SC04_005_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_005/ov_SC04_005_jr_801734BC.c b/src/ov_SC04_005/ov_SC04_005_jr_801734BC.c index cf773e8db..01b2e1deb 100644 --- a/src/ov_SC04_005/ov_SC04_005_jr_801734BC.c +++ b/src/ov_SC04_005/ov_SC04_005_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_005/ov_SC04_005_jr_80178D40.c b/src/ov_SC04_005/ov_SC04_005_jr_80178D40.c index 9a5895fe5..8e4dc1def 100644 --- a/src/ov_SC04_005/ov_SC04_005_jr_80178D40.c +++ b/src/ov_SC04_005/ov_SC04_005_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_005/ov_SC04_005_jr_8017A4AC.c b/src/ov_SC04_005/ov_SC04_005_jr_8017A4AC.c index cc2ba394e..bfe464c9c 100644 --- a/src/ov_SC04_005/ov_SC04_005_jr_8017A4AC.c +++ b/src/ov_SC04_005/ov_SC04_005_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_005/ov_SC04_005_jr_8017BEBC.c b/src/ov_SC04_005/ov_SC04_005_jr_8017BEBC.c index b9e950631..9aab2a12e 100644 --- a/src/ov_SC04_005/ov_SC04_005_jr_8017BEBC.c +++ b/src/ov_SC04_005/ov_SC04_005_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_006/ov_SC04_006_after.c b/src/ov_SC04_006/ov_SC04_006_after.c index 90ad81677..8c1f4f0bd 100644 --- a/src/ov_SC04_006/ov_SC04_006_after.c +++ b/src/ov_SC04_006/ov_SC04_006_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC04_006/ov_SC04_006_jr_8015444C.c b/src/ov_SC04_006/ov_SC04_006_jr_8015444C.c index 5796d778c..d64470153 100644 --- a/src/ov_SC04_006/ov_SC04_006_jr_8015444C.c +++ b/src/ov_SC04_006/ov_SC04_006_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_006/ov_SC04_006_jr_8015A3C8.c b/src/ov_SC04_006/ov_SC04_006_jr_8015A3C8.c index 5fe6b180a..e07d4e911 100644 --- a/src/ov_SC04_006/ov_SC04_006_jr_8015A3C8.c +++ b/src/ov_SC04_006/ov_SC04_006_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_006/ov_SC04_006_jr_8015AE2C.c b/src/ov_SC04_006/ov_SC04_006_jr_8015AE2C.c index db292ba3d..dcbcbade5 100644 --- a/src/ov_SC04_006/ov_SC04_006_jr_8015AE2C.c +++ b/src/ov_SC04_006/ov_SC04_006_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_006/ov_SC04_006_jr_8016AB6C.c b/src/ov_SC04_006/ov_SC04_006_jr_8016AB6C.c index 3a13974e7..c5060331c 100644 --- a/src/ov_SC04_006/ov_SC04_006_jr_8016AB6C.c +++ b/src/ov_SC04_006/ov_SC04_006_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_006/ov_SC04_006_jr_801734BC.c b/src/ov_SC04_006/ov_SC04_006_jr_801734BC.c index 753044f5b..3722d248f 100644 --- a/src/ov_SC04_006/ov_SC04_006_jr_801734BC.c +++ b/src/ov_SC04_006/ov_SC04_006_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_006/ov_SC04_006_jr_80178D40.c b/src/ov_SC04_006/ov_SC04_006_jr_80178D40.c index cf26656a3..68e6599b1 100644 --- a/src/ov_SC04_006/ov_SC04_006_jr_80178D40.c +++ b/src/ov_SC04_006/ov_SC04_006_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_006/ov_SC04_006_jr_8017A4AC.c b/src/ov_SC04_006/ov_SC04_006_jr_8017A4AC.c index a8f95d004..7047b240e 100644 --- a/src/ov_SC04_006/ov_SC04_006_jr_8017A4AC.c +++ b/src/ov_SC04_006/ov_SC04_006_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_006/ov_SC04_006_jr_8017BEBC.c b/src/ov_SC04_006/ov_SC04_006_jr_8017BEBC.c index 57140491b..315d4f4df 100644 --- a/src/ov_SC04_006/ov_SC04_006_jr_8017BEBC.c +++ b/src/ov_SC04_006/ov_SC04_006_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_007/ov_SC04_007_after.c b/src/ov_SC04_007/ov_SC04_007_after.c index 6821b4945..df8202a58 100644 --- a/src/ov_SC04_007/ov_SC04_007_after.c +++ b/src/ov_SC04_007/ov_SC04_007_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC04_007/ov_SC04_007_jr_8015444C.c b/src/ov_SC04_007/ov_SC04_007_jr_8015444C.c index b34d7e509..185b60919 100644 --- a/src/ov_SC04_007/ov_SC04_007_jr_8015444C.c +++ b/src/ov_SC04_007/ov_SC04_007_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_007/ov_SC04_007_jr_8015A3C8.c b/src/ov_SC04_007/ov_SC04_007_jr_8015A3C8.c index fbcd078a9..ab75279f7 100644 --- a/src/ov_SC04_007/ov_SC04_007_jr_8015A3C8.c +++ b/src/ov_SC04_007/ov_SC04_007_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_007/ov_SC04_007_jr_8015AE2C.c b/src/ov_SC04_007/ov_SC04_007_jr_8015AE2C.c index 805bb39bb..3a80d5274 100644 --- a/src/ov_SC04_007/ov_SC04_007_jr_8015AE2C.c +++ b/src/ov_SC04_007/ov_SC04_007_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_007/ov_SC04_007_jr_8016AB6C.c b/src/ov_SC04_007/ov_SC04_007_jr_8016AB6C.c index 298e6c9ca..35f41930a 100644 --- a/src/ov_SC04_007/ov_SC04_007_jr_8016AB6C.c +++ b/src/ov_SC04_007/ov_SC04_007_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_007/ov_SC04_007_jr_801734BC.c b/src/ov_SC04_007/ov_SC04_007_jr_801734BC.c index cc0048906..d6e68d2f2 100644 --- a/src/ov_SC04_007/ov_SC04_007_jr_801734BC.c +++ b/src/ov_SC04_007/ov_SC04_007_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_007/ov_SC04_007_jr_80178D40.c b/src/ov_SC04_007/ov_SC04_007_jr_80178D40.c index 26b2e7196..74122f6cb 100644 --- a/src/ov_SC04_007/ov_SC04_007_jr_80178D40.c +++ b/src/ov_SC04_007/ov_SC04_007_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_007/ov_SC04_007_jr_8017A4AC.c b/src/ov_SC04_007/ov_SC04_007_jr_8017A4AC.c index d18fa604e..808877f79 100644 --- a/src/ov_SC04_007/ov_SC04_007_jr_8017A4AC.c +++ b/src/ov_SC04_007/ov_SC04_007_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c b/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c index 0318301f2..f735e8758 100644 --- a/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c +++ b/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_008/ov_SC04_008_after.c b/src/ov_SC04_008/ov_SC04_008_after.c index 4e14cd11d..b9d8b98d6 100644 --- a/src/ov_SC04_008/ov_SC04_008_after.c +++ b/src/ov_SC04_008/ov_SC04_008_after.c @@ -1629,7 +1629,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1658,7 +1658,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC04_008/nonmatchings/ov_SC04_008_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC04_008/ov_SC04_008_jr_8015AE2C.c b/src/ov_SC04_008/ov_SC04_008_jr_8015AE2C.c index 06011d879..8f48b1e2d 100644 --- a/src/ov_SC04_008/ov_SC04_008_jr_8015AE2C.c +++ b/src/ov_SC04_008/ov_SC04_008_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_008/ov_SC04_008_jr_8016AB6C.c b/src/ov_SC04_008/ov_SC04_008_jr_8016AB6C.c index f285916e3..cf6703d02 100644 --- a/src/ov_SC04_008/ov_SC04_008_jr_8016AB6C.c +++ b/src/ov_SC04_008/ov_SC04_008_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_008/ov_SC04_008_jr_801734BC.c b/src/ov_SC04_008/ov_SC04_008_jr_801734BC.c index 232cbdd44..a2b493d0a 100644 --- a/src/ov_SC04_008/ov_SC04_008_jr_801734BC.c +++ b/src/ov_SC04_008/ov_SC04_008_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_008/ov_SC04_008_jr_80178D40.c b/src/ov_SC04_008/ov_SC04_008_jr_80178D40.c index 6f0cff9fe..acd8e7949 100644 --- a/src/ov_SC04_008/ov_SC04_008_jr_80178D40.c +++ b/src/ov_SC04_008/ov_SC04_008_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_008/ov_SC04_008_jr_8017A4AC.c b/src/ov_SC04_008/ov_SC04_008_jr_8017A4AC.c index 7cdd2b8c4..c0509967f 100644 --- a/src/ov_SC04_008/ov_SC04_008_jr_8017A4AC.c +++ b/src/ov_SC04_008/ov_SC04_008_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_009/ov_SC04_009_after.c b/src/ov_SC04_009/ov_SC04_009_after.c index 8db97a286..5a08a97f2 100644 --- a/src/ov_SC04_009/ov_SC04_009_after.c +++ b/src/ov_SC04_009/ov_SC04_009_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC04_009/nonmatchings/ov_SC04_009_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC04_009/ov_SC04_009_jr_8015444C.c b/src/ov_SC04_009/ov_SC04_009_jr_8015444C.c index 16b962635..464c8812b 100644 --- a/src/ov_SC04_009/ov_SC04_009_jr_8015444C.c +++ b/src/ov_SC04_009/ov_SC04_009_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_009/ov_SC04_009_jr_8015A3C8.c b/src/ov_SC04_009/ov_SC04_009_jr_8015A3C8.c index bf6469688..7765391cd 100644 --- a/src/ov_SC04_009/ov_SC04_009_jr_8015A3C8.c +++ b/src/ov_SC04_009/ov_SC04_009_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_009/ov_SC04_009_jr_8015AE2C.c b/src/ov_SC04_009/ov_SC04_009_jr_8015AE2C.c index 4383915d7..79413289c 100644 --- a/src/ov_SC04_009/ov_SC04_009_jr_8015AE2C.c +++ b/src/ov_SC04_009/ov_SC04_009_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_009/ov_SC04_009_jr_8016AB6C.c b/src/ov_SC04_009/ov_SC04_009_jr_8016AB6C.c index fd109b180..4e1947a79 100644 --- a/src/ov_SC04_009/ov_SC04_009_jr_8016AB6C.c +++ b/src/ov_SC04_009/ov_SC04_009_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_009/ov_SC04_009_jr_801734BC.c b/src/ov_SC04_009/ov_SC04_009_jr_801734BC.c index ce0feca3c..e68a27f95 100644 --- a/src/ov_SC04_009/ov_SC04_009_jr_801734BC.c +++ b/src/ov_SC04_009/ov_SC04_009_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_009/ov_SC04_009_jr_80178D40.c b/src/ov_SC04_009/ov_SC04_009_jr_80178D40.c index 863e25930..164dffa46 100644 --- a/src/ov_SC04_009/ov_SC04_009_jr_80178D40.c +++ b/src/ov_SC04_009/ov_SC04_009_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_009/ov_SC04_009_jr_8017A4AC.c b/src/ov_SC04_009/ov_SC04_009_jr_8017A4AC.c index 38f25ab7e..ad2e25ae6 100644 --- a/src/ov_SC04_009/ov_SC04_009_jr_8017A4AC.c +++ b/src/ov_SC04_009/ov_SC04_009_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_009/ov_SC04_009_jr_8017BEBC.c b/src/ov_SC04_009/ov_SC04_009_jr_8017BEBC.c index 57427cd46..0d731e937 100644 --- a/src/ov_SC04_009/ov_SC04_009_jr_8017BEBC.c +++ b/src/ov_SC04_009/ov_SC04_009_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_010/ov_SC04_010_after.c b/src/ov_SC04_010/ov_SC04_010_after.c index 43c3033f6..ab37b2114 100644 --- a/src/ov_SC04_010/ov_SC04_010_after.c +++ b/src/ov_SC04_010/ov_SC04_010_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC04_010/nonmatchings/ov_SC04_010_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC04_010/ov_SC04_010_jr_8015444C.c b/src/ov_SC04_010/ov_SC04_010_jr_8015444C.c index 60d7c9e09..80ecb97a0 100644 --- a/src/ov_SC04_010/ov_SC04_010_jr_8015444C.c +++ b/src/ov_SC04_010/ov_SC04_010_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_010/ov_SC04_010_jr_8015A3C8.c b/src/ov_SC04_010/ov_SC04_010_jr_8015A3C8.c index 8b113f404..95eb80a0d 100644 --- a/src/ov_SC04_010/ov_SC04_010_jr_8015A3C8.c +++ b/src/ov_SC04_010/ov_SC04_010_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_010/ov_SC04_010_jr_8015AE2C.c b/src/ov_SC04_010/ov_SC04_010_jr_8015AE2C.c index 435d39f47..5a0e5e3ca 100644 --- a/src/ov_SC04_010/ov_SC04_010_jr_8015AE2C.c +++ b/src/ov_SC04_010/ov_SC04_010_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_010/ov_SC04_010_jr_8016AB6C.c b/src/ov_SC04_010/ov_SC04_010_jr_8016AB6C.c index 94768850f..9bdda1355 100644 --- a/src/ov_SC04_010/ov_SC04_010_jr_8016AB6C.c +++ b/src/ov_SC04_010/ov_SC04_010_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_010/ov_SC04_010_jr_801734BC.c b/src/ov_SC04_010/ov_SC04_010_jr_801734BC.c index 7832b81c1..6b68beefd 100644 --- a/src/ov_SC04_010/ov_SC04_010_jr_801734BC.c +++ b/src/ov_SC04_010/ov_SC04_010_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_010/ov_SC04_010_jr_80178D40.c b/src/ov_SC04_010/ov_SC04_010_jr_80178D40.c index a40c66b39..bb853d6ca 100644 --- a/src/ov_SC04_010/ov_SC04_010_jr_80178D40.c +++ b/src/ov_SC04_010/ov_SC04_010_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_010/ov_SC04_010_jr_8017A4AC.c b/src/ov_SC04_010/ov_SC04_010_jr_8017A4AC.c index 7982a1d0e..22b4028fe 100644 --- a/src/ov_SC04_010/ov_SC04_010_jr_8017A4AC.c +++ b/src/ov_SC04_010/ov_SC04_010_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_010/ov_SC04_010_jr_8017BEBC.c b/src/ov_SC04_010/ov_SC04_010_jr_8017BEBC.c index c477f776b..201444d66 100644 --- a/src/ov_SC04_010/ov_SC04_010_jr_8017BEBC.c +++ b/src/ov_SC04_010/ov_SC04_010_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_011/ov_SC04_011_after.c b/src/ov_SC04_011/ov_SC04_011_after.c index 8bde0ab01..83542a3f5 100644 --- a/src/ov_SC04_011/ov_SC04_011_after.c +++ b/src/ov_SC04_011/ov_SC04_011_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC04_011/nonmatchings/ov_SC04_011_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC04_011/ov_SC04_011_jr_8015444C.c b/src/ov_SC04_011/ov_SC04_011_jr_8015444C.c index 23d998406..3a8bbe9bb 100644 --- a/src/ov_SC04_011/ov_SC04_011_jr_8015444C.c +++ b/src/ov_SC04_011/ov_SC04_011_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_011/ov_SC04_011_jr_8015A3C8.c b/src/ov_SC04_011/ov_SC04_011_jr_8015A3C8.c index 001f84848..55076f1e9 100644 --- a/src/ov_SC04_011/ov_SC04_011_jr_8015A3C8.c +++ b/src/ov_SC04_011/ov_SC04_011_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_011/ov_SC04_011_jr_8015AE2C.c b/src/ov_SC04_011/ov_SC04_011_jr_8015AE2C.c index 577c66017..c54f9b239 100644 --- a/src/ov_SC04_011/ov_SC04_011_jr_8015AE2C.c +++ b/src/ov_SC04_011/ov_SC04_011_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_011/ov_SC04_011_jr_8016AB6C.c b/src/ov_SC04_011/ov_SC04_011_jr_8016AB6C.c index c90abf884..981080521 100644 --- a/src/ov_SC04_011/ov_SC04_011_jr_8016AB6C.c +++ b/src/ov_SC04_011/ov_SC04_011_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_011/ov_SC04_011_jr_801734BC.c b/src/ov_SC04_011/ov_SC04_011_jr_801734BC.c index 14ab20f33..394c1476e 100644 --- a/src/ov_SC04_011/ov_SC04_011_jr_801734BC.c +++ b/src/ov_SC04_011/ov_SC04_011_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_011/ov_SC04_011_jr_80178D40.c b/src/ov_SC04_011/ov_SC04_011_jr_80178D40.c index 9c2bec627..9805cf943 100644 --- a/src/ov_SC04_011/ov_SC04_011_jr_80178D40.c +++ b/src/ov_SC04_011/ov_SC04_011_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_011/ov_SC04_011_jr_8017A4AC.c b/src/ov_SC04_011/ov_SC04_011_jr_8017A4AC.c index c76e569e4..6fce23b26 100644 --- a/src/ov_SC04_011/ov_SC04_011_jr_8017A4AC.c +++ b/src/ov_SC04_011/ov_SC04_011_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_011/ov_SC04_011_jr_8017D494.c b/src/ov_SC04_011/ov_SC04_011_jr_8017D494.c index c7fc9ae06..e8cc2db72 100644 --- a/src/ov_SC04_011/ov_SC04_011_jr_8017D494.c +++ b/src/ov_SC04_011/ov_SC04_011_jr_8017D494.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_012/ov_SC04_012_after.c b/src/ov_SC04_012/ov_SC04_012_after.c index 0ec8bed87..6dbcb7e33 100644 --- a/src/ov_SC04_012/ov_SC04_012_after.c +++ b/src/ov_SC04_012/ov_SC04_012_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC04_012/ov_SC04_012_jr_8015444C.c b/src/ov_SC04_012/ov_SC04_012_jr_8015444C.c index a365fe2c2..8b595a183 100644 --- a/src/ov_SC04_012/ov_SC04_012_jr_8015444C.c +++ b/src/ov_SC04_012/ov_SC04_012_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_012/ov_SC04_012_jr_8015A3C8.c b/src/ov_SC04_012/ov_SC04_012_jr_8015A3C8.c index 31ad4c76b..aa15a8b62 100644 --- a/src/ov_SC04_012/ov_SC04_012_jr_8015A3C8.c +++ b/src/ov_SC04_012/ov_SC04_012_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_012/ov_SC04_012_jr_8015AE2C.c b/src/ov_SC04_012/ov_SC04_012_jr_8015AE2C.c index 56318be65..4a3795732 100644 --- a/src/ov_SC04_012/ov_SC04_012_jr_8015AE2C.c +++ b/src/ov_SC04_012/ov_SC04_012_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_012/ov_SC04_012_jr_8016AB6C.c b/src/ov_SC04_012/ov_SC04_012_jr_8016AB6C.c index 618d6d086..314bccebe 100644 --- a/src/ov_SC04_012/ov_SC04_012_jr_8016AB6C.c +++ b/src/ov_SC04_012/ov_SC04_012_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_012/ov_SC04_012_jr_801734BC.c b/src/ov_SC04_012/ov_SC04_012_jr_801734BC.c index 09ddd0f7f..07b53aa04 100644 --- a/src/ov_SC04_012/ov_SC04_012_jr_801734BC.c +++ b/src/ov_SC04_012/ov_SC04_012_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_012/ov_SC04_012_jr_80178D40.c b/src/ov_SC04_012/ov_SC04_012_jr_80178D40.c index f0e0fe5f2..b7c970d5e 100644 --- a/src/ov_SC04_012/ov_SC04_012_jr_80178D40.c +++ b/src/ov_SC04_012/ov_SC04_012_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_012/ov_SC04_012_jr_8017A4AC.c b/src/ov_SC04_012/ov_SC04_012_jr_8017A4AC.c index 993bc0fc8..d1ae59987 100644 --- a/src/ov_SC04_012/ov_SC04_012_jr_8017A4AC.c +++ b/src/ov_SC04_012/ov_SC04_012_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_015/ov_SC04_015_after.c b/src/ov_SC04_015/ov_SC04_015_after.c index 55d88adea..be92e7ac0 100644 --- a/src/ov_SC04_015/ov_SC04_015_after.c +++ b/src/ov_SC04_015/ov_SC04_015_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC04_015/ov_SC04_015_jr_8015444C.c b/src/ov_SC04_015/ov_SC04_015_jr_8015444C.c index bba79656c..a186e2787 100644 --- a/src/ov_SC04_015/ov_SC04_015_jr_8015444C.c +++ b/src/ov_SC04_015/ov_SC04_015_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_015/ov_SC04_015_jr_8015A3C8.c b/src/ov_SC04_015/ov_SC04_015_jr_8015A3C8.c index b97992571..4bfc1170c 100644 --- a/src/ov_SC04_015/ov_SC04_015_jr_8015A3C8.c +++ b/src/ov_SC04_015/ov_SC04_015_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_015/ov_SC04_015_jr_8015AE2C.c b/src/ov_SC04_015/ov_SC04_015_jr_8015AE2C.c index 7a7f19c99..e71a26a8b 100644 --- a/src/ov_SC04_015/ov_SC04_015_jr_8015AE2C.c +++ b/src/ov_SC04_015/ov_SC04_015_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_015/ov_SC04_015_jr_8016AB6C.c b/src/ov_SC04_015/ov_SC04_015_jr_8016AB6C.c index 3cc48e871..f26262699 100644 --- a/src/ov_SC04_015/ov_SC04_015_jr_8016AB6C.c +++ b/src/ov_SC04_015/ov_SC04_015_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_015/ov_SC04_015_jr_801734BC.c b/src/ov_SC04_015/ov_SC04_015_jr_801734BC.c index d03ebfdfd..587bd6794 100644 --- a/src/ov_SC04_015/ov_SC04_015_jr_801734BC.c +++ b/src/ov_SC04_015/ov_SC04_015_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_015/ov_SC04_015_jr_80178D40.c b/src/ov_SC04_015/ov_SC04_015_jr_80178D40.c index d0d762a27..efc0c9ad0 100644 --- a/src/ov_SC04_015/ov_SC04_015_jr_80178D40.c +++ b/src/ov_SC04_015/ov_SC04_015_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_015/ov_SC04_015_jr_8017A4AC.c b/src/ov_SC04_015/ov_SC04_015_jr_8017A4AC.c index faa55777c..2812ca782 100644 --- a/src/ov_SC04_015/ov_SC04_015_jr_8017A4AC.c +++ b/src/ov_SC04_015/ov_SC04_015_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_016/ov_SC04_016_after.c b/src/ov_SC04_016/ov_SC04_016_after.c index 265d0add8..2018050e8 100644 --- a/src/ov_SC04_016/ov_SC04_016_after.c +++ b/src/ov_SC04_016/ov_SC04_016_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC04_016/nonmatchings/ov_SC04_016_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC04_016/ov_SC04_016_jr_8015444C.c b/src/ov_SC04_016/ov_SC04_016_jr_8015444C.c index 162295f6e..1106cc0f1 100644 --- a/src/ov_SC04_016/ov_SC04_016_jr_8015444C.c +++ b/src/ov_SC04_016/ov_SC04_016_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_016/ov_SC04_016_jr_8015A3C8.c b/src/ov_SC04_016/ov_SC04_016_jr_8015A3C8.c index 781380855..26d898511 100644 --- a/src/ov_SC04_016/ov_SC04_016_jr_8015A3C8.c +++ b/src/ov_SC04_016/ov_SC04_016_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_016/ov_SC04_016_jr_8015AE2C.c b/src/ov_SC04_016/ov_SC04_016_jr_8015AE2C.c index 38b0c5548..42715e13c 100644 --- a/src/ov_SC04_016/ov_SC04_016_jr_8015AE2C.c +++ b/src/ov_SC04_016/ov_SC04_016_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_016/ov_SC04_016_jr_8016AB6C.c b/src/ov_SC04_016/ov_SC04_016_jr_8016AB6C.c index b67dacc00..0918bb2f4 100644 --- a/src/ov_SC04_016/ov_SC04_016_jr_8016AB6C.c +++ b/src/ov_SC04_016/ov_SC04_016_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_016/ov_SC04_016_jr_801734BC.c b/src/ov_SC04_016/ov_SC04_016_jr_801734BC.c index ea59f948b..ad52812e5 100644 --- a/src/ov_SC04_016/ov_SC04_016_jr_801734BC.c +++ b/src/ov_SC04_016/ov_SC04_016_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_016/ov_SC04_016_jr_80178D40.c b/src/ov_SC04_016/ov_SC04_016_jr_80178D40.c index bd1934b78..c130a8640 100644 --- a/src/ov_SC04_016/ov_SC04_016_jr_80178D40.c +++ b/src/ov_SC04_016/ov_SC04_016_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_016/ov_SC04_016_jr_8017A4AC.c b/src/ov_SC04_016/ov_SC04_016_jr_8017A4AC.c index a23c7eabc..8395c5b67 100644 --- a/src/ov_SC04_016/ov_SC04_016_jr_8017A4AC.c +++ b/src/ov_SC04_016/ov_SC04_016_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_016/ov_SC04_016_jr_8017BEBC.c b/src/ov_SC04_016/ov_SC04_016_jr_8017BEBC.c index 2ad7129a5..f8bf32593 100644 --- a/src/ov_SC04_016/ov_SC04_016_jr_8017BEBC.c +++ b/src/ov_SC04_016/ov_SC04_016_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_018/ov_SC04_018_after.c b/src/ov_SC04_018/ov_SC04_018_after.c index 22a3b6b45..a706a56f7 100644 --- a/src/ov_SC04_018/ov_SC04_018_after.c +++ b/src/ov_SC04_018/ov_SC04_018_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC04_018/ov_SC04_018_jr_8015444C.c b/src/ov_SC04_018/ov_SC04_018_jr_8015444C.c index 251587d92..e6e365bb4 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_8015444C.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_018/ov_SC04_018_jr_8015A3C8.c b/src/ov_SC04_018/ov_SC04_018_jr_8015A3C8.c index 27cb28e25..78f996bbe 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_8015A3C8.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_018/ov_SC04_018_jr_8015AE2C.c b/src/ov_SC04_018/ov_SC04_018_jr_8015AE2C.c index 0b3dc0495..bd8a52171 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_8015AE2C.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_018/ov_SC04_018_jr_8016AB6C.c b/src/ov_SC04_018/ov_SC04_018_jr_8016AB6C.c index 3ca896a59..bb7c644f9 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_8016AB6C.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_018/ov_SC04_018_jr_801734BC.c b/src/ov_SC04_018/ov_SC04_018_jr_801734BC.c index 77686c28d..ced1018d5 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_801734BC.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_018/ov_SC04_018_jr_80178D40.c b/src/ov_SC04_018/ov_SC04_018_jr_80178D40.c index f79f6885a..190fc0c99 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_80178D40.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_018/ov_SC04_018_jr_8017A4AC.c b/src/ov_SC04_018/ov_SC04_018_jr_8017A4AC.c index 6bd06af37..bc0ffa81d 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_8017A4AC.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_019/ov_SC04_019_after.c b/src/ov_SC04_019/ov_SC04_019_after.c index e06f1df1f..4bd5e0d6c 100644 --- a/src/ov_SC04_019/ov_SC04_019_after.c +++ b/src/ov_SC04_019/ov_SC04_019_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC04_019/ov_SC04_019_jr_8015444C.c b/src/ov_SC04_019/ov_SC04_019_jr_8015444C.c index e0a3effab..99050d246 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_8015444C.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_019/ov_SC04_019_jr_8015A3C8.c b/src/ov_SC04_019/ov_SC04_019_jr_8015A3C8.c index 27cb28e25..78f996bbe 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_8015A3C8.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_019/ov_SC04_019_jr_8015AE2C.c b/src/ov_SC04_019/ov_SC04_019_jr_8015AE2C.c index ec1b7835e..295f14aaa 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_8015AE2C.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_019/ov_SC04_019_jr_8016AB6C.c b/src/ov_SC04_019/ov_SC04_019_jr_8016AB6C.c index 190fa3053..94a98cfc4 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_8016AB6C.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_019/ov_SC04_019_jr_801734BC.c b/src/ov_SC04_019/ov_SC04_019_jr_801734BC.c index 79e4e5e35..c604f1134 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_801734BC.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_019/ov_SC04_019_jr_80178D40.c b/src/ov_SC04_019/ov_SC04_019_jr_80178D40.c index 3578f97a7..74bc1c5e8 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_80178D40.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_019/ov_SC04_019_jr_8017A4AC.c b/src/ov_SC04_019/ov_SC04_019_jr_8017A4AC.c index 5ad1c726c..73ed77a57 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_8017A4AC.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_020/ov_SC04_020_after.c b/src/ov_SC04_020/ov_SC04_020_after.c index 14349200f..d00110afd 100644 --- a/src/ov_SC04_020/ov_SC04_020_after.c +++ b/src/ov_SC04_020/ov_SC04_020_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC04_020/nonmatchings/ov_SC04_020_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC04_020/ov_SC04_020_jr_8015444C.c b/src/ov_SC04_020/ov_SC04_020_jr_8015444C.c index b47f9742f..2c8322754 100644 --- a/src/ov_SC04_020/ov_SC04_020_jr_8015444C.c +++ b/src/ov_SC04_020/ov_SC04_020_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_020/ov_SC04_020_jr_8015A3C8.c b/src/ov_SC04_020/ov_SC04_020_jr_8015A3C8.c index 50d16ef52..4b84334ef 100644 --- a/src/ov_SC04_020/ov_SC04_020_jr_8015A3C8.c +++ b/src/ov_SC04_020/ov_SC04_020_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_020/ov_SC04_020_jr_8015AE2C.c b/src/ov_SC04_020/ov_SC04_020_jr_8015AE2C.c index d0d525d04..a6061c476 100644 --- a/src/ov_SC04_020/ov_SC04_020_jr_8015AE2C.c +++ b/src/ov_SC04_020/ov_SC04_020_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_020/ov_SC04_020_jr_8016AB6C.c b/src/ov_SC04_020/ov_SC04_020_jr_8016AB6C.c index 095306ea4..d28d6ea47 100644 --- a/src/ov_SC04_020/ov_SC04_020_jr_8016AB6C.c +++ b/src/ov_SC04_020/ov_SC04_020_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_020/ov_SC04_020_jr_801734BC.c b/src/ov_SC04_020/ov_SC04_020_jr_801734BC.c index 19935f80f..0655ce983 100644 --- a/src/ov_SC04_020/ov_SC04_020_jr_801734BC.c +++ b/src/ov_SC04_020/ov_SC04_020_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_020/ov_SC04_020_jr_80178D40.c b/src/ov_SC04_020/ov_SC04_020_jr_80178D40.c index 0258ecb31..345ecb37d 100644 --- a/src/ov_SC04_020/ov_SC04_020_jr_80178D40.c +++ b/src/ov_SC04_020/ov_SC04_020_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_020/ov_SC04_020_jr_8017A4AC.c b/src/ov_SC04_020/ov_SC04_020_jr_8017A4AC.c index bd8f1b2c9..930d2c169 100644 --- a/src/ov_SC04_020/ov_SC04_020_jr_8017A4AC.c +++ b/src/ov_SC04_020/ov_SC04_020_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_020/ov_SC04_020_jr_8017D604.c b/src/ov_SC04_020/ov_SC04_020_jr_8017D604.c index 558792c44..7edf39224 100644 --- a/src/ov_SC04_020/ov_SC04_020_jr_8017D604.c +++ b/src/ov_SC04_020/ov_SC04_020_jr_8017D604.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_021/ov_SC04_021_after.c b/src/ov_SC04_021/ov_SC04_021_after.c index cc1691d6c..074561eff 100644 --- a/src/ov_SC04_021/ov_SC04_021_after.c +++ b/src/ov_SC04_021/ov_SC04_021_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC04_021/nonmatchings/ov_SC04_021_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC04_021/ov_SC04_021_jr_8015444C.c b/src/ov_SC04_021/ov_SC04_021_jr_8015444C.c index 4eb87b596..90d3866fc 100644 --- a/src/ov_SC04_021/ov_SC04_021_jr_8015444C.c +++ b/src/ov_SC04_021/ov_SC04_021_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_021/ov_SC04_021_jr_8015A3C8.c b/src/ov_SC04_021/ov_SC04_021_jr_8015A3C8.c index 43cb291ad..5522f97be 100644 --- a/src/ov_SC04_021/ov_SC04_021_jr_8015A3C8.c +++ b/src/ov_SC04_021/ov_SC04_021_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_021/ov_SC04_021_jr_8015AE2C.c b/src/ov_SC04_021/ov_SC04_021_jr_8015AE2C.c index 091627c3a..138e2ce60 100644 --- a/src/ov_SC04_021/ov_SC04_021_jr_8015AE2C.c +++ b/src/ov_SC04_021/ov_SC04_021_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_021/ov_SC04_021_jr_8016AB6C.c b/src/ov_SC04_021/ov_SC04_021_jr_8016AB6C.c index aa2f9e49e..46d31ed74 100644 --- a/src/ov_SC04_021/ov_SC04_021_jr_8016AB6C.c +++ b/src/ov_SC04_021/ov_SC04_021_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_021/ov_SC04_021_jr_801734BC.c b/src/ov_SC04_021/ov_SC04_021_jr_801734BC.c index 1be0dfe27..07a72a3b2 100644 --- a/src/ov_SC04_021/ov_SC04_021_jr_801734BC.c +++ b/src/ov_SC04_021/ov_SC04_021_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_021/ov_SC04_021_jr_80178D40.c b/src/ov_SC04_021/ov_SC04_021_jr_80178D40.c index 7bfc95fb8..cf356b81c 100644 --- a/src/ov_SC04_021/ov_SC04_021_jr_80178D40.c +++ b/src/ov_SC04_021/ov_SC04_021_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_021/ov_SC04_021_jr_8017A4AC.c b/src/ov_SC04_021/ov_SC04_021_jr_8017A4AC.c index 6a0764cad..4298f57a2 100644 --- a/src/ov_SC04_021/ov_SC04_021_jr_8017A4AC.c +++ b/src/ov_SC04_021/ov_SC04_021_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC04_021/ov_SC04_021_jr_8017D5C0.c b/src/ov_SC04_021/ov_SC04_021_jr_8017D5C0.c index 7d61077ea..83fd2d55f 100644 --- a/src/ov_SC04_021/ov_SC04_021_jr_8017D5C0.c +++ b/src/ov_SC04_021/ov_SC04_021_jr_8017D5C0.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_000/ov_SC05_000_after.c b/src/ov_SC05_000/ov_SC05_000_after.c index a35852ef5..476449076 100644 --- a/src/ov_SC05_000/ov_SC05_000_after.c +++ b/src/ov_SC05_000/ov_SC05_000_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC05_000/nonmatchings/ov_SC05_000_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC05_000/ov_SC05_000_jr_8015444C.c b/src/ov_SC05_000/ov_SC05_000_jr_8015444C.c index fba66db49..feb53f4f6 100644 --- a/src/ov_SC05_000/ov_SC05_000_jr_8015444C.c +++ b/src/ov_SC05_000/ov_SC05_000_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_000/ov_SC05_000_jr_8015A3C8.c b/src/ov_SC05_000/ov_SC05_000_jr_8015A3C8.c index eb4021a07..ac0f9cf7b 100644 --- a/src/ov_SC05_000/ov_SC05_000_jr_8015A3C8.c +++ b/src/ov_SC05_000/ov_SC05_000_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_000/ov_SC05_000_jr_8015AE2C.c b/src/ov_SC05_000/ov_SC05_000_jr_8015AE2C.c index 82b306948..19eb26fe2 100644 --- a/src/ov_SC05_000/ov_SC05_000_jr_8015AE2C.c +++ b/src/ov_SC05_000/ov_SC05_000_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_000/ov_SC05_000_jr_8016AB6C.c b/src/ov_SC05_000/ov_SC05_000_jr_8016AB6C.c index 2081423dd..7b209d4d7 100644 --- a/src/ov_SC05_000/ov_SC05_000_jr_8016AB6C.c +++ b/src/ov_SC05_000/ov_SC05_000_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_000/ov_SC05_000_jr_801734BC.c b/src/ov_SC05_000/ov_SC05_000_jr_801734BC.c index a59d2668d..070768012 100644 --- a/src/ov_SC05_000/ov_SC05_000_jr_801734BC.c +++ b/src/ov_SC05_000/ov_SC05_000_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_000/ov_SC05_000_jr_80178D40.c b/src/ov_SC05_000/ov_SC05_000_jr_80178D40.c index 291e318aa..4ada63e42 100644 --- a/src/ov_SC05_000/ov_SC05_000_jr_80178D40.c +++ b/src/ov_SC05_000/ov_SC05_000_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_000/ov_SC05_000_jr_8017A4AC.c b/src/ov_SC05_000/ov_SC05_000_jr_8017A4AC.c index 80dad933f..70a4acd58 100644 --- a/src/ov_SC05_000/ov_SC05_000_jr_8017A4AC.c +++ b/src/ov_SC05_000/ov_SC05_000_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_000/ov_SC05_000_jr_8017BEBC.c b/src/ov_SC05_000/ov_SC05_000_jr_8017BEBC.c index a98fdceb3..b566695f2 100644 --- a/src/ov_SC05_000/ov_SC05_000_jr_8017BEBC.c +++ b/src/ov_SC05_000/ov_SC05_000_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_001/ov_SC05_001_after.c b/src/ov_SC05_001/ov_SC05_001_after.c index 134a20b65..8720e2820 100644 --- a/src/ov_SC05_001/ov_SC05_001_after.c +++ b/src/ov_SC05_001/ov_SC05_001_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC05_001/nonmatchings/ov_SC05_001_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC05_001/ov_SC05_001_jr_8015444C.c b/src/ov_SC05_001/ov_SC05_001_jr_8015444C.c index f1485862b..0f147f228 100644 --- a/src/ov_SC05_001/ov_SC05_001_jr_8015444C.c +++ b/src/ov_SC05_001/ov_SC05_001_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_001/ov_SC05_001_jr_8015A3C8.c b/src/ov_SC05_001/ov_SC05_001_jr_8015A3C8.c index 8ff72c196..f1ff34346 100644 --- a/src/ov_SC05_001/ov_SC05_001_jr_8015A3C8.c +++ b/src/ov_SC05_001/ov_SC05_001_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_001/ov_SC05_001_jr_8015AE2C.c b/src/ov_SC05_001/ov_SC05_001_jr_8015AE2C.c index d76488918..d8258fa36 100644 --- a/src/ov_SC05_001/ov_SC05_001_jr_8015AE2C.c +++ b/src/ov_SC05_001/ov_SC05_001_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_001/ov_SC05_001_jr_8016AB6C.c b/src/ov_SC05_001/ov_SC05_001_jr_8016AB6C.c index 2d33d35a3..8f13850b8 100644 --- a/src/ov_SC05_001/ov_SC05_001_jr_8016AB6C.c +++ b/src/ov_SC05_001/ov_SC05_001_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_001/ov_SC05_001_jr_801734BC.c b/src/ov_SC05_001/ov_SC05_001_jr_801734BC.c index 496aac39b..942e26d00 100644 --- a/src/ov_SC05_001/ov_SC05_001_jr_801734BC.c +++ b/src/ov_SC05_001/ov_SC05_001_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_001/ov_SC05_001_jr_80178D40.c b/src/ov_SC05_001/ov_SC05_001_jr_80178D40.c index 80061faec..2f631f329 100644 --- a/src/ov_SC05_001/ov_SC05_001_jr_80178D40.c +++ b/src/ov_SC05_001/ov_SC05_001_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_001/ov_SC05_001_jr_8017A4AC.c b/src/ov_SC05_001/ov_SC05_001_jr_8017A4AC.c index b964cdac3..8a097beed 100644 --- a/src/ov_SC05_001/ov_SC05_001_jr_8017A4AC.c +++ b/src/ov_SC05_001/ov_SC05_001_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_001/ov_SC05_001_jr_8017BEBC.c b/src/ov_SC05_001/ov_SC05_001_jr_8017BEBC.c index ea4a5cc12..29dca914e 100644 --- a/src/ov_SC05_001/ov_SC05_001_jr_8017BEBC.c +++ b/src/ov_SC05_001/ov_SC05_001_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_002/ov_SC05_002_after.c b/src/ov_SC05_002/ov_SC05_002_after.c index 8b8a6eb9a..484a80b9d 100644 --- a/src/ov_SC05_002/ov_SC05_002_after.c +++ b/src/ov_SC05_002/ov_SC05_002_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC05_002/nonmatchings/ov_SC05_002_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC05_002/ov_SC05_002_jr_8015444C.c b/src/ov_SC05_002/ov_SC05_002_jr_8015444C.c index 5926fd753..ae233ee6b 100644 --- a/src/ov_SC05_002/ov_SC05_002_jr_8015444C.c +++ b/src/ov_SC05_002/ov_SC05_002_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_002/ov_SC05_002_jr_8015A3C8.c b/src/ov_SC05_002/ov_SC05_002_jr_8015A3C8.c index 5c60d68e3..868d3bf6b 100644 --- a/src/ov_SC05_002/ov_SC05_002_jr_8015A3C8.c +++ b/src/ov_SC05_002/ov_SC05_002_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_002/ov_SC05_002_jr_8015AE2C.c b/src/ov_SC05_002/ov_SC05_002_jr_8015AE2C.c index 8ed46b1e5..983973950 100644 --- a/src/ov_SC05_002/ov_SC05_002_jr_8015AE2C.c +++ b/src/ov_SC05_002/ov_SC05_002_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_002/ov_SC05_002_jr_8016AB6C.c b/src/ov_SC05_002/ov_SC05_002_jr_8016AB6C.c index ec05dd7f1..8855de75c 100644 --- a/src/ov_SC05_002/ov_SC05_002_jr_8016AB6C.c +++ b/src/ov_SC05_002/ov_SC05_002_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_002/ov_SC05_002_jr_801734BC.c b/src/ov_SC05_002/ov_SC05_002_jr_801734BC.c index c77423acf..6ea94e75c 100644 --- a/src/ov_SC05_002/ov_SC05_002_jr_801734BC.c +++ b/src/ov_SC05_002/ov_SC05_002_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_002/ov_SC05_002_jr_80178D40.c b/src/ov_SC05_002/ov_SC05_002_jr_80178D40.c index 12df063d3..b7b97cb31 100644 --- a/src/ov_SC05_002/ov_SC05_002_jr_80178D40.c +++ b/src/ov_SC05_002/ov_SC05_002_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_002/ov_SC05_002_jr_8017A4AC.c b/src/ov_SC05_002/ov_SC05_002_jr_8017A4AC.c index 603087a3e..0d9253d5c 100644 --- a/src/ov_SC05_002/ov_SC05_002_jr_8017A4AC.c +++ b/src/ov_SC05_002/ov_SC05_002_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_002/ov_SC05_002_jr_8017BEBC.c b/src/ov_SC05_002/ov_SC05_002_jr_8017BEBC.c index 36d67f80d..01acdc3e7 100644 --- a/src/ov_SC05_002/ov_SC05_002_jr_8017BEBC.c +++ b/src/ov_SC05_002/ov_SC05_002_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_003/ov_SC05_003_after.c b/src/ov_SC05_003/ov_SC05_003_after.c index 9fe31fb11..b67b9dc64 100644 --- a/src/ov_SC05_003/ov_SC05_003_after.c +++ b/src/ov_SC05_003/ov_SC05_003_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC05_003/nonmatchings/ov_SC05_003_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC05_003/ov_SC05_003_jr_8015444C.c b/src/ov_SC05_003/ov_SC05_003_jr_8015444C.c index 5e37294ea..d7479450c 100644 --- a/src/ov_SC05_003/ov_SC05_003_jr_8015444C.c +++ b/src/ov_SC05_003/ov_SC05_003_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_003/ov_SC05_003_jr_8015A3C8.c b/src/ov_SC05_003/ov_SC05_003_jr_8015A3C8.c index b55ecd9b3..645087496 100644 --- a/src/ov_SC05_003/ov_SC05_003_jr_8015A3C8.c +++ b/src/ov_SC05_003/ov_SC05_003_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_003/ov_SC05_003_jr_8015AE2C.c b/src/ov_SC05_003/ov_SC05_003_jr_8015AE2C.c index a952f0dcc..562db956c 100644 --- a/src/ov_SC05_003/ov_SC05_003_jr_8015AE2C.c +++ b/src/ov_SC05_003/ov_SC05_003_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_003/ov_SC05_003_jr_8016AB6C.c b/src/ov_SC05_003/ov_SC05_003_jr_8016AB6C.c index 69cef9705..55adcb39a 100644 --- a/src/ov_SC05_003/ov_SC05_003_jr_8016AB6C.c +++ b/src/ov_SC05_003/ov_SC05_003_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_003/ov_SC05_003_jr_801734BC.c b/src/ov_SC05_003/ov_SC05_003_jr_801734BC.c index fb6f49e9b..91813f9ba 100644 --- a/src/ov_SC05_003/ov_SC05_003_jr_801734BC.c +++ b/src/ov_SC05_003/ov_SC05_003_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_003/ov_SC05_003_jr_80178D40.c b/src/ov_SC05_003/ov_SC05_003_jr_80178D40.c index ae146e252..f977474ae 100644 --- a/src/ov_SC05_003/ov_SC05_003_jr_80178D40.c +++ b/src/ov_SC05_003/ov_SC05_003_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_003/ov_SC05_003_jr_8017A4AC.c b/src/ov_SC05_003/ov_SC05_003_jr_8017A4AC.c index 095209412..f237a2fde 100644 --- a/src/ov_SC05_003/ov_SC05_003_jr_8017A4AC.c +++ b/src/ov_SC05_003/ov_SC05_003_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_003/ov_SC05_003_jr_8017BEBC.c b/src/ov_SC05_003/ov_SC05_003_jr_8017BEBC.c index 187a168ae..9280c4378 100644 --- a/src/ov_SC05_003/ov_SC05_003_jr_8017BEBC.c +++ b/src/ov_SC05_003/ov_SC05_003_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_004/ov_SC05_004_after.c b/src/ov_SC05_004/ov_SC05_004_after.c index 8818dc376..1cf1fb5a8 100644 --- a/src/ov_SC05_004/ov_SC05_004_after.c +++ b/src/ov_SC05_004/ov_SC05_004_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC05_004/nonmatchings/ov_SC05_004_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC05_004/ov_SC05_004_jr_8015444C.c b/src/ov_SC05_004/ov_SC05_004_jr_8015444C.c index 1aa83814a..b8f405f99 100644 --- a/src/ov_SC05_004/ov_SC05_004_jr_8015444C.c +++ b/src/ov_SC05_004/ov_SC05_004_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_004/ov_SC05_004_jr_8015A3C8.c b/src/ov_SC05_004/ov_SC05_004_jr_8015A3C8.c index 0e5201269..f7acb8a90 100644 --- a/src/ov_SC05_004/ov_SC05_004_jr_8015A3C8.c +++ b/src/ov_SC05_004/ov_SC05_004_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_004/ov_SC05_004_jr_8015AE2C.c b/src/ov_SC05_004/ov_SC05_004_jr_8015AE2C.c index 9b573a148..0e72566ac 100644 --- a/src/ov_SC05_004/ov_SC05_004_jr_8015AE2C.c +++ b/src/ov_SC05_004/ov_SC05_004_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_004/ov_SC05_004_jr_8016AB6C.c b/src/ov_SC05_004/ov_SC05_004_jr_8016AB6C.c index b0fbc3ea7..a7c1f87a2 100644 --- a/src/ov_SC05_004/ov_SC05_004_jr_8016AB6C.c +++ b/src/ov_SC05_004/ov_SC05_004_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_004/ov_SC05_004_jr_801734BC.c b/src/ov_SC05_004/ov_SC05_004_jr_801734BC.c index 37e7d83d8..bb909221d 100644 --- a/src/ov_SC05_004/ov_SC05_004_jr_801734BC.c +++ b/src/ov_SC05_004/ov_SC05_004_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_004/ov_SC05_004_jr_80178D40.c b/src/ov_SC05_004/ov_SC05_004_jr_80178D40.c index b5c3c4e53..008c7b4b5 100644 --- a/src/ov_SC05_004/ov_SC05_004_jr_80178D40.c +++ b/src/ov_SC05_004/ov_SC05_004_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_004/ov_SC05_004_jr_8017A4AC.c b/src/ov_SC05_004/ov_SC05_004_jr_8017A4AC.c index 70783365c..46d6957eb 100644 --- a/src/ov_SC05_004/ov_SC05_004_jr_8017A4AC.c +++ b/src/ov_SC05_004/ov_SC05_004_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_004/ov_SC05_004_jr_8017BEBC.c b/src/ov_SC05_004/ov_SC05_004_jr_8017BEBC.c index e5cabb2de..2846d69e3 100644 --- a/src/ov_SC05_004/ov_SC05_004_jr_8017BEBC.c +++ b/src/ov_SC05_004/ov_SC05_004_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_005/ov_SC05_005_after.c b/src/ov_SC05_005/ov_SC05_005_after.c index ab0ebc135..1309f1083 100644 --- a/src/ov_SC05_005/ov_SC05_005_after.c +++ b/src/ov_SC05_005/ov_SC05_005_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC05_005/nonmatchings/ov_SC05_005_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC05_005/ov_SC05_005_jr_8015444C.c b/src/ov_SC05_005/ov_SC05_005_jr_8015444C.c index e5580f304..4333279e6 100644 --- a/src/ov_SC05_005/ov_SC05_005_jr_8015444C.c +++ b/src/ov_SC05_005/ov_SC05_005_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_005/ov_SC05_005_jr_8015A3C8.c b/src/ov_SC05_005/ov_SC05_005_jr_8015A3C8.c index e80173fcc..d179fb0a6 100644 --- a/src/ov_SC05_005/ov_SC05_005_jr_8015A3C8.c +++ b/src/ov_SC05_005/ov_SC05_005_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_005/ov_SC05_005_jr_8015AE2C.c b/src/ov_SC05_005/ov_SC05_005_jr_8015AE2C.c index 0d221a801..1af49359e 100644 --- a/src/ov_SC05_005/ov_SC05_005_jr_8015AE2C.c +++ b/src/ov_SC05_005/ov_SC05_005_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_005/ov_SC05_005_jr_8016AB6C.c b/src/ov_SC05_005/ov_SC05_005_jr_8016AB6C.c index 37ce83cb4..4178add9e 100644 --- a/src/ov_SC05_005/ov_SC05_005_jr_8016AB6C.c +++ b/src/ov_SC05_005/ov_SC05_005_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_005/ov_SC05_005_jr_801734BC.c b/src/ov_SC05_005/ov_SC05_005_jr_801734BC.c index f2d47675e..4d00f7747 100644 --- a/src/ov_SC05_005/ov_SC05_005_jr_801734BC.c +++ b/src/ov_SC05_005/ov_SC05_005_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_005/ov_SC05_005_jr_80178D40.c b/src/ov_SC05_005/ov_SC05_005_jr_80178D40.c index d642d72c6..754153158 100644 --- a/src/ov_SC05_005/ov_SC05_005_jr_80178D40.c +++ b/src/ov_SC05_005/ov_SC05_005_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_005/ov_SC05_005_jr_8017A4AC.c b/src/ov_SC05_005/ov_SC05_005_jr_8017A4AC.c index 165ef7dfd..e009f08b1 100644 --- a/src/ov_SC05_005/ov_SC05_005_jr_8017A4AC.c +++ b/src/ov_SC05_005/ov_SC05_005_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_005/ov_SC05_005_jr_8017D898.c b/src/ov_SC05_005/ov_SC05_005_jr_8017D898.c index 6ef9af2bb..bd9ae4351 100644 --- a/src/ov_SC05_005/ov_SC05_005_jr_8017D898.c +++ b/src/ov_SC05_005/ov_SC05_005_jr_8017D898.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_006/ov_SC05_006_after.c b/src/ov_SC05_006/ov_SC05_006_after.c index a71c54bc4..5a0473f7b 100644 --- a/src/ov_SC05_006/ov_SC05_006_after.c +++ b/src/ov_SC05_006/ov_SC05_006_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC05_006/nonmatchings/ov_SC05_006_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC05_006/ov_SC05_006_jr_8015444C.c b/src/ov_SC05_006/ov_SC05_006_jr_8015444C.c index 2907be0ef..f75321e23 100644 --- a/src/ov_SC05_006/ov_SC05_006_jr_8015444C.c +++ b/src/ov_SC05_006/ov_SC05_006_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_006/ov_SC05_006_jr_8015A3C8.c b/src/ov_SC05_006/ov_SC05_006_jr_8015A3C8.c index 0f4e10b2e..872060f09 100644 --- a/src/ov_SC05_006/ov_SC05_006_jr_8015A3C8.c +++ b/src/ov_SC05_006/ov_SC05_006_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_006/ov_SC05_006_jr_8015AE2C.c b/src/ov_SC05_006/ov_SC05_006_jr_8015AE2C.c index 448eb6270..12895b707 100644 --- a/src/ov_SC05_006/ov_SC05_006_jr_8015AE2C.c +++ b/src/ov_SC05_006/ov_SC05_006_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_006/ov_SC05_006_jr_8016AB6C.c b/src/ov_SC05_006/ov_SC05_006_jr_8016AB6C.c index 2c2cb6143..e4e82225c 100644 --- a/src/ov_SC05_006/ov_SC05_006_jr_8016AB6C.c +++ b/src/ov_SC05_006/ov_SC05_006_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_006/ov_SC05_006_jr_801734BC.c b/src/ov_SC05_006/ov_SC05_006_jr_801734BC.c index 592ffaf1a..734da6fdf 100644 --- a/src/ov_SC05_006/ov_SC05_006_jr_801734BC.c +++ b/src/ov_SC05_006/ov_SC05_006_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_006/ov_SC05_006_jr_80178D40.c b/src/ov_SC05_006/ov_SC05_006_jr_80178D40.c index ba1283b67..ce059817e 100644 --- a/src/ov_SC05_006/ov_SC05_006_jr_80178D40.c +++ b/src/ov_SC05_006/ov_SC05_006_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_006/ov_SC05_006_jr_8017A4AC.c b/src/ov_SC05_006/ov_SC05_006_jr_8017A4AC.c index 2b5fa3cb9..bc37eeb45 100644 --- a/src/ov_SC05_006/ov_SC05_006_jr_8017A4AC.c +++ b/src/ov_SC05_006/ov_SC05_006_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_006/ov_SC05_006_jr_8017BEBC.c b/src/ov_SC05_006/ov_SC05_006_jr_8017BEBC.c index e8b1facdd..85bf6f98e 100644 --- a/src/ov_SC05_006/ov_SC05_006_jr_8017BEBC.c +++ b/src/ov_SC05_006/ov_SC05_006_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_007/ov_SC05_007_after.c b/src/ov_SC05_007/ov_SC05_007_after.c index c39969ccc..4a010ae91 100644 --- a/src/ov_SC05_007/ov_SC05_007_after.c +++ b/src/ov_SC05_007/ov_SC05_007_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC05_007/nonmatchings/ov_SC05_007_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC05_007/ov_SC05_007_jr_8015444C.c b/src/ov_SC05_007/ov_SC05_007_jr_8015444C.c index b9d2341f1..03dc460b3 100644 --- a/src/ov_SC05_007/ov_SC05_007_jr_8015444C.c +++ b/src/ov_SC05_007/ov_SC05_007_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_007/ov_SC05_007_jr_8015A3C8.c b/src/ov_SC05_007/ov_SC05_007_jr_8015A3C8.c index 2872e1fa8..3d45d2cb5 100644 --- a/src/ov_SC05_007/ov_SC05_007_jr_8015A3C8.c +++ b/src/ov_SC05_007/ov_SC05_007_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_007/ov_SC05_007_jr_8015AE2C.c b/src/ov_SC05_007/ov_SC05_007_jr_8015AE2C.c index 1a2737bf2..7dcefb9b5 100644 --- a/src/ov_SC05_007/ov_SC05_007_jr_8015AE2C.c +++ b/src/ov_SC05_007/ov_SC05_007_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_007/ov_SC05_007_jr_8016AB6C.c b/src/ov_SC05_007/ov_SC05_007_jr_8016AB6C.c index c54a5a46b..ec3982863 100644 --- a/src/ov_SC05_007/ov_SC05_007_jr_8016AB6C.c +++ b/src/ov_SC05_007/ov_SC05_007_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_007/ov_SC05_007_jr_801734BC.c b/src/ov_SC05_007/ov_SC05_007_jr_801734BC.c index 9b3c55c75..e17a8bddc 100644 --- a/src/ov_SC05_007/ov_SC05_007_jr_801734BC.c +++ b/src/ov_SC05_007/ov_SC05_007_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_007/ov_SC05_007_jr_80178D40.c b/src/ov_SC05_007/ov_SC05_007_jr_80178D40.c index e36e0d791..5836f5a2b 100644 --- a/src/ov_SC05_007/ov_SC05_007_jr_80178D40.c +++ b/src/ov_SC05_007/ov_SC05_007_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_007/ov_SC05_007_jr_8017A4AC.c b/src/ov_SC05_007/ov_SC05_007_jr_8017A4AC.c index b95f0d1ba..288766c09 100644 --- a/src/ov_SC05_007/ov_SC05_007_jr_8017A4AC.c +++ b/src/ov_SC05_007/ov_SC05_007_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_007/ov_SC05_007_jr_8017BEBC.c b/src/ov_SC05_007/ov_SC05_007_jr_8017BEBC.c index acb96a3ef..28e2b51f2 100644 --- a/src/ov_SC05_007/ov_SC05_007_jr_8017BEBC.c +++ b/src/ov_SC05_007/ov_SC05_007_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_008/ov_SC05_008_after.c b/src/ov_SC05_008/ov_SC05_008_after.c index 277546579..101f3882b 100644 --- a/src/ov_SC05_008/ov_SC05_008_after.c +++ b/src/ov_SC05_008/ov_SC05_008_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC05_008/nonmatchings/ov_SC05_008_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC05_008/ov_SC05_008_jr_8015444C.c b/src/ov_SC05_008/ov_SC05_008_jr_8015444C.c index 6129101f2..997222b9f 100644 --- a/src/ov_SC05_008/ov_SC05_008_jr_8015444C.c +++ b/src/ov_SC05_008/ov_SC05_008_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_008/ov_SC05_008_jr_8015A3C8.c b/src/ov_SC05_008/ov_SC05_008_jr_8015A3C8.c index ed3e6bcf4..729bef951 100644 --- a/src/ov_SC05_008/ov_SC05_008_jr_8015A3C8.c +++ b/src/ov_SC05_008/ov_SC05_008_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_008/ov_SC05_008_jr_8015AE2C.c b/src/ov_SC05_008/ov_SC05_008_jr_8015AE2C.c index f3cafb158..65f4510ce 100644 --- a/src/ov_SC05_008/ov_SC05_008_jr_8015AE2C.c +++ b/src/ov_SC05_008/ov_SC05_008_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_008/ov_SC05_008_jr_8016AB6C.c b/src/ov_SC05_008/ov_SC05_008_jr_8016AB6C.c index 90af057fb..bd0316c0c 100644 --- a/src/ov_SC05_008/ov_SC05_008_jr_8016AB6C.c +++ b/src/ov_SC05_008/ov_SC05_008_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_008/ov_SC05_008_jr_801734BC.c b/src/ov_SC05_008/ov_SC05_008_jr_801734BC.c index 1c9bbbdae..038346053 100644 --- a/src/ov_SC05_008/ov_SC05_008_jr_801734BC.c +++ b/src/ov_SC05_008/ov_SC05_008_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_008/ov_SC05_008_jr_80178D40.c b/src/ov_SC05_008/ov_SC05_008_jr_80178D40.c index 327f59c06..6f723f527 100644 --- a/src/ov_SC05_008/ov_SC05_008_jr_80178D40.c +++ b/src/ov_SC05_008/ov_SC05_008_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_008/ov_SC05_008_jr_8017A4AC.c b/src/ov_SC05_008/ov_SC05_008_jr_8017A4AC.c index 998451d55..1e581c6c5 100644 --- a/src/ov_SC05_008/ov_SC05_008_jr_8017A4AC.c +++ b/src/ov_SC05_008/ov_SC05_008_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_009/ov_SC05_009_after.c b/src/ov_SC05_009/ov_SC05_009_after.c index 5e5204d59..105c1909b 100644 --- a/src/ov_SC05_009/ov_SC05_009_after.c +++ b/src/ov_SC05_009/ov_SC05_009_after.c @@ -1629,7 +1629,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1658,7 +1658,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC05_009/nonmatchings/ov_SC05_009_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC05_009/ov_SC05_009_jr_8015AE2C.c b/src/ov_SC05_009/ov_SC05_009_jr_8015AE2C.c index bb4ff9eaf..b04fd7d7c 100644 --- a/src/ov_SC05_009/ov_SC05_009_jr_8015AE2C.c +++ b/src/ov_SC05_009/ov_SC05_009_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_009/ov_SC05_009_jr_8016AB6C.c b/src/ov_SC05_009/ov_SC05_009_jr_8016AB6C.c index 5d0a3a90e..3e984c031 100644 --- a/src/ov_SC05_009/ov_SC05_009_jr_8016AB6C.c +++ b/src/ov_SC05_009/ov_SC05_009_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_009/ov_SC05_009_jr_801734BC.c b/src/ov_SC05_009/ov_SC05_009_jr_801734BC.c index d383f1b8e..221a1b1d7 100644 --- a/src/ov_SC05_009/ov_SC05_009_jr_801734BC.c +++ b/src/ov_SC05_009/ov_SC05_009_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_009/ov_SC05_009_jr_80178D40.c b/src/ov_SC05_009/ov_SC05_009_jr_80178D40.c index 0587ff1e0..228b7dd0b 100644 --- a/src/ov_SC05_009/ov_SC05_009_jr_80178D40.c +++ b/src/ov_SC05_009/ov_SC05_009_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_009/ov_SC05_009_jr_8017A4AC.c b/src/ov_SC05_009/ov_SC05_009_jr_8017A4AC.c index 85ba293f3..9fa574285 100644 --- a/src/ov_SC05_009/ov_SC05_009_jr_8017A4AC.c +++ b/src/ov_SC05_009/ov_SC05_009_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_009/ov_SC05_009_jr_8017BEBC.c b/src/ov_SC05_009/ov_SC05_009_jr_8017BEBC.c index d663d506d..52ee46a8e 100644 --- a/src/ov_SC05_009/ov_SC05_009_jr_8017BEBC.c +++ b/src/ov_SC05_009/ov_SC05_009_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_010/ov_SC05_010_after.c b/src/ov_SC05_010/ov_SC05_010_after.c index 54c6e15e8..4e2efb23a 100644 --- a/src/ov_SC05_010/ov_SC05_010_after.c +++ b/src/ov_SC05_010/ov_SC05_010_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC05_010/nonmatchings/ov_SC05_010_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC05_010/ov_SC05_010_jr_8015444C.c b/src/ov_SC05_010/ov_SC05_010_jr_8015444C.c index a9107c6de..1ca54e10e 100644 --- a/src/ov_SC05_010/ov_SC05_010_jr_8015444C.c +++ b/src/ov_SC05_010/ov_SC05_010_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_010/ov_SC05_010_jr_8015A3C8.c b/src/ov_SC05_010/ov_SC05_010_jr_8015A3C8.c index 5dd9fc4eb..d86a81e4b 100644 --- a/src/ov_SC05_010/ov_SC05_010_jr_8015A3C8.c +++ b/src/ov_SC05_010/ov_SC05_010_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_010/ov_SC05_010_jr_8015AE2C.c b/src/ov_SC05_010/ov_SC05_010_jr_8015AE2C.c index cfa1fe2c3..81652353b 100644 --- a/src/ov_SC05_010/ov_SC05_010_jr_8015AE2C.c +++ b/src/ov_SC05_010/ov_SC05_010_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_010/ov_SC05_010_jr_8016AB6C.c b/src/ov_SC05_010/ov_SC05_010_jr_8016AB6C.c index 555f3007c..3733c1213 100644 --- a/src/ov_SC05_010/ov_SC05_010_jr_8016AB6C.c +++ b/src/ov_SC05_010/ov_SC05_010_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_010/ov_SC05_010_jr_801734BC.c b/src/ov_SC05_010/ov_SC05_010_jr_801734BC.c index aafeb2612..20bebf7a5 100644 --- a/src/ov_SC05_010/ov_SC05_010_jr_801734BC.c +++ b/src/ov_SC05_010/ov_SC05_010_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_010/ov_SC05_010_jr_80178D40.c b/src/ov_SC05_010/ov_SC05_010_jr_80178D40.c index 6f167ed74..e144b256b 100644 --- a/src/ov_SC05_010/ov_SC05_010_jr_80178D40.c +++ b/src/ov_SC05_010/ov_SC05_010_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_010/ov_SC05_010_jr_8017A4AC.c b/src/ov_SC05_010/ov_SC05_010_jr_8017A4AC.c index a78f3c158..c13c822bd 100644 --- a/src/ov_SC05_010/ov_SC05_010_jr_8017A4AC.c +++ b/src/ov_SC05_010/ov_SC05_010_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_010/ov_SC05_010_jr_8017C8D0.c b/src/ov_SC05_010/ov_SC05_010_jr_8017C8D0.c index e7eb52f73..80ea864ff 100644 --- a/src/ov_SC05_010/ov_SC05_010_jr_8017C8D0.c +++ b/src/ov_SC05_010/ov_SC05_010_jr_8017C8D0.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_011/ov_SC05_011_after.c b/src/ov_SC05_011/ov_SC05_011_after.c index 9a22c1fb1..4aafc28f5 100644 --- a/src/ov_SC05_011/ov_SC05_011_after.c +++ b/src/ov_SC05_011/ov_SC05_011_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC05_011/nonmatchings/ov_SC05_011_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC05_011/ov_SC05_011_jr_8015444C.c b/src/ov_SC05_011/ov_SC05_011_jr_8015444C.c index d9fdc3c02..b25981534 100644 --- a/src/ov_SC05_011/ov_SC05_011_jr_8015444C.c +++ b/src/ov_SC05_011/ov_SC05_011_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_011/ov_SC05_011_jr_8015A3C8.c b/src/ov_SC05_011/ov_SC05_011_jr_8015A3C8.c index c6f34cb65..7d385bd28 100644 --- a/src/ov_SC05_011/ov_SC05_011_jr_8015A3C8.c +++ b/src/ov_SC05_011/ov_SC05_011_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_011/ov_SC05_011_jr_8015AE2C.c b/src/ov_SC05_011/ov_SC05_011_jr_8015AE2C.c index fa0eaf113..7840dd5a5 100644 --- a/src/ov_SC05_011/ov_SC05_011_jr_8015AE2C.c +++ b/src/ov_SC05_011/ov_SC05_011_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_011/ov_SC05_011_jr_8016AB6C.c b/src/ov_SC05_011/ov_SC05_011_jr_8016AB6C.c index d1f1d6567..e88abbc87 100644 --- a/src/ov_SC05_011/ov_SC05_011_jr_8016AB6C.c +++ b/src/ov_SC05_011/ov_SC05_011_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_011/ov_SC05_011_jr_801734BC.c b/src/ov_SC05_011/ov_SC05_011_jr_801734BC.c index 24c265512..8ccb0396f 100644 --- a/src/ov_SC05_011/ov_SC05_011_jr_801734BC.c +++ b/src/ov_SC05_011/ov_SC05_011_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_011/ov_SC05_011_jr_80178D40.c b/src/ov_SC05_011/ov_SC05_011_jr_80178D40.c index 8466c767e..0abbbf677 100644 --- a/src/ov_SC05_011/ov_SC05_011_jr_80178D40.c +++ b/src/ov_SC05_011/ov_SC05_011_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_011/ov_SC05_011_jr_8017A4AC.c b/src/ov_SC05_011/ov_SC05_011_jr_8017A4AC.c index 3dc3efcc5..96027ad6b 100644 --- a/src/ov_SC05_011/ov_SC05_011_jr_8017A4AC.c +++ b/src/ov_SC05_011/ov_SC05_011_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_011/ov_SC05_011_jr_8017BEBC.c b/src/ov_SC05_011/ov_SC05_011_jr_8017BEBC.c index d6ce190cb..318492448 100644 --- a/src/ov_SC05_011/ov_SC05_011_jr_8017BEBC.c +++ b/src/ov_SC05_011/ov_SC05_011_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_017/ov_SC05_017_after.c b/src/ov_SC05_017/ov_SC05_017_after.c index 4393eba30..3cbd9433c 100644 --- a/src/ov_SC05_017/ov_SC05_017_after.c +++ b/src/ov_SC05_017/ov_SC05_017_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC05_017/ov_SC05_017_jr_8015444C.c b/src/ov_SC05_017/ov_SC05_017_jr_8015444C.c index ae97899ed..55e921959 100644 --- a/src/ov_SC05_017/ov_SC05_017_jr_8015444C.c +++ b/src/ov_SC05_017/ov_SC05_017_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_017/ov_SC05_017_jr_8015A3C8.c b/src/ov_SC05_017/ov_SC05_017_jr_8015A3C8.c index eb0cc15ea..41c93fd3b 100644 --- a/src/ov_SC05_017/ov_SC05_017_jr_8015A3C8.c +++ b/src/ov_SC05_017/ov_SC05_017_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_017/ov_SC05_017_jr_8015AE2C.c b/src/ov_SC05_017/ov_SC05_017_jr_8015AE2C.c index 09b45d9d5..165c25443 100644 --- a/src/ov_SC05_017/ov_SC05_017_jr_8015AE2C.c +++ b/src/ov_SC05_017/ov_SC05_017_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_017/ov_SC05_017_jr_8016AB6C.c b/src/ov_SC05_017/ov_SC05_017_jr_8016AB6C.c index b402f8a91..cc127fd8d 100644 --- a/src/ov_SC05_017/ov_SC05_017_jr_8016AB6C.c +++ b/src/ov_SC05_017/ov_SC05_017_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_017/ov_SC05_017_jr_801734BC.c b/src/ov_SC05_017/ov_SC05_017_jr_801734BC.c index 9e112299f..72d7ee7c8 100644 --- a/src/ov_SC05_017/ov_SC05_017_jr_801734BC.c +++ b/src/ov_SC05_017/ov_SC05_017_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_017/ov_SC05_017_jr_80178D40.c b/src/ov_SC05_017/ov_SC05_017_jr_80178D40.c index 284227cc2..93fb03e7d 100644 --- a/src/ov_SC05_017/ov_SC05_017_jr_80178D40.c +++ b/src/ov_SC05_017/ov_SC05_017_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_017/ov_SC05_017_jr_8017A4AC.c b/src/ov_SC05_017/ov_SC05_017_jr_8017A4AC.c index 4a2fe34a6..f98e6867b 100644 --- a/src/ov_SC05_017/ov_SC05_017_jr_8017A4AC.c +++ b/src/ov_SC05_017/ov_SC05_017_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_018/ov_SC05_018_after.c b/src/ov_SC05_018/ov_SC05_018_after.c index d554d3dce..bc33db2f6 100644 --- a/src/ov_SC05_018/ov_SC05_018_after.c +++ b/src/ov_SC05_018/ov_SC05_018_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC05_018/ov_SC05_018_jr_8015444C.c b/src/ov_SC05_018/ov_SC05_018_jr_8015444C.c index 10a34e510..3a1ba4be7 100644 --- a/src/ov_SC05_018/ov_SC05_018_jr_8015444C.c +++ b/src/ov_SC05_018/ov_SC05_018_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_018/ov_SC05_018_jr_8015A3C8.c b/src/ov_SC05_018/ov_SC05_018_jr_8015A3C8.c index 8f1f6492b..6e2778172 100644 --- a/src/ov_SC05_018/ov_SC05_018_jr_8015A3C8.c +++ b/src/ov_SC05_018/ov_SC05_018_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_018/ov_SC05_018_jr_8015AE2C.c b/src/ov_SC05_018/ov_SC05_018_jr_8015AE2C.c index 45d422fe2..469f00871 100644 --- a/src/ov_SC05_018/ov_SC05_018_jr_8015AE2C.c +++ b/src/ov_SC05_018/ov_SC05_018_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_018/ov_SC05_018_jr_8016AB6C.c b/src/ov_SC05_018/ov_SC05_018_jr_8016AB6C.c index f3c217dd4..a76919271 100644 --- a/src/ov_SC05_018/ov_SC05_018_jr_8016AB6C.c +++ b/src/ov_SC05_018/ov_SC05_018_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_018/ov_SC05_018_jr_801734BC.c b/src/ov_SC05_018/ov_SC05_018_jr_801734BC.c index 342e9bd77..081d3a96d 100644 --- a/src/ov_SC05_018/ov_SC05_018_jr_801734BC.c +++ b/src/ov_SC05_018/ov_SC05_018_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_018/ov_SC05_018_jr_80178D40.c b/src/ov_SC05_018/ov_SC05_018_jr_80178D40.c index e63b40269..a542aed93 100644 --- a/src/ov_SC05_018/ov_SC05_018_jr_80178D40.c +++ b/src/ov_SC05_018/ov_SC05_018_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_018/ov_SC05_018_jr_8017A4AC.c b/src/ov_SC05_018/ov_SC05_018_jr_8017A4AC.c index 9bd9f574f..e00ffcfea 100644 --- a/src/ov_SC05_018/ov_SC05_018_jr_8017A4AC.c +++ b/src/ov_SC05_018/ov_SC05_018_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_018/ov_SC05_018_jr_8017D604.c b/src/ov_SC05_018/ov_SC05_018_jr_8017D604.c index 971b363c2..dc794c20f 100644 --- a/src/ov_SC05_018/ov_SC05_018_jr_8017D604.c +++ b/src/ov_SC05_018/ov_SC05_018_jr_8017D604.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_019/ov_SC05_019_after.c b/src/ov_SC05_019/ov_SC05_019_after.c index 221621a83..e7794d0c9 100644 --- a/src/ov_SC05_019/ov_SC05_019_after.c +++ b/src/ov_SC05_019/ov_SC05_019_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC05_019/nonmatchings/ov_SC05_019_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC05_019/ov_SC05_019_jr_8015444C.c b/src/ov_SC05_019/ov_SC05_019_jr_8015444C.c index 32da4f86f..d0e9c0703 100644 --- a/src/ov_SC05_019/ov_SC05_019_jr_8015444C.c +++ b/src/ov_SC05_019/ov_SC05_019_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_019/ov_SC05_019_jr_8015A3C8.c b/src/ov_SC05_019/ov_SC05_019_jr_8015A3C8.c index 43cb291ad..5522f97be 100644 --- a/src/ov_SC05_019/ov_SC05_019_jr_8015A3C8.c +++ b/src/ov_SC05_019/ov_SC05_019_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_019/ov_SC05_019_jr_8015AE2C.c b/src/ov_SC05_019/ov_SC05_019_jr_8015AE2C.c index d5a774102..96fa9acd9 100644 --- a/src/ov_SC05_019/ov_SC05_019_jr_8015AE2C.c +++ b/src/ov_SC05_019/ov_SC05_019_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_019/ov_SC05_019_jr_8016AB6C.c b/src/ov_SC05_019/ov_SC05_019_jr_8016AB6C.c index fbb96869d..a34fdc1ee 100644 --- a/src/ov_SC05_019/ov_SC05_019_jr_8016AB6C.c +++ b/src/ov_SC05_019/ov_SC05_019_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_019/ov_SC05_019_jr_801734BC.c b/src/ov_SC05_019/ov_SC05_019_jr_801734BC.c index ee88c7a6b..68da32a3f 100644 --- a/src/ov_SC05_019/ov_SC05_019_jr_801734BC.c +++ b/src/ov_SC05_019/ov_SC05_019_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_019/ov_SC05_019_jr_80178D40.c b/src/ov_SC05_019/ov_SC05_019_jr_80178D40.c index ba92d7348..ac0efd2f2 100644 --- a/src/ov_SC05_019/ov_SC05_019_jr_80178D40.c +++ b/src/ov_SC05_019/ov_SC05_019_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_019/ov_SC05_019_jr_8017A4AC.c b/src/ov_SC05_019/ov_SC05_019_jr_8017A4AC.c index 813c23bbd..ab98d9706 100644 --- a/src/ov_SC05_019/ov_SC05_019_jr_8017A4AC.c +++ b/src/ov_SC05_019/ov_SC05_019_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC05_019/ov_SC05_019_jr_8017D5C0.c b/src/ov_SC05_019/ov_SC05_019_jr_8017D5C0.c index 0b8368191..a61bd00ba 100644 --- a/src/ov_SC05_019/ov_SC05_019_jr_8017D5C0.c +++ b/src/ov_SC05_019/ov_SC05_019_jr_8017D5C0.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_000/ov_SC06_000_after.c b/src/ov_SC06_000/ov_SC06_000_after.c index c037c2255..aa2f06e22 100644 --- a/src/ov_SC06_000/ov_SC06_000_after.c +++ b/src/ov_SC06_000/ov_SC06_000_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC06_000/ov_SC06_000_jr_8015444C.c b/src/ov_SC06_000/ov_SC06_000_jr_8015444C.c index 45e2f34bd..5a53c26b6 100644 --- a/src/ov_SC06_000/ov_SC06_000_jr_8015444C.c +++ b/src/ov_SC06_000/ov_SC06_000_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_000/ov_SC06_000_jr_8015A3C8.c b/src/ov_SC06_000/ov_SC06_000_jr_8015A3C8.c index 0456525ae..7d690cf5a 100644 --- a/src/ov_SC06_000/ov_SC06_000_jr_8015A3C8.c +++ b/src/ov_SC06_000/ov_SC06_000_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_000/ov_SC06_000_jr_8015AE2C.c b/src/ov_SC06_000/ov_SC06_000_jr_8015AE2C.c index 1db0ae376..f9a59eed1 100644 --- a/src/ov_SC06_000/ov_SC06_000_jr_8015AE2C.c +++ b/src/ov_SC06_000/ov_SC06_000_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_000/ov_SC06_000_jr_8016AB6C.c b/src/ov_SC06_000/ov_SC06_000_jr_8016AB6C.c index 4b8584eea..26d905e1d 100644 --- a/src/ov_SC06_000/ov_SC06_000_jr_8016AB6C.c +++ b/src/ov_SC06_000/ov_SC06_000_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_000/ov_SC06_000_jr_801734BC.c b/src/ov_SC06_000/ov_SC06_000_jr_801734BC.c index c18484b45..de46a5869 100644 --- a/src/ov_SC06_000/ov_SC06_000_jr_801734BC.c +++ b/src/ov_SC06_000/ov_SC06_000_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_000/ov_SC06_000_jr_80178D40.c b/src/ov_SC06_000/ov_SC06_000_jr_80178D40.c index 3884dce8b..7919c4e0a 100644 --- a/src/ov_SC06_000/ov_SC06_000_jr_80178D40.c +++ b/src/ov_SC06_000/ov_SC06_000_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_000/ov_SC06_000_jr_8017A4AC.c b/src/ov_SC06_000/ov_SC06_000_jr_8017A4AC.c index 9062947da..0b6bdb0ea 100644 --- a/src/ov_SC06_000/ov_SC06_000_jr_8017A4AC.c +++ b/src/ov_SC06_000/ov_SC06_000_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_006/ov_SC06_006_after.c b/src/ov_SC06_006/ov_SC06_006_after.c index 3d9dfbeb5..5e656c2f2 100644 --- a/src/ov_SC06_006/ov_SC06_006_after.c +++ b/src/ov_SC06_006/ov_SC06_006_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC06_006/nonmatchings/ov_SC06_006_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC06_006/ov_SC06_006_jr_8015444C.c b/src/ov_SC06_006/ov_SC06_006_jr_8015444C.c index c365276cb..1d1338781 100644 --- a/src/ov_SC06_006/ov_SC06_006_jr_8015444C.c +++ b/src/ov_SC06_006/ov_SC06_006_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_006/ov_SC06_006_jr_8015A3C8.c b/src/ov_SC06_006/ov_SC06_006_jr_8015A3C8.c index 7d1b9041b..2ac1133cf 100644 --- a/src/ov_SC06_006/ov_SC06_006_jr_8015A3C8.c +++ b/src/ov_SC06_006/ov_SC06_006_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_006/ov_SC06_006_jr_8015AE2C.c b/src/ov_SC06_006/ov_SC06_006_jr_8015AE2C.c index ad6de868b..f56da27f2 100644 --- a/src/ov_SC06_006/ov_SC06_006_jr_8015AE2C.c +++ b/src/ov_SC06_006/ov_SC06_006_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_006/ov_SC06_006_jr_8016AB6C.c b/src/ov_SC06_006/ov_SC06_006_jr_8016AB6C.c index e04444967..608a244a8 100644 --- a/src/ov_SC06_006/ov_SC06_006_jr_8016AB6C.c +++ b/src/ov_SC06_006/ov_SC06_006_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_006/ov_SC06_006_jr_801734BC.c b/src/ov_SC06_006/ov_SC06_006_jr_801734BC.c index 76dfeaea9..5591f69cb 100644 --- a/src/ov_SC06_006/ov_SC06_006_jr_801734BC.c +++ b/src/ov_SC06_006/ov_SC06_006_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_006/ov_SC06_006_jr_80178D40.c b/src/ov_SC06_006/ov_SC06_006_jr_80178D40.c index 8f886fd80..2f53254ac 100644 --- a/src/ov_SC06_006/ov_SC06_006_jr_80178D40.c +++ b/src/ov_SC06_006/ov_SC06_006_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_006/ov_SC06_006_jr_8017A4AC.c b/src/ov_SC06_006/ov_SC06_006_jr_8017A4AC.c index 6afc1f24b..318bb7f54 100644 --- a/src/ov_SC06_006/ov_SC06_006_jr_8017A4AC.c +++ b/src/ov_SC06_006/ov_SC06_006_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_006/ov_SC06_006_jr_8017BEBC.c b/src/ov_SC06_006/ov_SC06_006_jr_8017BEBC.c index 77bb54262..efb349f2a 100644 --- a/src/ov_SC06_006/ov_SC06_006_jr_8017BEBC.c +++ b/src/ov_SC06_006/ov_SC06_006_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_008/ov_SC06_008_after.c b/src/ov_SC06_008/ov_SC06_008_after.c index a9e2e6588..e23f312f0 100644 --- a/src/ov_SC06_008/ov_SC06_008_after.c +++ b/src/ov_SC06_008/ov_SC06_008_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC06_008/ov_SC06_008_jr_8015444C.c b/src/ov_SC06_008/ov_SC06_008_jr_8015444C.c index 2189ab469..4fa97b339 100644 --- a/src/ov_SC06_008/ov_SC06_008_jr_8015444C.c +++ b/src/ov_SC06_008/ov_SC06_008_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_008/ov_SC06_008_jr_8015A3C8.c b/src/ov_SC06_008/ov_SC06_008_jr_8015A3C8.c index 439f95154..a936d43c7 100644 --- a/src/ov_SC06_008/ov_SC06_008_jr_8015A3C8.c +++ b/src/ov_SC06_008/ov_SC06_008_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_008/ov_SC06_008_jr_8015AE2C.c b/src/ov_SC06_008/ov_SC06_008_jr_8015AE2C.c index 96d66d628..fe855930d 100644 --- a/src/ov_SC06_008/ov_SC06_008_jr_8015AE2C.c +++ b/src/ov_SC06_008/ov_SC06_008_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_008/ov_SC06_008_jr_8016AB6C.c b/src/ov_SC06_008/ov_SC06_008_jr_8016AB6C.c index c935f0dfd..9da77640d 100644 --- a/src/ov_SC06_008/ov_SC06_008_jr_8016AB6C.c +++ b/src/ov_SC06_008/ov_SC06_008_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_008/ov_SC06_008_jr_801734BC.c b/src/ov_SC06_008/ov_SC06_008_jr_801734BC.c index 66be47be3..28a87ba2f 100644 --- a/src/ov_SC06_008/ov_SC06_008_jr_801734BC.c +++ b/src/ov_SC06_008/ov_SC06_008_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_008/ov_SC06_008_jr_80178D40.c b/src/ov_SC06_008/ov_SC06_008_jr_80178D40.c index 2e1108fbe..2e5c258cb 100644 --- a/src/ov_SC06_008/ov_SC06_008_jr_80178D40.c +++ b/src/ov_SC06_008/ov_SC06_008_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_008/ov_SC06_008_jr_8017A4AC.c b/src/ov_SC06_008/ov_SC06_008_jr_8017A4AC.c index b7febf718..d39318367 100644 --- a/src/ov_SC06_008/ov_SC06_008_jr_8017A4AC.c +++ b/src/ov_SC06_008/ov_SC06_008_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_008/ov_SC06_008_jr_8017C294.c b/src/ov_SC06_008/ov_SC06_008_jr_8017C294.c index aaadb721e..c806f8cd2 100644 --- a/src/ov_SC06_008/ov_SC06_008_jr_8017C294.c +++ b/src/ov_SC06_008/ov_SC06_008_jr_8017C294.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_010/ov_SC06_010_after.c b/src/ov_SC06_010/ov_SC06_010_after.c index 7aef87ecf..504cc2308 100644 --- a/src/ov_SC06_010/ov_SC06_010_after.c +++ b/src/ov_SC06_010/ov_SC06_010_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC06_010/ov_SC06_010_jr_8015444C.c b/src/ov_SC06_010/ov_SC06_010_jr_8015444C.c index 5fd857425..95f453d98 100644 --- a/src/ov_SC06_010/ov_SC06_010_jr_8015444C.c +++ b/src/ov_SC06_010/ov_SC06_010_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_010/ov_SC06_010_jr_8015A3C8.c b/src/ov_SC06_010/ov_SC06_010_jr_8015A3C8.c index 9b61a15a6..4721366a9 100644 --- a/src/ov_SC06_010/ov_SC06_010_jr_8015A3C8.c +++ b/src/ov_SC06_010/ov_SC06_010_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_010/ov_SC06_010_jr_8015AE2C.c b/src/ov_SC06_010/ov_SC06_010_jr_8015AE2C.c index 541522a24..7a9029271 100644 --- a/src/ov_SC06_010/ov_SC06_010_jr_8015AE2C.c +++ b/src/ov_SC06_010/ov_SC06_010_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_010/ov_SC06_010_jr_8016AB6C.c b/src/ov_SC06_010/ov_SC06_010_jr_8016AB6C.c index c08378858..52031a2d4 100644 --- a/src/ov_SC06_010/ov_SC06_010_jr_8016AB6C.c +++ b/src/ov_SC06_010/ov_SC06_010_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_010/ov_SC06_010_jr_801734BC.c b/src/ov_SC06_010/ov_SC06_010_jr_801734BC.c index b021f8048..e3208f6b7 100644 --- a/src/ov_SC06_010/ov_SC06_010_jr_801734BC.c +++ b/src/ov_SC06_010/ov_SC06_010_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_010/ov_SC06_010_jr_80178D40.c b/src/ov_SC06_010/ov_SC06_010_jr_80178D40.c index 35ee5484d..78df8a422 100644 --- a/src/ov_SC06_010/ov_SC06_010_jr_80178D40.c +++ b/src/ov_SC06_010/ov_SC06_010_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_010/ov_SC06_010_jr_8017A4AC.c b/src/ov_SC06_010/ov_SC06_010_jr_8017A4AC.c index 8b4349dc5..7fadf0d83 100644 --- a/src/ov_SC06_010/ov_SC06_010_jr_8017A4AC.c +++ b/src/ov_SC06_010/ov_SC06_010_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_011/ov_SC06_011_after.c b/src/ov_SC06_011/ov_SC06_011_after.c index 4c287d8db..e7aa344f3 100644 --- a/src/ov_SC06_011/ov_SC06_011_after.c +++ b/src/ov_SC06_011/ov_SC06_011_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC06_011/ov_SC06_011_jr_8015444C.c b/src/ov_SC06_011/ov_SC06_011_jr_8015444C.c index ae93c0d7c..68f549037 100644 --- a/src/ov_SC06_011/ov_SC06_011_jr_8015444C.c +++ b/src/ov_SC06_011/ov_SC06_011_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_011/ov_SC06_011_jr_8015A3C8.c b/src/ov_SC06_011/ov_SC06_011_jr_8015A3C8.c index c4d55a745..207c74159 100644 --- a/src/ov_SC06_011/ov_SC06_011_jr_8015A3C8.c +++ b/src/ov_SC06_011/ov_SC06_011_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_011/ov_SC06_011_jr_8015AE2C.c b/src/ov_SC06_011/ov_SC06_011_jr_8015AE2C.c index 2125518c1..95b39e572 100644 --- a/src/ov_SC06_011/ov_SC06_011_jr_8015AE2C.c +++ b/src/ov_SC06_011/ov_SC06_011_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_011/ov_SC06_011_jr_8016AB6C.c b/src/ov_SC06_011/ov_SC06_011_jr_8016AB6C.c index aa94663a2..1d8b7cee7 100644 --- a/src/ov_SC06_011/ov_SC06_011_jr_8016AB6C.c +++ b/src/ov_SC06_011/ov_SC06_011_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_011/ov_SC06_011_jr_801734BC.c b/src/ov_SC06_011/ov_SC06_011_jr_801734BC.c index 9821ff6dd..420aedb1c 100644 --- a/src/ov_SC06_011/ov_SC06_011_jr_801734BC.c +++ b/src/ov_SC06_011/ov_SC06_011_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_011/ov_SC06_011_jr_80178D40.c b/src/ov_SC06_011/ov_SC06_011_jr_80178D40.c index 7fbc21470..12f50aa0d 100644 --- a/src/ov_SC06_011/ov_SC06_011_jr_80178D40.c +++ b/src/ov_SC06_011/ov_SC06_011_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_011/ov_SC06_011_jr_8017A4AC.c b/src/ov_SC06_011/ov_SC06_011_jr_8017A4AC.c index 81e2b0c68..a9e0364b2 100644 --- a/src/ov_SC06_011/ov_SC06_011_jr_8017A4AC.c +++ b/src/ov_SC06_011/ov_SC06_011_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_011/ov_SC06_011_jr_8017BEBC.c b/src/ov_SC06_011/ov_SC06_011_jr_8017BEBC.c index c34b562dd..bbc3e59cb 100644 --- a/src/ov_SC06_011/ov_SC06_011_jr_8017BEBC.c +++ b/src/ov_SC06_011/ov_SC06_011_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_013/ov_SC06_013_after.c b/src/ov_SC06_013/ov_SC06_013_after.c index 11e38236f..c273dcd70 100644 --- a/src/ov_SC06_013/ov_SC06_013_after.c +++ b/src/ov_SC06_013/ov_SC06_013_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC06_013/nonmatchings/ov_SC06_013_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC06_013/ov_SC06_013_jr_8015444C.c b/src/ov_SC06_013/ov_SC06_013_jr_8015444C.c index bbe719c99..6804d2766 100644 --- a/src/ov_SC06_013/ov_SC06_013_jr_8015444C.c +++ b/src/ov_SC06_013/ov_SC06_013_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_013/ov_SC06_013_jr_8015A3C8.c b/src/ov_SC06_013/ov_SC06_013_jr_8015A3C8.c index 81413e62f..e9f018376 100644 --- a/src/ov_SC06_013/ov_SC06_013_jr_8015A3C8.c +++ b/src/ov_SC06_013/ov_SC06_013_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_013/ov_SC06_013_jr_8015AE2C.c b/src/ov_SC06_013/ov_SC06_013_jr_8015AE2C.c index 10e55e003..fd943f15f 100644 --- a/src/ov_SC06_013/ov_SC06_013_jr_8015AE2C.c +++ b/src/ov_SC06_013/ov_SC06_013_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_013/ov_SC06_013_jr_8016AB6C.c b/src/ov_SC06_013/ov_SC06_013_jr_8016AB6C.c index 9c6e059c9..076d830a0 100644 --- a/src/ov_SC06_013/ov_SC06_013_jr_8016AB6C.c +++ b/src/ov_SC06_013/ov_SC06_013_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_013/ov_SC06_013_jr_801734BC.c b/src/ov_SC06_013/ov_SC06_013_jr_801734BC.c index 9429c2f67..c2bb9d46a 100644 --- a/src/ov_SC06_013/ov_SC06_013_jr_801734BC.c +++ b/src/ov_SC06_013/ov_SC06_013_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_013/ov_SC06_013_jr_80178D40.c b/src/ov_SC06_013/ov_SC06_013_jr_80178D40.c index f40b58dea..74524eee4 100644 --- a/src/ov_SC06_013/ov_SC06_013_jr_80178D40.c +++ b/src/ov_SC06_013/ov_SC06_013_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_013/ov_SC06_013_jr_8017A4AC.c b/src/ov_SC06_013/ov_SC06_013_jr_8017A4AC.c index ca36dcacc..19d8d29d8 100644 --- a/src/ov_SC06_013/ov_SC06_013_jr_8017A4AC.c +++ b/src/ov_SC06_013/ov_SC06_013_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_013/ov_SC06_013_jr_8017BEBC.c b/src/ov_SC06_013/ov_SC06_013_jr_8017BEBC.c index 9b3ed8180..cd128ff7e 100644 --- a/src/ov_SC06_013/ov_SC06_013_jr_8017BEBC.c +++ b/src/ov_SC06_013/ov_SC06_013_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_014/ov_SC06_014_after.c b/src/ov_SC06_014/ov_SC06_014_after.c index 3e761bdd3..79d6dfd77 100644 --- a/src/ov_SC06_014/ov_SC06_014_after.c +++ b/src/ov_SC06_014/ov_SC06_014_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC06_014/nonmatchings/ov_SC06_014_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC06_014/ov_SC06_014_jr_8015444C.c b/src/ov_SC06_014/ov_SC06_014_jr_8015444C.c index 6e368169e..52e497943 100644 --- a/src/ov_SC06_014/ov_SC06_014_jr_8015444C.c +++ b/src/ov_SC06_014/ov_SC06_014_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_014/ov_SC06_014_jr_8015A3C8.c b/src/ov_SC06_014/ov_SC06_014_jr_8015A3C8.c index b6d11a853..705eb400d 100644 --- a/src/ov_SC06_014/ov_SC06_014_jr_8015A3C8.c +++ b/src/ov_SC06_014/ov_SC06_014_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_014/ov_SC06_014_jr_8015AE2C.c b/src/ov_SC06_014/ov_SC06_014_jr_8015AE2C.c index a951f22ec..1587f1647 100644 --- a/src/ov_SC06_014/ov_SC06_014_jr_8015AE2C.c +++ b/src/ov_SC06_014/ov_SC06_014_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_014/ov_SC06_014_jr_8016AB6C.c b/src/ov_SC06_014/ov_SC06_014_jr_8016AB6C.c index bca6f6a58..de113021f 100644 --- a/src/ov_SC06_014/ov_SC06_014_jr_8016AB6C.c +++ b/src/ov_SC06_014/ov_SC06_014_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_014/ov_SC06_014_jr_801734BC.c b/src/ov_SC06_014/ov_SC06_014_jr_801734BC.c index 5f1a5665c..cc4f6bdb8 100644 --- a/src/ov_SC06_014/ov_SC06_014_jr_801734BC.c +++ b/src/ov_SC06_014/ov_SC06_014_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_014/ov_SC06_014_jr_80178D40.c b/src/ov_SC06_014/ov_SC06_014_jr_80178D40.c index c1ddbfd9c..7483eeb3f 100644 --- a/src/ov_SC06_014/ov_SC06_014_jr_80178D40.c +++ b/src/ov_SC06_014/ov_SC06_014_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_014/ov_SC06_014_jr_8017A4AC.c b/src/ov_SC06_014/ov_SC06_014_jr_8017A4AC.c index aed03bb38..0ff229613 100644 --- a/src/ov_SC06_014/ov_SC06_014_jr_8017A4AC.c +++ b/src/ov_SC06_014/ov_SC06_014_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_014/ov_SC06_014_jr_8017BEBC.c b/src/ov_SC06_014/ov_SC06_014_jr_8017BEBC.c index d91fd54dc..2cc488cb4 100644 --- a/src/ov_SC06_014/ov_SC06_014_jr_8017BEBC.c +++ b/src/ov_SC06_014/ov_SC06_014_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_015/ov_SC06_015_after.c b/src/ov_SC06_015/ov_SC06_015_after.c index 94a6ca6b4..c62ad8699 100644 --- a/src/ov_SC06_015/ov_SC06_015_after.c +++ b/src/ov_SC06_015/ov_SC06_015_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC06_015/nonmatchings/ov_SC06_015_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC06_015/ov_SC06_015_jr_8015444C.c b/src/ov_SC06_015/ov_SC06_015_jr_8015444C.c index 7efb86ae1..eaf88c666 100644 --- a/src/ov_SC06_015/ov_SC06_015_jr_8015444C.c +++ b/src/ov_SC06_015/ov_SC06_015_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_015/ov_SC06_015_jr_8015A3C8.c b/src/ov_SC06_015/ov_SC06_015_jr_8015A3C8.c index c14d55520..4c29bb9d5 100644 --- a/src/ov_SC06_015/ov_SC06_015_jr_8015A3C8.c +++ b/src/ov_SC06_015/ov_SC06_015_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_015/ov_SC06_015_jr_8015AE2C.c b/src/ov_SC06_015/ov_SC06_015_jr_8015AE2C.c index f8ddcf4e9..a713114ac 100644 --- a/src/ov_SC06_015/ov_SC06_015_jr_8015AE2C.c +++ b/src/ov_SC06_015/ov_SC06_015_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_015/ov_SC06_015_jr_8016AB6C.c b/src/ov_SC06_015/ov_SC06_015_jr_8016AB6C.c index 41300c723..bba874a48 100644 --- a/src/ov_SC06_015/ov_SC06_015_jr_8016AB6C.c +++ b/src/ov_SC06_015/ov_SC06_015_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_015/ov_SC06_015_jr_801734BC.c b/src/ov_SC06_015/ov_SC06_015_jr_801734BC.c index 0b8a73ee5..4de771f90 100644 --- a/src/ov_SC06_015/ov_SC06_015_jr_801734BC.c +++ b/src/ov_SC06_015/ov_SC06_015_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_015/ov_SC06_015_jr_80178D40.c b/src/ov_SC06_015/ov_SC06_015_jr_80178D40.c index 7c2358c97..7cbad0d5a 100644 --- a/src/ov_SC06_015/ov_SC06_015_jr_80178D40.c +++ b/src/ov_SC06_015/ov_SC06_015_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_015/ov_SC06_015_jr_8017A4AC.c b/src/ov_SC06_015/ov_SC06_015_jr_8017A4AC.c index effd1c0fc..febe7ae8e 100644 --- a/src/ov_SC06_015/ov_SC06_015_jr_8017A4AC.c +++ b/src/ov_SC06_015/ov_SC06_015_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_015/ov_SC06_015_jr_8017BEBC.c b/src/ov_SC06_015/ov_SC06_015_jr_8017BEBC.c index abe8de665..1b5076fd9 100644 --- a/src/ov_SC06_015/ov_SC06_015_jr_8017BEBC.c +++ b/src/ov_SC06_015/ov_SC06_015_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_016/ov_SC06_016_after.c b/src/ov_SC06_016/ov_SC06_016_after.c index 8c06b487a..01f53ae10 100644 --- a/src/ov_SC06_016/ov_SC06_016_after.c +++ b/src/ov_SC06_016/ov_SC06_016_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC06_016/nonmatchings/ov_SC06_016_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC06_016/ov_SC06_016_jr_8015444C.c b/src/ov_SC06_016/ov_SC06_016_jr_8015444C.c index bb4e9d40c..1b6c51d3e 100644 --- a/src/ov_SC06_016/ov_SC06_016_jr_8015444C.c +++ b/src/ov_SC06_016/ov_SC06_016_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_016/ov_SC06_016_jr_8015A3C8.c b/src/ov_SC06_016/ov_SC06_016_jr_8015A3C8.c index 425c19d7a..e1cda15aa 100644 --- a/src/ov_SC06_016/ov_SC06_016_jr_8015A3C8.c +++ b/src/ov_SC06_016/ov_SC06_016_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_016/ov_SC06_016_jr_8015AE2C.c b/src/ov_SC06_016/ov_SC06_016_jr_8015AE2C.c index 0a6be9023..fd39fa74c 100644 --- a/src/ov_SC06_016/ov_SC06_016_jr_8015AE2C.c +++ b/src/ov_SC06_016/ov_SC06_016_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_016/ov_SC06_016_jr_8016AB6C.c b/src/ov_SC06_016/ov_SC06_016_jr_8016AB6C.c index dadb50acb..b674f8951 100644 --- a/src/ov_SC06_016/ov_SC06_016_jr_8016AB6C.c +++ b/src/ov_SC06_016/ov_SC06_016_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_016/ov_SC06_016_jr_801734BC.c b/src/ov_SC06_016/ov_SC06_016_jr_801734BC.c index edfcb35ce..d647781fc 100644 --- a/src/ov_SC06_016/ov_SC06_016_jr_801734BC.c +++ b/src/ov_SC06_016/ov_SC06_016_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_016/ov_SC06_016_jr_80178D40.c b/src/ov_SC06_016/ov_SC06_016_jr_80178D40.c index 3c9ea247a..db1d91b60 100644 --- a/src/ov_SC06_016/ov_SC06_016_jr_80178D40.c +++ b/src/ov_SC06_016/ov_SC06_016_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_016/ov_SC06_016_jr_8017A4AC.c b/src/ov_SC06_016/ov_SC06_016_jr_8017A4AC.c index 5a3779492..b724befa8 100644 --- a/src/ov_SC06_016/ov_SC06_016_jr_8017A4AC.c +++ b/src/ov_SC06_016/ov_SC06_016_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_016/ov_SC06_016_jr_8017C8D0.c b/src/ov_SC06_016/ov_SC06_016_jr_8017C8D0.c index e4914700d..434522feb 100644 --- a/src/ov_SC06_016/ov_SC06_016_jr_8017C8D0.c +++ b/src/ov_SC06_016/ov_SC06_016_jr_8017C8D0.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_018/ov_SC06_018_after.c b/src/ov_SC06_018/ov_SC06_018_after.c index d6e3abf7f..8b2be6fc2 100644 --- a/src/ov_SC06_018/ov_SC06_018_after.c +++ b/src/ov_SC06_018/ov_SC06_018_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC06_018/ov_SC06_018_jr_8015444C.c b/src/ov_SC06_018/ov_SC06_018_jr_8015444C.c index 184105cac..23f5d4b82 100644 --- a/src/ov_SC06_018/ov_SC06_018_jr_8015444C.c +++ b/src/ov_SC06_018/ov_SC06_018_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_018/ov_SC06_018_jr_8015A3C8.c b/src/ov_SC06_018/ov_SC06_018_jr_8015A3C8.c index e9041fd91..3138ba76a 100644 --- a/src/ov_SC06_018/ov_SC06_018_jr_8015A3C8.c +++ b/src/ov_SC06_018/ov_SC06_018_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_018/ov_SC06_018_jr_8015AE2C.c b/src/ov_SC06_018/ov_SC06_018_jr_8015AE2C.c index e4e008bc1..f2b8e7ddd 100644 --- a/src/ov_SC06_018/ov_SC06_018_jr_8015AE2C.c +++ b/src/ov_SC06_018/ov_SC06_018_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_018/ov_SC06_018_jr_8016AB6C.c b/src/ov_SC06_018/ov_SC06_018_jr_8016AB6C.c index 193b50846..63b4b2c13 100644 --- a/src/ov_SC06_018/ov_SC06_018_jr_8016AB6C.c +++ b/src/ov_SC06_018/ov_SC06_018_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_018/ov_SC06_018_jr_801734BC.c b/src/ov_SC06_018/ov_SC06_018_jr_801734BC.c index 68ef41f54..79b35bc67 100644 --- a/src/ov_SC06_018/ov_SC06_018_jr_801734BC.c +++ b/src/ov_SC06_018/ov_SC06_018_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_018/ov_SC06_018_jr_80178D40.c b/src/ov_SC06_018/ov_SC06_018_jr_80178D40.c index 9206c2bf1..8dd3ea3bb 100644 --- a/src/ov_SC06_018/ov_SC06_018_jr_80178D40.c +++ b/src/ov_SC06_018/ov_SC06_018_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_018/ov_SC06_018_jr_8017A4AC.c b/src/ov_SC06_018/ov_SC06_018_jr_8017A4AC.c index bff168ef5..242c60f3b 100644 --- a/src/ov_SC06_018/ov_SC06_018_jr_8017A4AC.c +++ b/src/ov_SC06_018/ov_SC06_018_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_018/ov_SC06_018_jr_8017C24C.c b/src/ov_SC06_018/ov_SC06_018_jr_8017C24C.c index 5c7b51449..98162983c 100644 --- a/src/ov_SC06_018/ov_SC06_018_jr_8017C24C.c +++ b/src/ov_SC06_018/ov_SC06_018_jr_8017C24C.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_020/ov_SC06_020_after.c b/src/ov_SC06_020/ov_SC06_020_after.c index f82c762cc..1e738812b 100644 --- a/src/ov_SC06_020/ov_SC06_020_after.c +++ b/src/ov_SC06_020/ov_SC06_020_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC06_020/ov_SC06_020_jr_8015444C.c b/src/ov_SC06_020/ov_SC06_020_jr_8015444C.c index f274c9623..61fb1ced5 100644 --- a/src/ov_SC06_020/ov_SC06_020_jr_8015444C.c +++ b/src/ov_SC06_020/ov_SC06_020_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_020/ov_SC06_020_jr_8015A3C8.c b/src/ov_SC06_020/ov_SC06_020_jr_8015A3C8.c index 4881bce08..b1c73b0fa 100644 --- a/src/ov_SC06_020/ov_SC06_020_jr_8015A3C8.c +++ b/src/ov_SC06_020/ov_SC06_020_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_020/ov_SC06_020_jr_8015AE2C.c b/src/ov_SC06_020/ov_SC06_020_jr_8015AE2C.c index 22808f66d..2ecbf88d4 100644 --- a/src/ov_SC06_020/ov_SC06_020_jr_8015AE2C.c +++ b/src/ov_SC06_020/ov_SC06_020_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_020/ov_SC06_020_jr_8016AB6C.c b/src/ov_SC06_020/ov_SC06_020_jr_8016AB6C.c index 3e79e1ad0..23dfe3063 100644 --- a/src/ov_SC06_020/ov_SC06_020_jr_8016AB6C.c +++ b/src/ov_SC06_020/ov_SC06_020_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_020/ov_SC06_020_jr_801734BC.c b/src/ov_SC06_020/ov_SC06_020_jr_801734BC.c index 7a50836c7..05551b89f 100644 --- a/src/ov_SC06_020/ov_SC06_020_jr_801734BC.c +++ b/src/ov_SC06_020/ov_SC06_020_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_020/ov_SC06_020_jr_80178D40.c b/src/ov_SC06_020/ov_SC06_020_jr_80178D40.c index 3c0efd707..b704dc064 100644 --- a/src/ov_SC06_020/ov_SC06_020_jr_80178D40.c +++ b/src/ov_SC06_020/ov_SC06_020_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_020/ov_SC06_020_jr_8017A4AC.c b/src/ov_SC06_020/ov_SC06_020_jr_8017A4AC.c index 597bbdd7d..24ab33e4f 100644 --- a/src/ov_SC06_020/ov_SC06_020_jr_8017A4AC.c +++ b/src/ov_SC06_020/ov_SC06_020_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_020/ov_SC06_020_jr_8017C24C.c b/src/ov_SC06_020/ov_SC06_020_jr_8017C24C.c index fde38bfe4..05145581f 100644 --- a/src/ov_SC06_020/ov_SC06_020_jr_8017C24C.c +++ b/src/ov_SC06_020/ov_SC06_020_jr_8017C24C.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_022/ov_SC06_022_after.c b/src/ov_SC06_022/ov_SC06_022_after.c index 2f8c02ca2..da25cfb35 100644 --- a/src/ov_SC06_022/ov_SC06_022_after.c +++ b/src/ov_SC06_022/ov_SC06_022_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC06_022/nonmatchings/ov_SC06_022_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC06_022/ov_SC06_022_jr_8015444C.c b/src/ov_SC06_022/ov_SC06_022_jr_8015444C.c index 704cae5fe..08e4ea664 100644 --- a/src/ov_SC06_022/ov_SC06_022_jr_8015444C.c +++ b/src/ov_SC06_022/ov_SC06_022_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_022/ov_SC06_022_jr_8015A3C8.c b/src/ov_SC06_022/ov_SC06_022_jr_8015A3C8.c index 461f2a2be..f4de066f5 100644 --- a/src/ov_SC06_022/ov_SC06_022_jr_8015A3C8.c +++ b/src/ov_SC06_022/ov_SC06_022_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_022/ov_SC06_022_jr_8015AE2C.c b/src/ov_SC06_022/ov_SC06_022_jr_8015AE2C.c index 1c4bdd23e..77392bc02 100644 --- a/src/ov_SC06_022/ov_SC06_022_jr_8015AE2C.c +++ b/src/ov_SC06_022/ov_SC06_022_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_022/ov_SC06_022_jr_8016AB6C.c b/src/ov_SC06_022/ov_SC06_022_jr_8016AB6C.c index 264266e8b..7256233de 100644 --- a/src/ov_SC06_022/ov_SC06_022_jr_8016AB6C.c +++ b/src/ov_SC06_022/ov_SC06_022_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_022/ov_SC06_022_jr_801734BC.c b/src/ov_SC06_022/ov_SC06_022_jr_801734BC.c index 4e932a074..9f799a66b 100644 --- a/src/ov_SC06_022/ov_SC06_022_jr_801734BC.c +++ b/src/ov_SC06_022/ov_SC06_022_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_022/ov_SC06_022_jr_80178D40.c b/src/ov_SC06_022/ov_SC06_022_jr_80178D40.c index c65222fcf..846be948b 100644 --- a/src/ov_SC06_022/ov_SC06_022_jr_80178D40.c +++ b/src/ov_SC06_022/ov_SC06_022_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_022/ov_SC06_022_jr_8017A4AC.c b/src/ov_SC06_022/ov_SC06_022_jr_8017A4AC.c index 2042883bf..753d9f84d 100644 --- a/src/ov_SC06_022/ov_SC06_022_jr_8017A4AC.c +++ b/src/ov_SC06_022/ov_SC06_022_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_022/ov_SC06_022_jr_8017BEBC.c b/src/ov_SC06_022/ov_SC06_022_jr_8017BEBC.c index de88f2fef..a53228b59 100644 --- a/src/ov_SC06_022/ov_SC06_022_jr_8017BEBC.c +++ b/src/ov_SC06_022/ov_SC06_022_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_024/ov_SC06_024_after.c b/src/ov_SC06_024/ov_SC06_024_after.c index 4ac27fb6b..219607a78 100644 --- a/src/ov_SC06_024/ov_SC06_024_after.c +++ b/src/ov_SC06_024/ov_SC06_024_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC06_024/ov_SC06_024_jr_8015444C.c b/src/ov_SC06_024/ov_SC06_024_jr_8015444C.c index 60e2f1af0..fa871cf59 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_8015444C.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_024/ov_SC06_024_jr_8015A3C8.c b/src/ov_SC06_024/ov_SC06_024_jr_8015A3C8.c index 77d17b1bf..5b43fa582 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_8015A3C8.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_024/ov_SC06_024_jr_8015AE2C.c b/src/ov_SC06_024/ov_SC06_024_jr_8015AE2C.c index 3fb12f716..d638e3c27 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_8015AE2C.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_024/ov_SC06_024_jr_8016AB6C.c b/src/ov_SC06_024/ov_SC06_024_jr_8016AB6C.c index 3a7184e43..a089aacc4 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_8016AB6C.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_024/ov_SC06_024_jr_801734BC.c b/src/ov_SC06_024/ov_SC06_024_jr_801734BC.c index d9a10639f..a0c2ed1f7 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_801734BC.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_024/ov_SC06_024_jr_80178D40.c b/src/ov_SC06_024/ov_SC06_024_jr_80178D40.c index d8ced5ddf..ca9494027 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_80178D40.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_024/ov_SC06_024_jr_8017A4AC.c b/src/ov_SC06_024/ov_SC06_024_jr_8017A4AC.c index e67395fb2..b1d731465 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_8017A4AC.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_024/ov_SC06_024_jr_8017BEBC.c b/src/ov_SC06_024/ov_SC06_024_jr_8017BEBC.c index ecb9d29b3..10e03e329 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_8017BEBC.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_025/ov_SC06_025_after.c b/src/ov_SC06_025/ov_SC06_025_after.c index 3a817f60e..d10d826a9 100644 --- a/src/ov_SC06_025/ov_SC06_025_after.c +++ b/src/ov_SC06_025/ov_SC06_025_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC06_025/nonmatchings/ov_SC06_025_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC06_025/ov_SC06_025_jr_8015444C.c b/src/ov_SC06_025/ov_SC06_025_jr_8015444C.c index d3c014c7e..1cdf2ff31 100644 --- a/src/ov_SC06_025/ov_SC06_025_jr_8015444C.c +++ b/src/ov_SC06_025/ov_SC06_025_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_025/ov_SC06_025_jr_8015A3C8.c b/src/ov_SC06_025/ov_SC06_025_jr_8015A3C8.c index ff3db2062..78dfcce17 100644 --- a/src/ov_SC06_025/ov_SC06_025_jr_8015A3C8.c +++ b/src/ov_SC06_025/ov_SC06_025_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_025/ov_SC06_025_jr_8015AE2C.c b/src/ov_SC06_025/ov_SC06_025_jr_8015AE2C.c index 45d5f0b4b..e036ec01f 100644 --- a/src/ov_SC06_025/ov_SC06_025_jr_8015AE2C.c +++ b/src/ov_SC06_025/ov_SC06_025_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_025/ov_SC06_025_jr_8016AB6C.c b/src/ov_SC06_025/ov_SC06_025_jr_8016AB6C.c index c810983db..d46a67f39 100644 --- a/src/ov_SC06_025/ov_SC06_025_jr_8016AB6C.c +++ b/src/ov_SC06_025/ov_SC06_025_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_025/ov_SC06_025_jr_801734BC.c b/src/ov_SC06_025/ov_SC06_025_jr_801734BC.c index 8b26b6311..bcdaca6b8 100644 --- a/src/ov_SC06_025/ov_SC06_025_jr_801734BC.c +++ b/src/ov_SC06_025/ov_SC06_025_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_025/ov_SC06_025_jr_80178D40.c b/src/ov_SC06_025/ov_SC06_025_jr_80178D40.c index 54538222e..b551745de 100644 --- a/src/ov_SC06_025/ov_SC06_025_jr_80178D40.c +++ b/src/ov_SC06_025/ov_SC06_025_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_025/ov_SC06_025_jr_8017A4AC.c b/src/ov_SC06_025/ov_SC06_025_jr_8017A4AC.c index a46738ae9..d75ced4a0 100644 --- a/src/ov_SC06_025/ov_SC06_025_jr_8017A4AC.c +++ b/src/ov_SC06_025/ov_SC06_025_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_025/ov_SC06_025_jr_8017BEBC.c b/src/ov_SC06_025/ov_SC06_025_jr_8017BEBC.c index aab250192..1e4bd5aa3 100644 --- a/src/ov_SC06_025/ov_SC06_025_jr_8017BEBC.c +++ b/src/ov_SC06_025/ov_SC06_025_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_027/ov_SC06_027_after.c b/src/ov_SC06_027/ov_SC06_027_after.c index 60367efb3..255eec4cb 100644 --- a/src/ov_SC06_027/ov_SC06_027_after.c +++ b/src/ov_SC06_027/ov_SC06_027_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC06_027/nonmatchings/ov_SC06_027_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC06_027/ov_SC06_027_jr_8015444C.c b/src/ov_SC06_027/ov_SC06_027_jr_8015444C.c index 5ea61b8c4..5f67f3dc3 100644 --- a/src/ov_SC06_027/ov_SC06_027_jr_8015444C.c +++ b/src/ov_SC06_027/ov_SC06_027_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_027/ov_SC06_027_jr_8015A3C8.c b/src/ov_SC06_027/ov_SC06_027_jr_8015A3C8.c index e20ee7276..0e48b5b60 100644 --- a/src/ov_SC06_027/ov_SC06_027_jr_8015A3C8.c +++ b/src/ov_SC06_027/ov_SC06_027_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_027/ov_SC06_027_jr_8015AE2C.c b/src/ov_SC06_027/ov_SC06_027_jr_8015AE2C.c index c46b0853a..01dcbcc4a 100644 --- a/src/ov_SC06_027/ov_SC06_027_jr_8015AE2C.c +++ b/src/ov_SC06_027/ov_SC06_027_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_027/ov_SC06_027_jr_8016AB6C.c b/src/ov_SC06_027/ov_SC06_027_jr_8016AB6C.c index 27896a254..51faf5e3f 100644 --- a/src/ov_SC06_027/ov_SC06_027_jr_8016AB6C.c +++ b/src/ov_SC06_027/ov_SC06_027_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_027/ov_SC06_027_jr_801734BC.c b/src/ov_SC06_027/ov_SC06_027_jr_801734BC.c index 397532d3f..9927f5981 100644 --- a/src/ov_SC06_027/ov_SC06_027_jr_801734BC.c +++ b/src/ov_SC06_027/ov_SC06_027_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_027/ov_SC06_027_jr_80178D40.c b/src/ov_SC06_027/ov_SC06_027_jr_80178D40.c index ac435e53c..7dbdf7a35 100644 --- a/src/ov_SC06_027/ov_SC06_027_jr_80178D40.c +++ b/src/ov_SC06_027/ov_SC06_027_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_027/ov_SC06_027_jr_8017A4AC.c b/src/ov_SC06_027/ov_SC06_027_jr_8017A4AC.c index 71c4cf284..ca045e83e 100644 --- a/src/ov_SC06_027/ov_SC06_027_jr_8017A4AC.c +++ b/src/ov_SC06_027/ov_SC06_027_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_027/ov_SC06_027_jr_8017BEBC.c b/src/ov_SC06_027/ov_SC06_027_jr_8017BEBC.c index 94278b6f4..0d82fa855 100644 --- a/src/ov_SC06_027/ov_SC06_027_jr_8017BEBC.c +++ b/src/ov_SC06_027/ov_SC06_027_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_029/ov_SC06_029_after.c b/src/ov_SC06_029/ov_SC06_029_after.c index fdfdb65ff..7dd49d03d 100644 --- a/src/ov_SC06_029/ov_SC06_029_after.c +++ b/src/ov_SC06_029/ov_SC06_029_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC06_029/nonmatchings/ov_SC06_029_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC06_029/ov_SC06_029_jr_8015444C.c b/src/ov_SC06_029/ov_SC06_029_jr_8015444C.c index 10aa1a538..f5a8cef33 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_8015444C.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_029/ov_SC06_029_jr_8015A3C8.c b/src/ov_SC06_029/ov_SC06_029_jr_8015A3C8.c index b3b56996e..e2a206bcc 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_8015A3C8.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_029/ov_SC06_029_jr_8015AE2C.c b/src/ov_SC06_029/ov_SC06_029_jr_8015AE2C.c index ea59257dd..10c7f5bc9 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_8015AE2C.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_029/ov_SC06_029_jr_8016AB6C.c b/src/ov_SC06_029/ov_SC06_029_jr_8016AB6C.c index 9a7d3d99f..acdc43065 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_8016AB6C.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_029/ov_SC06_029_jr_801734BC.c b/src/ov_SC06_029/ov_SC06_029_jr_801734BC.c index 12cfcffe3..53d9e937e 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_801734BC.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_029/ov_SC06_029_jr_80178D40.c b/src/ov_SC06_029/ov_SC06_029_jr_80178D40.c index 0261b15ed..7dcfb14d2 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_80178D40.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_029/ov_SC06_029_jr_8017A4AC.c b/src/ov_SC06_029/ov_SC06_029_jr_8017A4AC.c index 0a67f9ceb..16f02bcda 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_8017A4AC.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_030/ov_SC06_030_after.c b/src/ov_SC06_030/ov_SC06_030_after.c index 6e32c7982..3884dddde 100644 --- a/src/ov_SC06_030/ov_SC06_030_after.c +++ b/src/ov_SC06_030/ov_SC06_030_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC06_030/nonmatchings/ov_SC06_030_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC06_030/ov_SC06_030_jr_8015444C.c b/src/ov_SC06_030/ov_SC06_030_jr_8015444C.c index 742d173c6..578b74bdb 100644 --- a/src/ov_SC06_030/ov_SC06_030_jr_8015444C.c +++ b/src/ov_SC06_030/ov_SC06_030_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_030/ov_SC06_030_jr_8015A3C8.c b/src/ov_SC06_030/ov_SC06_030_jr_8015A3C8.c index 761ee2e6d..7a24f2d5b 100644 --- a/src/ov_SC06_030/ov_SC06_030_jr_8015A3C8.c +++ b/src/ov_SC06_030/ov_SC06_030_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_030/ov_SC06_030_jr_8015AE2C.c b/src/ov_SC06_030/ov_SC06_030_jr_8015AE2C.c index 632ba5aa0..7fff5c2fe 100644 --- a/src/ov_SC06_030/ov_SC06_030_jr_8015AE2C.c +++ b/src/ov_SC06_030/ov_SC06_030_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_030/ov_SC06_030_jr_8016AB6C.c b/src/ov_SC06_030/ov_SC06_030_jr_8016AB6C.c index 9ed715158..038a313d6 100644 --- a/src/ov_SC06_030/ov_SC06_030_jr_8016AB6C.c +++ b/src/ov_SC06_030/ov_SC06_030_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_030/ov_SC06_030_jr_801734BC.c b/src/ov_SC06_030/ov_SC06_030_jr_801734BC.c index da19c011d..9d9fe8fb2 100644 --- a/src/ov_SC06_030/ov_SC06_030_jr_801734BC.c +++ b/src/ov_SC06_030/ov_SC06_030_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_030/ov_SC06_030_jr_80178D40.c b/src/ov_SC06_030/ov_SC06_030_jr_80178D40.c index 3d8fa4b39..1f2880835 100644 --- a/src/ov_SC06_030/ov_SC06_030_jr_80178D40.c +++ b/src/ov_SC06_030/ov_SC06_030_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_030/ov_SC06_030_jr_8017A4AC.c b/src/ov_SC06_030/ov_SC06_030_jr_8017A4AC.c index 5f7f464c3..40c5f7cdf 100644 --- a/src/ov_SC06_030/ov_SC06_030_jr_8017A4AC.c +++ b/src/ov_SC06_030/ov_SC06_030_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_030/ov_SC06_030_jr_8017C8D0.c b/src/ov_SC06_030/ov_SC06_030_jr_8017C8D0.c index 33538a125..a47a45f69 100644 --- a/src/ov_SC06_030/ov_SC06_030_jr_8017C8D0.c +++ b/src/ov_SC06_030/ov_SC06_030_jr_8017C8D0.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_032/ov_SC06_032_after.c b/src/ov_SC06_032/ov_SC06_032_after.c index 0680413f4..d3fad3e21 100644 --- a/src/ov_SC06_032/ov_SC06_032_after.c +++ b/src/ov_SC06_032/ov_SC06_032_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC06_032/ov_SC06_032_jr_8015444C.c b/src/ov_SC06_032/ov_SC06_032_jr_8015444C.c index 1d524fd3e..dea5ce0da 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_8015444C.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_032/ov_SC06_032_jr_8015A3C8.c b/src/ov_SC06_032/ov_SC06_032_jr_8015A3C8.c index 688276d32..6680e8c00 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_8015A3C8.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_032/ov_SC06_032_jr_8015AE2C.c b/src/ov_SC06_032/ov_SC06_032_jr_8015AE2C.c index 9e1cffc12..93132c4b5 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_8015AE2C.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_032/ov_SC06_032_jr_8016AB6C.c b/src/ov_SC06_032/ov_SC06_032_jr_8016AB6C.c index 762884e87..8a897e50a 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_8016AB6C.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_032/ov_SC06_032_jr_801734BC.c b/src/ov_SC06_032/ov_SC06_032_jr_801734BC.c index a1796ff6e..3cd35dcd0 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_801734BC.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_032/ov_SC06_032_jr_80178D40.c b/src/ov_SC06_032/ov_SC06_032_jr_80178D40.c index b9351063b..54a74513d 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_80178D40.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_032/ov_SC06_032_jr_8017A4AC.c b/src/ov_SC06_032/ov_SC06_032_jr_8017A4AC.c index 9c9380ff8..1c456eaf1 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_8017A4AC.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_032/ov_SC06_032_jr_8017C24C.c b/src/ov_SC06_032/ov_SC06_032_jr_8017C24C.c index 8da54a63d..26ab28d3e 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_8017C24C.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_8017C24C.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_033/ov_SC06_033_after.c b/src/ov_SC06_033/ov_SC06_033_after.c index c6aeb5dd6..488c6510b 100644 --- a/src/ov_SC06_033/ov_SC06_033_after.c +++ b/src/ov_SC06_033/ov_SC06_033_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC06_033/nonmatchings/ov_SC06_033_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC06_033/ov_SC06_033_jr_8015444C.c b/src/ov_SC06_033/ov_SC06_033_jr_8015444C.c index 1110c3b8a..ae880eab2 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_8015444C.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_033/ov_SC06_033_jr_8015A3C8.c b/src/ov_SC06_033/ov_SC06_033_jr_8015A3C8.c index 24b808b2c..146996eea 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_8015A3C8.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_033/ov_SC06_033_jr_8015AE2C.c b/src/ov_SC06_033/ov_SC06_033_jr_8015AE2C.c index 7a0d0a78b..f2bf916b0 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_8015AE2C.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_033/ov_SC06_033_jr_8016AB6C.c b/src/ov_SC06_033/ov_SC06_033_jr_8016AB6C.c index e7c3bb4a9..83d8e106a 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_8016AB6C.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_033/ov_SC06_033_jr_801734BC.c b/src/ov_SC06_033/ov_SC06_033_jr_801734BC.c index 77282fd3f..a435e5161 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_801734BC.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_033/ov_SC06_033_jr_80178D40.c b/src/ov_SC06_033/ov_SC06_033_jr_80178D40.c index 637f66049..0ce55780e 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_80178D40.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_033/ov_SC06_033_jr_8017A4AC.c b/src/ov_SC06_033/ov_SC06_033_jr_8017A4AC.c index 2cf4992d1..64b79e37a 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_8017A4AC.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC06_033/ov_SC06_033_jr_8017C24C.c b/src/ov_SC06_033/ov_SC06_033_jr_8017C24C.c index 769749659..febfbd857 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_8017C24C.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_8017C24C.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_000/ov_SC07_000_after.c b/src/ov_SC07_000/ov_SC07_000_after.c index 3b6274f82..58e87a10a 100644 --- a/src/ov_SC07_000/ov_SC07_000_after.c +++ b/src/ov_SC07_000/ov_SC07_000_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC07_000/ov_SC07_000_jr_8015444C.c b/src/ov_SC07_000/ov_SC07_000_jr_8015444C.c index 6455a53fd..f2d28234b 100644 --- a/src/ov_SC07_000/ov_SC07_000_jr_8015444C.c +++ b/src/ov_SC07_000/ov_SC07_000_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_000/ov_SC07_000_jr_8015A3C8.c b/src/ov_SC07_000/ov_SC07_000_jr_8015A3C8.c index 90d642957..85655f1c5 100644 --- a/src/ov_SC07_000/ov_SC07_000_jr_8015A3C8.c +++ b/src/ov_SC07_000/ov_SC07_000_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_000/ov_SC07_000_jr_8015AE2C.c b/src/ov_SC07_000/ov_SC07_000_jr_8015AE2C.c index 21e587562..c59f8171c 100644 --- a/src/ov_SC07_000/ov_SC07_000_jr_8015AE2C.c +++ b/src/ov_SC07_000/ov_SC07_000_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_000/ov_SC07_000_jr_8016AB6C.c b/src/ov_SC07_000/ov_SC07_000_jr_8016AB6C.c index f0f286deb..f7f00b98c 100644 --- a/src/ov_SC07_000/ov_SC07_000_jr_8016AB6C.c +++ b/src/ov_SC07_000/ov_SC07_000_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_000/ov_SC07_000_jr_801734BC.c b/src/ov_SC07_000/ov_SC07_000_jr_801734BC.c index cd6e8d1dc..654a0c293 100644 --- a/src/ov_SC07_000/ov_SC07_000_jr_801734BC.c +++ b/src/ov_SC07_000/ov_SC07_000_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_000/ov_SC07_000_jr_80178D40.c b/src/ov_SC07_000/ov_SC07_000_jr_80178D40.c index 43ceb42ef..ad300200b 100644 --- a/src/ov_SC07_000/ov_SC07_000_jr_80178D40.c +++ b/src/ov_SC07_000/ov_SC07_000_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_000/ov_SC07_000_jr_8017A4AC.c b/src/ov_SC07_000/ov_SC07_000_jr_8017A4AC.c index 0bb081337..44330c92f 100644 --- a/src/ov_SC07_000/ov_SC07_000_jr_8017A4AC.c +++ b/src/ov_SC07_000/ov_SC07_000_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_000/ov_SC07_000_jr_8017BEBC.c b/src/ov_SC07_000/ov_SC07_000_jr_8017BEBC.c index 7453bfb76..55b85f603 100644 --- a/src/ov_SC07_000/ov_SC07_000_jr_8017BEBC.c +++ b/src/ov_SC07_000/ov_SC07_000_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_001/ov_SC07_001_after.c b/src/ov_SC07_001/ov_SC07_001_after.c index a25143e5e..c7f78867f 100644 --- a/src/ov_SC07_001/ov_SC07_001_after.c +++ b/src/ov_SC07_001/ov_SC07_001_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC07_001/nonmatchings/ov_SC07_001_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC07_001/ov_SC07_001_jr_8015444C.c b/src/ov_SC07_001/ov_SC07_001_jr_8015444C.c index 67417efc1..553f0a6e9 100644 --- a/src/ov_SC07_001/ov_SC07_001_jr_8015444C.c +++ b/src/ov_SC07_001/ov_SC07_001_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_001/ov_SC07_001_jr_8015A3C8.c b/src/ov_SC07_001/ov_SC07_001_jr_8015A3C8.c index 77b959c07..4e4448e68 100644 --- a/src/ov_SC07_001/ov_SC07_001_jr_8015A3C8.c +++ b/src/ov_SC07_001/ov_SC07_001_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_001/ov_SC07_001_jr_8015AE2C.c b/src/ov_SC07_001/ov_SC07_001_jr_8015AE2C.c index f89f79f72..e758bf601 100644 --- a/src/ov_SC07_001/ov_SC07_001_jr_8015AE2C.c +++ b/src/ov_SC07_001/ov_SC07_001_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_001/ov_SC07_001_jr_8016AB6C.c b/src/ov_SC07_001/ov_SC07_001_jr_8016AB6C.c index 048fb4747..0e6b7d875 100644 --- a/src/ov_SC07_001/ov_SC07_001_jr_8016AB6C.c +++ b/src/ov_SC07_001/ov_SC07_001_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_001/ov_SC07_001_jr_801734BC.c b/src/ov_SC07_001/ov_SC07_001_jr_801734BC.c index bf5ac76c1..4a3e6962c 100644 --- a/src/ov_SC07_001/ov_SC07_001_jr_801734BC.c +++ b/src/ov_SC07_001/ov_SC07_001_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_001/ov_SC07_001_jr_80178D40.c b/src/ov_SC07_001/ov_SC07_001_jr_80178D40.c index 2426a22a8..28180001a 100644 --- a/src/ov_SC07_001/ov_SC07_001_jr_80178D40.c +++ b/src/ov_SC07_001/ov_SC07_001_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_001/ov_SC07_001_jr_8017A4AC.c b/src/ov_SC07_001/ov_SC07_001_jr_8017A4AC.c index 243d36d12..78db0a746 100644 --- a/src/ov_SC07_001/ov_SC07_001_jr_8017A4AC.c +++ b/src/ov_SC07_001/ov_SC07_001_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_001/ov_SC07_001_jr_8017BEBC.c b/src/ov_SC07_001/ov_SC07_001_jr_8017BEBC.c index 8e6b45154..617df3fe2 100644 --- a/src/ov_SC07_001/ov_SC07_001_jr_8017BEBC.c +++ b/src/ov_SC07_001/ov_SC07_001_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_002/ov_SC07_002_after.c b/src/ov_SC07_002/ov_SC07_002_after.c index b9198556f..aec84fe66 100644 --- a/src/ov_SC07_002/ov_SC07_002_after.c +++ b/src/ov_SC07_002/ov_SC07_002_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC07_002/ov_SC07_002_jr_8015444C.c b/src/ov_SC07_002/ov_SC07_002_jr_8015444C.c index 6f1994dc9..22def4cba 100644 --- a/src/ov_SC07_002/ov_SC07_002_jr_8015444C.c +++ b/src/ov_SC07_002/ov_SC07_002_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_002/ov_SC07_002_jr_8015A3C8.c b/src/ov_SC07_002/ov_SC07_002_jr_8015A3C8.c index efd57df80..0145cb6f5 100644 --- a/src/ov_SC07_002/ov_SC07_002_jr_8015A3C8.c +++ b/src/ov_SC07_002/ov_SC07_002_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_002/ov_SC07_002_jr_8015AE2C.c b/src/ov_SC07_002/ov_SC07_002_jr_8015AE2C.c index 736ca3370..8cd8ed918 100644 --- a/src/ov_SC07_002/ov_SC07_002_jr_8015AE2C.c +++ b/src/ov_SC07_002/ov_SC07_002_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_002/ov_SC07_002_jr_8016AB6C.c b/src/ov_SC07_002/ov_SC07_002_jr_8016AB6C.c index c3f3b2896..d45137cce 100644 --- a/src/ov_SC07_002/ov_SC07_002_jr_8016AB6C.c +++ b/src/ov_SC07_002/ov_SC07_002_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_002/ov_SC07_002_jr_801734BC.c b/src/ov_SC07_002/ov_SC07_002_jr_801734BC.c index 1d0501605..c8f14bdf3 100644 --- a/src/ov_SC07_002/ov_SC07_002_jr_801734BC.c +++ b/src/ov_SC07_002/ov_SC07_002_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_002/ov_SC07_002_jr_80178D40.c b/src/ov_SC07_002/ov_SC07_002_jr_80178D40.c index fb35b1ef3..8042810aa 100644 --- a/src/ov_SC07_002/ov_SC07_002_jr_80178D40.c +++ b/src/ov_SC07_002/ov_SC07_002_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_002/ov_SC07_002_jr_8017A4AC.c b/src/ov_SC07_002/ov_SC07_002_jr_8017A4AC.c index 8640d3acc..f51b71216 100644 --- a/src/ov_SC07_002/ov_SC07_002_jr_8017A4AC.c +++ b/src/ov_SC07_002/ov_SC07_002_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_002/ov_SC07_002_jr_8017C8D0.c b/src/ov_SC07_002/ov_SC07_002_jr_8017C8D0.c index 62dd1b0c6..1cd5aa163 100644 --- a/src/ov_SC07_002/ov_SC07_002_jr_8017C8D0.c +++ b/src/ov_SC07_002/ov_SC07_002_jr_8017C8D0.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_008/ov_SC07_008_after.c b/src/ov_SC07_008/ov_SC07_008_after.c index 27fb767a8..43292406d 100644 --- a/src/ov_SC07_008/ov_SC07_008_after.c +++ b/src/ov_SC07_008/ov_SC07_008_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC07_008/nonmatchings/ov_SC07_008_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC07_008/ov_SC07_008_jr_8015444C.c b/src/ov_SC07_008/ov_SC07_008_jr_8015444C.c index 63627afcf..9b9e6ccec 100644 --- a/src/ov_SC07_008/ov_SC07_008_jr_8015444C.c +++ b/src/ov_SC07_008/ov_SC07_008_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_008/ov_SC07_008_jr_8015A3C8.c b/src/ov_SC07_008/ov_SC07_008_jr_8015A3C8.c index b5c315b19..ccfdd2517 100644 --- a/src/ov_SC07_008/ov_SC07_008_jr_8015A3C8.c +++ b/src/ov_SC07_008/ov_SC07_008_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_008/ov_SC07_008_jr_8015AE2C.c b/src/ov_SC07_008/ov_SC07_008_jr_8015AE2C.c index bc7947041..354687536 100644 --- a/src/ov_SC07_008/ov_SC07_008_jr_8015AE2C.c +++ b/src/ov_SC07_008/ov_SC07_008_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_008/ov_SC07_008_jr_8016AB6C.c b/src/ov_SC07_008/ov_SC07_008_jr_8016AB6C.c index 57923c579..ff5f95e1b 100644 --- a/src/ov_SC07_008/ov_SC07_008_jr_8016AB6C.c +++ b/src/ov_SC07_008/ov_SC07_008_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_008/ov_SC07_008_jr_801734BC.c b/src/ov_SC07_008/ov_SC07_008_jr_801734BC.c index bc208b43b..dcc3fc82c 100644 --- a/src/ov_SC07_008/ov_SC07_008_jr_801734BC.c +++ b/src/ov_SC07_008/ov_SC07_008_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_008/ov_SC07_008_jr_80178D40.c b/src/ov_SC07_008/ov_SC07_008_jr_80178D40.c index 277b0d31f..a142d820a 100644 --- a/src/ov_SC07_008/ov_SC07_008_jr_80178D40.c +++ b/src/ov_SC07_008/ov_SC07_008_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_008/ov_SC07_008_jr_8017A4AC.c b/src/ov_SC07_008/ov_SC07_008_jr_8017A4AC.c index 2dc220f7a..82b4ec664 100644 --- a/src/ov_SC07_008/ov_SC07_008_jr_8017A4AC.c +++ b/src/ov_SC07_008/ov_SC07_008_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_008/ov_SC07_008_jr_8017BEBC.c b/src/ov_SC07_008/ov_SC07_008_jr_8017BEBC.c index 34d1c9738..d3924237c 100644 --- a/src/ov_SC07_008/ov_SC07_008_jr_8017BEBC.c +++ b/src/ov_SC07_008/ov_SC07_008_jr_8017BEBC.c @@ -802,7 +802,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_009/ov_SC07_009_after.c b/src/ov_SC07_009/ov_SC07_009_after.c index 050b52fa8..553d813ef 100644 --- a/src/ov_SC07_009/ov_SC07_009_after.c +++ b/src/ov_SC07_009/ov_SC07_009_after.c @@ -1635,7 +1635,7 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014F2E0 (src/shared) */ INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009_after", func_8014F3E8); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); s32 func_8014F468(void) { @@ -1664,7 +1664,7 @@ s32 func_8014F468(void) } -INCLUDE_ASM("asm/ov_SC07_009/nonmatchings/ov_SC07_009_after", func_8014F4C0); +DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014F4C0 (src/shared) */ // @class: plumbing diff --git a/src/ov_SC07_009/ov_SC07_009_jr_8015444C.c b/src/ov_SC07_009/ov_SC07_009_jr_8015444C.c index 9c8187f65..b89feedb9 100644 --- a/src/ov_SC07_009/ov_SC07_009_jr_8015444C.c +++ b/src/ov_SC07_009/ov_SC07_009_jr_8015444C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_009/ov_SC07_009_jr_8015A3C8.c b/src/ov_SC07_009/ov_SC07_009_jr_8015A3C8.c index 2685f29ea..d1ee7cdc7 100644 --- a/src/ov_SC07_009/ov_SC07_009_jr_8015A3C8.c +++ b/src/ov_SC07_009/ov_SC07_009_jr_8015A3C8.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_009/ov_SC07_009_jr_8015AE2C.c b/src/ov_SC07_009/ov_SC07_009_jr_8015AE2C.c index b1e05521d..34902cce7 100644 --- a/src/ov_SC07_009/ov_SC07_009_jr_8015AE2C.c +++ b/src/ov_SC07_009/ov_SC07_009_jr_8015AE2C.c @@ -623,7 +623,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_009/ov_SC07_009_jr_8016AB6C.c b/src/ov_SC07_009/ov_SC07_009_jr_8016AB6C.c index 9af2d87be..c33b3e75d 100644 --- a/src/ov_SC07_009/ov_SC07_009_jr_8016AB6C.c +++ b/src/ov_SC07_009/ov_SC07_009_jr_8016AB6C.c @@ -732,7 +732,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_009/ov_SC07_009_jr_801734BC.c b/src/ov_SC07_009/ov_SC07_009_jr_801734BC.c index 2699a501b..aaa072fb4 100644 --- a/src/ov_SC07_009/ov_SC07_009_jr_801734BC.c +++ b/src/ov_SC07_009/ov_SC07_009_jr_801734BC.c @@ -759,7 +759,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_009/ov_SC07_009_jr_80178D40.c b/src/ov_SC07_009/ov_SC07_009_jr_80178D40.c index 1b03af68d..e4a24acdd 100644 --- a/src/ov_SC07_009/ov_SC07_009_jr_80178D40.c +++ b/src/ov_SC07_009/ov_SC07_009_jr_80178D40.c @@ -758,7 +758,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/ov_SC07_009/ov_SC07_009_jr_8017A4AC.c b/src/ov_SC07_009/ov_SC07_009_jr_8017A4AC.c index b149e2a82..2e618ad32 100644 --- a/src/ov_SC07_009/ov_SC07_009_jr_8017A4AC.c +++ b/src/ov_SC07_009/ov_SC07_009_jr_8017A4AC.c @@ -791,7 +791,7 @@ extern s32 func_8014F24C(struct SubF24C *a0); extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F4C0(void); +extern s32 func_8014F4C0(); extern s32 func_8014F468(void); extern int func_8014F74C(); extern int func_8014F6F4(void); diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 7d7ef080c..61d469317 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -27783,4 +27783,63 @@ } \ } +#define DEFINE_func_8014F4C0() \ + extern s32 func_80133784(s32 a0, void *a1, s32 a2); \ + extern s32 func_80029178(s32 arg); \ + extern int func_8014F74C(); \ + extern u8 D_800D3918[]; \ + extern u8 D_801152A8[]; \ + extern s16 D_801152B0; \ + extern s32 D_801152BC; \ + s32 func_8014F4C0(s32 arg0) \ + { \ + PosT sp10; \ + MoveT sp18; \ + u16 x6, xA, xE; \ + s32 ret; \ + if (*(s16 *)(arg0 + 0x146) != 0) { \ + return func_8014F74C(); \ + } \ + sp10.x = *(u16 *)(arg0 + 0x88); \ + sp10.y = *(u16 *)(arg0 + 0x8A); \ + sp10.z = *(u16 *)(arg0 + 0x8C); \ + sp18.x = x6 = *(u16 *)(arg0 + 6); \ + sp18.y = xA = *(u16 *)(arg0 + 0xA) + 8; \ + sp18.z = xE = *(u16 *)(arg0 + 0xE); \ + if (*(s16 *)(arg0 + 0x146) != 0) { \ + sp18.x = x6 + *(u16 *)(arg0 + 0x140); \ + sp18.y = xA + *(u16 *)(arg0 + 0x142); \ + sp18.z = xE + *(u16 *)(arg0 + 0x144); \ + } \ + ret = func_80133784(0, &sp10, (s32)&sp18); \ + if (ret != 0) { \ + if (*(u8 *)&sp18.w != 0) { \ + *(u16 *)(arg0 + 0x16C) = *(u8 *)&sp18.w; \ + } \ + *(u16 *)(arg0 + 0x16E) = (u32)sp18.w >> 13; \ + if (ret == 0x2000) { \ + __builtin_memcpy((void *)(arg0 + 0x120), (void *)D_801152A8, 8); \ + } else if (ret == 0x4000) { \ + __builtin_memcpy((void *)(arg0 + 0x120), (void *)&D_801152B0, 8); \ + } \ + /* NOT the sibling's `if (x != 0x1D) return ret;` early-return form — that inverts the \ + * branch polarity here (beq instead of the target's bne) and costs +2 ins. The \ + * short-circuit && is what folds the 0x1D test and the func_80029178 test into the \ + * single fallthrough chain the target uses. */ \ + if (*(u16 *)(arg0 + 0x16C) == 0x1D && (func_80029178(0x21) & 0xFF) == 0) { \ + ret &= ~0x2000; \ + ret |= 0x4000; \ + __builtin_memcpy((void *)&D_801152B0, (void *)D_801152A8, 8); \ + D_801152BC = 1; \ + } \ + return ret; \ + } \ + /* ret == 0 */ \ + __builtin_memcpy((void *)(arg0 + 0x120), (void *)D_800D3918, 8); \ + if (*(u8 *)&sp18.w != 0) { \ + *(u16 *)(arg0 + 0x16C) = *(u8 *)&sp18.w; \ + } \ + return 0; \ + } + #endif