mirror of
https://github.com/Druthulu/BFM-decomp
synced 2026-10-03 00:05:11 -04:00
T4: batch t38_4HL1 — restruct: batch t38_4HL1 rung L — 3 files (headers; 3 drawable) · 29 definitions: 3 folded (42 member renames) / 26 refused · compiles 111305 in 1679 s wall · final 3/3 identical · written 3 files | R22 check-all: 218 passed, 0 failed of 218 | (census skipped) (restruct_cycle)
This commit is contained in:
Drew T
+153
-153
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"head": "ea4ab8089",
|
||||
"head": "4cae59454",
|
||||
"stamp": "588cbf38c6e4",
|
||||
"generated": "2026-09-29 22:20",
|
||||
"generated": "2026-09-29 22:22",
|
||||
"aliases": [
|
||||
"main",
|
||||
"md_SC07_004",
|
||||
@@ -21,175 +21,175 @@
|
||||
"main": {
|
||||
"objects": 85,
|
||||
"identical": 85,
|
||||
"seconds": 7.714999999999998,
|
||||
"mean_s": 0.091
|
||||
"seconds": 7.927000000000004,
|
||||
"mean_s": 0.093
|
||||
},
|
||||
"md_SC07_004": {
|
||||
"objects": 1,
|
||||
"identical": 1,
|
||||
"seconds": 0.564,
|
||||
"mean_s": 0.564
|
||||
"seconds": 0.539,
|
||||
"mean_s": 0.539
|
||||
},
|
||||
"ov_SC03_015": {
|
||||
"objects": 32,
|
||||
"identical": 32,
|
||||
"seconds": 5.176,
|
||||
"mean_s": 0.162
|
||||
"seconds": 4.770000000000001,
|
||||
"mean_s": 0.149
|
||||
},
|
||||
"ov_SC04_011": {
|
||||
"objects": 28,
|
||||
"identical": 28,
|
||||
"seconds": 4.37,
|
||||
"mean_s": 0.156
|
||||
"seconds": 4.424,
|
||||
"mean_s": 0.158
|
||||
}
|
||||
},
|
||||
"per_object_seconds": {
|
||||
"build/src/800.o": 0.831,
|
||||
"build/src/800_b.o": 0.084,
|
||||
"build/src/800_b_2.o": 0.352,
|
||||
"build/src/800_b_o0a.o": 0.08,
|
||||
"build/src/800_c.o": 0.208,
|
||||
"build/src/800b2.o": 0.084,
|
||||
"build/src/apicard1.o": 0.079,
|
||||
"build/src/apicard2.o": 0.084,
|
||||
"build/src/apicard3.o": 0.071,
|
||||
"build/src/apicard4.o": 0.087,
|
||||
"build/src/apicard5.o": 0.087,
|
||||
"build/src/apicard6.o": 0.07,
|
||||
"build/src/apicard7.o": 0.077,
|
||||
"build/src/boot.o": 0.115,
|
||||
"build/src/gap.o": 0.075,
|
||||
"build/src/libapi1.o": 0.074,
|
||||
"build/src/libapi2.o": 0.07,
|
||||
"build/src/libc2_1.o": 0.072,
|
||||
"build/src/libc2_2.o": 0.07,
|
||||
"build/src/800.o": 0.796,
|
||||
"build/src/800_b.o": 0.086,
|
||||
"build/src/800_b_2.o": 0.364,
|
||||
"build/src/800_b_o0a.o": 0.079,
|
||||
"build/src/800_c.o": 0.232,
|
||||
"build/src/800b2.o": 0.093,
|
||||
"build/src/apicard1.o": 0.07,
|
||||
"build/src/apicard2.o": 0.081,
|
||||
"build/src/apicard3.o": 0.065,
|
||||
"build/src/apicard4.o": 0.07,
|
||||
"build/src/apicard5.o": 0.079,
|
||||
"build/src/apicard6.o": 0.073,
|
||||
"build/src/apicard7.o": 0.079,
|
||||
"build/src/boot.o": 0.111,
|
||||
"build/src/gap.o": 0.088,
|
||||
"build/src/libapi1.o": 0.091,
|
||||
"build/src/libapi2.o": 0.074,
|
||||
"build/src/libc2_1.o": 0.073,
|
||||
"build/src/libc2_2.o": 0.072,
|
||||
"build/src/libcd1.o": 0.085,
|
||||
"build/src/libcd2.o": 0.071,
|
||||
"build/src/libetc.o": 0.065,
|
||||
"build/src/libgpu.o": 0.074,
|
||||
"build/src/libgpu2.o": 0.075,
|
||||
"build/src/libgs1.o": 0.069,
|
||||
"build/src/libgs2.o": 0.073,
|
||||
"build/src/libgs3.o": 0.07,
|
||||
"build/src/libgs4.o": 0.072,
|
||||
"build/src/libgs5.o": 0.071,
|
||||
"build/src/libgs6.o": 0.092,
|
||||
"build/src/libgs7.o": 0.074,
|
||||
"build/src/libgs8.o": 0.07,
|
||||
"build/src/libgte1.o": 0.072,
|
||||
"build/src/libgte10.o": 0.066,
|
||||
"build/src/libgte11.o": 0.068,
|
||||
"build/src/libgte12.o": 0.075,
|
||||
"build/src/libgte13.o": 0.078,
|
||||
"build/src/libgte14.o": 0.074,
|
||||
"build/src/libgte15.o": 0.073,
|
||||
"build/src/libgte16.o": 0.069,
|
||||
"build/src/libgte17.o": 0.08,
|
||||
"build/src/libgte18.o": 0.075,
|
||||
"build/src/libgte19.o": 0.071,
|
||||
"build/src/libgte2.o": 0.069,
|
||||
"build/src/libgte20.o": 0.076,
|
||||
"build/src/libgte21.o": 0.077,
|
||||
"build/src/libcd2.o": 0.076,
|
||||
"build/src/libetc.o": 0.081,
|
||||
"build/src/libgpu.o": 0.079,
|
||||
"build/src/libgpu2.o": 0.09,
|
||||
"build/src/libgs1.o": 0.076,
|
||||
"build/src/libgs2.o": 0.083,
|
||||
"build/src/libgs3.o": 0.079,
|
||||
"build/src/libgs4.o": 0.081,
|
||||
"build/src/libgs5.o": 0.075,
|
||||
"build/src/libgs6.o": 0.101,
|
||||
"build/src/libgs7.o": 0.083,
|
||||
"build/src/libgs8.o": 0.074,
|
||||
"build/src/libgte1.o": 0.073,
|
||||
"build/src/libgte10.o": 0.067,
|
||||
"build/src/libgte11.o": 0.072,
|
||||
"build/src/libgte12.o": 0.073,
|
||||
"build/src/libgte13.o": 0.083,
|
||||
"build/src/libgte14.o": 0.075,
|
||||
"build/src/libgte15.o": 0.075,
|
||||
"build/src/libgte16.o": 0.104,
|
||||
"build/src/libgte17.o": 0.082,
|
||||
"build/src/libgte18.o": 0.069,
|
||||
"build/src/libgte19.o": 0.079,
|
||||
"build/src/libgte2.o": 0.087,
|
||||
"build/src/libgte20.o": 0.079,
|
||||
"build/src/libgte21.o": 0.078,
|
||||
"build/src/libgte22.o": 0.077,
|
||||
"build/src/libgte23.o": 0.077,
|
||||
"build/src/libgte24.o": 0.075,
|
||||
"build/src/libgte25.o": 0.076,
|
||||
"build/src/libgte26.o": 0.07,
|
||||
"build/src/libgte27.o": 0.087,
|
||||
"build/src/libgte28.o": 0.071,
|
||||
"build/src/libgte29.o": 0.071,
|
||||
"build/src/libgte3.o": 0.08,
|
||||
"build/src/libgte30.o": 0.071,
|
||||
"build/src/libgte4.o": 0.072,
|
||||
"build/src/libgte5.o": 0.081,
|
||||
"build/src/libgte6.o": 0.077,
|
||||
"build/src/libgte7.o": 0.074,
|
||||
"build/src/libgte8.o": 0.076,
|
||||
"build/src/libgte9.o": 0.072,
|
||||
"build/src/libmcrd1.o": 0.087,
|
||||
"build/src/libmcrd2.o": 0.082,
|
||||
"build/src/libpad1.o": 0.082,
|
||||
"build/src/libpad2.o": 0.091,
|
||||
"build/src/sgap.o": 0.075,
|
||||
"build/src/sgap_2.o": 0.075,
|
||||
"build/src/libgte23.o": 0.084,
|
||||
"build/src/libgte24.o": 0.086,
|
||||
"build/src/libgte25.o": 0.077,
|
||||
"build/src/libgte26.o": 0.081,
|
||||
"build/src/libgte27.o": 0.083,
|
||||
"build/src/libgte28.o": 0.086,
|
||||
"build/src/libgte29.o": 0.076,
|
||||
"build/src/libgte3.o": 0.081,
|
||||
"build/src/libgte30.o": 0.082,
|
||||
"build/src/libgte4.o": 0.081,
|
||||
"build/src/libgte5.o": 0.078,
|
||||
"build/src/libgte6.o": 0.079,
|
||||
"build/src/libgte7.o": 0.082,
|
||||
"build/src/libgte8.o": 0.086,
|
||||
"build/src/libgte9.o": 0.079,
|
||||
"build/src/libmcrd1.o": 0.093,
|
||||
"build/src/libmcrd2.o": 0.075,
|
||||
"build/src/libpad1.o": 0.073,
|
||||
"build/src/libpad2.o": 0.081,
|
||||
"build/src/sgap.o": 0.077,
|
||||
"build/src/sgap_2.o": 0.074,
|
||||
"build/src/sgap_3.o": 0.076,
|
||||
"build/src/sgap_4.o": 0.082,
|
||||
"build/src/sgap_5.o": 0.077,
|
||||
"build/src/sgap_6.o": 0.076,
|
||||
"build/src/sgap_8.o": 0.089,
|
||||
"build/src/snd1.o": 0.088,
|
||||
"build/src/snd10.o": 0.083,
|
||||
"build/src/snd11.o": 0.074,
|
||||
"build/src/snd12.o": 0.08,
|
||||
"build/src/snd2.o": 0.082,
|
||||
"build/src/snd3.o": 0.085,
|
||||
"build/src/snd4.o": 0.079,
|
||||
"build/src/snd5.o": 0.079,
|
||||
"build/src/snd6.o": 0.08,
|
||||
"build/src/snd7.o": 0.078,
|
||||
"build/src/snd8.o": 0.076,
|
||||
"build/src/snd9.o": 0.078,
|
||||
"build/src/md_SC07_004/md_SC07_004.o": 0.564,
|
||||
"build/src/ov_SC03_015/ov_SC03_015.o": 0.148,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_after.o": 0.568,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_8012ACE0.o": 0.442,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_80135888.o": 0.074,
|
||||
"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.147,
|
||||
"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.132,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_8013F350.o": 0.097,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_8013FFD8.o": 0.076,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_80140608.o": 0.192,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_8015444C.o": 0.083,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_80154C24.o": 0.183,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_801588CC.o": 0.094,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_80159C84.o": 0.069,
|
||||
"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.101,
|
||||
"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.288,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_80171B4C.o": 0.112,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_801734BC.o": 0.228,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_801789AC.o": 0.068,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_80178D40.o": 0.115,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_8017A4AC.o": 0.069,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_8017AE2C.o": 0.19,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_8017EB7C.o": 0.222,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_80184440.o": 0.06,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_801848E4.o": 0.31,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_o0b.o": 0.072,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_o0c.o": 0.068,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_o0d.o": 0.066,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_o0e.o": 0.08,
|
||||
"build/src/ov_SC04_011/ov_SC04_011.o": 0.14,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_after.o": 0.476,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.o": 0.381,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_80135888.o": 0.063,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_80135A4C.o": 0.061,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_80135D20.o": 0.128,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_801380E0.o": 0.162,
|
||||
"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.081,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_8013FFD8.o": 0.066,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_80140608.o": 0.199,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_8015444C.o": 0.075,
|
||||
"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.1,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_80159C84.o": 0.069,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_8015A3C8.o": 0.076,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_8015AE2C.o": 0.103,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_8015C32C.o": 0.394,
|
||||
"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.112,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_801734BC.o": 0.181,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_801789AC.o": 0.067,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_80178D40.o": 0.103,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_8017A4AC.o": 0.07,
|
||||
"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.485,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_o0b.o": 0.063,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_o0c.o": 0.066
|
||||
"build/src/sgap_4.o": 0.085,
|
||||
"build/src/sgap_5.o": 0.073,
|
||||
"build/src/sgap_6.o": 0.071,
|
||||
"build/src/sgap_8.o": 0.085,
|
||||
"build/src/snd1.o": 0.085,
|
||||
"build/src/snd10.o": 0.073,
|
||||
"build/src/snd11.o": 0.072,
|
||||
"build/src/snd12.o": 0.081,
|
||||
"build/src/snd2.o": 0.104,
|
||||
"build/src/snd3.o": 0.072,
|
||||
"build/src/snd4.o": 0.076,
|
||||
"build/src/snd5.o": 0.07,
|
||||
"build/src/snd6.o": 0.081,
|
||||
"build/src/snd7.o": 0.079,
|
||||
"build/src/snd8.o": 0.07,
|
||||
"build/src/snd9.o": 0.068,
|
||||
"build/src/md_SC07_004/md_SC07_004.o": 0.539,
|
||||
"build/src/ov_SC03_015/ov_SC03_015.o": 0.129,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_after.o": 0.522,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_8012ACE0.o": 0.422,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_80135888.o": 0.078,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_80135A4C.o": 0.059,
|
||||
"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.167,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_8013C98C.o": 0.119,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_8013F350.o": 0.081,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_8013FFD8.o": 0.073,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_80140608.o": 0.187,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_8015444C.o": 0.069,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_80154C24.o": 0.175,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_801588CC.o": 0.095,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_80159C84.o": 0.064,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_8015A3C8.o": 0.067,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_8015AE2C.o": 0.094,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_8015C32C.o": 0.498,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_8016AB6C.o": 0.273,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_80171B4C.o": 0.097,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_801734BC.o": 0.204,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_801789AC.o": 0.057,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_80178D40.o": 0.1,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_8017A4AC.o": 0.068,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_8017AE2C.o": 0.16,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_8017EB7C.o": 0.197,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_80184440.o": 0.054,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_jr_801848E4.o": 0.29,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_o0b.o": 0.059,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_o0c.o": 0.063,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_o0d.o": 0.054,
|
||||
"build/src/ov_SC03_015/ov_SC03_015_o0e.o": 0.064,
|
||||
"build/src/ov_SC04_011/ov_SC04_011.o": 0.13,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_after.o": 0.489,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.o": 0.382,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_80135888.o": 0.05,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_80135A4C.o": 0.052,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_80135D20.o": 0.116,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_801380E0.o": 0.157,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_8013C98C.o": 0.118,
|
||||
"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.187,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_8015444C.o": 0.072,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_80154C24.o": 0.186,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_801588CC.o": 0.088,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_80159C84.o": 0.064,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_8015A3C8.o": 0.072,
|
||||
"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.406,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_8016AB6C.o": 0.259,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_80171B4C.o": 0.113,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_801734BC.o": 0.214,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_801789AC.o": 0.068,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_80178D40.o": 0.114,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_8017A4AC.o": 0.08,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_8017AE2C.o": 0.122,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_jr_8017D494.o": 0.499,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_o0b.o": 0.066,
|
||||
"build/src/ov_SC04_011/ov_SC04_011_o0c.o": 0.078
|
||||
},
|
||||
"ok": true,
|
||||
"seconds": 2.3
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -442,12 +442,7 @@ typedef struct {
|
||||
u8 pad_AC[0x60];
|
||||
} Entry8014A238;
|
||||
|
||||
typedef struct {
|
||||
u16 unk0;
|
||||
u8 pad[0x6E];
|
||||
s16 unk70;
|
||||
u8 pad2[0x9A];
|
||||
} Entry8014C118;
|
||||
typedef Unkstruct_800B5CB8 Entry8014C118;
|
||||
|
||||
typedef struct {
|
||||
u16 unk0;
|
||||
|
||||
@@ -16,24 +16,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];
|
||||
@@ -75,24 +58,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);
|
||||
@@ -103,11 +86,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;
|
||||
@@ -123,19 +106,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));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -160,15 +143,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;
|
||||
}
|
||||
@@ -182,9 +165,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;
|
||||
|
||||
@@ -16,24 +16,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];
|
||||
@@ -75,24 +58,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);
|
||||
@@ -103,11 +86,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;
|
||||
@@ -123,19 +106,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));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -160,15 +143,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;
|
||||
}
|
||||
@@ -182,9 +165,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;
|
||||
|
||||
Reference in New Issue
Block a user