From ea4ab8089bd448e52b9718276c6cac1550a4752b Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Tue, 29 Sep 2026 22:20:45 -0600 Subject: [PATCH] =?UTF-8?q?T4:=20batch=20t38=5F4L2=20=E2=80=94=20restruct:?= =?UTF-8?q?=20batch=20t38=5F4L2=20rung=20L=20=E2=80=94=2013=20files=20(TUs?= =?UTF-8?q?;=2013=20drawable)=20=C2=B7=2018=20definitions:=206=20folded=20?= =?UTF-8?q?(84=20member=20renames)=20/=2012=20refused=20=C2=B7=20compiles?= =?UTF-8?q?=2013=20in=206=20s=20wall=20=C2=B7=20final=2013/13=20identical?= =?UTF-8?q?=20=C2=B7=20written=206=20files=20|=20R22=20check-all:=20218=20?= =?UTF-8?q?passed,=200=20failed=20of=20218=20|=20(census=20skipped)=20(res?= =?UTF-8?q?truct=5Fcycle)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .run/P36/delever/calibration.json | 298 +++++++++++----------- .run/P37/restruct/ledger.jsonl | 18 ++ src/ov_SC03_095/ov_SC03_095_after.c | 57 ++--- src/ov_SC04_015/ov_SC04_015_after.c | 57 ++--- src/ov_SC04_016/ov_SC04_016_after.c | 57 ++--- src/ov_SC06_029/ov_SC06_029_jr_801867D0.c | 18 +- src/ov_SC06_029/ov_SC06_029_jr_801898CC.c | 18 +- src/ov_SC06_030/ov_SC06_030_after.c | 57 ++--- 8 files changed, 249 insertions(+), 331 deletions(-) diff --git a/.run/P36/delever/calibration.json b/.run/P36/delever/calibration.json index 86dbe5099f..9ffaacb109 100644 --- a/.run/P36/delever/calibration.json +++ b/.run/P36/delever/calibration.json @@ -1,7 +1,7 @@ { - "head": "54c26d08a", + "head": "5ae5fe94c", "stamp": "588cbf38c6e4", - "generated": "2026-09-29 21:30", + "generated": "2026-09-29 22:18", "aliases": [ "main", "md_SC07_004", @@ -21,175 +21,175 @@ "main": { "objects": 85, "identical": 85, - "seconds": 8.487000000000005, - "mean_s": 0.1 + "seconds": 8.042, + "mean_s": 0.095 }, "md_SC07_004": { "objects": 1, "identical": 1, - "seconds": 0.565, - "mean_s": 0.565 + "seconds": 0.568, + "mean_s": 0.568 }, "ov_SC03_015": { "objects": 32, "identical": 32, - "seconds": 5.006000000000002, - "mean_s": 0.156 + "seconds": 5.131000000000002, + "mean_s": 0.16 }, "ov_SC04_011": { "objects": 28, "identical": 28, - "seconds": 4.24, - "mean_s": 0.151 + "seconds": 4.306, + "mean_s": 0.154 } }, "per_object_seconds": { - "build/src/800.o": 0.836, - "build/src/800_b.o": 0.107, - "build/src/800_b_2.o": 0.408, - "build/src/800_b_o0a.o": 0.078, - "build/src/800_c.o": 0.228, - "build/src/800b2.o": 0.089, - "build/src/apicard1.o": 0.084, - "build/src/apicard2.o": 0.107, - "build/src/apicard3.o": 0.077, - "build/src/apicard4.o": 0.074, - "build/src/apicard5.o": 0.069, - "build/src/apicard6.o": 0.087, - "build/src/apicard7.o": 0.095, - "build/src/boot.o": 0.1, - "build/src/gap.o": 0.089, - "build/src/libapi1.o": 0.089, - "build/src/libapi2.o": 0.067, - "build/src/libc2_1.o": 0.071, - "build/src/libc2_2.o": 0.067, - "build/src/libcd1.o": 0.099, - "build/src/libcd2.o": 0.076, - "build/src/libetc.o": 0.08, - "build/src/libgpu.o": 0.078, - "build/src/libgpu2.o": 0.094, - "build/src/libgs1.o": 0.076, - "build/src/libgs2.o": 0.1, - "build/src/libgs3.o": 0.113, - "build/src/libgs4.o": 0.087, - "build/src/libgs5.o": 0.083, - "build/src/libgs6.o": 0.096, - "build/src/libgs7.o": 0.093, - "build/src/libgs8.o": 0.078, - "build/src/libgte1.o": 0.094, - "build/src/libgte10.o": 0.082, - "build/src/libgte11.o": 0.092, - "build/src/libgte12.o": 0.088, - "build/src/libgte13.o": 0.091, - "build/src/libgte14.o": 0.095, - "build/src/libgte15.o": 0.106, - "build/src/libgte16.o": 0.1, - "build/src/libgte17.o": 0.098, - "build/src/libgte18.o": 0.129, - "build/src/libgte19.o": 0.117, - "build/src/libgte2.o": 0.083, - "build/src/libgte20.o": 0.086, - "build/src/libgte21.o": 0.1, - "build/src/libgte22.o": 0.093, - "build/src/libgte23.o": 0.088, - "build/src/libgte24.o": 0.109, - "build/src/libgte25.o": 0.101, - "build/src/libgte26.o": 0.099, - "build/src/libgte27.o": 0.082, - "build/src/libgte28.o": 0.102, - "build/src/libgte29.o": 0.075, + "build/src/800.o": 0.854, + "build/src/800_b.o": 0.095, + "build/src/800_b_2.o": 0.355, + "build/src/800_b_o0a.o": 0.072, + "build/src/800_c.o": 0.227, + "build/src/800b2.o": 0.083, + "build/src/apicard1.o": 0.093, + "build/src/apicard2.o": 0.087, + "build/src/apicard3.o": 0.084, + "build/src/apicard4.o": 0.101, + "build/src/apicard5.o": 0.11, + "build/src/apicard6.o": 0.09, + "build/src/apicard7.o": 0.094, + "build/src/boot.o": 0.104, + "build/src/gap.o": 0.086, + "build/src/libapi1.o": 0.088, + "build/src/libapi2.o": 0.074, + "build/src/libc2_1.o": 0.083, + "build/src/libc2_2.o": 0.069, + "build/src/libcd1.o": 0.083, + "build/src/libcd2.o": 0.071, + "build/src/libetc.o": 0.073, + "build/src/libgpu.o": 0.074, + "build/src/libgpu2.o": 0.087, + "build/src/libgs1.o": 0.071, + "build/src/libgs2.o": 0.078, + "build/src/libgs3.o": 0.076, + "build/src/libgs4.o": 0.072, + "build/src/libgs5.o": 0.076, + "build/src/libgs6.o": 0.088, + "build/src/libgs7.o": 0.068, + "build/src/libgs8.o": 0.069, + "build/src/libgte1.o": 0.067, + "build/src/libgte10.o": 0.065, + "build/src/libgte11.o": 0.075, + "build/src/libgte12.o": 0.077, + "build/src/libgte13.o": 0.081, + "build/src/libgte14.o": 0.079, + "build/src/libgte15.o": 0.072, + "build/src/libgte16.o": 0.077, + "build/src/libgte17.o": 0.074, + "build/src/libgte18.o": 0.086, + "build/src/libgte19.o": 0.076, + "build/src/libgte2.o": 0.076, + "build/src/libgte20.o": 0.075, + "build/src/libgte21.o": 0.073, + "build/src/libgte22.o": 0.074, + "build/src/libgte23.o": 0.081, + "build/src/libgte24.o": 0.073, + "build/src/libgte25.o": 0.08, + "build/src/libgte26.o": 0.074, + "build/src/libgte27.o": 0.079, + "build/src/libgte28.o": 0.077, + "build/src/libgte29.o": 0.084, "build/src/libgte3.o": 0.086, - "build/src/libgte30.o": 0.094, - "build/src/libgte4.o": 0.09, - "build/src/libgte5.o": 0.086, - "build/src/libgte6.o": 0.084, - "build/src/libgte7.o": 0.082, - "build/src/libgte8.o": 0.075, - "build/src/libgte9.o": 0.079, - "build/src/libmcrd1.o": 0.086, - "build/src/libmcrd2.o": 0.07, - "build/src/libpad1.o": 0.076, - "build/src/libpad2.o": 0.08, - "build/src/sgap.o": 0.081, - "build/src/sgap_2.o": 0.07, - "build/src/sgap_3.o": 0.076, - "build/src/sgap_4.o": 0.079, - "build/src/sgap_5.o": 0.079, - "build/src/sgap_6.o": 0.075, - "build/src/sgap_8.o": 0.081, - "build/src/snd1.o": 0.078, - "build/src/snd10.o": 0.065, - "build/src/snd11.o": 0.068, - "build/src/snd12.o": 0.078, - "build/src/snd2.o": 0.075, - "build/src/snd3.o": 0.079, - "build/src/snd4.o": 0.076, - "build/src/snd5.o": 0.068, - "build/src/snd6.o": 0.079, - "build/src/snd7.o": 0.07, - "build/src/snd8.o": 0.067, - "build/src/snd9.o": 0.07, - "build/src/md_SC07_004/md_SC07_004.o": 0.565, - "build/src/ov_SC03_015/ov_SC03_015.o": 0.143, - "build/src/ov_SC03_015/ov_SC03_015_after.o": 0.552, - "build/src/ov_SC03_015/ov_SC03_015_jr_8012ACE0.o": 0.421, - "build/src/ov_SC03_015/ov_SC03_015_jr_80135888.o": 0.068, - "build/src/ov_SC03_015/ov_SC03_015_jr_80135A4C.o": 0.064, - "build/src/ov_SC03_015/ov_SC03_015_jr_80135D20.o": 0.131, - "build/src/ov_SC03_015/ov_SC03_015_jr_801380E0.o": 0.172, - "build/src/ov_SC03_015/ov_SC03_015_jr_8013C98C.o": 0.143, - "build/src/ov_SC03_015/ov_SC03_015_jr_8013F350.o": 0.09, - "build/src/ov_SC03_015/ov_SC03_015_jr_8013FFD8.o": 0.069, - "build/src/ov_SC03_015/ov_SC03_015_jr_80140608.o": 0.2, - "build/src/ov_SC03_015/ov_SC03_015_jr_8015444C.o": 0.079, - "build/src/ov_SC03_015/ov_SC03_015_jr_80154C24.o": 0.182, - "build/src/ov_SC03_015/ov_SC03_015_jr_801588CC.o": 0.102, - "build/src/ov_SC03_015/ov_SC03_015_jr_80159C84.o": 0.068, - "build/src/ov_SC03_015/ov_SC03_015_jr_8015A3C8.o": 0.071, - "build/src/ov_SC03_015/ov_SC03_015_jr_8015AE2C.o": 0.096, - "build/src/ov_SC03_015/ov_SC03_015_jr_8015C32C.o": 0.5, - "build/src/ov_SC03_015/ov_SC03_015_jr_8016AB6C.o": 0.284, - "build/src/ov_SC03_015/ov_SC03_015_jr_80171B4C.o": 0.109, + "build/src/libgte30.o": 0.082, + "build/src/libgte4.o": 0.077, + "build/src/libgte5.o": 0.079, + "build/src/libgte6.o": 0.075, + "build/src/libgte7.o": 0.079, + "build/src/libgte8.o": 0.083, + "build/src/libgte9.o": 0.086, + "build/src/libmcrd1.o": 0.09, + "build/src/libmcrd2.o": 0.076, + "build/src/libpad1.o": 0.085, + "build/src/libpad2.o": 0.082, + "build/src/sgap.o": 0.079, + "build/src/sgap_2.o": 0.087, + "build/src/sgap_3.o": 0.073, + "build/src/sgap_4.o": 0.083, + "build/src/sgap_5.o": 0.094, + "build/src/sgap_6.o": 0.074, + "build/src/sgap_8.o": 0.088, + "build/src/snd1.o": 0.083, + "build/src/snd10.o": 0.076, + "build/src/snd11.o": 0.077, + "build/src/snd12.o": 0.076, + "build/src/snd2.o": 0.082, + "build/src/snd3.o": 0.08, + "build/src/snd4.o": 0.082, + "build/src/snd5.o": 0.077, + "build/src/snd6.o": 0.088, + "build/src/snd7.o": 0.092, + "build/src/snd8.o": 0.078, + "build/src/snd9.o": 0.083, + "build/src/md_SC07_004/md_SC07_004.o": 0.568, + "build/src/ov_SC03_015/ov_SC03_015.o": 0.157, + "build/src/ov_SC03_015/ov_SC03_015_after.o": 0.551, + "build/src/ov_SC03_015/ov_SC03_015_jr_8012ACE0.o": 0.434, + "build/src/ov_SC03_015/ov_SC03_015_jr_80135888.o": 0.066, + "build/src/ov_SC03_015/ov_SC03_015_jr_80135A4C.o": 0.072, + "build/src/ov_SC03_015/ov_SC03_015_jr_80135D20.o": 0.153, + "build/src/ov_SC03_015/ov_SC03_015_jr_801380E0.o": 0.18, + "build/src/ov_SC03_015/ov_SC03_015_jr_8013C98C.o": 0.141, + "build/src/ov_SC03_015/ov_SC03_015_jr_8013F350.o": 0.086, + "build/src/ov_SC03_015/ov_SC03_015_jr_8013FFD8.o": 0.082, + "build/src/ov_SC03_015/ov_SC03_015_jr_80140608.o": 0.198, + "build/src/ov_SC03_015/ov_SC03_015_jr_8015444C.o": 0.072, + "build/src/ov_SC03_015/ov_SC03_015_jr_80154C24.o": 0.185, + "build/src/ov_SC03_015/ov_SC03_015_jr_801588CC.o": 0.112, + "build/src/ov_SC03_015/ov_SC03_015_jr_80159C84.o": 0.08, + "build/src/ov_SC03_015/ov_SC03_015_jr_8015A3C8.o": 0.089, + "build/src/ov_SC03_015/ov_SC03_015_jr_8015AE2C.o": 0.1, + "build/src/ov_SC03_015/ov_SC03_015_jr_8015C32C.o": 0.499, + "build/src/ov_SC03_015/ov_SC03_015_jr_8016AB6C.o": 0.285, + "build/src/ov_SC03_015/ov_SC03_015_jr_80171B4C.o": 0.11, "build/src/ov_SC03_015/ov_SC03_015_jr_801734BC.o": 0.22, "build/src/ov_SC03_015/ov_SC03_015_jr_801789AC.o": 0.063, - "build/src/ov_SC03_015/ov_SC03_015_jr_80178D40.o": 0.112, + "build/src/ov_SC03_015/ov_SC03_015_jr_80178D40.o": 0.11, "build/src/ov_SC03_015/ov_SC03_015_jr_8017A4AC.o": 0.07, - "build/src/ov_SC03_015/ov_SC03_015_jr_8017AE2C.o": 0.179, + "build/src/ov_SC03_015/ov_SC03_015_jr_8017AE2C.o": 0.18, "build/src/ov_SC03_015/ov_SC03_015_jr_8017EB7C.o": 0.215, - "build/src/ov_SC03_015/ov_SC03_015_jr_80184440.o": 0.056, - "build/src/ov_SC03_015/ov_SC03_015_jr_801848E4.o": 0.296, - "build/src/ov_SC03_015/ov_SC03_015_o0b.o": 0.065, - "build/src/ov_SC03_015/ov_SC03_015_o0c.o": 0.059, - "build/src/ov_SC03_015/ov_SC03_015_o0d.o": 0.058, - "build/src/ov_SC03_015/ov_SC03_015_o0e.o": 0.069, - "build/src/ov_SC04_011/ov_SC04_011.o": 0.125, - "build/src/ov_SC04_011/ov_SC04_011_after.o": 0.462, - "build/src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.o": 0.37, - "build/src/ov_SC04_011/ov_SC04_011_jr_80135888.o": 0.055, - "build/src/ov_SC04_011/ov_SC04_011_jr_80135A4C.o": 0.057, - "build/src/ov_SC04_011/ov_SC04_011_jr_80135D20.o": 0.123, - "build/src/ov_SC04_011/ov_SC04_011_jr_801380E0.o": 0.161, - "build/src/ov_SC04_011/ov_SC04_011_jr_8013C98C.o": 0.123, - "build/src/ov_SC04_011/ov_SC04_011_jr_8013F350.o": 0.077, - "build/src/ov_SC04_011/ov_SC04_011_jr_8013FFD8.o": 0.061, - "build/src/ov_SC04_011/ov_SC04_011_jr_80140608.o": 0.192, - "build/src/ov_SC04_011/ov_SC04_011_jr_8015444C.o": 0.076, - "build/src/ov_SC04_011/ov_SC04_011_jr_80154C24.o": 0.179, - "build/src/ov_SC04_011/ov_SC04_011_jr_801588CC.o": 0.104, - "build/src/ov_SC04_011/ov_SC04_011_jr_80159C84.o": 0.074, - "build/src/ov_SC04_011/ov_SC04_011_jr_8015A3C8.o": 0.079, - "build/src/ov_SC04_011/ov_SC04_011_jr_8015AE2C.o": 0.108, - "build/src/ov_SC04_011/ov_SC04_011_jr_8015C32C.o": 0.386, + "build/src/ov_SC03_015/ov_SC03_015_jr_80184440.o": 0.057, + "build/src/ov_SC03_015/ov_SC03_015_jr_801848E4.o": 0.293, + "build/src/ov_SC03_015/ov_SC03_015_o0b.o": 0.067, + "build/src/ov_SC03_015/ov_SC03_015_o0c.o": 0.066, + "build/src/ov_SC03_015/ov_SC03_015_o0d.o": 0.062, + "build/src/ov_SC03_015/ov_SC03_015_o0e.o": 0.076, + "build/src/ov_SC04_011/ov_SC04_011.o": 0.139, + "build/src/ov_SC04_011/ov_SC04_011_after.o": 0.474, + "build/src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.o": 0.368, + "build/src/ov_SC04_011/ov_SC04_011_jr_80135888.o": 0.058, + "build/src/ov_SC04_011/ov_SC04_011_jr_80135A4C.o": 0.062, + "build/src/ov_SC04_011/ov_SC04_011_jr_80135D20.o": 0.13, + "build/src/ov_SC04_011/ov_SC04_011_jr_801380E0.o": 0.16, + "build/src/ov_SC04_011/ov_SC04_011_jr_8013C98C.o": 0.116, + "build/src/ov_SC04_011/ov_SC04_011_jr_8013F350.o": 0.083, + "build/src/ov_SC04_011/ov_SC04_011_jr_8013FFD8.o": 0.064, + "build/src/ov_SC04_011/ov_SC04_011_jr_80140608.o": 0.197, + "build/src/ov_SC04_011/ov_SC04_011_jr_8015444C.o": 0.078, + "build/src/ov_SC04_011/ov_SC04_011_jr_80154C24.o": 0.181, + "build/src/ov_SC04_011/ov_SC04_011_jr_801588CC.o": 0.099, + "build/src/ov_SC04_011/ov_SC04_011_jr_80159C84.o": 0.073, + "build/src/ov_SC04_011/ov_SC04_011_jr_8015A3C8.o": 0.071, + "build/src/ov_SC04_011/ov_SC04_011_jr_8015AE2C.o": 0.104, + "build/src/ov_SC04_011/ov_SC04_011_jr_8015C32C.o": 0.39, "build/src/ov_SC04_011/ov_SC04_011_jr_8016AB6C.o": 0.236, "build/src/ov_SC04_011/ov_SC04_011_jr_80171B4C.o": 0.107, - "build/src/ov_SC04_011/ov_SC04_011_jr_801734BC.o": 0.182, - "build/src/ov_SC04_011/ov_SC04_011_jr_801789AC.o": 0.065, - "build/src/ov_SC04_011/ov_SC04_011_jr_80178D40.o": 0.099, - "build/src/ov_SC04_011/ov_SC04_011_jr_8017A4AC.o": 0.072, - "build/src/ov_SC04_011/ov_SC04_011_jr_8017AE2C.o": 0.106, - "build/src/ov_SC04_011/ov_SC04_011_jr_8017D494.o": 0.444, - "build/src/ov_SC04_011/ov_SC04_011_o0b.o": 0.055, - "build/src/ov_SC04_011/ov_SC04_011_o0c.o": 0.062 + "build/src/ov_SC04_011/ov_SC04_011_jr_801734BC.o": 0.184, + "build/src/ov_SC04_011/ov_SC04_011_jr_801789AC.o": 0.071, + "build/src/ov_SC04_011/ov_SC04_011_jr_80178D40.o": 0.105, + "build/src/ov_SC04_011/ov_SC04_011_jr_8017A4AC.o": 0.073, + "build/src/ov_SC04_011/ov_SC04_011_jr_8017AE2C.o": 0.111, + "build/src/ov_SC04_011/ov_SC04_011_jr_8017D494.o": 0.451, + "build/src/ov_SC04_011/ov_SC04_011_o0b.o": 0.058, + "build/src/ov_SC04_011/ov_SC04_011_o0c.o": 0.063 }, "ok": true, "seconds": 2.2 diff --git a/.run/P37/restruct/ledger.jsonl b/.run/P37/restruct/ledger.jsonl index 92827c0708..a890920915 100644 --- a/.run/P37/restruct/ledger.jsonl +++ b/.run/P37/restruct/ledger.jsonl @@ -171796,3 +171796,21 @@ {"ts": "2026-09-29 22:03:51", "label": "t38_4L1", "rung": "L", "calib": {"head": "d87c35435", "stamp": "588cbf38c6e4"}, "tu": "src/ov_SC06_032/ov_SC06_032_jr_801902EC.c", "unit": "fold:Ent_80188E10_80183BB4@file", "defn": "Ent_80188E10_80183BB4", "kind": "head-fold", "head": "Unkstruct_800B5CB8", "canon": "Unkstruct_800B5CB8", "fn": null, "renames": 0, "fields": {}, "files": ["src/ov_SC06_032/ov_SC06_032_jr_801902EC.c"], "verdict": "FOLDED", "nhash_before": "-", "nhash_after": "-", "sites": []} {"ts": "2026-09-29 22:03:51", "label": "t38_4L1", "rung": "L", "calib": {"head": "d87c35435", "stamp": "588cbf38c6e4"}, "tu": "src/ov_SC07_002/ov_SC07_002_after.c", "unit": "fold:Ent@func_8014D820", "defn": "Ent", "kind": "head-fold", "head": "Unkstruct_800B5CB8", "canon": "Unkstruct_800B5CB8", "fn": "func_8014D820", "renames": 21, "fields": {"f0": "unk0", "f5C": "unk5C", "f58": "unk58", "f20": "unk20", "x": "unk6", "z": "unkE", "y": "unkA"}, "files": ["src/ov_SC07_002/ov_SC07_002_after.c"], "verdict": "FOLDED", "nhash_before": "-", "nhash_after": "-", "sites": []} {"ts": "2026-09-29 22:03:51", "label": "t38_4L1", "rung": "L", "calib": {"head": "d87c35435", "stamp": "588cbf38c6e4"}, "tu": "src/ov_SC07_001/ov_SC07_001_after.c", "unit": "fold:Ent@func_8014D820", "defn": "Ent", "kind": "head-fold", "head": "Unkstruct_800B5CB8", "canon": "Unkstruct_800B5CB8", "fn": "func_8014D820", "renames": 21, "fields": {"f0": "unk0", "f5C": "unk5C", "f58": "unk58", "f20": "unk20", "x": "unk6", "z": "unkE", "y": "unkA"}, "files": ["src/ov_SC07_001/ov_SC07_001_after.c"], "verdict": "FOLDED", "nhash_before": "-", "nhash_after": "-", "sites": []} +{"ts": "2026-09-29 22:18:51", "label": "t38_4L2", "rung": "L", "calib": {"head": "5ae5fe94c", "stamp": "588cbf38c6e4"}, "tu": "src/ov_SC02_011/ov_SC02_011_jr_80188E3C.c", "unit": "fold:Cnt_8018E8A0@file", "defn": "Cnt_8018E8A0", "kind": "head-fold", "head": "Unkstruct_800B5CB8", "canon": "Unkstruct_800B5CB8", "fn": null, "renames": 0, "fields": {}, "files": [], "verdict": "FOLD-REFUSED", "nhash_before": "-", "nhash_after": "-", "sites": [], "cause": "indexed local array field `f` [0x0+0x10c] spans several canonical fields (`unk0` is 0x2)"} +{"ts": "2026-09-29 22:18:51", "label": "t38_4L2", "rung": "L", "calib": {"head": "5ae5fe94c", "stamp": "588cbf38c6e4"}, "tu": "src/ov_SC03_095/ov_SC03_095_after.c", "unit": "fold:Ent@func_8014D820", "defn": "Ent", "kind": "head-fold", "head": "Unkstruct_800B5CB8", "canon": "Unkstruct_800B5CB8", "fn": "func_8014D820", "renames": 21, "fields": {"f0": "unk0", "f5C": "unk5C", "f58": "unk58", "f20": "unk20", "x": "unk6", "z": "unkE", "y": "unkA"}, "files": ["src/ov_SC03_095/ov_SC03_095_after.c"], "verdict": "FOLDED", "nhash_before": "-", "nhash_after": "-", "sites": []} +{"ts": "2026-09-29 22:18:51", "label": "t38_4L2", "rung": "L", "calib": {"head": "5ae5fe94c", "stamp": "588cbf38c6e4"}, "tu": "src/ov_SC04_015/ov_SC04_015_after.c", "unit": "fold:Ent@func_8014D820", "defn": "Ent", "kind": "head-fold", "head": "Unkstruct_800B5CB8", "canon": "Unkstruct_800B5CB8", "fn": "func_8014D820", "renames": 21, "fields": {"f0": "unk0", "f5C": "unk5C", "f58": "unk58", "f20": "unk20", "x": "unk6", "z": "unkE", "y": "unkA"}, "files": ["src/ov_SC04_015/ov_SC04_015_after.c"], "verdict": "FOLDED", "nhash_before": "-", "nhash_after": "-", "sites": []} +{"ts": "2026-09-29 22:18:52", "label": "t38_4L2", "rung": "L", "calib": {"head": "5ae5fe94c", "stamp": "588cbf38c6e4"}, "tu": "src/ov_SC03_029/ov_SC03_029_jr_8017FF7C.c", "unit": "fold:Cnt_8018E8A0_80184FF0@file", "defn": "Cnt_8018E8A0_80184FF0", "kind": "head-fold", "head": "Unkstruct_800B5CB8", "canon": "Unkstruct_800B5CB8", "fn": null, "renames": 0, "fields": {}, "files": [], "verdict": "FOLD-REFUSED", "nhash_before": "-", "nhash_after": "-", "sites": [], "cause": "indexed local array field `f` [0x0+0x10c] spans several canonical fields (`unk0` is 0x2)"} +{"ts": "2026-09-29 22:18:51", "label": "t38_4L2", "rung": "L", "calib": {"head": "5ae5fe94c", "stamp": "588cbf38c6e4"}, "tu": "src/ov_SC04_016/ov_SC04_016_after.c", "unit": "fold:Ent@func_8014D820", "defn": "Ent", "kind": "head-fold", "head": "Unkstruct_800B5CB8", "canon": "Unkstruct_800B5CB8", "fn": "func_8014D820", "renames": 21, "fields": {"f0": "unk0", "f5C": "unk5C", "f58": "unk58", "f20": "unk20", "x": "unk6", "z": "unkE", "y": "unkA"}, "files": ["src/ov_SC04_016/ov_SC04_016_after.c"], "verdict": "FOLDED", "nhash_before": "-", "nhash_after": "-", "sites": []} +{"ts": "2026-09-29 22:18:52", "label": "t38_4L2", "rung": "L", "calib": {"head": "5ae5fe94c", "stamp": "588cbf38c6e4"}, "tu": "src/ov_SC06_018/ov_SC06_018_jr_80187AEC.c", "unit": "fold:Ent_8018D654@file", "defn": "Ent_8018D654", "kind": "head-fold", "head": "Unkstruct_800B5CB8", "canon": "Unkstruct_800B5CB8", "fn": null, "renames": 13, "fields": {}, "files": [], "verdict": "FOLD-REFUSED", "nhash_before": "-", "nhash_after": "-", "sites": [], "cause": "no canonical field at 0x3c for local `f3C` (only pad3C)"} +{"ts": "2026-09-29 22:18:52", "label": "t38_4L2", "rung": "L", "calib": {"head": "5ae5fe94c", "stamp": "588cbf38c6e4"}, "tu": "src/ov_SC06_030/ov_SC06_030_after.c", "unit": "fold:Ent@func_8014D820", "defn": "Ent", "kind": "head-fold", "head": "Unkstruct_800B5CB8", "canon": "Unkstruct_800B5CB8", "fn": "func_8014D820", "renames": 21, "fields": {"f0": "unk0", "f5C": "unk5C", "f58": "unk58", "f20": "unk20", "x": "unk6", "z": "unkE", "y": "unkA"}, "files": ["src/ov_SC06_030/ov_SC06_030_after.c"], "verdict": "FOLDED", "nhash_before": "-", "nhash_after": "-", "sites": []} +{"ts": "2026-09-29 22:18:53", "label": "t38_4L2", "rung": "L", "calib": {"head": "5ae5fe94c", "stamp": "588cbf38c6e4"}, "tu": "src/ov_SC06_032/ov_SC06_032_jr_80182890.c", "unit": "fold:Ent_8018D3A4@file", "defn": "Ent_8018D3A4", "kind": "head-fold", "head": "Unkstruct_800B5CB8", "canon": "Unkstruct_800B5CB8", "fn": null, "renames": 13, "fields": {}, "files": [], "verdict": "FOLD-REFUSED", "nhash_before": "-", "nhash_after": "-", "sites": [], "cause": "no canonical field at 0x3c for local `f3C` (only pad3C)"} +{"ts": "2026-09-29 22:18:52", "label": "t38_4L2", "rung": "L", "calib": {"head": "5ae5fe94c", "stamp": "588cbf38c6e4"}, "tu": "src/ov_SC06_029/ov_SC06_029_jr_801898CC.c", "unit": "fold:Obj8017EBC4@file", "defn": "Obj8017EBC4", "kind": "head-fold", "head": "Unkstruct_800B5CB8", "canon": "Unkstruct_800B5CB8", "fn": null, "renames": 0, "fields": {}, "files": ["src/ov_SC06_029/ov_SC06_029_jr_801898CC.c"], "verdict": "FOLDED", "nhash_before": "-", "nhash_after": "-", "sites": []} +{"ts": "2026-09-29 22:18:52", "label": "t38_4L2", "rung": "L", "calib": {"head": "5ae5fe94c", "stamp": "588cbf38c6e4"}, "tu": "src/ov_SC06_029/ov_SC06_029_jr_801867D0.c", "unit": "fold:Obj8017EBC4@file", "defn": "Obj8017EBC4", "kind": "head-fold", "head": "Unkstruct_800B5CB8", "canon": "Unkstruct_800B5CB8", "fn": null, "renames": 0, "fields": {}, "files": ["src/ov_SC06_029/ov_SC06_029_jr_801867D0.c"], "verdict": "FOLDED", "nhash_before": "-", "nhash_after": "-", "sites": []} +{"ts": "2026-09-29 22:18:54", "label": "t38_4L2", "rung": "L", "calib": {"head": "5ae5fe94c", "stamp": "588cbf38c6e4"}, "tu": "src/ov_SC03_006/ov_SC03_006_jr_8017AE2C.c", "unit": "fold:Cnt_8018E8A0_801869CC@file", "defn": "Cnt_8018E8A0_801869CC", "kind": "head-fold", "head": "Unkstruct_800B5CB8", "canon": "Unkstruct_800B5CB8", "fn": null, "renames": 0, "fields": {}, "files": [], "verdict": "FOLD-REFUSED", "nhash_before": "-", "nhash_after": "-", "sites": [], "cause": "indexed local array field `f` [0x0+0x10c] spans several canonical fields (`unk0` is 0x2)"} +{"ts": "2026-09-29 22:18:54", "label": "t38_4L2", "rung": "L", "calib": {"head": "5ae5fe94c", "stamp": "588cbf38c6e4"}, "tu": "src/ov_SC06_033/ov_SC06_033_jr_80186574.c", "unit": "fold:Ent_8018D654@file", "defn": "Ent_8018D654", "kind": "head-fold", "head": "Unkstruct_800B5CB8", "canon": "Unkstruct_800B5CB8", "fn": null, "renames": 13, "fields": {}, "files": [], "verdict": "FOLD-REFUSED", "nhash_before": "-", "nhash_after": "-", "sites": [], "cause": "no canonical field at 0x3c for local `f3C` (only pad3C)"} +{"ts": "2026-09-29 22:18:54", "label": "t38_4L2", "rung": "L", "calib": {"head": "5ae5fe94c", "stamp": "588cbf38c6e4"}, "tu": "src/md_MAIN_011/md_MAIN_011.c", "unit": "fold:Gs_80078E78_init@func_800D0964", "defn": "Gs_80078E78_init", "kind": "head-fold", "head": "Unkstruct_80078E78", "canon": "Unkstruct_80078E78", "fn": "func_800D0964", "renames": 13, "fields": {"unk04": "unk4", "unk08": "unk8", "unk0C": "unkC", "unk14": "gold", "unk2C": "tiredness_raw", "unk34": "dayCounter", "unk3A": "hp_max", "unk3C": "hp_current", "unk3E": "bp_max", "unk40": "bp_current", "unk42": "dayOfWeek", "unk90": "posX", "unk94": "posZ"}, "files": ["src/md_MAIN_011/md_MAIN_011.c"], "verdict": "FOLD-REFUSED", "nhash_before": "-", "nhash_after": "-", "sites": [], "cause": "DIFFERS: [build/src/md_MAIN_011/md_MAIN_011.o]"} +{"ts": "2026-09-29 22:18:54", "label": "t38_4L2", "rung": "L", "calib": {"head": "5ae5fe94c", "stamp": "588cbf38c6e4"}, "tu": "src/md_MAIN_011/md_MAIN_011.c", "unit": "fold:S@func_800D0BDC", "defn": "S", "kind": "head-fold", "head": "Unkstruct_80078E78", "canon": "Unkstruct_80078E78", "fn": "func_800D0BDC", "renames": 13, "fields": {"unk04": "unk4", "unk08": "unk8", "unk0C": "unkC", "unk14": "gold", "unk2C": "tiredness_raw", "unk34": "dayCounter", "unk3A": "hp_max", "unk3C": "hp_current", "unk3E": "bp_max", "unk40": "bp_current", "unk42": "dayOfWeek", "unk90": "posX", "unk94": "posZ"}, "files": ["src/md_MAIN_011/md_MAIN_011.c"], "verdict": "FOLD-REFUSED", "nhash_before": "-", "nhash_after": "-", "sites": [], "cause": "DIFFERS: [build/src/md_MAIN_011/md_MAIN_011.o]"} +{"ts": "2026-09-29 22:18:54", "label": "t38_4L2", "rung": "L", "calib": {"head": "5ae5fe94c", "stamp": "588cbf38c6e4"}, "tu": "src/md_MAIN_011/md_MAIN_011.c", "unit": "fold:S1254@func_800D1254", "defn": "S1254", "kind": "head-fold", "head": "Unkstruct_80078E78", "canon": "Unkstruct_80078E78", "fn": "func_800D1254", "renames": 13, "fields": {"unk04": "unk4", "unk08": "unk8", "unk0C": "unkC", "unk14": "gold", "unk2C": "tiredness_raw", "unk34": "dayCounter", "unk3A": "hp_max", "unk3C": "hp_current", "unk3E": "bp_max", "unk40": "bp_current", "unk42": "dayOfWeek", "unk90": "posX", "unk94": "posZ"}, "files": ["src/md_MAIN_011/md_MAIN_011.c"], "verdict": "FOLD-REFUSED", "nhash_before": "-", "nhash_after": "-", "sites": [], "cause": "DIFFERS: [build/src/md_MAIN_011/md_MAIN_011.o]"} +{"ts": "2026-09-29 22:18:54", "label": "t38_4L2", "rung": "L", "calib": {"head": "5ae5fe94c", "stamp": "588cbf38c6e4"}, "tu": "src/md_MAIN_011/md_MAIN_011.c", "unit": "fold:St78@func_800D1B00", "defn": "St78", "kind": "head-fold", "head": "Unkstruct_80078E78", "canon": "Unkstruct_80078E78", "fn": "func_800D1B00", "renames": 49, "fields": {"f04": "unk4", "f08": "unk8", "f0C": "unkC", "f10": "unk10", "f14": "gold", "f18": "unk18", "f1C": "unk1C", "f20": "unk20", "f24": "unk24", "f28": "unk28", "f2C": "tiredness_raw", "f30": "unk30", "f34": "dayCounter", "f36": "unk36", "f37": "unk37", "f38": "unk38", "f3A": "hp_max", "f3C": "hp_current", "f3E": "bp_max", "f40": "bp_current", "f42": "dayOfWeek", "f43": "unk43", "f44": "unk44", "f45": "unk45", "f46": "unk46", "f47": "unk47", "f48": "unk48", "f49": "unk49", "f4A": "unk4A", "f4B": "unk4B", "f4C": "unk4C", "f50": "unk50", "f54": "unk54", "f58": "unk58", "f5C": "unk5C", "f60": "unk60", "f64": "unk64", "f68": "unk68", "f6C": "unk6C", "f70": "unk70", "f74": "unk74", "f78": "unk78", "f7C": "unk7C", "f80": "unk80", "f84": "unk84", "f88": "unk88", "f8C": "unk8C", "f90": "posX", "f94": "posZ"}, "files": ["src/md_MAIN_011/md_MAIN_011.c"], "verdict": "FOLD-REFUSED", "nhash_before": "-", "nhash_after": "-", "sites": [], "cause": "DIFFERS: [build/src/md_MAIN_011/md_MAIN_011.o]"} +{"ts": "2026-09-29 22:18:54", "label": "t38_4L2", "rung": "L", "calib": {"head": "5ae5fe94c", "stamp": "588cbf38c6e4"}, "tu": "src/md_MAIN_011/md_MAIN_011.c", "unit": "fold:Gs_80078E78@file", "defn": "Gs_80078E78", "kind": "head-fold", "head": "Unkstruct_80078E78", "canon": "Unkstruct_80078E78", "fn": null, "renames": 13, "fields": {"unk04": "unk4", "unk08": "unk8", "unk0C": "unkC", "unk14": "gold", "unk2C": "tiredness_raw", "unk34": "dayCounter", "unk3A": "hp_max", "unk3C": "hp_current", "unk3E": "bp_max", "unk40": "bp_current", "unk42": "dayOfWeek", "unk90": "posX", "unk94": "posZ"}, "files": ["src/md_MAIN_011/md_MAIN_011.c"], "verdict": "FOLD-REFUSED", "nhash_before": "-", "nhash_after": "-", "sites": [], "cause": "DIFFERS: [build/src/md_MAIN_011/md_MAIN_011.o]"} +{"ts": "2026-09-29 22:18:54", "label": "t38_4L2", "rung": "L", "calib": {"head": "5ae5fe94c", "stamp": "588cbf38c6e4"}, "tu": "src/md_MAIN_011/md_MAIN_011.c", "unit": "fold:S2BC4@file", "defn": "S2BC4", "kind": "head-fold", "head": "Unkstruct_80078E78", "canon": "Unkstruct_80078E78", "fn": null, "renames": 13, "fields": {"unk04": "unk4", "unk08": "unk8", "unk0C": "unkC", "unk14": "gold", "unk2C": "tiredness_raw", "unk34": "dayCounter", "unk3A": "hp_max", "unk3C": "hp_current", "unk3E": "bp_max", "unk40": "bp_current", "unk42": "dayOfWeek", "unk90": "posX", "unk94": "posZ"}, "files": ["src/md_MAIN_011/md_MAIN_011.c"], "verdict": "FOLD-REFUSED", "nhash_before": "-", "nhash_after": "-", "sites": [], "cause": "DIFFERS: [build/src/md_MAIN_011/md_MAIN_011.o]"} diff --git a/src/ov_SC03_095/ov_SC03_095_after.c b/src/ov_SC03_095/ov_SC03_095_after.c index 18dd897195..1c99c6bfcd 100644 --- a/src/ov_SC03_095/ov_SC03_095_after.c +++ b/src/ov_SC03_095/ov_SC03_095_after.c @@ -1561,24 +1561,7 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) u16 z; u16 w; } V4; - typedef struct EntD820 - { - u16 f0; - u16 f2; - u16 f4; - u16 x; - u16 f8; - u16 y; - u16 fC; - u16 z; - u8 p10[0x10]; - s32 f20; - u8 p24[0x34]; - s32 f58; - u16 f5C; - u16 f5E; - u8 p60[0x10C - 0x60]; - } Ent; + typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; V4 out[3]; @@ -1620,24 +1603,24 @@ a0v = a0; desc.y = a2[1] - a1[1]; desc.z = a2[2] - a1[2]; ent = *((Ent **) (a0v + 0x170)); - if (ent->f0 == 0) + if (ent->unk0 == 0) { goto fail; } - if ((ent->f5C & 0x1000) == 0) + if ((ent->unk5C & 0x1000) == 0) { goto fail; } - if (ent->f58 == 0) + if (ent->unk58 == 0) { goto fail; } - if (func_80135A4C(ent->f20, ent->f58, (s32 *) a1, (s32) a2) == 0) + if (func_80135A4C(ent->unk20, ent->unk58, (s32 *) a1, (s32) a2) == 0) { goto fail; } - ex = ent->x - (*((u16 *) (a0v + 6))); - ez = ent->z - (*((u16 *) (a0v + 0xE))); + ex = ent->unk6 - (*((u16 *) (a0v + 6))); + ez = ent->unkE - (*((u16 *) (a0v + 0xE))); r1 = (s16) ratan2((s16) dz, new_var3); r2 = (s16) ratan2((s16) ez, (s16) ex); r3 = (s16) func_80012A60(r1, r2); @@ -1648,11 +1631,11 @@ a0v = a0; desc.f20 = 0; desc.f1C = 0; desc.f18 = 0; - x0 = ent->x; + x0 = ent->unk6; pos.x = x0; - y0 = ent->y; + y0 = ent->unkA; pos.y = y0; - z0 = ent->z; + z0 = ent->unkE; tx = x0 + desc.x; pos.z = z0; tz = z0 + desc.z; @@ -1668,19 +1651,19 @@ a0v = a0; { continue; } - if (p->f0 == 0) + if (p->unk0 == 0) { continue; } - if (p->f5C == 0) + if (p->unk5C == 0) { continue; } - if (p->f58 == 0) + if (p->unk58 == 0) { continue; } - func_80135888(p->f20, p->f58, (s32) (&pos), (s32) (&desc)); + func_80135888(p->unk20, p->unk58, (s32) (&pos), (s32) (&desc)); } } @@ -1705,15 +1688,15 @@ a0v = a0; { continue; } - if (p->f0 == 0) + if (p->unk0 == 0) { continue; } - if (p->f5C == 0) + if (p->unk5C == 0) { continue; } - if (p->f58 == 0) + if (p->unk58 == 0) { continue; } @@ -1727,9 +1710,9 @@ a0v = a0; r = func_80133784(0, &pos, (s32) (&desc)); if ((r == 0) || ((r == 0x2000) && (((*(u16 *) D_801152A8) | ((u16) D_801152AC)) == 0))) { - ent->x = desc.x - desc.f18; - ent->y = desc.y; - ent->z = desc.z - desc.f20; + ent->unk6 = desc.x - desc.f18; + ent->unkA = desc.y; + ent->unkE = desc.z - desc.f20; desc.x -= pos.x; desc.y -= pos.y; desc.z -= pos.z; diff --git a/src/ov_SC04_015/ov_SC04_015_after.c b/src/ov_SC04_015/ov_SC04_015_after.c index 13870749d4..1733f76e97 100644 --- a/src/ov_SC04_015/ov_SC04_015_after.c +++ b/src/ov_SC04_015/ov_SC04_015_after.c @@ -1561,24 +1561,7 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) u16 z; u16 w; } V4; - typedef struct EntD820 - { - u16 f0; - u16 f2; - u16 f4; - u16 x; - u16 f8; - u16 y; - u16 fC; - u16 z; - u8 p10[0x10]; - s32 f20; - u8 p24[0x34]; - s32 f58; - u16 f5C; - u16 f5E; - u8 p60[0x10C - 0x60]; - } Ent; + typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; V4 out[3]; @@ -1620,24 +1603,24 @@ a0v = a0; desc.y = a2[1] - a1[1]; desc.z = a2[2] - a1[2]; ent = *((Ent **) (a0v + 0x170)); - if (ent->f0 == 0) + if (ent->unk0 == 0) { goto fail; } - if ((ent->f5C & 0x1000) == 0) + if ((ent->unk5C & 0x1000) == 0) { goto fail; } - if (ent->f58 == 0) + if (ent->unk58 == 0) { goto fail; } - if (func_80135A4C(ent->f20, ent->f58, (s32 *) a1, (s32) a2) == 0) + if (func_80135A4C(ent->unk20, ent->unk58, (s32 *) a1, (s32) a2) == 0) { goto fail; } - ex = ent->x - (*((u16 *) (a0v + 6))); - ez = ent->z - (*((u16 *) (a0v + 0xE))); + ex = ent->unk6 - (*((u16 *) (a0v + 6))); + ez = ent->unkE - (*((u16 *) (a0v + 0xE))); r1 = (s16) ratan2((s16) dz, new_var3); r2 = (s16) ratan2((s16) ez, (s16) ex); r3 = (s16) func_80012A60(r1, r2); @@ -1648,11 +1631,11 @@ a0v = a0; desc.f20 = 0; desc.f1C = 0; desc.f18 = 0; - x0 = ent->x; + x0 = ent->unk6; pos.x = x0; - y0 = ent->y; + y0 = ent->unkA; pos.y = y0; - z0 = ent->z; + z0 = ent->unkE; tx = x0 + desc.x; pos.z = z0; tz = z0 + desc.z; @@ -1668,19 +1651,19 @@ a0v = a0; { continue; } - if (p->f0 == 0) + if (p->unk0 == 0) { continue; } - if (p->f5C == 0) + if (p->unk5C == 0) { continue; } - if (p->f58 == 0) + if (p->unk58 == 0) { continue; } - func_80135888(p->f20, p->f58, (s32) (&pos), (s32) (&desc)); + func_80135888(p->unk20, p->unk58, (s32) (&pos), (s32) (&desc)); } } @@ -1705,15 +1688,15 @@ a0v = a0; { continue; } - if (p->f0 == 0) + if (p->unk0 == 0) { continue; } - if (p->f5C == 0) + if (p->unk5C == 0) { continue; } - if (p->f58 == 0) + if (p->unk58 == 0) { continue; } @@ -1727,9 +1710,9 @@ a0v = a0; r = func_80133784(0, &pos, (s32) (&desc)); if ((r == 0) || ((r == 0x2000) && (((*(u16 *) D_801152A8) | ((u16) D_801152AC)) == 0))) { - ent->x = desc.x - desc.f18; - ent->y = desc.y; - ent->z = desc.z - desc.f20; + ent->unk6 = desc.x - desc.f18; + ent->unkA = desc.y; + ent->unkE = desc.z - desc.f20; desc.x -= pos.x; desc.y -= pos.y; desc.z -= pos.z; diff --git a/src/ov_SC04_016/ov_SC04_016_after.c b/src/ov_SC04_016/ov_SC04_016_after.c index 338b32790d..e619679848 100644 --- a/src/ov_SC04_016/ov_SC04_016_after.c +++ b/src/ov_SC04_016/ov_SC04_016_after.c @@ -1561,24 +1561,7 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) u16 z; u16 w; } V4; - typedef struct EntD820 - { - u16 f0; - u16 f2; - u16 f4; - u16 x; - u16 f8; - u16 y; - u16 fC; - u16 z; - u8 p10[0x10]; - s32 f20; - u8 p24[0x34]; - s32 f58; - u16 f5C; - u16 f5E; - u8 p60[0x10C - 0x60]; - } Ent; + typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; V4 out[3]; @@ -1620,24 +1603,24 @@ a0v = a0; desc.y = a2[1] - a1[1]; desc.z = a2[2] - a1[2]; ent = *((Ent **) (a0v + 0x170)); - if (ent->f0 == 0) + if (ent->unk0 == 0) { goto fail; } - if ((ent->f5C & 0x1000) == 0) + if ((ent->unk5C & 0x1000) == 0) { goto fail; } - if (ent->f58 == 0) + if (ent->unk58 == 0) { goto fail; } - if (func_80135A4C(ent->f20, ent->f58, (s32 *) a1, (s32) a2) == 0) + if (func_80135A4C(ent->unk20, ent->unk58, (s32 *) a1, (s32) a2) == 0) { goto fail; } - ex = ent->x - (*((u16 *) (a0v + 6))); - ez = ent->z - (*((u16 *) (a0v + 0xE))); + ex = ent->unk6 - (*((u16 *) (a0v + 6))); + ez = ent->unkE - (*((u16 *) (a0v + 0xE))); r1 = (s16) ratan2((s16) dz, new_var3); r2 = (s16) ratan2((s16) ez, (s16) ex); r3 = (s16) func_80012A60(r1, r2); @@ -1648,11 +1631,11 @@ a0v = a0; desc.f20 = 0; desc.f1C = 0; desc.f18 = 0; - x0 = ent->x; + x0 = ent->unk6; pos.x = x0; - y0 = ent->y; + y0 = ent->unkA; pos.y = y0; - z0 = ent->z; + z0 = ent->unkE; tx = x0 + desc.x; pos.z = z0; tz = z0 + desc.z; @@ -1668,19 +1651,19 @@ a0v = a0; { continue; } - if (p->f0 == 0) + if (p->unk0 == 0) { continue; } - if (p->f5C == 0) + if (p->unk5C == 0) { continue; } - if (p->f58 == 0) + if (p->unk58 == 0) { continue; } - func_80135888(p->f20, p->f58, (s32) (&pos), (s32) (&desc)); + func_80135888(p->unk20, p->unk58, (s32) (&pos), (s32) (&desc)); } } @@ -1705,15 +1688,15 @@ a0v = a0; { continue; } - if (p->f0 == 0) + if (p->unk0 == 0) { continue; } - if (p->f5C == 0) + if (p->unk5C == 0) { continue; } - if (p->f58 == 0) + if (p->unk58 == 0) { continue; } @@ -1727,9 +1710,9 @@ a0v = a0; r = func_80133784(0, &pos, (s32) (&desc)); if ((r == 0) || ((r == 0x2000) && (((*(u16 *) D_801152A8) | ((u16) D_801152AC)) == 0))) { - ent->x = desc.x - desc.f18; - ent->y = desc.y; - ent->z = desc.z - desc.f20; + ent->unk6 = desc.x - desc.f18; + ent->unkA = desc.y; + ent->unkE = desc.z - desc.f20; desc.x -= pos.x; desc.y -= pos.y; desc.z -= pos.z; diff --git a/src/ov_SC06_029/ov_SC06_029_jr_801867D0.c b/src/ov_SC06_029/ov_SC06_029_jr_801867D0.c index 6db1469ce2..90e5fe9b08 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_801867D0.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_801867D0.c @@ -38,23 +38,7 @@ typedef struct Sub8017EBC4 { /* 0x00 */ u8 pad000[0x12]; /* 0x12 */ s16 unk_012; } Sub8017EBC4; -typedef struct Obj8017EBC4 { - /* 0x000 */ u8 pad000[0x02]; - /* 0x002 */ s16 unk_002; - /* 0x004 */ u8 pad004[0x06]; - /* 0x00A */ u16 unk_00A; - /* 0x00C */ u8 pad00C[0x10]; - /* 0x01C */ s32 unk_01C; - /* 0x020 */ Sub8017EBC4 *unk_020; - /* 0x024 */ u8 pad024[0x52]; - /* 0x076 */ s16 unk_076; - /* 0x078 */ u8 pad078[0x84]; - /* 0x0FC */ s16 unk_0FC; - /* 0x0FE */ u8 pad0FE[0x02]; - /* 0x100 */ s16 unk_100; - /* 0x102 */ u8 pad102[0x08]; - /* 0x10A */ s16 unk_10A; -} Obj8017EBC4; +typedef Unkstruct_800B5CB8 Obj8017EBC4; typedef struct { void *tag; s16 flag; diff --git a/src/ov_SC06_029/ov_SC06_029_jr_801898CC.c b/src/ov_SC06_029/ov_SC06_029_jr_801898CC.c index b14adfed92..57418ca9f9 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_801898CC.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_801898CC.c @@ -38,23 +38,7 @@ typedef struct Sub8017EBC4 { /* 0x00 */ u8 pad000[0x12]; /* 0x12 */ s16 unk_012; } Sub8017EBC4; -typedef struct Obj8017EBC4 { - /* 0x000 */ u8 pad000[0x02]; - /* 0x002 */ s16 unk_002; - /* 0x004 */ u8 pad004[0x06]; - /* 0x00A */ u16 unk_00A; - /* 0x00C */ u8 pad00C[0x10]; - /* 0x01C */ s32 unk_01C; - /* 0x020 */ Sub8017EBC4 *unk_020; - /* 0x024 */ u8 pad024[0x52]; - /* 0x076 */ s16 unk_076; - /* 0x078 */ u8 pad078[0x84]; - /* 0x0FC */ s16 unk_0FC; - /* 0x0FE */ u8 pad0FE[0x02]; - /* 0x100 */ s16 unk_100; - /* 0x102 */ u8 pad102[0x08]; - /* 0x10A */ s16 unk_10A; -} Obj8017EBC4; +typedef Unkstruct_800B5CB8 Obj8017EBC4; typedef struct { void *tag; s16 flag; diff --git a/src/ov_SC06_030/ov_SC06_030_after.c b/src/ov_SC06_030/ov_SC06_030_after.c index 19d44e656c..f199aa5fb7 100644 --- a/src/ov_SC06_030/ov_SC06_030_after.c +++ b/src/ov_SC06_030/ov_SC06_030_after.c @@ -1561,24 +1561,7 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) u16 z; u16 w; } V4; - typedef struct EntD820 - { - u16 f0; - u16 f2; - u16 f4; - u16 x; - u16 f8; - u16 y; - u16 fC; - u16 z; - u8 p10[0x10]; - s32 f20; - u8 p24[0x34]; - s32 f58; - u16 f5C; - u16 f5E; - u8 p60[0x10C - 0x60]; - } Ent; + typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; V4 out[3]; @@ -1620,24 +1603,24 @@ a0v = a0; desc.y = a2[1] - a1[1]; desc.z = a2[2] - a1[2]; ent = *((Ent **) (a0v + 0x170)); - if (ent->f0 == 0) + if (ent->unk0 == 0) { goto fail; } - if ((ent->f5C & 0x1000) == 0) + if ((ent->unk5C & 0x1000) == 0) { goto fail; } - if (ent->f58 == 0) + if (ent->unk58 == 0) { goto fail; } - if (func_80135A4C(ent->f20, ent->f58, (s32 *) a1, (s32) a2) == 0) + if (func_80135A4C(ent->unk20, ent->unk58, (s32 *) a1, (s32) a2) == 0) { goto fail; } - ex = ent->x - (*((u16 *) (a0v + 6))); - ez = ent->z - (*((u16 *) (a0v + 0xE))); + ex = ent->unk6 - (*((u16 *) (a0v + 6))); + ez = ent->unkE - (*((u16 *) (a0v + 0xE))); r1 = (s16) ratan2((s16) dz, new_var3); r2 = (s16) ratan2((s16) ez, (s16) ex); r3 = (s16) func_80012A60(r1, r2); @@ -1648,11 +1631,11 @@ a0v = a0; desc.f20 = 0; desc.f1C = 0; desc.f18 = 0; - x0 = ent->x; + x0 = ent->unk6; pos.x = x0; - y0 = ent->y; + y0 = ent->unkA; pos.y = y0; - z0 = ent->z; + z0 = ent->unkE; tx = x0 + desc.x; pos.z = z0; tz = z0 + desc.z; @@ -1668,19 +1651,19 @@ a0v = a0; { continue; } - if (p->f0 == 0) + if (p->unk0 == 0) { continue; } - if (p->f5C == 0) + if (p->unk5C == 0) { continue; } - if (p->f58 == 0) + if (p->unk58 == 0) { continue; } - func_80135888(p->f20, p->f58, (s32) (&pos), (s32) (&desc)); + func_80135888(p->unk20, p->unk58, (s32) (&pos), (s32) (&desc)); } } @@ -1705,15 +1688,15 @@ a0v = a0; { continue; } - if (p->f0 == 0) + if (p->unk0 == 0) { continue; } - if (p->f5C == 0) + if (p->unk5C == 0) { continue; } - if (p->f58 == 0) + if (p->unk58 == 0) { continue; } @@ -1727,9 +1710,9 @@ a0v = a0; r = func_80133784(0, &pos, (s32) (&desc)); if ((r == 0) || ((r == 0x2000) && (((*(u16 *) D_801152A8) | ((u16) D_801152AC)) == 0))) { - ent->x = desc.x - desc.f18; - ent->y = desc.y; - ent->z = desc.z - desc.f20; + ent->unk6 = desc.x - desc.f18; + ent->unkA = desc.y; + ent->unkE = desc.z - desc.f20; desc.x -= pos.x; desc.y -= pos.y; desc.z -= pos.z;