diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index c246286563..c32f46e926 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -13529,3 +13529,10 @@ groups: func: DEFINE_func_80182BD4 vram: 0x80182BD4 binaries: [ov_SC03_014, ov_SC03_015] + - id: E_func_80182BB0 + tier: h_exact + hash: a88cb6e7620d2650764619efb32d0dca9674be01 + source: src/shared/engine_core.h + func: DEFINE_func_80182BB0 + vram: 0x80182BB0 + binaries: [ov_SC03_014, ov_SC03_015] diff --git a/docs/progress.fleet.md b/docs/progress.fleet.md index 401241e10c..00d1df0a6d 100644 --- a/docs/progress.fleet.md +++ b/docs/progress.fleet.md @@ -4,16 +4,16 @@ # cross-binary collapsible-byte leverage: docs/duplicates.cross.md. # THREE progress metrics (all matter — see the labels): -FLEET fn-count byte-ident: 341362 / 353717 = 96.51% (REAL+LINKED+empties; FUNCTION-count, ×134-inflated — one crack counts per overlay) -FLEET instr-weighted : 12419144 / 13141652 = 94.5% (shipped .text across main + resident + 138 overlays; the decomp.dev-DISPLAY number) +FLEET fn-count byte-ident: 341363 / 353717 = 96.51% (REAL+LINKED+empties; FUNCTION-count, ×134-inflated — one crack counts per overlay) +FLEET instr-weighted : 12419153 / 13141652 = 94.5% (shipped .text across main + resident + 138 overlays; the decomp.dev-DISPLAY number) FLEET distinct-code(uniq): 5029454 / 5634875 = 89.3% (77973/87459 unique fns; the DISTINCT-RE number) MAIN game-code weighted : 436 / 60201 = 0.7% (INCLUDED in the fleet numbers above since 2026-07-22 — roadmap §1 metrics contract; LINKED-excluding Ghidra sig dated 2026-06-14; caveat is R34: no independent second oracle for a PS-X EXE, NOT drift) - (fleet EXCLUDING main, for continuity with pre-2026-07-22 readings: 12418708 / 13081451 = 94.9%) + (fleet EXCLUDING main, for continuity with pre-2026-07-22 readings: 12418717 / 13081451 = 94.9%) -FLEET REAL substantive : 339507 (of which dedup-shared 241429 via 1915 groups / 241503 instances) +FLEET REAL substantive : 339508 (of which dedup-shared 241431 via 1916 groups / 241505 instances) FLEET LINKED PsyQ objs : 959 FLEET NON_MATCHING : 7 (0 in any default build — G4) -FLEET INCLUDE_ASM stubs : 12348 +FLEET INCLUDE_ASM stubs : 12347 FLEET matchable : 353717 | binary | REAL | shared | LINKED | byte-ident | matchable | byte-ident % | @@ -56,8 +56,8 @@ FLEET matchable : 353717 | ov_SC03_011 | 2413 | 1751 | 0 | 2419 | 2527 | 95.7% | | ov_SC03_012 | 2385 | 1751 | 0 | 2386 | 2406 | 99.2% | | ov_SC03_013 | 2418 | 1751 | 0 | 2418 | 2493 | 97.0% | -| ov_SC03_014 | 2569 | 1780 | 0 | 2569 | 2685 | 95.7% | -| ov_SC03_015 | 2570 | 1780 | 0 | 2570 | 2685 | 95.7% | +| ov_SC03_014 | 2570 | 1781 | 0 | 2570 | 2685 | 95.7% | +| ov_SC03_015 | 2570 | 1781 | 0 | 2570 | 2685 | 95.7% | | ov_SC03_023 | 2397 | 1751 | 0 | 2398 | 2435 | 98.5% | | ov_SC03_024 | 2514 | 1756 | 0 | 2521 | 2641 | 95.5% | | ov_SC03_028 | 2457 | 1752 | 0 | 2461 | 2664 | 92.4% | 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 916bfdb4a3..04f7663c96 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_8017EB7C.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_8017EB7C.c @@ -5305,7 +5305,7 @@ void func_80182A40(void *a0) } -INCLUDE_ASM("asm/ov_SC03_014/nonmatchings/ov_SC03_014_jr_8017EB7C", func_80182BB0); +DEFINE_func_80182BB0() /* dedup: shared engine-core @0x80182BB0 (src/shared) */ DEFINE_func_80182BD4() /* dedup: shared engine-core @0x80182BD4 (src/shared) */ 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 c7f2accbc5..7f3f16231b 100644 --- a/src/ov_SC03_015/ov_SC03_015_jr_8017EB7C.c +++ b/src/ov_SC03_015/ov_SC03_015_jr_8017EB7C.c @@ -5207,10 +5207,7 @@ void func_80182A40(void *a0) } -extern void func_80182C28(s32 arg0, s32 arg1, s32 arg2, s32 arg3); - void func_80182BB0(s32 arg0, s32 arg1) { - func_80182C28(arg0, arg1, 0xC, 0); - } +DEFINE_func_80182BB0() /* dedup: shared engine-core @0x80182BB0 (src/shared) */ DEFINE_func_80182BD4() /* dedup: shared engine-core @0x80182BD4 (src/shared) */ diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index d9e1d29e22..e443c4754b 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -515,6 +515,12 @@ func_80182C28(arg0, arg1, arg2, 0); \ } +#define DEFINE_func_80182BB0() \ + extern void func_80182C28(s32 arg0, s32 arg1, s32 arg2, s32 arg3); \ + void func_80182BB0(s32 arg0, s32 arg1) { \ + func_80182C28(arg0, arg1, 0xC, 0); \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -30435,4 +30441,10 @@ func_80182C28(arg0, arg1, arg2, 0); \ } +#define DEFINE_func_80182BB0() \ + extern void func_80182C28(s32 arg0, s32 arg1, s32 arg2, s32 arg3); \ + void func_80182BB0(s32 arg0, s32 arg1) { \ + func_80182C28(arg0, arg1, 0xC, 0); \ + } + #endif