mirror/BFM-decomp
1
0
Fork 0
mirror of https://github.com/Druthulu/BFM-decomp synced 2026-10-04 16:28:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

T3: batch t3_S39 — restruct: batch t3_S39 rung S — 50 files (TUs; 1118 drawable) · 650 bodies: 332 sites → members / 0 kept / 180 skipped · levers off 0 · compiles 217 in 140 s wall · final 50/50 identical · written 45 files | R22 check-all: 218 passed, 0 failed of 218 | type_census: 1650 definitions (523 layouts, 53 duplicate classes, 0 variant camps) · 375218 cast sites in 53506 bodies over 8 base classes (4 forms + A, coverage OK) · 229 lying declarations / 24 callees (+5293 K&R sites, +418 cross-binary apart) · controls 4/4 (restruct_cycle)

Browse Source
This commit is contained in:
Drew T
2026-10-01 22:36:36 -06:00
parent 90111bc249
commit 665e85bc95
49 changed files with 1822 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.run/P36/delever/calibration.json
+153 -153
View File
@@ -1,7 +1,7 @@
{
"head": "372c1d4ac5",
"head": "c445ed4883",
"stamp": "588cbf38c6e4",
"generated": "2026-10-01 22:15",
"generated": "2026-10-01 22:25",
"aliases": [
"main",
"md_SC07_004",
@@ -21,176 +21,176 @@
"main": {
"objects": 85,
"identical": 85,
"seconds": 7.6579999999999995,
"mean_s": 0.09
"seconds": 8.367000000000004,
"mean_s": 0.098
},
"md_SC07_004": {
"objects": 1,
"identical": 1,
"seconds": 0.538,
"mean_s": 0.538
"seconds": 0.558,
"mean_s": 0.558
},
"ov_SC03_015": {
"objects": 32,
"identical": 32,
"seconds": 5.263,
"mean_s": 0.164
"seconds": 5.673000000000002,
"mean_s": 0.177
},
"ov_SC04_011": {
"objects": 28,
"identical": 28,
"seconds": 4.4190000000000005,
"mean_s": 0.158
"seconds": 5.257,
"mean_s": 0.188
}
},
"per_object_seconds": {
"build/src/800.o": 0.821,
"build/src/800_b.o": 0.085,
"build/src/800_b_2.o": 0.344,
"build/src/800_b_o0a.o": 0.071,
"build/src/800_c.o": 0.223,
"build/src/800.o": 0.838,
"build/src/800_b.o": 0.091,
"build/src/800_b_2.o": 0.365,
"build/src/800_b_o0a.o": 0.083,
"build/src/800_c.o": 0.242,
"build/src/800b2.o": 0.1,
"build/src/apicard1.o": 0.082,
"build/src/apicard2.o": 0.082,
"build/src/apicard3.o": 0.093,
"build/src/apicard4.o": 0.1,
"build/src/apicard5.o": 0.093,
"build/src/apicard6.o": 0.08,
"build/src/apicard7.o": 0.086,
"build/src/boot.o": 0.105,
"build/src/gap.o": 0.07,
"build/src/libapi1.o": 0.09,
"build/src/libapi2.o": 0.068,
"build/src/libc2_1.o": 0.081,
"build/src/libc2_2.o": 0.071,
"build/src/libcd1.o": 0.082,
"build/src/libcd2.o": 0.073,
"build/src/libetc.o": 0.077,
"build/src/libgpu.o": 0.067,
"build/src/libgpu2.o": 0.079,
"build/src/libgs1.o": 0.071,
"build/src/libgs2.o": 0.081,
"build/src/libgs3.o": 0.076,
"build/src/libgs4.o": 0.077,
"build/src/libgs5.o": 0.071,
"build/src/libgs6.o": 0.087,
"build/src/libgs7.o": 0.072,
"build/src/libgs8.o": 0.064,
"build/src/libgte1.o": 0.066,
"build/src/libgte10.o": 0.071,
"build/src/libgte11.o": 0.068,
"build/src/libgte12.o": 0.076,
"build/src/libgte13.o": 0.076,
"build/src/libgte14.o": 0.069,
"build/src/libgte15.o": 0.071,
"build/src/libgte16.o": 0.08,
"build/src/libgte17.o": 0.071,
"build/src/libgte18.o": 0.078,
"build/src/libgte19.o": 0.069,
"build/src/libgte2.o": 0.066,
"build/src/libgte20.o": 0.07,
"build/src/libgte21.o": 0.069,
"build/src/libgte22.o": 0.07,
"build/src/libgte23.o": 0.068,
"build/src/libgte24.o": 0.07,
"build/src/libgte25.o": 0.074,
"build/src/libgte26.o": 0.069,
"build/src/libgte27.o": 0.088,
"build/src/libgte28.o": 0.107,
"build/src/libgte29.o": 0.069,
"build/src/libgte3.o": 0.068,
"build/src/libgte30.o": 0.074,
"build/src/libgte4.o": 0.07,
"build/src/libgte5.o": 0.073,
"build/src/libgte6.o": 0.071,
"build/src/libgte7.o": 0.066,
"build/src/libgte8.o": 0.088,
"build/src/libgte9.o": 0.084,
"build/src/libmcrd1.o": 0.084,
"build/src/libmcrd2.o": 0.067,
"build/src/libpad1.o": 0.072,
"build/src/libpad2.o": 0.076,
"build/src/sgap.o": 0.074,
"build/src/sgap_2.o": 0.074,
"build/src/sgap_3.o": 0.081,
"build/src/sgap_4.o": 0.085,
"build/src/sgap_5.o": 0.069,
"build/src/sgap_6.o": 0.077,
"build/src/sgap_8.o": 0.078,
"build/src/snd1.o": 0.089,
"build/src/snd10.o": 0.071,
"build/src/snd11.o": 0.068,
"build/src/snd12.o": 0.07,
"build/src/snd2.o": 0.087,
"build/src/snd3.o": 0.069,
"build/src/snd4.o": 0.067,
"build/src/snd5.o": 0.071,
"build/src/snd6.o": 0.072,
"build/src/snd7.o": 0.069,
"build/src/snd8.o": 0.08,
"build/src/apicard1.o": 0.076,
"build/src/apicard2.o": 0.079,
"build/src/apicard3.o": 0.083,
"build/src/apicard4.o": 0.081,
"build/src/apicard5.o": 0.104,
"build/src/apicard6.o": 0.088,
"build/src/apicard7.o": 0.096,
"build/src/boot.o": 0.115,
"build/src/gap.o": 0.073,
"build/src/libapi1.o": 0.075,
"build/src/libapi2.o": 0.073,
"build/src/libc2_1.o": 0.09,
"build/src/libc2_2.o": 0.077,
"build/src/libcd1.o": 0.089,
"build/src/libcd2.o": 0.099,
"build/src/libetc.o": 0.097,
"build/src/libgpu.o": 0.087,
"build/src/libgpu2.o": 0.095,
"build/src/libgs1.o": 0.085,
"build/src/libgs2.o": 0.09,
"build/src/libgs3.o": 0.091,
"build/src/libgs4.o": 0.071,
"build/src/libgs5.o": 0.08,
"build/src/libgs6.o": 0.101,
"build/src/libgs7.o": 0.086,
"build/src/libgs8.o": 0.077,
"build/src/libgte1.o": 0.083,
"build/src/libgte10.o": 0.079,
"build/src/libgte11.o": 0.075,
"build/src/libgte12.o": 0.089,
"build/src/libgte13.o": 0.088,
"build/src/libgte14.o": 0.081,
"build/src/libgte15.o": 0.083,
"build/src/libgte16.o": 0.083,
"build/src/libgte17.o": 0.083,
"build/src/libgte18.o": 0.091,
"build/src/libgte19.o": 0.077,
"build/src/libgte2.o": 0.086,
"build/src/libgte20.o": 0.077,
"build/src/libgte21.o": 0.08,
"build/src/libgte22.o": 0.085,
"build/src/libgte23.o": 0.081,
"build/src/libgte24.o": 0.085,
"build/src/libgte25.o": 0.084,
"build/src/libgte26.o": 0.073,
"build/src/libgte27.o": 0.075,
"build/src/libgte28.o": 0.08,
"build/src/libgte29.o": 0.078,
"build/src/libgte3.o": 0.083,
"build/src/libgte30.o": 0.081,
"build/src/libgte4.o": 0.069,
"build/src/libgte5.o": 0.085,
"build/src/libgte6.o": 0.072,
"build/src/libgte7.o": 0.065,
"build/src/libgte8.o": 0.082,
"build/src/libgte9.o": 0.079,
"build/src/libmcrd1.o": 0.087,
"build/src/libmcrd2.o": 0.084,
"build/src/libpad1.o": 0.082,
"build/src/libpad2.o": 0.085,
"build/src/sgap.o": 0.111,
"build/src/sgap_2.o": 0.085,
"build/src/sgap_3.o": 0.082,
"build/src/sgap_4.o": 0.086,
"build/src/sgap_5.o": 0.09,
"build/src/sgap_6.o": 0.082,
"build/src/sgap_8.o": 0.094,
"build/src/snd1.o": 0.09,
"build/src/snd10.o": 0.075,
"build/src/snd11.o": 0.091,
"build/src/snd12.o": 0.083,
"build/src/snd2.o": 0.102,
"build/src/snd3.o": 0.078,
"build/src/snd4.o": 0.075,
"build/src/snd5.o": 0.078,
"build/src/snd6.o": 0.086,
"build/src/snd7.o": 0.091,
"build/src/snd8.o": 0.084,
"build/src/snd9.o": 0.077,
"build/src/md_SC07_004/md_SC07_004.o": 0.538,
"build/src/ov_SC03_015/ov_SC03_015.o": 0.151,
"build/src/ov_SC03_015/ov_SC03_015_after.o": 0.542,
"build/src/ov_SC03_015/ov_SC03_015_jr_8012ACE0.o": 0.42,
"build/src/ov_SC03_015/ov_SC03_015_jr_80135888.o": 0.08,
"build/src/ov_SC03_015/ov_SC03_015_jr_80135A4C.o": 0.085,
"build/src/ov_SC03_015/ov_SC03_015_jr_80135D20.o": 0.157,
"build/src/ov_SC03_015/ov_SC03_015_jr_801380E0.o": 0.187,
"build/src/ov_SC03_015/ov_SC03_015_jr_8013C98C.o": 0.138,
"build/src/ov_SC03_015/ov_SC03_015_jr_8013F350.o": 0.108,
"build/src/ov_SC03_015/ov_SC03_015_jr_8013FFD8.o": 0.089,
"build/src/ov_SC03_015/ov_SC03_015_jr_80140608.o": 0.196,
"build/src/ov_SC03_015/ov_SC03_015_jr_8015444C.o": 0.09,
"build/src/ov_SC03_015/ov_SC03_015_jr_80154C24.o": 0.181,
"build/src/ov_SC03_015/ov_SC03_015_jr_801588CC.o": 0.113,
"build/src/ov_SC03_015/ov_SC03_015_jr_80159C84.o": 0.078,
"build/src/ov_SC03_015/ov_SC03_015_jr_8015A3C8.o": 0.084,
"build/src/ov_SC03_015/ov_SC03_015_jr_8015AE2C.o": 0.109,
"build/src/ov_SC03_015/ov_SC03_015_jr_8015C32C.o": 0.49,
"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.117,
"build/src/ov_SC03_015/ov_SC03_015_jr_801734BC.o": 0.235,
"build/src/ov_SC03_015/ov_SC03_015_jr_801789AC.o": 0.073,
"build/src/ov_SC03_015/ov_SC03_015_jr_80178D40.o": 0.119,
"build/src/ov_SC03_015/ov_SC03_015_jr_8017A4AC.o": 0.087,
"build/src/ov_SC03_015/ov_SC03_015_jr_8017AE2C.o": 0.173,
"build/src/ov_SC03_015/ov_SC03_015_jr_8017EB7C.o": 0.212,
"build/src/ov_SC03_015/ov_SC03_015_jr_80184440.o": 0.065,
"build/src/ov_SC03_015/ov_SC03_015_jr_801848E4.o": 0.304,
"build/src/ov_SC03_015/ov_SC03_015_o0b.o": 0.062,
"build/src/ov_SC03_015/ov_SC03_015_o0c.o": 0.08,
"build/src/ov_SC03_015/ov_SC03_015_o0d.o": 0.069,
"build/src/ov_SC03_015/ov_SC03_015_o0e.o": 0.084,
"build/src/ov_SC04_011/ov_SC04_011.o": 0.141,
"build/src/ov_SC04_011/ov_SC04_011_after.o": 0.458,
"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.059,
"build/src/ov_SC04_011/ov_SC04_011_jr_80135A4C.o": 0.063,
"build/src/ov_SC04_011/ov_SC04_011_jr_80135D20.o": 0.138,
"build/src/ov_SC04_011/ov_SC04_011_jr_801380E0.o": 0.167,
"build/src/ov_SC04_011/ov_SC04_011_jr_8013C98C.o": 0.125,
"build/src/ov_SC04_011/ov_SC04_011_jr_8013F350.o": 0.095,
"build/src/ov_SC04_011/ov_SC04_011_jr_8013FFD8.o": 0.082,
"build/src/ov_SC04_011/ov_SC04_011_jr_80140608.o": 0.194,
"build/src/ov_SC04_011/ov_SC04_011_jr_8015444C.o": 0.092,
"build/src/md_SC07_004/md_SC07_004.o": 0.558,
"build/src/ov_SC03_015/ov_SC03_015.o": 0.157,
"build/src/ov_SC03_015/ov_SC03_015_after.o": 0.575,
"build/src/ov_SC03_015/ov_SC03_015_jr_8012ACE0.o": 0.448,
"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.084,
"build/src/ov_SC03_015/ov_SC03_015_jr_80135D20.o": 0.161,
"build/src/ov_SC03_015/ov_SC03_015_jr_801380E0.o": 0.198,
"build/src/ov_SC03_015/ov_SC03_015_jr_8013C98C.o": 0.154,
"build/src/ov_SC03_015/ov_SC03_015_jr_8013F350.o": 0.104,
"build/src/ov_SC03_015/ov_SC03_015_jr_8013FFD8.o": 0.095,
"build/src/ov_SC03_015/ov_SC03_015_jr_80140608.o": 0.219,
"build/src/ov_SC03_015/ov_SC03_015_jr_8015444C.o": 0.101,
"build/src/ov_SC03_015/ov_SC03_015_jr_80154C24.o": 0.206,
"build/src/ov_SC03_015/ov_SC03_015_jr_801588CC.o": 0.125,
"build/src/ov_SC03_015/ov_SC03_015_jr_80159C84.o": 0.082,
"build/src/ov_SC03_015/ov_SC03_015_jr_8015A3C8.o": 0.09,
"build/src/ov_SC03_015/ov_SC03_015_jr_8015AE2C.o": 0.115,
"build/src/ov_SC03_015/ov_SC03_015_jr_8015C32C.o": 0.522,
"build/src/ov_SC03_015/ov_SC03_015_jr_8016AB6C.o": 0.314,
"build/src/ov_SC03_015/ov_SC03_015_jr_80171B4C.o": 0.129,
"build/src/ov_SC03_015/ov_SC03_015_jr_801734BC.o": 0.244,
"build/src/ov_SC03_015/ov_SC03_015_jr_801789AC.o": 0.088,
"build/src/ov_SC03_015/ov_SC03_015_jr_80178D40.o": 0.131,
"build/src/ov_SC03_015/ov_SC03_015_jr_8017A4AC.o": 0.094,
"build/src/ov_SC03_015/ov_SC03_015_jr_8017AE2C.o": 0.206,
"build/src/ov_SC03_015/ov_SC03_015_jr_8017EB7C.o": 0.229,
"build/src/ov_SC03_015/ov_SC03_015_jr_80184440.o": 0.075,
"build/src/ov_SC03_015/ov_SC03_015_jr_801848E4.o": 0.317,
"build/src/ov_SC03_015/ov_SC03_015_o0b.o": 0.07,
"build/src/ov_SC03_015/ov_SC03_015_o0c.o": 0.084,
"build/src/ov_SC03_015/ov_SC03_015_o0d.o": 0.082,
"build/src/ov_SC03_015/ov_SC03_015_o0e.o": 0.096,
"build/src/ov_SC04_011/ov_SC04_011.o": 0.151,
"build/src/ov_SC04_011/ov_SC04_011_after.o": 0.596,
"build/src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.o": 0.393,
"build/src/ov_SC04_011/ov_SC04_011_jr_80135888.o": 0.073,
"build/src/ov_SC04_011/ov_SC04_011_jr_80135A4C.o": 0.072,
"build/src/ov_SC04_011/ov_SC04_011_jr_80135D20.o": 0.147,
"build/src/ov_SC04_011/ov_SC04_011_jr_801380E0.o": 0.176,
"build/src/ov_SC04_011/ov_SC04_011_jr_8013C98C.o": 0.134,
"build/src/ov_SC04_011/ov_SC04_011_jr_8013F350.o": 0.097,
"build/src/ov_SC04_011/ov_SC04_011_jr_8013FFD8.o": 0.087,
"build/src/ov_SC04_011/ov_SC04_011_jr_80140608.o": 0.212,
"build/src/ov_SC04_011/ov_SC04_011_jr_8015444C.o": 0.094,
"build/src/ov_SC04_011/ov_SC04_011_jr_80154C24.o": 0.191,
"build/src/ov_SC04_011/ov_SC04_011_jr_801588CC.o": 0.108,
"build/src/ov_SC04_011/ov_SC04_011_jr_80159C84.o": 0.088,
"build/src/ov_SC04_011/ov_SC04_011_jr_8015A3C8.o": 0.084,
"build/src/ov_SC04_011/ov_SC04_011_jr_8015AE2C.o": 0.111,
"build/src/ov_SC04_011/ov_SC04_011_jr_8015C32C.o": 0.372,
"build/src/ov_SC04_011/ov_SC04_011_jr_8016AB6C.o": 0.22,
"build/src/ov_SC04_011/ov_SC04_011_jr_80171B4C.o": 0.117,
"build/src/ov_SC04_011/ov_SC04_011_jr_801734BC.o": 0.188,
"build/src/ov_SC04_011/ov_SC04_011_jr_801789AC.o": 0.077,
"build/src/ov_SC04_011/ov_SC04_011_jr_80178D40.o": 0.109,
"build/src/ov_SC04_011/ov_SC04_011_jr_8017A4AC.o": 0.075,
"build/src/ov_SC04_011/ov_SC04_011_jr_8017AE2C.o": 0.121,
"build/src/ov_SC04_011/ov_SC04_011_jr_8017D494.o": 0.447,
"build/src/ov_SC04_011/ov_SC04_011_o0b.o": 0.061,
"build/src/ov_SC04_011/ov_SC04_011_jr_801588CC.o": 0.117,
"build/src/ov_SC04_011/ov_SC04_011_jr_80159C84.o": 0.086,
"build/src/ov_SC04_011/ov_SC04_011_jr_8015A3C8.o": 0.096,
"build/src/ov_SC04_011/ov_SC04_011_jr_8015AE2C.o": 0.124,
"build/src/ov_SC04_011/ov_SC04_011_jr_8015C32C.o": 0.511,
"build/src/ov_SC04_011/ov_SC04_011_jr_8016AB6C.o": 0.391,
"build/src/ov_SC04_011/ov_SC04_011_jr_80171B4C.o": 0.123,
"build/src/ov_SC04_011/ov_SC04_011_jr_801734BC.o": 0.377,
"build/src/ov_SC04_011/ov_SC04_011_jr_801789AC.o": 0.078,
"build/src/ov_SC04_011/ov_SC04_011_jr_80178D40.o": 0.12,
"build/src/ov_SC04_011/ov_SC04_011_jr_8017A4AC.o": 0.089,
"build/src/ov_SC04_011/ov_SC04_011_jr_8017AE2C.o": 0.112,
"build/src/ov_SC04_011/ov_SC04_011_jr_8017D494.o": 0.473,
"build/src/ov_SC04_011/ov_SC04_011_o0b.o": 0.069,
"build/src/ov_SC04_011/ov_SC04_011_o0c.o": 0.068
},
"ok": true,
"seconds": 2.1
"seconds": 2.3
}
.run/P37/census/struct_map_top.json
+1 -1
View File
File diff suppressed because one or more lines are too long
.run/P37/census/type_census.json
+1278 -156
View File
File diff suppressed because it is too large Load Diff
.run/P37/census/type_census.txt
+12 -12
View File
@@ -1,17 +1,17 @@
type_census — 2026-10-02T04:22:17Z at 372c1d4ac5 (src stamp fbd6fc644116feac, tool e17c5fa676); 7306 files (4121 TUs + 3181 headers), 99109 function definitions; walk 42.1 s, total 206.9 s
type_census — 2026-10-02T04:33:44Z at c445ed4883 (src stamp 0a48e9640ffb83fb, tool e17c5fa676); 7306 files (4121 TUs + 3181 headers), 99109 function definitions; walk 44.8 s, total 220.6 s
DEFINITIONS 1650 struct/union bodies (+0 enums): canonical header 1021 · .c file-scope 0 · .c block-scope 600 · per-function shared headers 29 · other headers 0 · include/ 326
1024 distinct names · 523 distinct layouts (0 unresolved) · 53 duplicate classes covering 496 names (tier 1 0 same-named, tier 2 53 opaque; 44 layout-twin classes / 472 names kept apart) · 42 exact-text classes / 546 copies · 0 VARIANT names (>1 layout) · 55 dead canonical names · 0 canonical names redefined in .c · 4300 scalar/alias typedefs · 145 forward decls
CAST SITES deref 375652 = P 291003 + I 55140 + X 13790 + M 15719 (+ A address-of 18890; + C typed cast-member 139148) in 53616 bodies · coverage OK (raw {'P': 291003, 'I': 55140, 'X': 13790, 'A': 18890, 'C': 139148, 'M': 15719, 'K': 18592}) · refused 0 · absolute 0 · readability regex over raw text 293840
by base: param 184129 · local 127872 · gaddr 40113 · nested 11670 · global 8755 · other 1614 · addr-of 1338 · ident 161
by width: s2 106149 · s4 102783 · u2 94717 · u1 36335 · agg 13415 · p4 11179 · u4 9136 · s1 1938
top bases: param_1(param) 59172 · arg0(param) 51649 · a0(param) 44518 · p(local) 13451 · cach(local) 8246 · p(param) 7168 · buf(local) 7056 · s0(local) 7049 · s1(local) 6579 · flag(local) 5453 · dst(local) 4853 · iVar2(local) 4720 · iVar1(local) 3866 · cur(local) 3375 · e(local) 3234 · src(local) 2599
CAST SITES deref 375218 = P 290569 + I 55140 + X 13790 + M 15719 (+ A address-of 18890; + C typed cast-member 139480) in 53506 bodies · coverage OK (raw {'P': 290569, 'I': 55140, 'X': 13790, 'A': 18890, 'C': 139480, 'M': 15719, 'K': 18694}) · refused 0 · absolute 0 · readability regex over raw text 293406
by base: param 183920 · local 127647 · gaddr 40113 · nested 11670 · global 8755 · other 1614 · addr-of 1338 · ident 161
by width: s2 106111 · s4 102615 · u2 94583 · u1 36291 · agg 13415 · p4 11179 · u4 9114 · s1 1910
top bases: param_1(param) 59051 · arg0(param) 51649 · a0(param) 44463 · p(local) 13451 · cach(local) 8246 · p(param) 7168 · buf(local) 7056 · s0(local) 7049 · s1(local) 6579 · flag(local) 5453 · dst(local) 4853 · iVar2(local) 4720 · iVar1(local) 3811 · cur(local) 3375 · e(local) 3234 · src(local) 2599
DECLARATIONS 99109 function definitions (1894 K&R) · 4279260 extern function declarations over 12088 names (3773 spelled >1 way) · 6427 names with >1 body text · 1078766 data externs over 55542 symbols (18498 typed >1 way) · asm-label aliases 5148 (159 names) · builtins {'memcpy': 301, 'abs': 1} · attributes {'packed': 26, 'aligned': 6}
lying declarations 229 over 24 callees {'K&R-empty': 216, 'narrow': 13} · K&R sites (marked, counted apart) 5293 over 200 callees · cross-binary (the fleet's definitions disagree, this binary has none) 418 over 96 callees
STRUCT MAP 18827 types explain 371721/375652 deref sites (99.0 %); unassigned 3931; 3992 types span ≥2 bodies (314968 sites), 14835 single-body; types with conflicts 857, suspect 11
merges by evidence {'param': 39502, 'arg': 10960, 'assign': 19186, 'ret-of': 5700, 'assign&': 1269, 'return': 1532, 'arg&': 276, 'field': 7100, 'nested': 9}; vetoed {'arg-conduit': 136326, 'assign-multisource': 33167, 'arg&-conduit': 14638, 'assign&-multisource': 12224, 'arg&-no-overlap': 3405, 'arg-no-overlap': 40290, 'ret-of-multisource': 6608, 'field-multisource': 5786, 'ret-of': 302, 'assign': 361, 'assign&': 336, 'arg': 189, 'return': 6, 'field': 40}
Unkstruct_80126B58 sites 31461 bodies 4351 fields 165 size≥0x24c width-conflicts 49 sign-mixed 53 merges {'param': 2244, 'arg': 1165, 'assign&': 104, 'assign': 44} at D_80126B58 ptr D_80126B58
Unkstruct_800B5CB8 sites 23979 bodies 4711 fields 129 size≥0x10c width-conflicts 50 sign-mixed 59 merges {'param': 9148, 'assign': 8615, 'arg': 6970, 'ret-of': 2377} at D_800B5CB8,D_800D3888,D_80181448 ptr D_8006386C,D_80074778,D_80074780
STRUCT MAP 18826 types explain 371287/375218 deref sites (99.0 %); unassigned 3931; 3992 types span ≥2 bodies (314539 sites), 14834 single-body; types with conflicts 857, suspect 11
merges by evidence {'param': 39478, 'arg': 10953, 'assign': 19183, 'ret-of': 5696, 'arg&': 274, 'assign&': 1268, 'return': 1532, 'field': 7101, 'nested': 9}; vetoed {'arg-conduit': 136439, 'arg&-conduit': 14638, 'assign&-multisource': 12224, 'assign-multisource': 33167, 'arg&-no-overlap': 3441, 'ret-of-multisource': 6608, 'arg-no-overlap': 38584, 'field-multisource': 5786, 'ret-of': 302, 'assign': 361, 'assign&': 337, 'arg': 189, 'return': 6, 'field': 40}
Unkstruct_80126B58 sites 32224 bodies 5225 fields 165 size≥0x24c width-conflicts 49 sign-mixed 52 merges {'param': 2198, 'arg': 1143, 'assign&': 104, 'assign': 43} at D_80126B58 ptr D_80126B58
Unkstruct_800B5CB8 sites 23753 bodies 4650 fields 129 size≥0x10c width-conflicts 50 sign-mixed 59 merges {'param': 9148, 'assign': 8613, 'arg': 6972, 'ret-of': 2375} at D_800B5CB8,D_800D3888,D_801815F8 ptr D_8006386C,D_80074778,D_80074780
Unkstruct_cb638a45 sites 6477 bodies 381 fields 6 size≥0x10 width-conflicts 0 sign-mixed 0 merges {'param': 10, 'arg': 4}
Unkstruct_dac960ce sites 4464 bodies 124 fields 13 size≥0x24c width-conflicts 0 sign-mixed 2 merges {'param': 2}
Unkstruct_0caecd54 sites 4340 bodies 124 fields 23 size≥0xfe width-conflicts 0 sign-mixed 1 merges {'param': 2, 'assign': 1, 'return': 1}
@@ -22,12 +22,12 @@ STRUCT MAP 18827 types explain 371721/375652 deref sites (99.0 %); unassigned
Unkstruct_1fa9e810 sites 3144 bodies 131 fields 3 size≥0x49 width-conflicts 0 sign-mixed 0 merges {}
Unkstruct_30b21035 sites 3100 bodies 124 fields 13 size≥0x54 width-conflicts 0 sign-mixed 0 merges {}
Unkstruct_80126948 sites 3034 bodies 848 fields 34 size≥0xa4 width-conflicts 0 sign-mixed 10 merges {'assign': 103, 'arg': 14, 'param': 6, 'assign&': 4} at D_80126948,D_80126E60 ptr D_80114EE8,D_801151D4,D_80126948
GLOBAL BLOCKS 2121 runs of ≥4 adjacent scalar D_ symbols (14232 symbols): 0x800cf10c+0x34 ×29 (D_800CF10C..D_800CF13C) · 0x800a6580+0x3a ×27 (D_800A6580..D_800A65B8) · 0x801998a4+0x57 ×24 (D_801998A4..D_801998FA) · 0x80199840+0x56 ×23 (D_80199840..D_80199895) · 0x801a9608+0x50 ×22 (D_801A9608..D_801A9654) · 0x801ab708+0x54 ×21 (D_801AB708..D_801AB758) · 0x801b0df0+0x4b ×21 (D_801B0DF0..D_801B0E3A) · 0x801b83a0+0x4e ×21 (D_801B83A0..D_801B83ED)
GLOBAL BLOCKS 2126 runs of ≥4 adjacent scalar D_ symbols (14264 symbols): 0x800cf10c+0x34 ×29 (D_800CF10C..D_800CF13C) · 0x800a6580+0x3a ×27 (D_800A6580..D_800A65B8) · 0x801998a4+0x57 ×24 (D_801998A4..D_801998FA) · 0x80199840+0x56 ×23 (D_80199840..D_80199895) · 0x801a9608+0x50 ×22 (D_801A9608..D_801A9654) · 0x801ab708+0x54 ×21 (D_801AB708..D_801AB758) · 0x801b0df0+0x4b ×21 (D_801B0DF0..D_801B0E3A) · 0x801b83a0+0x4e ×21 (D_801B83A0..D_801B83ED)
PARKED (P36) 24 classes / 453 bodies / 691 needed sites → .run/P37/census/parked.tsv; needs {'signature': 13, 'struct': 7, '?': 4}; 22 PARK names are minimum-lever banks
CONTROLS 4/4: player_block_widths OK (D_80078E8C:4/4 D_80078EB2:2/2 D_80078EB4:2/2 D_80078EB6:2/2 D_80078EB8:2/2 D_80078F08:4/4 D_80078F0C:4/4) · matrix_layouts OK (MATRIX=32 MATRIX_L48=48) · prim_layout_class OK (defs in 1 files, 1 spellings, 1/1 in one layout (64 B)) · tu_conflict_D_800A651C OK (s32:1202 | u8[]:9 | OtBlk[]:9 | OtBlk_80016450[]:8 | s32[]:7)
duplicate-layout classes (top 12): 4B×56 names (0 defs): B4_80165140, B4_8017F154, B4_8018750C, B4_8018AD9C… | 8B×46 names (0 defs): Blk8S16, Blk8_80126940, Blk8_80180A38, D_80195AF4_t… | 8B×45 names (0 defs): B8, B8_17F474, B8_80165140, B8_801851A8… | 8B×34 names (0 defs): Args_80182194, Blk8017FD54, Blk8_801A6AD0, Blk8_801AD914… | 20B×32 names (0 defs): Blk20_8017D110, Buf8017BF34_8017BF34, Buf8017BF50_8017C234, Loc_80180E10… | 16B×28 names (0 defs): Blk16X, Blk16_8017ECD4, Blk16_8018A4C4, Blk16_8018A8B8… | 6B×25 names (0 defs): D80190448_t, Pt6_8017D65C, ResMapCol, S6… | 32B×25 names (0 defs): Blk20_8016DF5C, Blk20_80180B78, Blk20_80184694, Blk32L_80133298… | 8B×22 names (22 defs): B8014, Blk8_80133CD4, Blk8_801463A0, Blk8_8017FF80… | 12B×19 names (19 defs): Blk12, Prim126, PrimC59C, PrimC974… | 8B×14 names (0 defs): CdFileLoc, Cmd_801805C8, M8_8016B6BC, Pair8_8017DDC4… | 4B×14 names (0 defs): D_801D0660_s, Ent_80186AE4, P4, Pair4_801B02DC…
VARIANT names (top 12):
type_census: 1650 definitions (523 layouts, 53 duplicate classes, 0 variant camps) · 375652 cast sites in 53616 bodies over 8 base classes (4 forms + A, coverage OK) · 229 lying declarations / 24 callees (+5293 K&R sites, +418 cross-binary apart) · controls 4/4
struct_map: 18827 types over 18827 clusters explain 371721/375652 sites (99.0 %); 3931 unassigned sites; 857 types with conflicts
type_census: 1650 definitions (523 layouts, 53 duplicate classes, 0 variant camps) · 375218 cast sites in 53506 bodies over 8 base classes (4 forms + A, coverage OK) · 229 lying declarations / 24 callees (+5293 K&R sites, +418 cross-binary apart) · controls 4/4
struct_map: 18826 types over 18826 clusters explain 371287/375218 sites (99.0 %); 3931 unassigned sites; 857 types with conflicts
src/ov_SC04_010/ov_SC04_010_jr_8015C32C.c
+4 -4
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_8018F600;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_8018F600;
RotMatrixYXZ(rot, D_8018F600);
func_80048D9C(D_8018F600, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80181238);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
src/ov_SC04_011/ov_SC04_011_jr_8015C32C.c
+4 -4
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801F1568;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801F1568;
RotMatrixYXZ(rot, D_801F1568);
func_80048D9C(D_801F1568, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801934C8);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
src/ov_SC04_015/ov_SC04_015_jr_8015C32C.c
+4 -4
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801C9270;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801C9270;
RotMatrixYXZ(rot, D_801C9270);
func_80048D9C(D_801C9270, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801875D4);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
src/ov_SC04_016/ov_SC04_016_jr_8015C32C.c
+4 -4
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801AC198;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801AC198;
RotMatrixYXZ(rot, D_801AC198);
func_80048D9C(D_801AC198, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80183098);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
src/ov_SC04_018/ov_SC04_018_jr_8015C32C.c
+4 -4
View File
@@ -5847,12 +5847,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801E79B8;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801E79B8;
RotMatrixYXZ(rot, D_801E79B8);
func_80048D9C(D_801E79B8, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801902B0);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
src/ov_SC04_020/ov_SC04_020_jr_8015C32C.c
+4 -4
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801BC640;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801BC640;
RotMatrixYXZ(rot, D_801BC640);
func_80048D9C(D_801BC640, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801863E8);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
src/ov_SC05_000/ov_SC05_000_jr_8015C32C.c
+4 -4
View File
@@ -5843,12 +5843,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_8019AB10;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_8019AB10;
RotMatrixYXZ(rot, D_8019AB10);
func_80048D9C(D_8019AB10, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80181328);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
src/ov_SC05_007/ov_SC05_007_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_8019CDB8;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_8019CDB8;
RotMatrixYXZ(rot, D_8019CDB8);
func_80048D9C(D_8019CDB8, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80183AF8);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80183AEC, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80183AAC);
src/ov_SC05_008/ov_SC05_008_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801A11A0;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801A11A0;
RotMatrixYXZ(rot, D_801A11A0);
func_80048D9C(D_801A11A0, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80185A50);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80185A44, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80185A04);
src/ov_SC05_010/ov_SC05_010_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801C7EE8;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801C7EE8;
RotMatrixYXZ(rot, D_801C7EE8);
func_80048D9C(D_801C7EE8, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_8018BA3C);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_8018BA30, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_8018B9F0);
src/ov_SC05_018/ov_SC05_018_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801E6718;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801E6718;
RotMatrixYXZ(rot, D_801E6718);
func_80048D9C(D_801E6718, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801899D0);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_801899C4, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80189984);
src/ov_SC06_000/ov_SC06_000_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801B2008;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801B2008;
RotMatrixYXZ(rot, D_801B2008);
func_80048D9C(D_801B2008, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_8018B324);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_8018B318, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_8018B2D8);
src/ov_SC06_006/ov_SC06_006_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801F8A20;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801F8A20;
RotMatrixYXZ(rot, D_801F8A20);
func_80048D9C(D_801F8A20, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80184E48);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80184E3C, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80184DFC);
src/ov_SC06_008/ov_SC06_008_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801AA6F0;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801AA6F0;
RotMatrixYXZ(rot, D_801AA6F0);
func_80048D9C(D_801AA6F0, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801888B0);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_801888A4, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80188864);
src/ov_SC06_010/ov_SC06_010_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801B2B38;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801B2B38;
RotMatrixYXZ(rot, D_801B2B38);
func_80048D9C(D_801B2B38, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80189A8C);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80189A80, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80189A40);
src/ov_SC06_011/ov_SC06_011_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801ABC10;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801ABC10;
RotMatrixYXZ(rot, D_801ABC10);
func_80048D9C(D_801ABC10, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801834EC);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_801834E0, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_801834A0);
src/ov_SC06_013/ov_SC06_013_jr_8015C32C.c
+4 -4
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_8019AAC0;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_8019AAC0;
RotMatrixYXZ(rot, D_8019AAC0);
func_80048D9C(D_8019AAC0, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80181C68);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
src/ov_SC06_014/ov_SC06_014_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801A14D8;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801A14D8;
RotMatrixYXZ(rot, D_801A14D8);
func_80048D9C(D_801A14D8, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80182FCC);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80182FC0, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80182F80);
src/ov_SC06_015/ov_SC06_015_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801948B8;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801948B8;
RotMatrixYXZ(rot, D_801948B8);
func_80048D9C(D_801948B8, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80181B24);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80181B18, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80181AD8);
src/ov_SC06_016/ov_SC06_016_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801A0128;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801A0128;
RotMatrixYXZ(rot, D_801A0128);
func_80048D9C(D_801A0128, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80187F34);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80187F28, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80187EE8);
src/ov_SC06_018/ov_SC06_018_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801D5A58;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801D5A58;
RotMatrixYXZ(rot, D_801D5A58);
func_80048D9C(D_801D5A58, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80196670);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80196664, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80196624);
src/ov_SC06_020/ov_SC06_020_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801BA8A8;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801BA8A8;
RotMatrixYXZ(rot, D_801BA8A8);
func_80048D9C(D_801BA8A8, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801880F8);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_801880EC, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_801880AC);
src/ov_SC06_022/ov_SC06_022_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801E2128;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801E2128;
RotMatrixYXZ(rot, D_801E2128);
func_80048D9C(D_801E2128, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801903B4);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_801903A8, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80190368);
src/ov_SC06_025/ov_SC06_025_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801B2140;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801B2140;
RotMatrixYXZ(rot, D_801B2140);
func_80048D9C(D_801B2140, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80187D30);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80187D24, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80187CE4);
src/ov_SC06_027/ov_SC06_027_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_8019D2E8;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_8019D2E8;
RotMatrixYXZ(rot, D_8019D2E8);
func_80048D9C(D_8019D2E8, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80181070);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80181064, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80181024);
src/ov_SC06_029/ov_SC06_029_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801E2048;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801E2048;
RotMatrixYXZ(rot, D_801E2048);
func_80048D9C(D_801E2048, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_8018F604);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_8018F5F8, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_8018F5B8);
src/ov_SC06_030/ov_SC06_030_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801B9F40;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801B9F40;
RotMatrixYXZ(rot, D_801B9F40);
func_80048D9C(D_801B9F40, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80184EF4);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80184EE8, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80184EA8);
src/ov_SC06_032/ov_SC06_032_jr_80154C24.c
+17 -17
View File
@@ -964,7 +964,7 @@ s32 func_80155458(s32 param_1)
extern void (*D_80195194[])(void);
void func_80155580(void *a0) {
D_80195194[*(u16 *)((s32)a0 + 0x2)]();
D_80195194[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1149,7 +1149,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
extern void (*D_80195608[])(void);
void func_80157544(void *a0) {
D_80195608[*(u16 *)((s32)a0 + 0x2)]();
D_80195608[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1229,7 +1229,7 @@ extern u8 D_80195610;
void func_801578C0(s32 param_1)
{
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -1279,8 +1279,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -1303,7 +1303,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_80195620);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -1368,7 +1368,7 @@ void func_80157D20(void *param_1, s32 param_2)
extern void (*D_80195670[])(void);
void func_80157DC4(void *a0) {
D_80195670[*(u16 *)((s32)a0 + 0x2)]();
D_80195670[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1384,7 +1384,7 @@ void func_80157DC4(void *a0) {
extern void (*D_80195678[])(void);
void func_80157FC4(void *a0) {
D_80195678[*(u16 *)((s32)a0 + 0x2)]();
D_80195678[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1406,11 +1406,11 @@ extern s32 D_80195644;
void func_80158038(void * param)
{
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_80195644);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -1425,7 +1425,7 @@ void func_80158038(void * param)
extern void (*D_80195684[])(void);
void func_8015824C(void *a0) {
D_80195684[*(u16 *)((s32)a0 + 0x2)]();
D_80195684[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1463,15 +1463,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_80195654);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -1490,7 +1490,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -1596,5 +1596,5 @@ extern void (*D_801956C0[])(s32 *);
void func_80158880(s32 *param) {
func_80149020(param);
D_801956C0[*(u8 *)((s32)param + 0x4F)](param);
D_801956C0[((Unkstruct_80126B58 *)param)->unk4F](param);
}
src/ov_SC06_032/ov_SC06_032_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801D1028;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801D1028;
RotMatrixYXZ(rot, D_801D1028);
func_80048D9C(D_801D1028, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801963C0);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_801963B4, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80196374);
src/ov_SC06_033/ov_SC06_033_jr_80154C24.c
+17 -17
View File
@@ -964,7 +964,7 @@ s32 func_80155458(s32 param_1)
extern void (*D_801936A4[])(void);
void func_80155580(void *a0) {
D_801936A4[*(u16 *)((s32)a0 + 0x2)]();
D_801936A4[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1149,7 +1149,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
extern void (*D_80193B18[])(void);
void func_80157544(void *a0) {
D_80193B18[*(u16 *)((s32)a0 + 0x2)]();
D_80193B18[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1229,7 +1229,7 @@ extern u8 D_80193B20;
void func_801578C0(s32 param_1)
{
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -1279,8 +1279,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -1303,7 +1303,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_80193B30);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -1368,7 +1368,7 @@ void func_80157D20(void *param_1, s32 param_2)
extern void (*D_80193B80[])(void);
void func_80157DC4(void *a0) {
D_80193B80[*(u16 *)((s32)a0 + 0x2)]();
D_80193B80[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1384,7 +1384,7 @@ void func_80157DC4(void *a0) {
extern void (*D_80193B88[])(void);
void func_80157FC4(void *a0) {
D_80193B88[*(u16 *)((s32)a0 + 0x2)]();
D_80193B88[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1406,11 +1406,11 @@ extern s32 D_80193B54;
void func_80158038(void * param)
{
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_80193B54);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -1425,7 +1425,7 @@ void func_80158038(void * param)
extern void (*D_80193B94[])(void);
void func_8015824C(void *a0) {
D_80193B94[*(u16 *)((s32)a0 + 0x2)]();
D_80193B94[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1463,15 +1463,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_80193B64);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -1490,7 +1490,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -1596,5 +1596,5 @@ extern void (*D_80193BD0[])(s32 *);
void func_80158880(s32 *param) {
func_80149020(param);
D_80193BD0[*(u8 *)((s32)param + 0x4F)](param);
D_80193BD0[((Unkstruct_80126B58 *)param)->unk4F](param);
}
src/ov_SC06_033/ov_SC06_033_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801D0EA8;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801D0EA8;
RotMatrixYXZ(rot, D_801D0EA8);
func_80048D9C(D_801D0EA8, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801948D0);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_801948C4, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80194884);
src/ov_SC07_000/ov_SC07_000_jr_80154C24.c
+17 -17
View File
@@ -964,7 +964,7 @@ s32 func_80155458(s32 param_1)
extern void (*D_801844EC[])(void);
void func_80155580(void *a0) {
D_801844EC[*(u16 *)((s32)a0 + 0x2)]();
D_801844EC[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1149,7 +1149,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
extern void (*D_80184960[])(void);
void func_80157544(void *a0) {
D_80184960[*(u16 *)((s32)a0 + 0x2)]();
D_80184960[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1229,7 +1229,7 @@ extern u8 D_80184968;
void func_801578C0(s32 param_1)
{
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -1279,8 +1279,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -1303,7 +1303,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_80184978);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -1368,7 +1368,7 @@ void func_80157D20(void *param_1, s32 param_2)
extern void (*D_801849C8[])(void);
void func_80157DC4(void *a0) {
D_801849C8[*(u16 *)((s32)a0 + 0x2)]();
D_801849C8[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1384,7 +1384,7 @@ void func_80157DC4(void *a0) {
extern void (*D_801849D0[])(void);
void func_80157FC4(void *a0) {
D_801849D0[*(u16 *)((s32)a0 + 0x2)]();
D_801849D0[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1406,11 +1406,11 @@ extern s32 D_8018499C;
void func_80158038(void * param)
{
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_8018499C);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -1425,7 +1425,7 @@ void func_80158038(void * param)
extern void (*D_801849DC[])(void);
void func_8015824C(void *a0) {
D_801849DC[*(u16 *)((s32)a0 + 0x2)]();
D_801849DC[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1463,15 +1463,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_801849AC);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -1490,7 +1490,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -1596,5 +1596,5 @@ extern void (*D_80184A18[])(s32 *);
void func_80158880(s32 *param) {
func_80149020(param);
D_80184A18[*(u8 *)((s32)param + 0x4F)](param);
D_80184A18[((Unkstruct_80126B58 *)param)->unk4F](param);
}
src/ov_SC07_000/ov_SC07_000_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801D0B98;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801D0B98;
RotMatrixYXZ(rot, D_801D0B98);
func_80048D9C(D_801D0B98, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80185718);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_8018570C, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_801856CC);
src/ov_SC07_001/ov_SC07_001_jr_80154C24.c
+17 -17
View File
@@ -964,7 +964,7 @@ s32 func_80155458(s32 param_1)
extern void (*D_8018339C[])(void);
void func_80155580(void *a0) {
D_8018339C[*(u16 *)((s32)a0 + 0x2)]();
D_8018339C[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1149,7 +1149,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
extern void (*D_80183810[])(void);
void func_80157544(void *a0) {
D_80183810[*(u16 *)((s32)a0 + 0x2)]();
D_80183810[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1229,7 +1229,7 @@ extern u8 D_80183818;
void func_801578C0(s32 param_1)
{
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -1279,8 +1279,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -1303,7 +1303,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_80183828);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -1368,7 +1368,7 @@ void func_80157D20(void *param_1, s32 param_2)
extern void (*D_80183878[])(void);
void func_80157DC4(void *a0) {
D_80183878[*(u16 *)((s32)a0 + 0x2)]();
D_80183878[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1384,7 +1384,7 @@ void func_80157DC4(void *a0) {
extern void (*D_80183880[])(void);
void func_80157FC4(void *a0) {
D_80183880[*(u16 *)((s32)a0 + 0x2)]();
D_80183880[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1406,11 +1406,11 @@ extern s32 D_8018384C;
void func_80158038(void * param)
{
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_8018384C);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -1425,7 +1425,7 @@ void func_80158038(void * param)
extern void (*D_8018388C[])(void);
void func_8015824C(void *a0) {
D_8018388C[*(u16 *)((s32)a0 + 0x2)]();
D_8018388C[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1463,15 +1463,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_8018385C);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -1490,7 +1490,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -1596,5 +1596,5 @@ extern void (*D_801838C8[])(s32 *);
void func_80158880(s32 *param) {
func_80149020(param);
D_801838C8[*(u8 *)((s32)param + 0x4F)](param);
D_801838C8[((Unkstruct_80126B58 *)param)->unk4F](param);
}
src/ov_SC07_001/ov_SC07_001_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801AADC8;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801AADC8;
RotMatrixYXZ(rot, D_801AADC8);
func_80048D9C(D_801AADC8, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801845C8);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_801845BC, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_8018457C);
src/ov_SC07_002/ov_SC07_002_jr_80154C24.c
+17 -17
View File
@@ -964,7 +964,7 @@ s32 func_80155458(s32 param_1)
extern void (*D_80188658[])(void);
void func_80155580(void *a0) {
D_80188658[*(u16 *)((s32)a0 + 0x2)]();
D_80188658[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1149,7 +1149,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
extern void (*D_80188ACC[])(void);
void func_80157544(void *a0) {
D_80188ACC[*(u16 *)((s32)a0 + 0x2)]();
D_80188ACC[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1229,7 +1229,7 @@ extern u8 D_80188AD4;
void func_801578C0(s32 param_1)
{
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -1279,8 +1279,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -1303,7 +1303,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_80188AE4);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -1368,7 +1368,7 @@ void func_80157D20(void *param_1, s32 param_2)
extern void (*D_80188B34[])(void);
void func_80157DC4(void *a0) {
D_80188B34[*(u16 *)((s32)a0 + 0x2)]();
D_80188B34[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1384,7 +1384,7 @@ void func_80157DC4(void *a0) {
extern void (*D_80188B3C[])(void);
void func_80157FC4(void *a0) {
D_80188B3C[*(u16 *)((s32)a0 + 0x2)]();
D_80188B3C[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1406,11 +1406,11 @@ extern s32 D_80188B08;
void func_80158038(void * param)
{
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_80188B08);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -1425,7 +1425,7 @@ void func_80158038(void * param)
extern void (*D_80188B48[])(void);
void func_8015824C(void *a0) {
D_80188B48[*(u16 *)((s32)a0 + 0x2)]();
D_80188B48[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1463,15 +1463,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_80188B18);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -1490,7 +1490,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -1596,5 +1596,5 @@ extern void (*D_80188B84[])(s32 *);
void func_80158880(s32 *param) {
func_80149020(param);
D_80188B84[*(u8 *)((s32)param + 0x4F)](param);
D_80188B84[((Unkstruct_80126B58 *)param)->unk4F](param);
}
src/ov_SC07_006/ov_SC07_006_jr_80154C24.c
+17 -17
View File
@@ -1861,7 +1861,7 @@ s32 func_80155458(s32 param_1)
void func_80155580(void *a0) {
extern void (*D_8018C27C[])(void);
D_8018C27C[*(u16 *)((s32)a0 + 0x2)]();
D_8018C27C[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2109,7 +2109,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
void func_80157544(void *a0) {
extern void (*D_8018C6F0[])(void);
D_8018C6F0[*(u16 *)((s32)a0 + 0x2)]();
D_8018C6F0[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2205,7 +2205,7 @@ void func_801578C0(s32 param_1)
extern u8 D_800D5128;
extern u8 D_8018C6F8;
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -2255,8 +2255,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -2279,7 +2279,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_8018C708);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -2351,7 +2351,7 @@ void func_80157D20(void *param_1, s32 param_2)
void func_80157DC4(void *a0) {
extern void (*D_8018C758[])(void);
D_8018C758[*(u16 *)((s32)a0 + 0x2)]();
D_8018C758[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2372,7 +2372,7 @@ void func_80157DC4(void *a0) {
void func_80157FC4(void *a0) {
extern void (*D_8018C760[])(void);
D_8018C760[*(u16 *)((s32)a0 + 0x2)]();
D_8018C760[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2396,11 +2396,11 @@ void func_80158038(void * param)
extern s32 D_800D51E0;
extern s32 D_8018C72C;
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_8018C72C);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -2418,7 +2418,7 @@ void func_80158038(void * param)
void func_8015824C(void *a0) {
extern void (*D_8018C76C[])(void);
D_8018C76C[*(u16 *)((s32)a0 + 0x2)]();
D_8018C76C[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2460,15 +2460,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_8018C73C);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -2487,7 +2487,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -2600,5 +2600,5 @@ void func_80158880(s32 *param) {
extern void (*D_8018C7A8[])(s32 *);
func_80149020(param);
D_8018C7A8[*(u8 *)((s32)param + 0x4F)](param);
D_8018C7A8[((Unkstruct_80126B58 *)param)->unk4F](param);
}
src/ov_SC07_007/ov_SC07_007_jr_80154C24.c
+17 -17
View File
@@ -1861,7 +1861,7 @@ s32 func_80155458(s32 param_1)
void func_80155580(void *a0) {
extern void (*D_80184DA0[])(void);
D_80184DA0[*(u16 *)((s32)a0 + 0x2)]();
D_80184DA0[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2078,7 +2078,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
void func_80157544(void *a0) {
extern void (*D_80185214[])(void);
D_80185214[*(u16 *)((s32)a0 + 0x2)]();
D_80185214[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2174,7 +2174,7 @@ void func_801578C0(s32 param_1)
extern u8 D_800D5128;
extern u8 D_8018521C;
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -2224,8 +2224,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -2248,7 +2248,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_8018522C);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -2320,7 +2320,7 @@ void func_80157D20(void *param_1, s32 param_2)
void func_80157DC4(void *a0) {
extern void (*D_8018527C[])(void);
D_8018527C[*(u16 *)((s32)a0 + 0x2)]();
D_8018527C[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2341,7 +2341,7 @@ void func_80157DC4(void *a0) {
void func_80157FC4(void *a0) {
extern void (*D_80185284[])(void);
D_80185284[*(u16 *)((s32)a0 + 0x2)]();
D_80185284[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2365,11 +2365,11 @@ void func_80158038(void * param)
extern s32 D_800D51E0;
extern s32 D_80185250;
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_80185250);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -2387,7 +2387,7 @@ void func_80158038(void * param)
void func_8015824C(void *a0) {
extern void (*D_80185290[])(void);
D_80185290[*(u16 *)((s32)a0 + 0x2)]();
D_80185290[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2429,15 +2429,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_80185260);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -2456,7 +2456,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -2569,5 +2569,5 @@ void func_80158880(s32 *param) {
extern void (*D_801852CC[])(s32 *);
func_80149020(param);
D_801852CC[*(u8 *)((s32)param + 0x4F)](param);
D_801852CC[((Unkstruct_80126B58 *)param)->unk4F](param);
}
src/ov_SC07_008/ov_SC07_008_jr_80154C24.c
+17 -17
View File
@@ -964,7 +964,7 @@ s32 func_80155458(s32 param_1)
extern void (*D_8017F170[])(void);
void func_80155580(void *a0) {
D_8017F170[*(u16 *)((s32)a0 + 0x2)]();
D_8017F170[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1149,7 +1149,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
extern void (*D_8017F5E4[])(void);
void func_80157544(void *a0) {
D_8017F5E4[*(u16 *)((s32)a0 + 0x2)]();
D_8017F5E4[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1229,7 +1229,7 @@ extern u8 D_8017F5EC;
void func_801578C0(s32 param_1)
{
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -1279,8 +1279,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -1303,7 +1303,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_8017F5FC);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -1368,7 +1368,7 @@ void func_80157D20(void *param_1, s32 param_2)
extern void (*D_8017F64C[])(void);
void func_80157DC4(void *a0) {
D_8017F64C[*(u16 *)((s32)a0 + 0x2)]();
D_8017F64C[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1384,7 +1384,7 @@ void func_80157DC4(void *a0) {
extern void (*D_8017F654[])(void);
void func_80157FC4(void *a0) {
D_8017F654[*(u16 *)((s32)a0 + 0x2)]();
D_8017F654[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1406,11 +1406,11 @@ extern s32 D_8017F620;
void func_80158038(void * param)
{
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_8017F620);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -1425,7 +1425,7 @@ void func_80158038(void * param)
extern void (*D_8017F660[])(void);
void func_8015824C(void *a0) {
D_8017F660[*(u16 *)((s32)a0 + 0x2)]();
D_8017F660[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1463,15 +1463,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_8017F630);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -1490,7 +1490,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -1596,5 +1596,5 @@ extern void (*D_8017F69C[])(s32 *);
void func_80158880(s32 *param) {
func_80149020(param);
D_8017F69C[*(u8 *)((s32)param + 0x4F)](param);
D_8017F69C[((Unkstruct_80126B58 *)param)->unk4F](param);
}
src/ov_SC07_008/ov_SC07_008_jr_8015C32C.c
+6 -6
View File
@@ -5846,12 +5846,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_80196600;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_80196600;
RotMatrixYXZ(rot, D_80196600);
func_80048D9C(D_80196600, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_8018039C);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5890,10 +5890,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80180390, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80180350);
src/ov_SC07_009/ov_SC07_009_jr_80154C24.c
+17 -17
View File
@@ -964,7 +964,7 @@ s32 func_80155458(s32 param_1)
extern void (*D_8017FC14[])(void);
void func_80155580(void *a0) {
D_8017FC14[*(u16 *)((s32)a0 + 0x2)]();
D_8017FC14[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1149,7 +1149,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
extern void (*D_80180088[])(void);
void func_80157544(void *a0) {
D_80180088[*(u16 *)((s32)a0 + 0x2)]();
D_80180088[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1229,7 +1229,7 @@ extern u8 D_80180090;
void func_801578C0(s32 param_1)
{
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -1279,8 +1279,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -1303,7 +1303,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_801800A0);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -1368,7 +1368,7 @@ void func_80157D20(void *param_1, s32 param_2)
extern void (*D_801800F0[])(void);
void func_80157DC4(void *a0) {
D_801800F0[*(u16 *)((s32)a0 + 0x2)]();
D_801800F0[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1384,7 +1384,7 @@ void func_80157DC4(void *a0) {
extern void (*D_801800F8[])(void);
void func_80157FC4(void *a0) {
D_801800F8[*(u16 *)((s32)a0 + 0x2)]();
D_801800F8[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1406,11 +1406,11 @@ extern s32 D_801800C4;
void func_80158038(void * param)
{
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_801800C4);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -1425,7 +1425,7 @@ void func_80158038(void * param)
extern void (*D_80180104[])(void);
void func_8015824C(void *a0) {
D_80180104[*(u16 *)((s32)a0 + 0x2)]();
D_80180104[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1463,15 +1463,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_801800D4);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -1490,7 +1490,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -1596,5 +1596,5 @@ extern void (*D_80180140[])(s32 *);
void func_80158880(s32 *param) {
func_80149020(param);
D_80180140[*(u8 *)((s32)param + 0x4F)](param);
D_80180140[((Unkstruct_80126B58 *)param)->unk4F](param);
}
src/ov_SC07_009/ov_SC07_009_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801A3C90;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801A3C90;
RotMatrixYXZ(rot, D_801A3C90);
func_80048D9C(D_801A3C90, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80180E40);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80180E34, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80180DF4);
src/ov_SC07_010/ov_SC07_010_jr_80154C24.c
+17 -17
View File
@@ -1282,7 +1282,7 @@ s32 func_80155458(s32 param_1)
void func_80155580(void *a0) {
extern void (*D_80183E30[])(void);
D_80183E30[*(u16 *)((s32)a0 + 0x2)]();
D_80183E30[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1499,7 +1499,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
void func_80157544(void *a0) {
extern void (*D_801842A4[])(void);
D_801842A4[*(u16 *)((s32)a0 + 0x2)]();
D_801842A4[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1595,7 +1595,7 @@ void func_801578C0(s32 param_1)
extern u8 D_800D5128;
extern u8 D_801842AC;
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -1645,8 +1645,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -1669,7 +1669,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_801842BC);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -1741,7 +1741,7 @@ void func_80157D20(void *param_1, s32 param_2)
void func_80157DC4(void *a0) {
extern void (*D_8018430C[])(void);
D_8018430C[*(u16 *)((s32)a0 + 0x2)]();
D_8018430C[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1762,7 +1762,7 @@ void func_80157DC4(void *a0) {
void func_80157FC4(void *a0) {
extern void (*D_80184314[])(void);
D_80184314[*(u16 *)((s32)a0 + 0x2)]();
D_80184314[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1786,11 +1786,11 @@ void func_80158038(void * param)
extern s32 D_800D51E0;
extern s32 D_801842E0;
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_801842E0);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -1808,7 +1808,7 @@ void func_80158038(void * param)
void func_8015824C(void *a0) {
extern void (*D_80184320[])(void);
D_80184320[*(u16 *)((s32)a0 + 0x2)]();
D_80184320[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1850,15 +1850,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_801842F0);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -1877,7 +1877,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -1990,5 +1990,5 @@ void func_80158880(s32 *param) {
extern void (*D_8018435C[])(s32 *);
func_80149020(param);
D_8018435C[*(u8 *)((s32)param + 0x4F)](param);
D_8018435C[((Unkstruct_80126B58 *)param)->unk4F](param);
}
src/ov_SC07_010/ov_SC07_010_jr_8015C32C.c
+9 -9
View File
@@ -6509,12 +6509,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801A9400;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801A9400;
RotMatrixYXZ(rot, D_801A9400);
func_80048D9C(D_801A9400, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_8018505C);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -6559,11 +6559,11 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80185050, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
*(short *)(iVar1 + 0x18) = 0x2000;
*(char *)(iVar1 + 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
*(char *)(iVar1 + 0x24) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk18 = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk26 = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk24 = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80185010);
*(short *)(param_1 + 2) = *(short *)(param_1 + 2) + 1;
src/ov_SC07_011/ov_SC07_011_jr_80154C24.c
+17 -17
View File
@@ -1862,7 +1862,7 @@ s32 func_80155458(s32 param_1)
void func_80155580(void *a0) {
extern void (*D_801804F0[])(void);
D_801804F0[*(u16 *)((s32)a0 + 0x2)]();
D_801804F0[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2079,7 +2079,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
void func_80157544(void *a0) {
extern void (*D_80180964[])(void);
D_80180964[*(u16 *)((s32)a0 + 0x2)]();
D_80180964[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2175,7 +2175,7 @@ void func_801578C0(s32 param_1)
extern u8 D_800D5128;
extern u8 D_8018096C;
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -2225,8 +2225,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -2249,7 +2249,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_8018097C);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -2321,7 +2321,7 @@ void func_80157D20(void *param_1, s32 param_2)
void func_80157DC4(void *a0) {
extern void (*D_801809CC[])(void);
D_801809CC[*(u16 *)((s32)a0 + 0x2)]();
D_801809CC[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2342,7 +2342,7 @@ void func_80157DC4(void *a0) {
void func_80157FC4(void *a0) {
extern void (*D_801809D4[])(void);
D_801809D4[*(u16 *)((s32)a0 + 0x2)]();
D_801809D4[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2366,11 +2366,11 @@ void func_80158038(void * param)
extern s32 D_800D51E0;
extern s32 D_801809A0;
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_801809A0);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -2388,7 +2388,7 @@ void func_80158038(void * param)
void func_8015824C(void *a0) {
extern void (*D_801809E0[])(void);
D_801809E0[*(u16 *)((s32)a0 + 0x2)]();
D_801809E0[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2430,15 +2430,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_801809B0);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -2457,7 +2457,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -2570,5 +2570,5 @@ void func_80158880(s32 *param) {
extern void (*D_80180A1C[])(s32 *);
func_80149020(param);
D_80180A1C[*(u8 *)((s32)param + 0x4F)](param);
D_80180A1C[((Unkstruct_80126B58 *)param)->unk4F](param);
}