diff --git a/phase-ends/CURRENT_PHASE.md b/phase-ends/CURRENT_PHASE.md index c346a25eb..caf876422 100644 --- a/phase-ends/CURRENT_PHASE.md +++ b/phase-ends/CURRENT_PHASE.md @@ -83,6 +83,13 @@ stub on a named wall/behemoth/queue ledger** — 140/140 byte-identical througho ## Per-task log +### T0(e) — part 1 ✅: the 21-file absolute-include defect fixed (2026-07-30) +All 21 carriers were jr-carve split files including `engine_types.h` by absolute path +(`/home/musashi/bfm-decomp/...`, some twice); swapped to the house-relative +`#include "../shared/engine_types.h"`. `grep -rln /home/musashi src/ include/` → **0**. +**R22 clean-fleet from a genuinely clean tree: 140 passed, 0 failed of 140.** Part 2 (autopsy +refresh) next. + ### T0(d) ✅ — backlog ledger: already clean; the scanner deleted (R33) (2026-07-30) Findings, byte-verified: (1) the still-a-stub filter **already existed** (`load_best` drop + `prune`, built 07-24) and the tracked jsonl was **already compacted** — the tree's pre-existing 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 f7b052256..c6a82f14f 100644 --- a/src/ov_SC02_016/ov_SC02_016_jr_8017DC70.c +++ b/src/ov_SC02_016/ov_SC02_016_jr_8017DC70.c @@ -3716,7 +3716,7 @@ void func_80182874(s32 param_1) { #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" diff --git a/src/ov_SC02_031/ov_SC02_031_jr_8017AE2C.c b/src/ov_SC02_031/ov_SC02_031_jr_8017AE2C.c index 3fc3b811a..745cd4e2e 100644 --- a/src/ov_SC02_031/ov_SC02_031_jr_8017AE2C.c +++ b/src/ov_SC02_031/ov_SC02_031_jr_8017AE2C.c @@ -3606,7 +3606,7 @@ INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031_jr_8017AE2C", func_8017F53 INCLUDE_ASM("asm/ov_SC02_031/nonmatchings/ov_SC02_031_jr_8017AE2C", func_8017F590); #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" #define gte_ldv0(r0) __asm__ volatile ( \ "lwc2 $0, 0( %0 );" \ 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 eb0c9b666..9f7db3cab 100644 --- a/src/ov_SC02_041/ov_SC02_041_jr_8017BEBC.c +++ b/src/ov_SC02_041/ov_SC02_041_jr_8017BEBC.c @@ -3581,7 +3581,7 @@ void func_8017F1B0(s32 param_1) { #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" diff --git a/src/ov_SC03_006/ov_SC03_006_jr_8017AE2C.c b/src/ov_SC03_006/ov_SC03_006_jr_8017AE2C.c index 612308f35..31cb83bc2 100644 --- a/src/ov_SC03_006/ov_SC03_006_jr_8017AE2C.c +++ b/src/ov_SC03_006/ov_SC03_006_jr_8017AE2C.c @@ -3642,7 +3642,7 @@ extern void func_8017F510(s32 arg0, s32 arg1, s32 arg2); #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" /* =========================================================================== * func_8017F510 -- 1,511 ins, ov_SC03_006 (behemoth #3). ***MATCH*** diff --git a/src/ov_SC03_010/ov_SC03_010_jr_8017C730.c b/src/ov_SC03_010/ov_SC03_010_jr_8017C730.c index 2a2c778e4..4b3dbe937 100644 --- a/src/ov_SC03_010/ov_SC03_010_jr_8017C730.c +++ b/src/ov_SC03_010/ov_SC03_010_jr_8017C730.c @@ -2684,7 +2684,7 @@ extern void func_8017C214(void); /* ==== end §8b carried decl layer ==== */ #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" /* =========================================================================== * func_8017C730 -- 1,061 ins, ov_SC03_010 (behemoth #6). *** MATCH *** 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 850a0ec15..74e07210b 100644 --- a/src/ov_SC03_089/ov_SC03_089_jr_8017CA80.c +++ b/src/ov_SC03_089/ov_SC03_089_jr_8017CA80.c @@ -3178,7 +3178,7 @@ void func_8017CA80(s32 arg0) #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" /* =========================================================================== * func_8017D960 -- 3,338 ins, ov_SC03_090 (behemoth #2). *** MATCHED *** 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 640b4c6be..85b89261e 100644 --- a/src/ov_SC03_090/ov_SC03_090_jr_8017CA80.c +++ b/src/ov_SC03_090/ov_SC03_090_jr_8017CA80.c @@ -3178,7 +3178,7 @@ void func_8017CA80(s32 arg0) #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" /* =========================================================================== * func_8017D960 -- 3,338 ins, ov_SC03_090 (behemoth #2). *** MATCHED *** 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 1f382ac05..fed0c85e7 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_8017D898.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_8017D898.c @@ -3182,7 +3182,7 @@ void func_8017D898(s32 arg0) #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" /* =========================================================================== * func_8017D960 -- 3,338 ins, ov_SC03_090 (behemoth #2). *** MATCHED *** 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 e2d1a81a8..f8c40f5d6 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_8017BEBC.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_8017BEBC.c @@ -3172,7 +3172,7 @@ void func_8017BEBC(s32 arg0) #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" /* =========================================================================== * func_8017D960 -- 3,338 ins, ov_SC03_090 (behemoth #2). *** MATCHED *** 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 225ad8954..7b1b1c2b1 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_8017CA80.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_8017CA80.c @@ -3178,7 +3178,7 @@ void func_8017CA80(s32 arg0) #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" /* =========================================================================== * func_8017D960 -- 3,338 ins, ov_SC03_090 (behemoth #2). *** MATCHED *** diff --git a/src/ov_SC03_116/ov_SC03_116_jr_8017AE2C.c b/src/ov_SC03_116/ov_SC03_116_jr_8017AE2C.c index c5c2a8e57..b0080dbbf 100644 --- a/src/ov_SC03_116/ov_SC03_116_jr_8017AE2C.c +++ b/src/ov_SC03_116/ov_SC03_116_jr_8017AE2C.c @@ -3324,7 +3324,7 @@ DEFINE_func_8017BEB4() /* dedup: shared engine-core @0x8017BEB4 (src/shared) */ INCLUDE_ASM("asm/ov_SC03_116/nonmatchings/ov_SC03_116_jr_8017AE2C", func_8017BEBC); #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" /* =========================================================================== * func_8017BF14 -- 4,763 ins, ov_SC03_116 (behemoth #4). *** MATCH *** 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 b733e50cb..9f724fa42 100644 --- a/src/ov_SC04_002/ov_SC04_002_jr_8017BEBC.c +++ b/src/ov_SC04_002/ov_SC04_002_jr_8017BEBC.c @@ -3699,7 +3699,7 @@ void func_80180E88(s32 param_1) { #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" 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 82e51b08b..fe44450af 100644 --- a/src/ov_SC04_005/ov_SC04_005_jr_8017BEBC.c +++ b/src/ov_SC04_005/ov_SC04_005_jr_8017BEBC.c @@ -3657,7 +3657,7 @@ void func_801802A0(s32 param_1) { #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" 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 2d56fd0b3..9ce0fd6eb 100644 --- a/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c +++ b/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c @@ -3982,7 +3982,7 @@ void func_80185660(s32 param_1) { #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" 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 e145f379d..a361f3a29 100644 --- a/src/ov_SC06_008/ov_SC06_008_jr_8017C294.c +++ b/src/ov_SC06_008/ov_SC06_008_jr_8017C294.c @@ -3426,7 +3426,7 @@ INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008_jr_8017C294", func_8017E69 INCLUDE_ASM("asm/ov_SC06_008/nonmatchings/ov_SC06_008_jr_8017C294", func_8017E6F0); #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" @@ -4530,7 +4530,7 @@ void func_801843B8(s32 param_1) { #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" 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 1baa3a4ce..016b94a13 100644 --- a/src/ov_SC06_010/ov_SC06_010_jr_8017A4AC.c +++ b/src/ov_SC06_010/ov_SC06_010_jr_8017A4AC.c @@ -3517,7 +3517,7 @@ void func_8017DD68(s32 param_1) { #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" 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 999c06a2b..23d63adb6 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_8017BEBC.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_8017BEBC.c @@ -3648,7 +3648,7 @@ void func_80181854(s32 param_1) { #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" 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 b6545dc8a..3cbad7608 100644 --- a/src/ov_SC06_025/ov_SC06_025_jr_8017BEBC.c +++ b/src/ov_SC06_025/ov_SC06_025_jr_8017BEBC.c @@ -3898,7 +3898,7 @@ void func_80183D74(s32 param_1) { #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" diff --git a/src/ov_SC06_029/ov_SC06_029_jr_8017C954.c b/src/ov_SC06_029/ov_SC06_029_jr_8017C954.c index de14e4a3e..6151f4b9a 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_8017C954.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_8017C954.c @@ -2679,7 +2679,7 @@ extern void func_8017C8D0(void); /* ==== end §8b carried decl layer ==== */ #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" /* =========================================================================== * func_8017C954 -- 1,194 ins, ov_SC06_029 (behemoth #5). *** MATCH *** @@ -4383,7 +4383,7 @@ void func_8018B8F8(s32 param_1) { #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" 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 40e6a12b0..3ae40b59d 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_8017C24C.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_8017C24C.c @@ -3451,7 +3451,7 @@ void func_8017E2C4(s32 param_1) { #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h" 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 ac65c8821..7a61eb594 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_8017C24C.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_8017C24C.c @@ -3512,7 +3512,7 @@ void func_8017EE4C(s32 param_1) { #include "common.h" -#include "/home/musashi/bfm-decomp/src/shared/engine_types.h" +#include "../shared/engine_types.h"