From c36cb498002f1ecbedd420beac9ec9def05f4f70 Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Wed, 30 Sep 2026 10:30:17 -0600 Subject: [PATCH] T5.1.c2b: lift_types --census: batch ov-block moved (694 groups, 1044 defs) --- include/struct_types.h | 7 + src/800.c | 2 +- src/md_MAIN_039/md_MAIN_039.c | 1 - src/md_SC03_076/md_SC03_076.c | 3 +- src/md_SC03_076/md_SC03_076_jr_801F218C.c | 1 - src/md_SC03_077/md_SC03_077.c | 1 - src/md_SC03_077/md_SC03_077_jr_801EFB58.c | 1 - src/md_SC03_079/md_SC03_079.c | 1 - src/md_SC03_132/md_SC03_132.c | 1 - src/md_SC03_135/md_SC03_135.c | 3 +- src/md_SC03_135/md_SC03_135_jr_801E5358.c | 1 - src/md_SC03_136/md_SC03_136.c | 1 - src/md_SC03_136/md_SC03_136_jr_801E2CD0.c | 1 - src/md_SC04_024/md_SC04_024.c | 1 - src/md_SC04_025/md_SC04_025.c | 1 - src/md_SC04_026/md_SC04_026.c | 1 - src/md_SC04_027/md_SC04_027.c | 3 +- src/md_SC04_027/md_SC04_027_jr_801EA8C0.c | 1 - src/md_SC04_028/md_SC04_028.c | 1 - src/md_SC04_028/md_SC04_028_jr_801E8238.c | 1 - src/md_SC04_029/md_SC04_029.c | 1 - src/md_SC04_030/md_SC04_030.c | 1 - src/md_SC05_023/md_SC05_023.c | 1 - src/md_SC05_024/md_SC05_024.c | 1 - src/md_SC05_025/md_SC05_025.c | 1 - src/md_SC05_026/md_SC05_026.c | 3 +- src/md_SC05_026/md_SC05_026_jr_801F0748.c | 1 - src/md_SC05_027/md_SC05_027.c | 1 - src/md_SC05_027/md_SC05_027_jr_801EE0C0.c | 1 - src/md_SC05_028/md_SC05_028.c | 1 - src/md_SC05_029/md_SC05_029.c | 1 - src/ov_MAIN_012/ov_MAIN_012_jr_80131340.c | 6 +- src/ov_MAIN_012/ov_MAIN_012_jr_80135A4C.c | 1 - src/ov_MAIN_012/ov_MAIN_012_jr_801458E0.c | 7 - src/ov_MAIN_012/ov_MAIN_012_jr_8017CA18.c | 2 +- src/ov_MAIN_012/ov_MAIN_012_jr_8017CF3C.c | 20 +- src/ov_SC01_000/ov_SC01_000_after.c | 7 - src/ov_SC01_000/ov_SC01_000_jr_8012ACE0.c | 6 +- src/ov_SC01_000/ov_SC01_000_jr_80135A4C.c | 1 - src/ov_SC01_000/ov_SC01_000_jr_8017BEBC.c | 1 - src/ov_SC01_001/ov_SC01_001_after.c | 7 - src/ov_SC01_001/ov_SC01_001_jr_8012ACE0.c | 6 +- src/ov_SC01_001/ov_SC01_001_jr_80135A4C.c | 1 - src/ov_SC01_004/ov_SC01_004_after.c | 7 - src/ov_SC01_004/ov_SC01_004_jr_8012ACE0.c | 6 +- src/ov_SC01_004/ov_SC01_004_jr_80135A4C.c | 1 - src/ov_SC01_004/ov_SC01_004_jr_8017BE9C.c | 1 - src/ov_SC01_005/ov_SC01_005_after.c | 7 - src/ov_SC01_005/ov_SC01_005_jr_8012ACE0.c | 6 +- src/ov_SC01_005/ov_SC01_005_jr_80135A4C.c | 1 - src/ov_SC01_005/ov_SC01_005_jr_8017C340.c | 1 - src/ov_SC01_008/ov_SC01_008_after.c | 7 - src/ov_SC01_008/ov_SC01_008_jr_8012ACE0.c | 6 +- src/ov_SC01_008/ov_SC01_008_jr_80135A4C.c | 1 - src/ov_SC01_008/ov_SC01_008_jr_8017BE9C.c | 1 - src/ov_SC01_009/ov_SC01_009_after.c | 7 - src/ov_SC01_009/ov_SC01_009_jr_8012ACE0.c | 6 +- src/ov_SC01_009/ov_SC01_009_jr_80135A4C.c | 1 - src/ov_SC01_009/ov_SC01_009_jr_8017BE9C.c | 1 - src/ov_SC01_009/ov_SC01_009_jr_8018057C.c | 24 - src/ov_SC01_074/ov_SC01_074_after.c | 7 - src/ov_SC01_074/ov_SC01_074_jr_8012ACE0.c | 6 +- src/ov_SC01_074/ov_SC01_074_jr_80135A4C.c | 1 - src/ov_SC01_074/ov_SC01_074_jr_8017BE9C.c | 1 - src/ov_SC01_077/ov_SC01_077_after.c | 7 - src/ov_SC01_077/ov_SC01_077_jr_8012ACE0.c | 6 +- src/ov_SC01_077/ov_SC01_077_jr_80135A4C.c | 1 - src/ov_SC01_077/ov_SC01_077_jr_80181F08.c | 1 - src/ov_SC01_077/ov_SC01_077_jr_80183CF4.c | 1 - src/ov_SC01_080/ov_SC01_080_after.c | 7 - src/ov_SC01_080/ov_SC01_080_jr_8012ACE0.c | 6 +- src/ov_SC01_080/ov_SC01_080_jr_80135A4C.c | 1 - src/ov_SC01_080/ov_SC01_080_jr_8017AE2C.c | 10 - src/ov_SC01_084/ov_SC01_084_after.c | 7 - src/ov_SC01_084/ov_SC01_084_jr_8012ACE0.c | 6 +- src/ov_SC01_084/ov_SC01_084_jr_80135A4C.c | 1 - src/ov_SC01_084/ov_SC01_084_jr_8017CA80.c | 5 +- src/ov_SC01_084/ov_SC01_084_jr_8017F690.c | 12 +- src/ov_SC01_084/ov_SC01_084_jr_80182A00.c | 4 +- src/ov_SC02_000/ov_SC02_000_after.c | 7 - src/ov_SC02_000/ov_SC02_000_jr_8012ACE0.c | 6 +- src/ov_SC02_000/ov_SC02_000_jr_80135A4C.c | 1 - src/ov_SC02_000/ov_SC02_000_jr_8017F950.c | 1 - src/ov_SC02_000/ov_SC02_000_jr_8018173C.c | 1 - src/ov_SC02_000/ov_SC02_000_jr_80187B40.c | 13 +- src/ov_SC02_004/ov_SC02_004_after.c | 7 - src/ov_SC02_004/ov_SC02_004_jr_8012ACE0.c | 6 +- src/ov_SC02_004/ov_SC02_004_jr_80135A4C.c | 1 - src/ov_SC02_005/ov_SC02_005_after.c | 7 - src/ov_SC02_005/ov_SC02_005_jr_8012ACE0.c | 6 +- src/ov_SC02_005/ov_SC02_005_jr_80135A4C.c | 1 - src/ov_SC02_005/ov_SC02_005_jr_8017CF90.c | 11 - src/ov_SC02_005/ov_SC02_005_jr_80185060.c | 1 - src/ov_SC02_005/ov_SC02_005_jr_80185E80.c | 7 - src/ov_SC02_011/ov_SC02_011_after.c | 7 - src/ov_SC02_011/ov_SC02_011_jr_8012ACE0.c | 6 +- src/ov_SC02_011/ov_SC02_011_jr_80135A4C.c | 1 - src/ov_SC02_011/ov_SC02_011_jr_8017AE2C.c | 3 - src/ov_SC02_011/ov_SC02_011_jr_80183178.c | 3 +- src/ov_SC02_015/ov_SC02_015_after.c | 7 - src/ov_SC02_015/ov_SC02_015_jr_8012ACE0.c | 6 +- src/ov_SC02_015/ov_SC02_015_jr_80135A4C.c | 1 - src/ov_SC02_016/ov_SC02_016_after.c | 7 - src/ov_SC02_016/ov_SC02_016_jr_8012ACE0.c | 6 +- src/ov_SC02_016/ov_SC02_016_jr_80135A4C.c | 1 - src/ov_SC02_016/ov_SC02_016_jr_8017DC70.c | 1 - src/ov_SC02_017/ov_SC02_017_after.c | 7 - src/ov_SC02_017/ov_SC02_017_jr_8012ACE0.c | 6 +- src/ov_SC02_017/ov_SC02_017_jr_80135A4C.c | 1 - src/ov_SC02_017/ov_SC02_017_jr_8017DF34.c | 1 - src/ov_SC02_021/ov_SC02_021_after.c | 7 - src/ov_SC02_021/ov_SC02_021_jr_8012ACE0.c | 6 +- src/ov_SC02_021/ov_SC02_021_jr_80135A4C.c | 1 - src/ov_SC02_021/ov_SC02_021_jr_8017C294.c | 9 - src/ov_SC02_026/ov_SC02_026_after.c | 7 - src/ov_SC02_026/ov_SC02_026_jr_8012ACE0.c | 6 +- src/ov_SC02_026/ov_SC02_026_jr_80135A4C.c | 1 - src/ov_SC02_026/ov_SC02_026_jr_8017C180.c | 19 +- src/ov_SC02_027/ov_SC02_027_after.c | 7 - src/ov_SC02_027/ov_SC02_027_jr_8012ACE0.c | 6 +- src/ov_SC02_027/ov_SC02_027_jr_80135A4C.c | 1 - src/ov_SC02_027/ov_SC02_027_jr_8017D898.c | 14 +- src/ov_SC02_028/ov_SC02_028_after.c | 7 - src/ov_SC02_028/ov_SC02_028_jr_8012ACE0.c | 6 +- src/ov_SC02_028/ov_SC02_028_jr_80135A4C.c | 1 - src/ov_SC02_028/ov_SC02_028_jr_8017D898.c | 3 - src/ov_SC02_028/ov_SC02_028_jr_80184BD8.c | 17 +- src/ov_SC02_031/ov_SC02_031_after.c | 7 - src/ov_SC02_031/ov_SC02_031_jr_8012ACE0.c | 6 +- src/ov_SC02_031/ov_SC02_031_jr_80135A4C.c | 1 - src/ov_SC02_031/ov_SC02_031_jr_8017AE2C.c | 1 - src/ov_SC02_035/ov_SC02_035_after.c | 7 - src/ov_SC02_035/ov_SC02_035_jr_8012ACE0.c | 6 +- src/ov_SC02_035/ov_SC02_035_jr_80135A4C.c | 1 - src/ov_SC02_037/ov_SC02_037_jr_80131340.c | 6 +- src/ov_SC02_037/ov_SC02_037_jr_80135A4C.c | 1 - src/ov_SC02_037/ov_SC02_037_jr_801458E0.c | 7 - src/ov_SC02_037/ov_SC02_037_jr_8017AE2C.c | 11 - src/ov_SC02_039/ov_SC02_039_after.c | 7 - src/ov_SC02_039/ov_SC02_039_jr_8012ACE0.c | 6 +- src/ov_SC02_039/ov_SC02_039_jr_80135A4C.c | 1 - src/ov_SC02_041/ov_SC02_041_after.c | 7 - src/ov_SC02_041/ov_SC02_041_jr_8012ACE0.c | 6 +- src/ov_SC02_041/ov_SC02_041_jr_80135A4C.c | 1 - src/ov_SC02_041/ov_SC02_041_jr_8017BEBC.c | 9 +- src/ov_SC03_001/ov_SC03_001_after.c | 7 - src/ov_SC03_001/ov_SC03_001_jr_8012ACE0.c | 6 +- src/ov_SC03_001/ov_SC03_001_jr_80135A4C.c | 1 - src/ov_SC03_001/ov_SC03_001_jr_8018631C.c | 1 - src/ov_SC03_001/ov_SC03_001_jr_801870B0.c | 2 +- src/ov_SC03_001/ov_SC03_001_jr_8018B8DC.c | 21 +- src/ov_SC03_002/ov_SC03_002_after.c | 7 - src/ov_SC03_002/ov_SC03_002_jr_8012ACE0.c | 6 +- src/ov_SC03_002/ov_SC03_002_jr_80135A4C.c | 1 - src/ov_SC03_002/ov_SC03_002_jr_8017D604.c | 6 - src/ov_SC03_002/ov_SC03_002_jr_80181D78.c | 2 +- src/ov_SC03_003/ov_SC03_003_after.c | 7 - src/ov_SC03_003/ov_SC03_003_jr_8012ACE0.c | 6 +- src/ov_SC03_003/ov_SC03_003_jr_80135A4C.c | 1 - src/ov_SC03_003/ov_SC03_003_jr_8017D5C0.c | 1 - src/ov_SC03_006/ov_SC03_006_after.c | 7 - src/ov_SC03_006/ov_SC03_006_jr_8012ACE0.c | 6 +- src/ov_SC03_006/ov_SC03_006_jr_80135A4C.c | 1 - src/ov_SC03_006/ov_SC03_006_jr_8017AE2C.c | 11 - src/ov_SC03_007/ov_SC03_007_after.c | 7 - src/ov_SC03_007/ov_SC03_007_jr_8012ACE0.c | 6 +- src/ov_SC03_007/ov_SC03_007_jr_80135A4C.c | 1 - src/ov_SC03_007/ov_SC03_007_jr_8017AE2C.c | 3 - src/ov_SC03_010/ov_SC03_010_after.c | 7 - src/ov_SC03_010/ov_SC03_010_jr_8012ACE0.c | 6 +- src/ov_SC03_010/ov_SC03_010_jr_80135A4C.c | 1 - src/ov_SC03_011/ov_SC03_011_after.c | 7 - src/ov_SC03_011/ov_SC03_011_jr_8012ACE0.c | 6 +- src/ov_SC03_011/ov_SC03_011_jr_80135A4C.c | 1 - src/ov_SC03_011/ov_SC03_011_jr_8017C730.c | 1 - src/ov_SC03_012/ov_SC03_012_after.c | 7 - src/ov_SC03_012/ov_SC03_012_jr_8012ACE0.c | 6 +- src/ov_SC03_012/ov_SC03_012_jr_80135A4C.c | 1 - src/ov_SC03_013/ov_SC03_013_after.c | 7 - src/ov_SC03_013/ov_SC03_013_jr_8012ACE0.c | 6 +- src/ov_SC03_013/ov_SC03_013_jr_80135A4C.c | 1 - src/ov_SC03_014/ov_SC03_014_after.c | 7 - src/ov_SC03_014/ov_SC03_014_jr_8012ACE0.c | 6 +- src/ov_SC03_014/ov_SC03_014_jr_80135A4C.c | 1 - src/ov_SC03_014/ov_SC03_014_jr_8017AE2C.c | 3 - src/ov_SC03_014/ov_SC03_014_jr_8017EB7C.c | 3 - src/ov_SC03_014/ov_SC03_014_jr_801848E4.c | 4 +- src/ov_SC03_023/ov_SC03_023_after.c | 7 - src/ov_SC03_023/ov_SC03_023_jr_8012ACE0.c | 6 +- src/ov_SC03_023/ov_SC03_023_jr_80135A4C.c | 1 - src/ov_SC03_024/ov_SC03_024_after.c | 7 - src/ov_SC03_024/ov_SC03_024_jr_8012ACE0.c | 6 +- src/ov_SC03_024/ov_SC03_024_jr_80135A4C.c | 1 - src/ov_SC03_024/ov_SC03_024_jr_8017AE2C.c | 1 - src/ov_SC03_024/ov_SC03_024_jr_8017DF84.c | 1 - src/ov_SC03_024/ov_SC03_024_jr_80183BF8.c | 1 - src/ov_SC03_028/ov_SC03_028_after.c | 7 - src/ov_SC03_028/ov_SC03_028_jr_8012ACE0.c | 6 +- src/ov_SC03_028/ov_SC03_028_jr_80135A4C.c | 1 - src/ov_SC03_029/ov_SC03_029_after.c | 7 - src/ov_SC03_029/ov_SC03_029_jr_8012ACE0.c | 6 +- src/ov_SC03_029/ov_SC03_029_jr_80135A4C.c | 1 - src/ov_SC03_029/ov_SC03_029_jr_8017DC70.c | 1 - src/ov_SC03_029/ov_SC03_029_jr_8017FF7C.c | 4 - src/ov_SC03_030/ov_SC03_030_after.c | 7 - src/ov_SC03_030/ov_SC03_030_jr_8012ACE0.c | 6 +- src/ov_SC03_030/ov_SC03_030_jr_80135A4C.c | 1 - src/ov_SC03_031/ov_SC03_031_after.c | 7 - src/ov_SC03_031/ov_SC03_031_jr_8012ACE0.c | 6 +- src/ov_SC03_031/ov_SC03_031_jr_80135A4C.c | 1 - src/ov_SC03_031/ov_SC03_031_jr_8017DB5C.c | 1 - src/ov_SC03_089/ov_SC03_089_after.c | 7 - src/ov_SC03_089/ov_SC03_089_jr_8012ACE0.c | 6 +- src/ov_SC03_089/ov_SC03_089_jr_80135A4C.c | 1 - src/ov_SC03_089/ov_SC03_089_jr_8017CA80.c | 1 - src/ov_SC03_090/ov_SC03_090_after.c | 7 - src/ov_SC03_090/ov_SC03_090_jr_8012ACE0.c | 6 +- src/ov_SC03_090/ov_SC03_090_jr_80135A4C.c | 1 - src/ov_SC03_090/ov_SC03_090_jr_8017CA80.c | 1 - src/ov_SC03_091/ov_SC03_091_after.c | 7 - src/ov_SC03_091/ov_SC03_091_jr_8012ACE0.c | 6 +- src/ov_SC03_091/ov_SC03_091_jr_80135A4C.c | 1 - src/ov_SC03_091/ov_SC03_091_jr_8017D898.c | 1 - src/ov_SC03_091/ov_SC03_091_jr_80182268.c | 1 - src/ov_SC03_091/ov_SC03_091_jr_8018326C.c | 1 - src/ov_SC03_092/ov_SC03_092_after.c | 7 - src/ov_SC03_092/ov_SC03_092_jr_8012ACE0.c | 6 +- src/ov_SC03_092/ov_SC03_092_jr_80135A4C.c | 1 - src/ov_SC03_092/ov_SC03_092_jr_8017AE2C.c | 5 - src/ov_SC03_093/ov_SC03_093_after.c | 7 - src/ov_SC03_093/ov_SC03_093_jr_8012ACE0.c | 6 +- src/ov_SC03_093/ov_SC03_093_jr_80135A4C.c | 1 - src/ov_SC03_093/ov_SC03_093_jr_801825B8.c | 1 - src/ov_SC03_094/ov_SC03_094_after.c | 7 - src/ov_SC03_094/ov_SC03_094_jr_8012ACE0.c | 6 +- src/ov_SC03_094/ov_SC03_094_jr_80135A4C.c | 1 - src/ov_SC03_095/ov_SC03_095_after.c | 7 - src/ov_SC03_095/ov_SC03_095_jr_8012ACE0.c | 6 +- src/ov_SC03_095/ov_SC03_095_jr_80135A4C.c | 1 - src/ov_SC03_095/ov_SC03_095_jr_8017BEBC.c | 1 - src/ov_SC03_096/ov_SC03_096_after.c | 7 - src/ov_SC03_096/ov_SC03_096_jr_8012ACE0.c | 6 +- src/ov_SC03_096/ov_SC03_096_jr_80135A4C.c | 1 - src/ov_SC03_097/ov_SC03_097_after.c | 7 - src/ov_SC03_097/ov_SC03_097_jr_8012ACE0.c | 6 +- src/ov_SC03_097/ov_SC03_097_jr_80135A4C.c | 1 - src/ov_SC03_097/ov_SC03_097_jr_8017D898.c | 3 - src/ov_SC03_098/ov_SC03_098_after.c | 7 - src/ov_SC03_098/ov_SC03_098_jr_8012ACE0.c | 6 +- src/ov_SC03_098/ov_SC03_098_jr_80135A4C.c | 1 - src/ov_SC03_098/ov_SC03_098_jr_80184E24.c | 1 - src/ov_SC03_099/ov_SC03_099_after.c | 7 - src/ov_SC03_099/ov_SC03_099_jr_8012ACE0.c | 6 +- src/ov_SC03_099/ov_SC03_099_jr_80135A4C.c | 1 - src/ov_SC03_100/ov_SC03_100_after.c | 7 - src/ov_SC03_100/ov_SC03_100_jr_8012ACE0.c | 6 +- src/ov_SC03_100/ov_SC03_100_jr_80135A4C.c | 1 - src/ov_SC03_100/ov_SC03_100_jr_80183C10.c | 1 - src/ov_SC03_101/ov_SC03_101_after.c | 7 - src/ov_SC03_101/ov_SC03_101_jr_8012ACE0.c | 6 +- src/ov_SC03_101/ov_SC03_101_jr_80135A4C.c | 1 - src/ov_SC03_101/ov_SC03_101_jr_8017CA80.c | 3 - src/ov_SC03_102/ov_SC03_102_after.c | 25 - src/ov_SC03_102/ov_SC03_102_jr_8012ACE0.c | 6 +- src/ov_SC03_102/ov_SC03_102_jr_80135A4C.c | 1 - src/ov_SC03_102/ov_SC03_102_jr_8017BEBC.c | 3 - src/ov_SC03_102/ov_SC03_102_jr_801855D0.c | 1 - src/ov_SC03_103/ov_SC03_103_after.c | 7 - src/ov_SC03_103/ov_SC03_103_jr_8012ACE0.c | 6 +- src/ov_SC03_103/ov_SC03_103_jr_80135A4C.c | 1 - src/ov_SC03_103/ov_SC03_103_jr_8017C294.c | 1 - src/ov_SC03_103/ov_SC03_103_jr_80183C34.c | 1 - src/ov_SC03_104/ov_SC03_104_after.c | 7 - src/ov_SC03_104/ov_SC03_104_jr_8012ACE0.c | 6 +- src/ov_SC03_104/ov_SC03_104_jr_80135A4C.c | 1 - src/ov_SC03_104/ov_SC03_104_jr_8017CA80.c | 2 - src/ov_SC03_104/ov_SC03_104_jr_80182038.c | 2 - src/ov_SC03_104/ov_SC03_104_jr_80189FE4.c | 1 - src/ov_SC03_105/ov_SC03_105_after.c | 7 - src/ov_SC03_105/ov_SC03_105_jr_8012ACE0.c | 6 +- src/ov_SC03_105/ov_SC03_105_jr_80135A4C.c | 1 - src/ov_SC03_105/ov_SC03_105_jr_80181C84.c | 4 - src/ov_SC03_105/ov_SC03_105_jr_80186DDC.c | 11 - src/ov_SC03_105/ov_SC03_105_jr_80189798.c | 1 - src/ov_SC03_107/ov_SC03_107_jr_80131340.c | 6 +- src/ov_SC03_107/ov_SC03_107_jr_80135A4C.c | 1 - src/ov_SC03_107/ov_SC03_107_jr_801458E0.c | 7 - src/ov_SC03_107/ov_SC03_107_jr_801789AC.c | 9 - src/ov_SC03_108/ov_SC03_108_after.c | 7 - src/ov_SC03_108/ov_SC03_108_jr_8012ACE0.c | 6 +- src/ov_SC03_108/ov_SC03_108_jr_80135A4C.c | 1 - src/ov_SC03_108/ov_SC03_108_jr_8017F83C.c | 1 - src/ov_SC03_109/ov_SC03_109_after.c | 7 - src/ov_SC03_109/ov_SC03_109_jr_8012ACE0.c | 6 +- src/ov_SC03_109/ov_SC03_109_jr_80135A4C.c | 1 - src/ov_SC03_110/ov_SC03_110_after.c | 7 - src/ov_SC03_110/ov_SC03_110_jr_8012ACE0.c | 6 +- src/ov_SC03_110/ov_SC03_110_jr_80135A4C.c | 1 - src/ov_SC03_110/ov_SC03_110_jr_8017FBC8.c | 1 - src/ov_SC03_111/ov_SC03_111_after.c | 7 - src/ov_SC03_111/ov_SC03_111_jr_8012ACE0.c | 6 +- src/ov_SC03_111/ov_SC03_111_jr_80135A4C.c | 1 - src/ov_SC03_111/ov_SC03_111_jr_8017EC58.c | 1 - src/ov_SC03_112/ov_SC03_112_after.c | 7 - src/ov_SC03_112/ov_SC03_112_jr_8012ACE0.c | 6 +- src/ov_SC03_112/ov_SC03_112_jr_80135A4C.c | 1 - src/ov_SC03_112/ov_SC03_112_jr_801817E0.c | 1 - src/ov_SC03_113/ov_SC03_113_after.c | 7 - src/ov_SC03_113/ov_SC03_113_jr_8012ACE0.c | 6 +- src/ov_SC03_113/ov_SC03_113_jr_80135A4C.c | 1 - src/ov_SC03_114/ov_SC03_114_after.c | 7 - src/ov_SC03_114/ov_SC03_114_jr_8012ACE0.c | 6 +- src/ov_SC03_114/ov_SC03_114_jr_80135A4C.c | 1 - src/ov_SC03_115/ov_SC03_115_after.c | 7 - src/ov_SC03_115/ov_SC03_115_jr_8012ACE0.c | 6 +- src/ov_SC03_115/ov_SC03_115_jr_80135A4C.c | 1 - src/ov_SC03_115/ov_SC03_115_jr_8017BEBC.c | 1 - src/ov_SC03_116/ov_SC03_116_after.c | 7 - src/ov_SC03_116/ov_SC03_116_jr_8012ACE0.c | 6 +- src/ov_SC03_116/ov_SC03_116_jr_80135A4C.c | 1 - src/ov_SC03_116/ov_SC03_116_jr_8017AE2C.c | 3 - src/ov_SC03_117/ov_SC03_117_after.c | 7 - src/ov_SC03_117/ov_SC03_117_jr_8012ACE0.c | 6 +- src/ov_SC03_117/ov_SC03_117_jr_80135A4C.c | 1 - src/ov_SC03_117/ov_SC03_117_jr_8017BEBC.c | 1 - src/ov_SC03_118/ov_SC03_118_after.c | 7 - src/ov_SC03_118/ov_SC03_118_jr_8012ACE0.c | 6 +- src/ov_SC03_118/ov_SC03_118_jr_80135A4C.c | 1 - src/ov_SC03_118/ov_SC03_118_jr_8017AE2C.c | 1 - src/ov_SC03_118/ov_SC03_118_jr_8017FB84.c | 1 - src/ov_SC03_118/ov_SC03_118_jr_80183830.c | 4 - src/ov_SC03_118/ov_SC03_118_o0d.c | 36 - src/ov_SC03_121/ov_SC03_121_after.c | 7 - src/ov_SC03_121/ov_SC03_121_jr_8012ACE0.c | 6 +- src/ov_SC03_121/ov_SC03_121_jr_80135A4C.c | 1 - src/ov_SC03_124/ov_SC03_124_after.c | 7 - src/ov_SC03_124/ov_SC03_124_jr_8012ACE0.c | 6 +- src/ov_SC03_124/ov_SC03_124_jr_80135A4C.c | 1 - src/ov_SC03_124/ov_SC03_124_jr_8017AE2C.c | 1 - src/ov_SC03_124/ov_SC03_124_jr_80181B44.c | 2 +- src/ov_SC03_124/ov_SC03_124_jr_80188544.c | 21 +- src/ov_SC03_125/ov_SC03_125_after.c | 7 - src/ov_SC03_125/ov_SC03_125_jr_8012ACE0.c | 6 +- src/ov_SC03_125/ov_SC03_125_jr_80135A4C.c | 1 - src/ov_SC03_125/ov_SC03_125_jr_8017D604.c | 8 +- src/ov_SC04_000/ov_SC04_000_after.c | 7 - src/ov_SC04_000/ov_SC04_000_jr_8012ACE0.c | 6 +- src/ov_SC04_000/ov_SC04_000_jr_80135A4C.c | 1 - src/ov_SC04_000/ov_SC04_000_jr_8017BEBC.c | 2 - src/ov_SC04_002/ov_SC04_002_after.c | 7 - src/ov_SC04_002/ov_SC04_002_jr_8012ACE0.c | 6 +- src/ov_SC04_002/ov_SC04_002_jr_80135A4C.c | 1 - src/ov_SC04_002/ov_SC04_002_jr_8017BEBC.c | 11 +- src/ov_SC04_003/ov_SC04_003_after.c | 7 - src/ov_SC04_003/ov_SC04_003_jr_8012ACE0.c | 6 +- src/ov_SC04_003/ov_SC04_003_jr_80135A4C.c | 1 - src/ov_SC04_003/ov_SC04_003_jr_8017BEBC.c | 14 +- src/ov_SC04_004/ov_SC04_004_after.c | 7 - src/ov_SC04_004/ov_SC04_004_jr_8012ACE0.c | 6 +- src/ov_SC04_004/ov_SC04_004_jr_80135A4C.c | 1 - src/ov_SC04_004/ov_SC04_004_jr_8017AE2C.c | 1 - src/ov_SC04_005/ov_SC04_005_after.c | 7 - src/ov_SC04_005/ov_SC04_005_jr_8012ACE0.c | 6 +- src/ov_SC04_005/ov_SC04_005_jr_80135A4C.c | 1 - src/ov_SC04_005/ov_SC04_005_jr_8017BEBC.c | 10 +- src/ov_SC04_006/ov_SC04_006_after.c | 7 - src/ov_SC04_006/ov_SC04_006_jr_8012ACE0.c | 6 +- src/ov_SC04_006/ov_SC04_006_jr_80135A4C.c | 1 - src/ov_SC04_007/ov_SC04_007_after.c | 7 - src/ov_SC04_007/ov_SC04_007_jr_8012ACE0.c | 6 +- src/ov_SC04_007/ov_SC04_007_jr_80135A4C.c | 1 - src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c | 10 +- src/ov_SC04_008/ov_SC04_008_jr_8012ACE0.c | 6 +- src/ov_SC04_008/ov_SC04_008_jr_80135A4C.c | 1 - src/ov_SC04_009/ov_SC04_009_after.c | 7 - src/ov_SC04_009/ov_SC04_009_jr_8012ACE0.c | 6 +- src/ov_SC04_009/ov_SC04_009_jr_80135A4C.c | 1 - src/ov_SC04_010/ov_SC04_010_after.c | 7 - src/ov_SC04_010/ov_SC04_010_jr_8012ACE0.c | 6 +- src/ov_SC04_010/ov_SC04_010_jr_80135A4C.c | 1 - src/ov_SC04_011/ov_SC04_011_after.c | 7 - src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.c | 6 +- src/ov_SC04_011/ov_SC04_011_jr_80135A4C.c | 1 - src/ov_SC04_011/ov_SC04_011_jr_8017D494.c | 12 +- src/ov_SC04_012/ov_SC04_012_after.c | 7 - src/ov_SC04_012/ov_SC04_012_jr_8012ACE0.c | 6 +- src/ov_SC04_012/ov_SC04_012_jr_80135A4C.c | 1 - src/ov_SC04_015/ov_SC04_015_after.c | 7 - src/ov_SC04_015/ov_SC04_015_jr_8012ACE0.c | 6 +- src/ov_SC04_015/ov_SC04_015_jr_80135A4C.c | 1 - src/ov_SC04_015/ov_SC04_015_jr_8017AE2C.c | 3 +- src/ov_SC04_016/ov_SC04_016_after.c | 7 - src/ov_SC04_016/ov_SC04_016_jr_8012ACE0.c | 6 +- src/ov_SC04_016/ov_SC04_016_jr_80135A4C.c | 1 - src/ov_SC04_016/ov_SC04_016_jr_8017BEBC.c | 5 - src/ov_SC04_018/ov_SC04_018_after.c | 7 - src/ov_SC04_018/ov_SC04_018_jr_8012ACE0.c | 6 +- src/ov_SC04_018/ov_SC04_018_jr_80135A4C.c | 1 - src/ov_SC04_018/ov_SC04_018_jr_80183E6C.c | 2 +- src/ov_SC04_018/ov_SC04_018_jr_80188E1C.c | 23 +- src/ov_SC04_020/ov_SC04_020_after.c | 7 - src/ov_SC04_020/ov_SC04_020_jr_8012ACE0.c | 6 +- src/ov_SC04_020/ov_SC04_020_jr_80135A4C.c | 1 - src/ov_SC04_020/ov_SC04_020_jr_8017D604.c | 8 +- src/ov_SC05_000/ov_SC05_000_after.c | 7 - src/ov_SC05_000/ov_SC05_000_jr_8012ACE0.c | 6 +- src/ov_SC05_000/ov_SC05_000_jr_80135A4C.c | 1 - src/ov_SC05_000/ov_SC05_000_jr_8017BEBC.c | 1 - src/ov_SC05_001/ov_SC05_001_after.c | 7 - src/ov_SC05_001/ov_SC05_001_jr_8012ACE0.c | 6 +- src/ov_SC05_001/ov_SC05_001_jr_80135A4C.c | 1 - src/ov_SC05_001/ov_SC05_001_jr_8017BEBC.c | 1 - src/ov_SC05_001/ov_SC05_001_jr_80183508.c | 1 - src/ov_SC05_002/ov_SC05_002_after.c | 7 - src/ov_SC05_002/ov_SC05_002_jr_8012ACE0.c | 6 +- src/ov_SC05_002/ov_SC05_002_jr_80135A4C.c | 1 - src/ov_SC05_003/ov_SC05_003_after.c | 7 - src/ov_SC05_003/ov_SC05_003_jr_8012ACE0.c | 6 +- src/ov_SC05_003/ov_SC05_003_jr_80135A4C.c | 1 - src/ov_SC05_003/ov_SC05_003_jr_8017BEBC.c | 1 - src/ov_SC05_004/ov_SC05_004_after.c | 7 - src/ov_SC05_004/ov_SC05_004_jr_8012ACE0.c | 6 +- src/ov_SC05_004/ov_SC05_004_jr_80135A4C.c | 1 - src/ov_SC05_004/ov_SC05_004_jr_8017BEBC.c | 1 - src/ov_SC05_005/ov_SC05_005_after.c | 7 - src/ov_SC05_005/ov_SC05_005_jr_8012ACE0.c | 6 +- src/ov_SC05_005/ov_SC05_005_jr_80135A4C.c | 1 - src/ov_SC05_005/ov_SC05_005_jr_8017D898.c | 1 - src/ov_SC05_006/ov_SC05_006_after.c | 7 - src/ov_SC05_006/ov_SC05_006_jr_8012ACE0.c | 6 +- src/ov_SC05_006/ov_SC05_006_jr_80135A4C.c | 1 - src/ov_SC05_006/ov_SC05_006_jr_8017BEBC.c | 1 - src/ov_SC05_007/ov_SC05_007_after.c | 7 - src/ov_SC05_007/ov_SC05_007_jr_8012ACE0.c | 6 +- src/ov_SC05_007/ov_SC05_007_jr_80135A4C.c | 1 - src/ov_SC05_008/ov_SC05_008_after.c | 7 - src/ov_SC05_008/ov_SC05_008_jr_8012ACE0.c | 6 +- src/ov_SC05_008/ov_SC05_008_jr_80135A4C.c | 1 - src/ov_SC05_009/ov_SC05_009_jr_8012ACE0.c | 6 +- src/ov_SC05_009/ov_SC05_009_jr_80135A4C.c | 1 - src/ov_SC05_010/ov_SC05_010_after.c | 7 - src/ov_SC05_010/ov_SC05_010_jr_8012ACE0.c | 6 +- src/ov_SC05_010/ov_SC05_010_jr_80135A4C.c | 1 - src/ov_SC05_011/ov_SC05_011_after.c | 7 - src/ov_SC05_011/ov_SC05_011_jr_8012ACE0.c | 6 +- src/ov_SC05_011/ov_SC05_011_jr_80135A4C.c | 1 - src/ov_SC05_017/ov_SC05_017_after.c | 7 - src/ov_SC05_017/ov_SC05_017_jr_8012ACE0.c | 6 +- src/ov_SC05_017/ov_SC05_017_jr_80135A4C.c | 1 - src/ov_SC05_017/ov_SC05_017_jr_80182A74.c | 2 +- src/ov_SC05_017/ov_SC05_017_jr_80188B1C.c | 22 +- src/ov_SC05_018/ov_SC05_018_after.c | 7 - src/ov_SC05_018/ov_SC05_018_jr_8012ACE0.c | 6 +- src/ov_SC05_018/ov_SC05_018_jr_80135A4C.c | 1 - src/ov_SC05_018/ov_SC05_018_jr_8017D604.c | 10 +- src/ov_SC06_000/ov_SC06_000_after.c | 7 - src/ov_SC06_000/ov_SC06_000_jr_8012ACE0.c | 6 +- src/ov_SC06_000/ov_SC06_000_jr_80135A4C.c | 1 - src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c | 13 +- src/ov_SC06_006/ov_SC06_006_after.c | 7 - src/ov_SC06_006/ov_SC06_006_jr_8012ACE0.c | 6 +- src/ov_SC06_006/ov_SC06_006_jr_80135A4C.c | 1 - src/ov_SC06_006/ov_SC06_006_jr_8017DB90.c | 11 - src/ov_SC06_008/ov_SC06_008_after.c | 7 - src/ov_SC06_008/ov_SC06_008_jr_8012ACE0.c | 6 +- src/ov_SC06_008/ov_SC06_008_jr_80135A4C.c | 1 - src/ov_SC06_010/ov_SC06_010_after.c | 7 - src/ov_SC06_010/ov_SC06_010_jr_8012ACE0.c | 6 +- src/ov_SC06_010/ov_SC06_010_jr_80135A4C.c | 1 - src/ov_SC06_011/ov_SC06_011_after.c | 7 - src/ov_SC06_011/ov_SC06_011_jr_8012ACE0.c | 6 +- src/ov_SC06_011/ov_SC06_011_jr_80135A4C.c | 1 - src/ov_SC06_013/ov_SC06_013_after.c | 7 - src/ov_SC06_013/ov_SC06_013_jr_8012ACE0.c | 6 +- src/ov_SC06_013/ov_SC06_013_jr_80135A4C.c | 1 - src/ov_SC06_014/ov_SC06_014_after.c | 7 - src/ov_SC06_014/ov_SC06_014_jr_8012ACE0.c | 6 +- src/ov_SC06_014/ov_SC06_014_jr_80135A4C.c | 1 - src/ov_SC06_015/ov_SC06_015_after.c | 7 - src/ov_SC06_015/ov_SC06_015_jr_8012ACE0.c | 6 +- src/ov_SC06_015/ov_SC06_015_jr_80135A4C.c | 1 - src/ov_SC06_016/ov_SC06_016_after.c | 7 - src/ov_SC06_016/ov_SC06_016_jr_8012ACE0.c | 6 +- src/ov_SC06_016/ov_SC06_016_jr_80135A4C.c | 1 - src/ov_SC06_016/ov_SC06_016_jr_8017C8D0.c | 6 +- src/ov_SC06_018/ov_SC06_018_after.c | 7 - src/ov_SC06_018/ov_SC06_018_jr_8012ACE0.c | 6 +- src/ov_SC06_018/ov_SC06_018_jr_80135A4C.c | 1 - src/ov_SC06_018/ov_SC06_018_jr_80186270.c | 3 - src/ov_SC06_018/ov_SC06_018_jr_80187AEC.c | 1 - src/ov_SC06_020/ov_SC06_020_after.c | 7 - src/ov_SC06_020/ov_SC06_020_jr_8012ACE0.c | 6 +- src/ov_SC06_020/ov_SC06_020_jr_80135A4C.c | 1 - src/ov_SC06_020/ov_SC06_020_jr_80180B04.c | 3 - src/ov_SC06_022/ov_SC06_022_after.c | 7 - src/ov_SC06_022/ov_SC06_022_jr_8012ACE0.c | 6 +- src/ov_SC06_022/ov_SC06_022_jr_80135A4C.c | 1 - src/ov_SC06_022/ov_SC06_022_jr_80180CD0.c | 2 - src/ov_SC06_022/ov_SC06_022_jr_80184A28.c | 3 - src/ov_SC06_024/ov_SC06_024_after.c | 7 - src/ov_SC06_024/ov_SC06_024_jr_8012ACE0.c | 6 +- src/ov_SC06_024/ov_SC06_024_jr_80135A4C.c | 1 - src/ov_SC06_024/ov_SC06_024_jr_8017BEBC.c | 3 - src/ov_SC06_024/ov_SC06_024_jr_80181D34.c | 2 - src/ov_SC06_024/ov_SC06_024_jr_80186F00.c | 14 - src/ov_SC06_025/ov_SC06_025_after.c | 7 - src/ov_SC06_025/ov_SC06_025_jr_8012ACE0.c | 6 +- src/ov_SC06_025/ov_SC06_025_jr_80135A4C.c | 1 - src/ov_SC06_025/ov_SC06_025_jr_8017EEC4.c | 71 +- src/ov_SC06_027/ov_SC06_027_after.c | 7 - src/ov_SC06_027/ov_SC06_027_jr_8012ACE0.c | 6 +- src/ov_SC06_027/ov_SC06_027_jr_80135A4C.c | 1 - src/ov_SC06_027/ov_SC06_027_jr_8017BEBC.c | 2 - src/ov_SC06_029/ov_SC06_029_after.c | 7 - src/ov_SC06_029/ov_SC06_029_jr_8012ACE0.c | 6 +- src/ov_SC06_029/ov_SC06_029_jr_80135A4C.c | 1 - src/ov_SC06_029/ov_SC06_029_jr_8017C954.c | 65 +- src/ov_SC06_029/ov_SC06_029_jr_801867D0.c | 9 +- src/ov_SC06_030/ov_SC06_030_after.c | 7 - src/ov_SC06_030/ov_SC06_030_jr_8012ACE0.c | 6 +- src/ov_SC06_030/ov_SC06_030_jr_80135A4C.c | 1 - src/ov_SC06_030/ov_SC06_030_jr_8017F65C.c | 1 - src/ov_SC06_032/ov_SC06_032_after.c | 7 - src/ov_SC06_032/ov_SC06_032_jr_8012ACE0.c | 6 +- src/ov_SC06_032/ov_SC06_032_jr_80135A4C.c | 1 - src/ov_SC06_032/ov_SC06_032_jr_80181014.c | 3 - src/ov_SC06_032/ov_SC06_032_jr_80182890.c | 6 +- src/ov_SC06_033/ov_SC06_033_after.c | 7 - src/ov_SC06_033/ov_SC06_033_jr_8012ACE0.c | 6 +- src/ov_SC06_033/ov_SC06_033_jr_80135A4C.c | 1 - src/ov_SC06_033/ov_SC06_033_jr_8017C24C.c | 1 - src/ov_SC06_033/ov_SC06_033_jr_80184CF8.c | 3 - src/ov_SC07_000/ov_SC07_000_after.c | 7 - src/ov_SC07_000/ov_SC07_000_jr_8012ACE0.c | 6 +- src/ov_SC07_000/ov_SC07_000_jr_80135A4C.c | 1 - src/ov_SC07_000/ov_SC07_000_jr_8017BEBC.c | 4 - src/ov_SC07_001/ov_SC07_001_after.c | 7 - src/ov_SC07_001/ov_SC07_001_jr_8012ACE0.c | 6 +- src/ov_SC07_001/ov_SC07_001_jr_80135A4C.c | 1 - src/ov_SC07_001/ov_SC07_001_jr_8017BEBC.c | 4 +- src/ov_SC07_002/ov_SC07_002_after.c | 7 - src/ov_SC07_002/ov_SC07_002_jr_8012ACE0.c | 6 +- src/ov_SC07_002/ov_SC07_002_jr_80135A4C.c | 1 - src/ov_SC07_002/ov_SC07_002_jr_8017C8D0.c | 15 +- src/ov_SC07_006/ov_SC07_006_jr_80131340.c | 6 +- src/ov_SC07_006/ov_SC07_006_jr_80135A4C.c | 1 - src/ov_SC07_006/ov_SC07_006_jr_801457A4.c | 7 - src/ov_SC07_007/ov_SC07_007_jr_80131340.c | 6 +- src/ov_SC07_007/ov_SC07_007_jr_80135A4C.c | 1 - src/ov_SC07_007/ov_SC07_007_jr_801457A4.c | 7 - src/ov_SC07_007/ov_SC07_007_jr_8017BEBC.c | 6 - src/ov_SC07_008/ov_SC07_008_after.c | 7 - src/ov_SC07_008/ov_SC07_008_jr_8012ACE0.c | 6 +- src/ov_SC07_008/ov_SC07_008_jr_80135A4C.c | 1 - src/ov_SC07_009/ov_SC07_009_after.c | 7 - src/ov_SC07_009/ov_SC07_009_jr_8012ACE0.c | 6 +- src/ov_SC07_009/ov_SC07_009_jr_80135A4C.c | 1 - src/ov_SC07_010/ov_SC07_010_jr_80131340.c | 6 +- src/ov_SC07_010/ov_SC07_010_jr_80135A4C.c | 1 - src/ov_SC07_010/ov_SC07_010_jr_801457A4.c | 7 - src/ov_SC07_010/ov_SC07_010_jr_8017AE2C.c | 4 - src/ov_SC07_011/ov_SC07_011_jr_80131340.c | 6 +- src/ov_SC07_011/ov_SC07_011_jr_80135A4C.c | 1 - src/ov_SC07_011/ov_SC07_011_jr_801457A4.c | 7 - src/shared/engine_types.h | 1248 +++++++++++++++++++++ src/shared/ov/func_80133CD4__de6ea26c.h | 2 +- src/shared/ov/func_8014D820__9ab0f3b9.h | 7 - src/shared/ov/func_8014D820__ce76d008.h | 7 - 568 files changed, 1465 insertions(+), 2524 deletions(-) diff --git a/include/struct_types.h b/include/struct_types.h index f35d555f00..80be8eec69 100644 --- a/include/struct_types.h +++ b/include/struct_types.h @@ -503,4 +503,11 @@ typedef struct { s16 vx, vy, vz, pad; } SVECTOR_800; +/* --- lift_types.py --census (P38 T5.1.c2, batch ov-block) --- */ +typedef struct { u8 c[8]; } Blk8_md_SC03_076; +typedef struct { u32 addr : 24; u32 len : 8; } PTag; +typedef struct { u32 w[4]; } St801D9204; +typedef struct { s32 f; } Unkstruct_801151D0; +typedef struct { s32 vx, vy, vz, pad; } V32; + #endif /* STRUCT_TYPES_H */ diff --git a/src/800.c b/src/800.c index a7c4445a53..cd44eb6e28 100644 --- a/src/800.c +++ b/src/800.c @@ -3562,7 +3562,7 @@ extern void *func_80010A08(s32 a0); void func_80016638(void *a0, s32 a1, s32 a2) { - typedef struct { u32 addr : 24; u32 len : 8; } PTag; /* libgpu P_TAG: an OT link word */ + /* libgpu P_TAG: an OT link word */ typedef struct { u32 addr : 24; u32 len : 8; u32 code; } DrTpage; /* libgpu DR_TPAGE (8 bytes) */ typedef struct { u8 pad[4]; PTag *ot; } Env; /* a0 + 4: the frame's ordering table */ Env *env = a0; diff --git a/src/md_MAIN_039/md_MAIN_039.c b/src/md_MAIN_039/md_MAIN_039.c index 730f390eb8..a7fea1225b 100644 --- a/src/md_MAIN_039/md_MAIN_039.c +++ b/src/md_MAIN_039/md_MAIN_039.c @@ -395,7 +395,6 @@ void func_800CB804(void *arg0) { typedef struct { s16 m[3][3]; s32 t[3]; } MTX_md_MAIN_039; -typedef struct { s32 vx, vy, vz, pad; } V32; extern void func_801465C0(); extern s32 func_8001CC3C(s32, s32, s32, s32); diff --git a/src/md_SC03_076/md_SC03_076.c b/src/md_SC03_076/md_SC03_076.c index 67c14c4035..25745b4891 100644 --- a/src/md_SC03_076/md_SC03_076.c +++ b/src/md_SC03_076/md_SC03_076.c @@ -655,7 +655,7 @@ void func_801F0210(void) { (D_800AE7BC[*(u16 *)&D_800B9A02].ot[2] & 0xFF000000) | ((u32)ot & 0xFFFFFF); ot += 0x28; - ((struct { s32 f; } *)&D_801151D0)->f = ot; + ((Unkstruct_801151D0 *)&D_801151D0)->f = ot; } @@ -1548,7 +1548,6 @@ void func_801F1CB0(void) { #include "common.h" -typedef struct { u8 c[8]; } Blk8_md_SC03_076; const Blk8_md_SC03_076 D_801EF6C0 = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}}; diff --git a/src/md_SC03_076/md_SC03_076_jr_801F218C.c b/src/md_SC03_076/md_SC03_076_jr_801F218C.c index 98a847c427..4a9be96737 100644 --- a/src/md_SC03_076/md_SC03_076_jr_801F218C.c +++ b/src/md_SC03_076/md_SC03_076_jr_801F218C.c @@ -3,7 +3,6 @@ typedef struct { s16 m[3][3]; s32 t[3]; } MTX_C974_801F03C0; typedef struct { u32 w[38]; } Blk152_8017DF40_801F1738; typedef struct { u8 b[4]; } Blk4_8017DF40_801F1738; -typedef struct { u8 c[8]; } Blk8_md_SC03_076; typedef struct { short m[3][3]; long t[3]; } MATRIX_801EDED4_801F1F94; typedef struct { short vx, vy, vz, pad; } SVECTOR_801EDED4_801F1F94; extern void func_801EF750(void); diff --git a/src/md_SC03_077/md_SC03_077.c b/src/md_SC03_077/md_SC03_077.c index b3e0645f0b..247622924a 100644 --- a/src/md_SC03_077/md_SC03_077.c +++ b/src/md_SC03_077/md_SC03_077.c @@ -109,7 +109,6 @@ INCLUDE_RODATA("asm/md_SC03_077/nonmatchings/md_SC03_077", D_801EF468); #include "common.h" -typedef struct { u8 c[8]; } Blk8_md_SC03_076; const Blk8_md_SC03_076 D_801EF46C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}}; diff --git a/src/md_SC03_077/md_SC03_077_jr_801EFB58.c b/src/md_SC03_077/md_SC03_077_jr_801EFB58.c index be723e86e5..3a80b2c21f 100644 --- a/src/md_SC03_077/md_SC03_077_jr_801EFB58.c +++ b/src/md_SC03_077/md_SC03_077_jr_801EFB58.c @@ -2,7 +2,6 @@ #include "common.h" -typedef struct { u8 c[8]; } Blk8_md_SC03_076; extern u8 D_801F00E8[]; void func_800167B8(int); void func_80175414(s32 _arg0); diff --git a/src/md_SC03_079/md_SC03_079.c b/src/md_SC03_079/md_SC03_079.c index d2fec503b1..e1fbeeaf69 100644 --- a/src/md_SC03_079/md_SC03_079.c +++ b/src/md_SC03_079/md_SC03_079.c @@ -100,7 +100,6 @@ void func_801EF6B8(void) { INCLUDE_RODATA("asm/md_SC03_079/nonmatchings/md_SC03_079", D_801EF468); -typedef struct { u8 c[8]; } Blk8_md_SC03_076; const Blk8_md_SC03_076 D_801EF46C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}}; extern s32 func_80171D78(u32, void *); extern void func_80171A1C(void*); diff --git a/src/md_SC03_132/md_SC03_132.c b/src/md_SC03_132/md_SC03_132.c index f3861229a1..a7e30f61e5 100644 --- a/src/md_SC03_132/md_SC03_132.c +++ b/src/md_SC03_132/md_SC03_132.c @@ -100,7 +100,6 @@ void func_801E2830(void) { } -typedef struct { u8 c[8]; } Blk8_md_SC03_076; extern const Blk8_md_SC03_076 D_801E25EC; extern int func_80171D78(u32, void *); diff --git a/src/md_SC03_135/md_SC03_135.c b/src/md_SC03_135/md_SC03_135.c index 24db699289..cb857ef5b6 100644 --- a/src/md_SC03_135/md_SC03_135.c +++ b/src/md_SC03_135/md_SC03_135.c @@ -626,7 +626,7 @@ s32 func_801E3390(void) { (D_800AE7BC[*(u16 *)&D_800B9A02].ot[2] & 0xFF000000) | ((u32)ot & 0xFFFFFF); ot += 0x28; - ((struct { s32 f; } *)&D_801151D0)->f = ot; + ((Unkstruct_801151D0 *)&D_801151D0)->f = ot; } @@ -1567,7 +1567,6 @@ void func_801E4E40(void) { } -typedef struct { u8 c[8]; } Blk8_md_SC03_076; const Blk8_md_SC03_076 D_801E2840 = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}}; extern s32 func_80171D78(u32, void *); extern void func_80171A1C(void*); diff --git a/src/md_SC03_135/md_SC03_135_jr_801E5358.c b/src/md_SC03_135/md_SC03_135_jr_801E5358.c index ccaba1ea28..58beb96476 100644 --- a/src/md_SC03_135/md_SC03_135_jr_801E5358.c +++ b/src/md_SC03_135/md_SC03_135_jr_801E5358.c @@ -3,7 +3,6 @@ typedef struct { s16 m[3][3]; s32 t[3]; } MTX_C974_801E3540; typedef struct { u32 w[38]; } Blk152_8017DF40_801E48B8; typedef struct { u8 b[4]; } Blk4_8017DF40_801E48B8; -typedef struct { u8 c[8]; } Blk8_md_SC03_076; typedef struct { short m[3][3]; long t[3]; } MATRIX_801EDED4_801E5124; typedef struct { short vx, vy, vz, pad; } SVECTOR_801EDED4_801E5124; extern s32 func_801E288C(void); diff --git a/src/md_SC03_136/md_SC03_136.c b/src/md_SC03_136/md_SC03_136.c index 2920de02db..8ed236e342 100644 --- a/src/md_SC03_136/md_SC03_136.c +++ b/src/md_SC03_136/md_SC03_136.c @@ -102,7 +102,6 @@ void func_801E284C(void) { INCLUDE_RODATA("asm/md_SC03_136/nonmatchings/md_SC03_136", D_801E25E8); -typedef struct { u8 c[8]; } Blk8_md_SC03_076; const Blk8_md_SC03_076 D_801E25EC = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}}; extern s32 func_80171D78(u32, void *); extern void func_80171A1C(void*); diff --git a/src/md_SC03_136/md_SC03_136_jr_801E2CD0.c b/src/md_SC03_136/md_SC03_136_jr_801E2CD0.c index dbec536af3..dcadae6b99 100644 --- a/src/md_SC03_136/md_SC03_136_jr_801E2CD0.c +++ b/src/md_SC03_136/md_SC03_136_jr_801E2CD0.c @@ -1,6 +1,5 @@ #include "common.h" -typedef struct { u8 c[8]; } Blk8_md_SC03_076; extern u8 *D_80126B10; extern u8 D_801E3230[]; extern void func_80175414(s32 _arg0); diff --git a/src/md_SC04_024/md_SC04_024.c b/src/md_SC04_024/md_SC04_024.c index 04ab1ee6d1..cc927121a6 100644 --- a/src/md_SC04_024/md_SC04_024.c +++ b/src/md_SC04_024/md_SC04_024.c @@ -102,7 +102,6 @@ void func_801E7D70(void) { } -typedef struct { u8 c[8]; } Blk8_md_SC03_076; extern const Blk8_md_SC03_076 D_801E7B2C; extern s32 func_80171D78(u32, void *); extern void func_80171A1C(void*); diff --git a/src/md_SC04_025/md_SC04_025.c b/src/md_SC04_025/md_SC04_025.c index 5c96cc3548..981a5168d4 100644 --- a/src/md_SC04_025/md_SC04_025.c +++ b/src/md_SC04_025/md_SC04_025.c @@ -95,7 +95,6 @@ void func_801E7D78(void) { INCLUDE_RODATA("asm/md_SC04_025/nonmatchings/md_SC04_025", D_801E7B28); -typedef struct { u8 c[8]; } Blk8_md_SC03_076; const Blk8_md_SC03_076 D_801E7B2C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}}; extern s32 func_80171D78(u32, void *); extern void func_80171A1C(void*); diff --git a/src/md_SC04_026/md_SC04_026.c b/src/md_SC04_026/md_SC04_026.c index f03ddc591d..2b803740ed 100644 --- a/src/md_SC04_026/md_SC04_026.c +++ b/src/md_SC04_026/md_SC04_026.c @@ -96,7 +96,6 @@ void func_801E7D78(void) { INCLUDE_RODATA("asm/md_SC04_026/nonmatchings/md_SC04_026", D_801E7B28); -typedef struct { u8 c[8]; } Blk8_md_SC03_076; const Blk8_md_SC03_076 D_801E7B2C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}}; extern s32 func_80171D78(u32, void *); extern void func_80171A1C(void*); diff --git a/src/md_SC04_027/md_SC04_027.c b/src/md_SC04_027/md_SC04_027.c index 5490759d87..a9f1e8301c 100644 --- a/src/md_SC04_027/md_SC04_027.c +++ b/src/md_SC04_027/md_SC04_027.c @@ -636,7 +636,7 @@ void func_801E88D0(void) { (D_800AE7BC[*(u16 *)&D_800B9A02].ot[2] & 0xFF000000) | ((u32)ot & 0xFFFFFF); ot += 0x28; - ((struct { s32 f; } *)&D_801151D0)->f = ot; + ((Unkstruct_801151D0 *)&D_801151D0)->f = ot; } @@ -1549,7 +1549,6 @@ void func_801EA380(void) { } -typedef struct { u8 c[8]; } Blk8_md_SC03_076; const Blk8_md_SC03_076 D_801E7D80 = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}}; extern s32 func_80171D78(u32, void *); extern void func_80171A1C(void*); diff --git a/src/md_SC04_027/md_SC04_027_jr_801EA8C0.c b/src/md_SC04_027/md_SC04_027_jr_801EA8C0.c index ba84058196..e5dc931ce4 100644 --- a/src/md_SC04_027/md_SC04_027_jr_801EA8C0.c +++ b/src/md_SC04_027/md_SC04_027_jr_801EA8C0.c @@ -3,7 +3,6 @@ typedef struct { s16 m[3][3]; s32 t[3]; } MTX_C974_801E8A80; typedef struct { u32 w[38]; } Blk152_8017DF40_801E9DF8; typedef struct { u8 b[4]; } Blk4_8017DF40_801E9DF8; -typedef struct { u8 c[8]; } Blk8_md_SC03_076; typedef struct { short m[3][3]; long t[3]; } MATRIX_801EDED4_801EA664; typedef struct { short vx, vy, vz, pad; } SVECTOR_801EDED4_801EA664; extern void func_801E7DA4(void); diff --git a/src/md_SC04_028/md_SC04_028.c b/src/md_SC04_028/md_SC04_028.c index 1097f5721a..f9c008a730 100644 --- a/src/md_SC04_028/md_SC04_028.c +++ b/src/md_SC04_028/md_SC04_028.c @@ -104,7 +104,6 @@ void func_801E7D8C(void) { INCLUDE_RODATA("asm/md_SC04_028/nonmatchings/md_SC04_028", D_801E7B28); -typedef struct { u8 c[8]; } Blk8_md_SC03_076; const Blk8_md_SC03_076 D_801E7B2C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}}; extern s32 func_80171D78(u32, void *); extern void func_80171A1C(void*); diff --git a/src/md_SC04_028/md_SC04_028_jr_801E8238.c b/src/md_SC04_028/md_SC04_028_jr_801E8238.c index b63340d9c1..7e46c48d42 100644 --- a/src/md_SC04_028/md_SC04_028_jr_801E8238.c +++ b/src/md_SC04_028/md_SC04_028_jr_801E8238.c @@ -2,7 +2,6 @@ #include "common.h" -typedef struct { u8 c[8]; } Blk8_md_SC03_076; extern u8 D_801E8798[]; void func_800167B8(int); void func_80175414(s32 _arg0); diff --git a/src/md_SC04_029/md_SC04_029.c b/src/md_SC04_029/md_SC04_029.c index 5b722d0f68..570691d0b6 100644 --- a/src/md_SC04_029/md_SC04_029.c +++ b/src/md_SC04_029/md_SC04_029.c @@ -97,7 +97,6 @@ void func_801E7D78(void) { INCLUDE_RODATA("asm/md_SC04_029/nonmatchings/md_SC04_029", D_801E7B28); -typedef struct { u8 c[8]; } Blk8_md_SC03_076; const Blk8_md_SC03_076 D_801E7B2C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}}; extern s32 func_80171D78(u32, void *); extern void func_80171A1C(void*); diff --git a/src/md_SC04_030/md_SC04_030.c b/src/md_SC04_030/md_SC04_030.c index 1337efda21..0b29987122 100644 --- a/src/md_SC04_030/md_SC04_030.c +++ b/src/md_SC04_030/md_SC04_030.c @@ -97,7 +97,6 @@ void func_801E7D78(void) { INCLUDE_RODATA("asm/md_SC04_030/nonmatchings/md_SC04_030", D_801E7B28); -typedef struct { u8 c[8]; } Blk8_md_SC03_076; const Blk8_md_SC03_076 D_801E7B2C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}}; extern s32 func_80171D78(u32, void *); extern void func_80171A1C(void*); diff --git a/src/md_SC05_023/md_SC05_023.c b/src/md_SC05_023/md_SC05_023.c index 960d65ca43..e296dfcf18 100644 --- a/src/md_SC05_023/md_SC05_023.c +++ b/src/md_SC05_023/md_SC05_023.c @@ -104,7 +104,6 @@ INCLUDE_RODATA("asm/md_SC05_023/nonmatchings/md_SC05_023", D_801ED988); -typedef struct { u8 c[8]; } Blk8_md_SC03_076; const Blk8_md_SC03_076 D_801ED98C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}}; diff --git a/src/md_SC05_024/md_SC05_024.c b/src/md_SC05_024/md_SC05_024.c index 925e7805b2..4813beef60 100644 --- a/src/md_SC05_024/md_SC05_024.c +++ b/src/md_SC05_024/md_SC05_024.c @@ -98,7 +98,6 @@ void func_801EDBF0(void) { INCLUDE_RODATA("asm/md_SC05_024/nonmatchings/md_SC05_024", D_801ED988); -typedef struct { u8 c[8]; } Blk8_md_SC03_076; const Blk8_md_SC03_076 D_801ED98C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}}; diff --git a/src/md_SC05_025/md_SC05_025.c b/src/md_SC05_025/md_SC05_025.c index 06de68fb37..a12ab7830f 100644 --- a/src/md_SC05_025/md_SC05_025.c +++ b/src/md_SC05_025/md_SC05_025.c @@ -97,7 +97,6 @@ void func_801EDBF0(void) { INCLUDE_RODATA("asm/md_SC05_025/nonmatchings/md_SC05_025", D_801ED988); -typedef struct { u8 c[8]; } Blk8_md_SC03_076; const Blk8_md_SC03_076 D_801ED98C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}}; diff --git a/src/md_SC05_026/md_SC05_026.c b/src/md_SC05_026/md_SC05_026.c index e498181a5f..a51a3f6444 100644 --- a/src/md_SC05_026/md_SC05_026.c +++ b/src/md_SC05_026/md_SC05_026.c @@ -638,7 +638,7 @@ void func_801EE730(void) { (D_800AE7BC[*(u16 *)&D_800B9A02].ot[2] & 0xFF000000) | ((u32)ot & 0xFFFFFF); ot += 0x28; - ((struct { s32 f; } *)&D_801151D0)->f = ot; + ((Unkstruct_801151D0 *)&D_801151D0)->f = ot; } @@ -1500,7 +1500,6 @@ void func_801F01F8(void) { } -typedef struct { u8 c[8]; } Blk8_md_SC03_076; const Blk8_md_SC03_076 D_801EDBE0 = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}}; extern s32 func_80171D78(u32, void *); extern void func_80171A1C(void*); diff --git a/src/md_SC05_026/md_SC05_026_jr_801F0748.c b/src/md_SC05_026/md_SC05_026_jr_801F0748.c index dad622ddb4..08b84c4af4 100644 --- a/src/md_SC05_026/md_SC05_026_jr_801F0748.c +++ b/src/md_SC05_026/md_SC05_026_jr_801F0748.c @@ -3,7 +3,6 @@ typedef struct { s16 m[3][3]; s32 t[3]; } MTX_C974_801EE8E0; typedef struct { u32 w[38]; } Blk152_8017DF40_801EFC58; typedef struct { u8 b[4]; } Blk4_8017DF40_801EFC58; -typedef struct { u8 c[8]; } Blk8_md_SC03_076; typedef struct { short m[3][3]; long t[3]; } MATRIX_801EDED4_801F04DC; typedef struct { short vx, vy, vz, pad; } SVECTOR_801EDED4_801F04DC; extern void func_801EDC04(void); diff --git a/src/md_SC05_027/md_SC05_027.c b/src/md_SC05_027/md_SC05_027.c index 7ead0654de..e36c4bfc5d 100644 --- a/src/md_SC05_027/md_SC05_027.c +++ b/src/md_SC05_027/md_SC05_027.c @@ -103,7 +103,6 @@ void func_801EDC04(void) { INCLUDE_RODATA("asm/md_SC05_027/nonmatchings/md_SC05_027", D_801ED988); -typedef struct { u8 c[8]; } Blk8_md_SC03_076; const Blk8_md_SC03_076 D_801ED98C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}}; extern s32 func_80171D78(u32, void *); extern void func_80171A1C(void*); diff --git a/src/md_SC05_027/md_SC05_027_jr_801EE0C0.c b/src/md_SC05_027/md_SC05_027_jr_801EE0C0.c index e4141dcb9b..9d5f83e5cf 100644 --- a/src/md_SC05_027/md_SC05_027_jr_801EE0C0.c +++ b/src/md_SC05_027/md_SC05_027_jr_801EE0C0.c @@ -1,6 +1,5 @@ #include "common.h" -typedef struct { u8 c[8]; } Blk8_md_SC03_076; extern u8 *D_80126B10; extern u8 D_801EE620[]; extern void func_80175414(s32 _arg0); diff --git a/src/md_SC05_028/md_SC05_028.c b/src/md_SC05_028/md_SC05_028.c index ed338fd398..d13a92793f 100644 --- a/src/md_SC05_028/md_SC05_028.c +++ b/src/md_SC05_028/md_SC05_028.c @@ -98,7 +98,6 @@ void func_801EDBF0(void) { INCLUDE_RODATA("asm/md_SC05_028/nonmatchings/md_SC05_028", D_801ED988); -typedef struct { u8 c[8]; } Blk8_md_SC03_076; const Blk8_md_SC03_076 D_801ED98C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}}; diff --git a/src/md_SC05_029/md_SC05_029.c b/src/md_SC05_029/md_SC05_029.c index e253e8f987..bbcc4e1f19 100644 --- a/src/md_SC05_029/md_SC05_029.c +++ b/src/md_SC05_029/md_SC05_029.c @@ -98,7 +98,6 @@ void func_801EDBF0(void) { INCLUDE_RODATA("asm/md_SC05_029/nonmatchings/md_SC05_029", D_801ED988); -typedef struct { u8 c[8]; } Blk8_md_SC03_076; const Blk8_md_SC03_076 D_801ED98C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}}; diff --git a/src/ov_MAIN_012/ov_MAIN_012_jr_80131340.c b/src/ov_MAIN_012/ov_MAIN_012_jr_80131340.c index 1fafb80849..f279bfbb8d 100644 --- a/src/ov_MAIN_012/ov_MAIN_012_jr_80131340.c +++ b/src/ov_MAIN_012/ov_MAIN_012_jr_80131340.c @@ -624,9 +624,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_80131340 { - u16 vx, vy, vz, pad; - }; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 * with the stale 1-arg engine_core canonical. A file-scope `extern int @@ -1640,7 +1637,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017E924; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -1706,7 +1703,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017E910[3] = y; { - typedef struct { s8 c[8]; } Blk8_80133CD4; *(Blk8_80133CD4 *)&D_801152B0 = *(Blk8_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_MAIN_012/ov_MAIN_012_jr_80135A4C.c b/src/ov_MAIN_012/ov_MAIN_012_jr_80135A4C.c index 989bc31ee1..fc1b972dfe 100644 --- a/src/ov_MAIN_012/ov_MAIN_012_jr_80135A4C.c +++ b/src/ov_MAIN_012/ov_MAIN_012_jr_80135A4C.c @@ -600,7 +600,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_MAIN_012_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_MAIN_012/ov_MAIN_012_jr_801458E0.c b/src/ov_MAIN_012/ov_MAIN_012_jr_801458E0.c index 885ed74252..d916ef438d 100644 --- a/src/ov_MAIN_012/ov_MAIN_012_jr_801458E0.c +++ b/src/ov_MAIN_012/ov_MAIN_012_jr_801458E0.c @@ -3015,13 +3015,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2x) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent_8014D820` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4_8014D820; typedef Unkstruct_800B5CB8 Ent_8014D820; int new_var2; s16 new_var3; diff --git a/src/ov_MAIN_012/ov_MAIN_012_jr_8017CA18.c b/src/ov_MAIN_012/ov_MAIN_012_jr_8017CA18.c index 0b73a4f34e..5b9dba8d12 100644 --- a/src/ov_MAIN_012/ov_MAIN_012_jr_8017CA18.c +++ b/src/ov_MAIN_012/ov_MAIN_012_jr_8017CA18.c @@ -3670,7 +3670,7 @@ void func_8017CA18(void) { (D_800AE7BC[*(u16 *)&D_800B9A02].ot[2] & 0xFF000000) | ((u32)ot & 0xFFFFFF); ot += 0x28; - ((struct { s32 f; } *)&D_801151D0)->f = ot; + ((Unkstruct_801151D0 *)&D_801151D0)->f = ot; } diff --git a/src/ov_MAIN_012/ov_MAIN_012_jr_8017CF3C.c b/src/ov_MAIN_012/ov_MAIN_012_jr_8017CF3C.c index 4e209664f8..4645efbe8d 100644 --- a/src/ov_MAIN_012/ov_MAIN_012_jr_8017CF3C.c +++ b/src/ov_MAIN_012/ov_MAIN_012_jr_8017CF3C.c @@ -3810,7 +3810,7 @@ void func_8017D2A4(void) { case 3: { s16 *q = &D_8011512C; D_801150D4 = 0; - if (((struct { s16 h; } *)q)->h != 0xC) { + if (((Unkstruct_8017D2A4 *)q)->h != 0xC) { ret = 0x11; *q = 5; } @@ -4174,22 +4174,8 @@ void func_8017DCB0(s32 val, s32 n, void *dst, s32 flag) { */ s32 *func_8017DD28(s32 *out) { - typedef struct { u32 addr : 24; u32 len : 8; } PTag_8017DD28; - typedef struct { u32 *ot; u32 pad[4]; } Env_8017DD28; /* 0x14 stride */ - typedef struct { u16 f0; u16 f2; } Prim4_8017DD28; - typedef struct { - s16 f0; /* 0x00 */ - s16 f2; /* 0x02 */ - void *f4; /* 0x04 */ - void *f8; /* 0x08 */ - s16 fC; /* 0x0C */ - s16 fE; /* 0x0E */ - s16 f10; /* 0x10 */ - s16 f12; /* 0x12 */ - void *f14; /* 0x14 */ - Prim4_8017DD28 *f18; /* 0x18 */ - void *f1C; /* 0x1C */ - } Panel_8017DD28; /* 0x20 stride */ + /* 0x14 stride */ + /* 0x20 stride */ extern Env_8017DD28 D_800AE7BC[]; extern short D_800B9A02; diff --git a/src/ov_SC01_000/ov_SC01_000_after.c b/src/ov_SC01_000/ov_SC01_000_after.c index 7c1b21444c..f13ec1a911 100644 --- a/src/ov_SC01_000/ov_SC01_000_after.c +++ b/src/ov_SC01_000/ov_SC01_000_after.c @@ -1552,13 +1552,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC01_000/ov_SC01_000_jr_8012ACE0.c b/src/ov_SC01_000/ov_SC01_000_jr_8012ACE0.c index 5b8c460a31..c603a533c6 100644 --- a/src/ov_SC01_000/ov_SC01_000_jr_8012ACE0.c +++ b/src/ov_SC01_000/ov_SC01_000_jr_8012ACE0.c @@ -1434,9 +1434,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC01_000_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC01_000_80131340 D_8017F0C0; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2400,7 +2397,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017F1AC; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2459,7 +2456,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017F198[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC01_000_80133CD4; *(Blk8_SC01_000_80133CD4 *)&D_801152B0 = *(Blk8_SC01_000_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC01_000/ov_SC01_000_jr_80135A4C.c b/src/ov_SC01_000/ov_SC01_000_jr_80135A4C.c index 7c7b725882..658a6938cc 100644 --- a/src/ov_SC01_000/ov_SC01_000_jr_80135A4C.c +++ b/src/ov_SC01_000/ov_SC01_000_jr_80135A4C.c @@ -619,7 +619,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC01_000_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC01_000/ov_SC01_000_jr_8017BEBC.c b/src/ov_SC01_000/ov_SC01_000_jr_8017BEBC.c index 2800b9b754..291d1b409f 100644 --- a/src/ov_SC01_000/ov_SC01_000_jr_8017BEBC.c +++ b/src/ov_SC01_000/ov_SC01_000_jr_8017BEBC.c @@ -3273,7 +3273,6 @@ void func_8017D490(void) */ void func_8017DD04(s32 arg0, s32 arg1) { - typedef struct { u32 addr:24; u32 len:8; } P_TAG_SC01_000_8017DD04; extern void func_8017E1A8(); extern u8 *D_800A5E60; extern u8 D_800AA60C[]; diff --git a/src/ov_SC01_001/ov_SC01_001_after.c b/src/ov_SC01_001/ov_SC01_001_after.c index 8424c65c16..a83232e038 100644 --- a/src/ov_SC01_001/ov_SC01_001_after.c +++ b/src/ov_SC01_001/ov_SC01_001_after.c @@ -1552,13 +1552,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC01_001/ov_SC01_001_jr_8012ACE0.c b/src/ov_SC01_001/ov_SC01_001_jr_8012ACE0.c index 08d6f4f2a9..d9d3a78574 100644 --- a/src/ov_SC01_001/ov_SC01_001_jr_8012ACE0.c +++ b/src/ov_SC01_001/ov_SC01_001_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC01_001_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC01_001_80131340 D_80183D10; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2400,7 +2397,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80183DFC; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2459,7 +2456,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80183DE8[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC01_001_80133CD4; *(Blk8_SC01_001_80133CD4 *)&D_801152B0 = *(Blk8_SC01_001_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC01_001/ov_SC01_001_jr_80135A4C.c b/src/ov_SC01_001/ov_SC01_001_jr_80135A4C.c index 7fa9734564..520139e8a9 100644 --- a/src/ov_SC01_001/ov_SC01_001_jr_80135A4C.c +++ b/src/ov_SC01_001/ov_SC01_001_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC01_001_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC01_004/ov_SC01_004_after.c b/src/ov_SC01_004/ov_SC01_004_after.c index 3762ee6122..6a5b8934aa 100644 --- a/src/ov_SC01_004/ov_SC01_004_after.c +++ b/src/ov_SC01_004/ov_SC01_004_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC01_004/ov_SC01_004_jr_8012ACE0.c b/src/ov_SC01_004/ov_SC01_004_jr_8012ACE0.c index c0c4ee3418..8da09b754d 100644 --- a/src/ov_SC01_004/ov_SC01_004_jr_8012ACE0.c +++ b/src/ov_SC01_004/ov_SC01_004_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC01_004_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC01_004_80131340 D_8017F6D4; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017F7C0; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017F7AC[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC01_004_80133CD4; *(Blk8_SC01_004_80133CD4 *)&D_801152B0 = *(Blk8_SC01_004_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC01_004/ov_SC01_004_jr_80135A4C.c b/src/ov_SC01_004/ov_SC01_004_jr_80135A4C.c index 1c99def9a6..75d324abfe 100644 --- a/src/ov_SC01_004/ov_SC01_004_jr_80135A4C.c +++ b/src/ov_SC01_004/ov_SC01_004_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC01_004_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC01_004/ov_SC01_004_jr_8017BE9C.c b/src/ov_SC01_004/ov_SC01_004_jr_8017BE9C.c index 74429b9f78..35f6e08bb9 100644 --- a/src/ov_SC01_004/ov_SC01_004_jr_8017BE9C.c +++ b/src/ov_SC01_004/ov_SC01_004_jr_8017BE9C.c @@ -2698,7 +2698,6 @@ extern void func_8017BE60(void *a0); void func_8017BE9C(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC01_004_8017BE9C; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC01_005/ov_SC01_005_after.c b/src/ov_SC01_005/ov_SC01_005_after.c index 9b0a25c636..fb250bf4a3 100644 --- a/src/ov_SC01_005/ov_SC01_005_after.c +++ b/src/ov_SC01_005/ov_SC01_005_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC01_005/ov_SC01_005_jr_8012ACE0.c b/src/ov_SC01_005/ov_SC01_005_jr_8012ACE0.c index 43eeea1c37..709e7e485a 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_8012ACE0.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_8012ACE0.c @@ -1419,9 +1419,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC01_005_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC01_005_80131340 D_80182868; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2393,7 +2390,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80182954; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2452,7 +2449,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80182940[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC01_005_80133CD4; *(Blk8_SC01_005_80133CD4 *)&D_801152B0 = *(Blk8_SC01_005_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC01_005/ov_SC01_005_jr_80135A4C.c b/src/ov_SC01_005/ov_SC01_005_jr_80135A4C.c index 5a95a2803e..13e4b3095c 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_80135A4C.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC01_005_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC01_005/ov_SC01_005_jr_8017C340.c b/src/ov_SC01_005/ov_SC01_005_jr_8017C340.c index ef03aad89d..911fd437c0 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_8017C340.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_8017C340.c @@ -2707,7 +2707,6 @@ extern void func_8017C338(void *a0); void func_8017C340(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC01_005_8017C340; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC01_008/ov_SC01_008_after.c b/src/ov_SC01_008/ov_SC01_008_after.c index 7f9e1d1105..9b354f4c59 100644 --- a/src/ov_SC01_008/ov_SC01_008_after.c +++ b/src/ov_SC01_008/ov_SC01_008_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC01_008/ov_SC01_008_jr_8012ACE0.c b/src/ov_SC01_008/ov_SC01_008_jr_8012ACE0.c index adf4421e37..82404732d9 100644 --- a/src/ov_SC01_008/ov_SC01_008_jr_8012ACE0.c +++ b/src/ov_SC01_008/ov_SC01_008_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC01_008_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC01_008_80131340 D_8017FC48; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017FD34; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017FD20[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC01_008_80133CD4; *(Blk8_SC01_008_80133CD4 *)&D_801152B0 = *(Blk8_SC01_008_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC01_008/ov_SC01_008_jr_80135A4C.c b/src/ov_SC01_008/ov_SC01_008_jr_80135A4C.c index 0acc42cf9a..be13c849f4 100644 --- a/src/ov_SC01_008/ov_SC01_008_jr_80135A4C.c +++ b/src/ov_SC01_008/ov_SC01_008_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC01_008_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC01_008/ov_SC01_008_jr_8017BE9C.c b/src/ov_SC01_008/ov_SC01_008_jr_8017BE9C.c index b5a6c02e22..92455eb800 100644 --- a/src/ov_SC01_008/ov_SC01_008_jr_8017BE9C.c +++ b/src/ov_SC01_008/ov_SC01_008_jr_8017BE9C.c @@ -2698,7 +2698,6 @@ extern void func_8017BE60(void *a0); void func_8017BE9C(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC01_008_8017BE9C; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC01_009/ov_SC01_009_after.c b/src/ov_SC01_009/ov_SC01_009_after.c index c1cf0f40d6..33b40d487a 100644 --- a/src/ov_SC01_009/ov_SC01_009_after.c +++ b/src/ov_SC01_009/ov_SC01_009_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC01_009/ov_SC01_009_jr_8012ACE0.c b/src/ov_SC01_009/ov_SC01_009_jr_8012ACE0.c index 85420bac8b..8703ebecf8 100644 --- a/src/ov_SC01_009/ov_SC01_009_jr_8012ACE0.c +++ b/src/ov_SC01_009/ov_SC01_009_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC01_009_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC01_009_80131340 D_80182E30; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80182F1C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80182F08[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC01_009_80133CD4; *(Blk8_SC01_009_80133CD4 *)&D_801152B0 = *(Blk8_SC01_009_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC01_009/ov_SC01_009_jr_80135A4C.c b/src/ov_SC01_009/ov_SC01_009_jr_80135A4C.c index de3c727610..c090802423 100644 --- a/src/ov_SC01_009/ov_SC01_009_jr_80135A4C.c +++ b/src/ov_SC01_009/ov_SC01_009_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC01_009_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC01_009/ov_SC01_009_jr_8017BE9C.c b/src/ov_SC01_009/ov_SC01_009_jr_8017BE9C.c index e0ca7b2eef..85eef58f12 100644 --- a/src/ov_SC01_009/ov_SC01_009_jr_8017BE9C.c +++ b/src/ov_SC01_009/ov_SC01_009_jr_8017BE9C.c @@ -2691,7 +2691,6 @@ extern void func_8017BE60(void *a0); void func_8017BE9C(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC01_009_8017BE9C; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC01_009/ov_SC01_009_jr_8018057C.c b/src/ov_SC01_009/ov_SC01_009_jr_8018057C.c index 75d6a390a4..41d6077fe1 100644 --- a/src/ov_SC01_009/ov_SC01_009_jr_8018057C.c +++ b/src/ov_SC01_009/ov_SC01_009_jr_8018057C.c @@ -3467,10 +3467,6 @@ extern void func_8012B200(u8 *param_1); extern s32 func_8012C51C(void *a0, void *a1); void func_801819B0(void *arg0) { - typedef struct { - s16 a, b, c, d, e, f, g, h; - s32 w; - } Blk801819B0; Blk801819B0 blk; s32 v0; @@ -3492,10 +3488,6 @@ extern s32 func_8012C51C(void *a0, void *a1); extern u16 D_801F32D4; void func_80181A1C(void *arg0) { - typedef struct { - s16 a, b, c, d, e, f, g, h; - s32 w; - } Blk80181A1C; Blk80181A1C blk; blk.d = 0x1AB; @@ -3742,10 +3734,6 @@ extern u8 D_801EB534; extern u16 D_801F32D4; void func_80182030(void *arg0) { - typedef struct { - s16 a, b, c, d, e, f, g, h; - s32 w; - } Blk80182030; Blk80182030 blk; if (--*(s32 *)((s32)arg0 + 0x1C) != -1) { @@ -3780,10 +3768,6 @@ extern u8 D_801EB534; extern u16 D_801F32D4; void func_8018210C(void *arg0) { - typedef struct { - s16 a, b, c, d, e, f, g, h; - s32 w; - } Blk80182030; Blk80182030 blk; if (--*(s32 *)((s32)arg0 + 0x1C) != -1) { @@ -3816,10 +3800,6 @@ extern u8 D_801EB534; extern u16 D_801F32D4; void func_801821E8(void *arg0) { - typedef struct { - s16 a, b, c, d, e, f, g, h; - s32 w; - } Blk801821E8; Blk801821E8 blk; if (--*(s32 *)((s32)arg0 + 0x1C) != -1) { @@ -3983,10 +3963,6 @@ extern s16 D_801F32D8; extern u8 D_801ED1D4[]; void func_80182634(void *arg0) { - typedef struct { - s16 a, b, c, d, e, f, g, h; - s32 w; - } Blk80182634; Blk80182634 blk; u16 w; u16 cnt; diff --git a/src/ov_SC01_074/ov_SC01_074_after.c b/src/ov_SC01_074/ov_SC01_074_after.c index e8031e754d..75dd98ee66 100644 --- a/src/ov_SC01_074/ov_SC01_074_after.c +++ b/src/ov_SC01_074/ov_SC01_074_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC01_074/ov_SC01_074_jr_8012ACE0.c b/src/ov_SC01_074/ov_SC01_074_jr_8012ACE0.c index 7cfce71509..ae1b32babc 100644 --- a/src/ov_SC01_074/ov_SC01_074_jr_8012ACE0.c +++ b/src/ov_SC01_074/ov_SC01_074_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC01_074_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC01_074_80131340 D_8017EAB0; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017EB9C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017EB88[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC01_074_80133CD4; *(Blk8_SC01_074_80133CD4 *)&D_801152B0 = *(Blk8_SC01_074_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC01_074/ov_SC01_074_jr_80135A4C.c b/src/ov_SC01_074/ov_SC01_074_jr_80135A4C.c index b8042b15e2..befc0fa27a 100644 --- a/src/ov_SC01_074/ov_SC01_074_jr_80135A4C.c +++ b/src/ov_SC01_074/ov_SC01_074_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC01_074_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC01_074/ov_SC01_074_jr_8017BE9C.c b/src/ov_SC01_074/ov_SC01_074_jr_8017BE9C.c index c928706cac..3b02cf57e1 100644 --- a/src/ov_SC01_074/ov_SC01_074_jr_8017BE9C.c +++ b/src/ov_SC01_074/ov_SC01_074_jr_8017BE9C.c @@ -2698,7 +2698,6 @@ extern void func_8017BE60(void *a0); void func_8017BE9C(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC01_074_8017BE9C; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC01_077/ov_SC01_077_after.c b/src/ov_SC01_077/ov_SC01_077_after.c index ffa5fc61a1..0cc97fe7a9 100644 --- a/src/ov_SC01_077/ov_SC01_077_after.c +++ b/src/ov_SC01_077/ov_SC01_077_after.c @@ -1906,13 +1906,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2x) { /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC01_077/ov_SC01_077_jr_8012ACE0.c b/src/ov_SC01_077/ov_SC01_077_jr_8012ACE0.c index 46e1ef0995..eef19b3105 100644 --- a/src/ov_SC01_077/ov_SC01_077_jr_8012ACE0.c +++ b/src/ov_SC01_077/ov_SC01_077_jr_8012ACE0.c @@ -1727,9 +1727,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC01_077_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC01_077_80131340 D_80186FD4; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2797,7 +2794,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801870C0; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2856,7 +2853,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801870AC[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC01_077_80133CD4; *(Blk8_SC01_077_80133CD4 *)&D_801152B0 = *(Blk8_SC01_077_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC01_077/ov_SC01_077_jr_80135A4C.c b/src/ov_SC01_077/ov_SC01_077_jr_80135A4C.c index 1c36a317c6..85acf41daa 100644 --- a/src/ov_SC01_077/ov_SC01_077_jr_80135A4C.c +++ b/src/ov_SC01_077/ov_SC01_077_jr_80135A4C.c @@ -667,7 +667,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC01_077_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC01_077/ov_SC01_077_jr_80181F08.c b/src/ov_SC01_077/ov_SC01_077_jr_80181F08.c index a6a2927b70..a1cf4fe9c8 100644 --- a/src/ov_SC01_077/ov_SC01_077_jr_80181F08.c +++ b/src/ov_SC01_077/ov_SC01_077_jr_80181F08.c @@ -3071,7 +3071,6 @@ extern void func_80181BE4(s32 p); void func_80181F08(s32 arg0) { - typedef struct { u32 w[4]; } St801D9204; extern void func_80019064(void *a0); extern void func_8012A828(s32 a0, void *a1); extern void func_8012B23C(s32 a0); diff --git a/src/ov_SC01_077/ov_SC01_077_jr_80183CF4.c b/src/ov_SC01_077/ov_SC01_077_jr_80183CF4.c index 73f8eef498..7a5b1fcc4f 100644 --- a/src/ov_SC01_077/ov_SC01_077_jr_80183CF4.c +++ b/src/ov_SC01_077/ov_SC01_077_jr_80183CF4.c @@ -3322,7 +3322,6 @@ void func_80184278(int param_1) #include "common.h" void func_801842C8(s32 a0) { - typedef struct { s8 c[8]; } Blk8_SC01_077_801842C8; extern void func_8012CBA4(s32 a0); extern s32 func_8012BEE8(s32); s32 a3; diff --git a/src/ov_SC01_080/ov_SC01_080_after.c b/src/ov_SC01_080/ov_SC01_080_after.c index 5073aa2253..83beb5eab4 100644 --- a/src/ov_SC01_080/ov_SC01_080_after.c +++ b/src/ov_SC01_080/ov_SC01_080_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC01_080/ov_SC01_080_jr_8012ACE0.c b/src/ov_SC01_080/ov_SC01_080_jr_8012ACE0.c index 9083328dcc..c9d8bde508 100644 --- a/src/ov_SC01_080/ov_SC01_080_jr_8012ACE0.c +++ b/src/ov_SC01_080/ov_SC01_080_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC01_080_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC01_080_80131340 D_80183A10; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80183AFC; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80183AE8[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC01_080_80133CD4; *(Blk8_SC01_080_80133CD4 *)&D_801152B0 = *(Blk8_SC01_080_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC01_080/ov_SC01_080_jr_80135A4C.c b/src/ov_SC01_080/ov_SC01_080_jr_80135A4C.c index dcdcda8fdf..1e3b6e90f0 100644 --- a/src/ov_SC01_080/ov_SC01_080_jr_80135A4C.c +++ b/src/ov_SC01_080/ov_SC01_080_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC01_080_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC01_080/ov_SC01_080_jr_8017AE2C.c b/src/ov_SC01_080/ov_SC01_080_jr_8017AE2C.c index ba5ac1b94a..0aa6e405e2 100644 --- a/src/ov_SC01_080/ov_SC01_080_jr_8017AE2C.c +++ b/src/ov_SC01_080/ov_SC01_080_jr_8017AE2C.c @@ -5905,7 +5905,6 @@ void func_80180728(s32 a0) { BLOCK-SCOPE redeclaration of the same externally-linked symbol is only a WARNING ("type mismatch with previous external decl") -- codegen is unaffected, confirmed byte-identical both standalone and spliced. */ - typedef struct { s32 q[16]; } Str_801C5B00; extern Str_801C5B00 D_801C5B00[]; /* `pad` is the 16 unused frame bytes at 0x10..0x20 the target reserves below the two vectors; locals are laid out in declaration order, so it @@ -6377,7 +6376,6 @@ extern void func_801696D8(s32 a0, s32 a1); extern s32 func_80169A4C(s32 a0, s32 a1); void func_801810E4(void *a0) { - typedef struct { s16 vx, vy, vz, pad; } SVec8; extern Blk20 D_800AE620; Blk20 mtx; @@ -6691,7 +6689,6 @@ void func_80181854(void *a0) { func_80180728): two file-scope anonymous-struct typedefs of one name are a hard cc1 error, block scope is not. Frame: v @ sp+0x10, v2 @ sp+0x18, mtx @ sp+0x20 -- declaration order IS slot order. */ - typedef struct { u16 vx, vy, vz, pad; } UVec8; UVec8 v; UVec8 v2; @@ -7661,14 +7658,7 @@ extern s32 func_8012AD50(void * arg0); void func_80183054(s32 arg0) { - typedef struct { - u8 raw[8]; - } S8Blob; - typedef struct { - S8Blob a; - S8Blob b; - } Entry16; extern u16 D_8018A45C[]; extern u32 D_801C7594; diff --git a/src/ov_SC01_084/ov_SC01_084_after.c b/src/ov_SC01_084/ov_SC01_084_after.c index 394ec246e1..cc6f546990 100644 --- a/src/ov_SC01_084/ov_SC01_084_after.c +++ b/src/ov_SC01_084/ov_SC01_084_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC01_084/ov_SC01_084_jr_8012ACE0.c b/src/ov_SC01_084/ov_SC01_084_jr_8012ACE0.c index 85675cc688..e8a57a95a2 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_8012ACE0.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC01_084_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC01_084_80131340 D_80186D04; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80186DF0; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80186DDC[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC01_084_80133CD4; *(Blk8_SC01_084_80133CD4 *)&D_801152B0 = *(Blk8_SC01_084_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC01_084/ov_SC01_084_jr_80135A4C.c b/src/ov_SC01_084/ov_SC01_084_jr_80135A4C.c index d002091312..abae55d388 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_80135A4C.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC01_084_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC01_084/ov_SC01_084_jr_8017CA80.c b/src/ov_SC01_084/ov_SC01_084_jr_8017CA80.c index 262105db75..05643600f7 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_8017CA80.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_8017CA80.c @@ -2737,7 +2737,6 @@ void func_8017D960(void) { void func_8017DA00(void) { - typedef struct { s32 words[41]; } Blk164; extern u8 D_80126948[]; extern u8 D_8011F920[]; extern void func_8012A018(s32 a, s32 b); @@ -2776,7 +2775,6 @@ void func_8017DA9C() { void func_8017DAF8(void) { - typedef struct { s32 w[4]; } Blk16_SC01_084_8017DAF8; extern u8 D_80126948[]; extern u8 D_8011F920[]; Blk16_SC01_084_8017DAF8 *src; @@ -3382,7 +3380,6 @@ void func_8017E8E8(void *arg0) { void func_8017E94C(u8 *a0) { - typedef struct { s16 a, b, c, d; } SV4; extern s32 func_801399F0(s32 a0); extern void func_80139914(s32 a0); extern s32 func_8013767C(s32 a0); @@ -3918,7 +3915,7 @@ void func_8017F378(s32 param_1) void func_8017F474(void *a0) { - extern struct B8_17F474 { u8 b[8]; } D_8018A790[]; + extern struct B8_17F474 D_8018A790[]; extern s32 D_801270D8; extern s32 func_8012BEE8(s32 a0); extern s32 func_8012BD14(s32 a0); diff --git a/src/ov_SC01_084/ov_SC01_084_jr_8017F690.c b/src/ov_SC01_084/ov_SC01_084_jr_8017F690.c index 661fb16f8e..8bcd494a96 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_8017F690.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_8017F690.c @@ -2753,9 +2753,9 @@ void func_8017F690(s32 param_1) { u8 *s0; - if (*(s32 *)(param_1 + 0xDC) != ((struct { s32 w; } *)&D_801270D8)->w) { - *(s32 *)(param_1 + 0xDC) = ((struct { s32 w; } *)&D_801270D8)->w; - switch (((struct { s32 w; } *)&D_801270D8)->w) { + if (*(s32 *)(param_1 + 0xDC) != ((Unkstruct_801270D8 *)&D_801270D8)->w) { + *(s32 *)(param_1 + 0xDC) = ((Unkstruct_801270D8 *)&D_801270D8)->w; + switch (((Unkstruct_801270D8 *)&D_801270D8)->w) { case 2: case 4: case 6: @@ -3220,9 +3220,9 @@ void func_80180000(s32 param_1) { func_80028620(0, rec - 8); *(s32 *)(param_1 + 0xE4) = (rand() & 1) + 1; } - if (*(s32 *)(param_1 + 0xDC) != ((struct { s32 w; } *)&D_801270D8)->w) { - *(s32 *)(param_1 + 0xDC) = ((struct { s32 w; } *)&D_801270D8)->w; - switch (((struct { s32 w; } *)&D_801270D8)->w) { + if (*(s32 *)(param_1 + 0xDC) != ((Unkstruct_801270D8 *)&D_801270D8)->w) { + *(s32 *)(param_1 + 0xDC) = ((Unkstruct_801270D8 *)&D_801270D8)->w; + switch (((Unkstruct_801270D8 *)&D_801270D8)->w) { case 2: case 4: case 6: diff --git a/src/ov_SC01_084/ov_SC01_084_jr_80182A00.c b/src/ov_SC01_084/ov_SC01_084_jr_80182A00.c index e47d327f4a..2c3e2ec119 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_80182A00.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_80182A00.c @@ -2098,8 +2098,8 @@ void func_8018528C(void *a0) { switch (state) { case 0: - ((struct { unsigned short h; } *)((u8 *)s0 + 0x34))->h = state + 1; - ((struct { s32 f; } *)((u8 *)s0 + 0x1C))->f = 0; + ((Unkstruct_8018528C *)((u8 *)s0 + 0x34))->h = state + 1; + ((Unkstruct_8018528C_2 *)((u8 *)s0 + 0x1C))->f = 0; func_8002D4C8(0x4AA, 0); break; case 1: diff --git a/src/ov_SC02_000/ov_SC02_000_after.c b/src/ov_SC02_000/ov_SC02_000_after.c index bd0d3ede2e..b62981d3f8 100644 --- a/src/ov_SC02_000/ov_SC02_000_after.c +++ b/src/ov_SC02_000/ov_SC02_000_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC02_000/ov_SC02_000_jr_8012ACE0.c b/src/ov_SC02_000/ov_SC02_000_jr_8012ACE0.c index dd8433fc71..5181a03ae5 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_8012ACE0.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_8012ACE0.c @@ -1424,9 +1424,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC02_000_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC02_000_80131340 D_8018B0B4; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2398,7 +2395,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018B1A0; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2457,7 +2454,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018B18C[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC02_000_80133CD4; *(Blk8_SC02_000_80133CD4 *)&D_801152B0 = *(Blk8_SC02_000_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC02_000/ov_SC02_000_jr_80135A4C.c b/src/ov_SC02_000/ov_SC02_000_jr_80135A4C.c index 6b6774220b..beafed60a0 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_80135A4C.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC02_000_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC02_000/ov_SC02_000_jr_8017F950.c b/src/ov_SC02_000/ov_SC02_000_jr_8017F950.c index d0b85d3a6b..98ba121f06 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_8017F950.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_8017F950.c @@ -3,7 +3,6 @@ void func_8017F950(s32 arg0) { - typedef struct { u32 w[4]; } St801D9204; extern void func_80019064(void *a0); extern void func_8012A828(s32 a0, void *a1); extern void func_8012B23C(s32 a0); diff --git a/src/ov_SC02_000/ov_SC02_000_jr_8018173C.c b/src/ov_SC02_000/ov_SC02_000_jr_8018173C.c index 5e1203df7e..3d519721b2 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_8018173C.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_8018173C.c @@ -3383,7 +3383,6 @@ void func_80182BD0(u8 *a0) { void func_80182CB4(s32 _arg0) { - typedef struct { s32 w[4]; } Blk16_SC02_000_80182CB4; extern u8 D_80126948[]; extern s32 D_80126E60[]; Blk16_SC02_000_80182CB4 *src; diff --git a/src/ov_SC02_000/ov_SC02_000_jr_80187B40.c b/src/ov_SC02_000/ov_SC02_000_jr_80187B40.c index a3e5058e60..5bfb37ae31 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_80187B40.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_80187B40.c @@ -3908,18 +3908,7 @@ extern s32 AddPrim(s32 a0, void *a1); void func_80189340(s32 p) { - typedef struct { u8 pad0[3]; u8 len; u8 pad1[3]; u8 code; } PHdr_80189340; - typedef struct { - u32 tag; /* 0x00 */ - u32 c0; /* 0x04 */ - u16 x0, y0; /* 0x08, 0x0A */ - u32 c1; /* 0x0C */ - u16 x1, y1; /* 0x10, 0x12 */ - u32 c2; /* 0x14 */ - u16 x2, y2; /* 0x18, 0x1A */ - u32 c3; /* 0x1C */ - u16 x3, y3; /* 0x20, 0x22 */ - } PG4_80189340; /* 0x24 */ + /* 0x24 */ s32 tags[28]; /* sp+0x18 */ s16 sv[4]; /* sp+0x88 */ diff --git a/src/ov_SC02_004/ov_SC02_004_after.c b/src/ov_SC02_004/ov_SC02_004_after.c index 7ea34eab3f..db8efa8331 100644 --- a/src/ov_SC02_004/ov_SC02_004_after.c +++ b/src/ov_SC02_004/ov_SC02_004_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC02_004/ov_SC02_004_jr_8012ACE0.c b/src/ov_SC02_004/ov_SC02_004_jr_8012ACE0.c index 5a22bdb85e..e9e902ed67 100644 --- a/src/ov_SC02_004/ov_SC02_004_jr_8012ACE0.c +++ b/src/ov_SC02_004/ov_SC02_004_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC02_004_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC02_004_80131340 D_8017E194; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017E280; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017E26C[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC02_004_80133CD4; *(Blk8_SC02_004_80133CD4 *)&D_801152B0 = *(Blk8_SC02_004_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC02_004/ov_SC02_004_jr_80135A4C.c b/src/ov_SC02_004/ov_SC02_004_jr_80135A4C.c index 4ae6615075..6a9d3a5a43 100644 --- a/src/ov_SC02_004/ov_SC02_004_jr_80135A4C.c +++ b/src/ov_SC02_004/ov_SC02_004_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC02_004_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC02_005/ov_SC02_005_after.c b/src/ov_SC02_005/ov_SC02_005_after.c index e5d63894f0..b12a705585 100644 --- a/src/ov_SC02_005/ov_SC02_005_after.c +++ b/src/ov_SC02_005/ov_SC02_005_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC02_005/ov_SC02_005_jr_8012ACE0.c b/src/ov_SC02_005/ov_SC02_005_jr_8012ACE0.c index 889000b002..8f95917cc0 100644 --- a/src/ov_SC02_005/ov_SC02_005_jr_8012ACE0.c +++ b/src/ov_SC02_005/ov_SC02_005_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC02_005_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC02_005_80131340 D_80190D98; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80190E84; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80190E70[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC02_005_80133CD4; *(Blk8_SC02_005_80133CD4 *)&D_801152B0 = *(Blk8_SC02_005_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC02_005/ov_SC02_005_jr_80135A4C.c b/src/ov_SC02_005/ov_SC02_005_jr_80135A4C.c index c0aa4e93b2..392b4bede5 100644 --- a/src/ov_SC02_005/ov_SC02_005_jr_80135A4C.c +++ b/src/ov_SC02_005/ov_SC02_005_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC02_005_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC02_005/ov_SC02_005_jr_8017CF90.c b/src/ov_SC02_005/ov_SC02_005_jr_8017CF90.c index c9fbbd2259..b9a98d479f 100644 --- a/src/ov_SC02_005/ov_SC02_005_jr_8017CF90.c +++ b/src/ov_SC02_005/ov_SC02_005_jr_8017CF90.c @@ -3562,12 +3562,10 @@ extern void func_8017E97C(void *a0); void func_8017E798(void *a0) { - typedef struct { s16 vx, vy, vz, pad; } Vec8_DB0; extern Vec8_DB0 D_801E2DB0; extern Vec8_DB0 D_801E2DB8; extern u8 D_80126948[]; extern s32 D_80126E60[]; - typedef struct { s32 w[41]; } Blk164_SC02_005_8017E798; u8 *base; Vec8_DB0 a; Vec8_DB0 b; @@ -3591,7 +3589,6 @@ void func_8017E798(void *a0) { void func_8017E898(void) { - typedef struct { s32 w[4]; } Blk16_E898; extern u8 D_80126948[]; extern s32 D_80126E60[]; Blk16_E898 *src; @@ -4222,7 +4219,6 @@ void func_8017F6E8(s32 param_1) #include "common.h" void func_8017F748(void *a0) { - typedef struct { u8 b[8]; } Blk8x; extern Blk8x D_801E2DD0; extern s32 func_80171D78(s32 a0, s32 a1); extern void func_80142454(s32 a0); @@ -4241,8 +4237,6 @@ void func_8017F748(void *a0) { void func_8017F7CC(s32 param_1) { - typedef struct { u8 b[8]; } M8_SC02_005_8017F7CC; - typedef struct { u8 b[0x10]; } S16_SC02_005_8017F7CC; extern M8_SC02_005_8017F7CC D_801E2DD8; extern void func_8017E5CC(void); extern void func_8017E0B4(void); @@ -4503,7 +4497,6 @@ void func_8017FDB4(void *arg0) { void func_8017FE08(void *a0) { - typedef struct { u8 b[8]; } Blk8_FE08; extern Blk8_FE08 D_801E2DE0; extern s32 func_80171D78(s32, s32); extern s32 func_801289F0(); @@ -4879,10 +4872,6 @@ extern s16 D_801E4C50; * must therefore be 62 then 6A to emit 6A then 62. */ void func_80180610(void *a0) { - typedef struct { - s16 f0; s16 f2; s16 f4; u16 f6; s16 f8; - s16 fA; s16 fC; s16 fE; s16 f10; s16 f12; - } Row_801944F4; extern Row_801944F4 D_801944F4[]; s32 v1; diff --git a/src/ov_SC02_005/ov_SC02_005_jr_80185060.c b/src/ov_SC02_005/ov_SC02_005_jr_80185060.c index e55ed8ac51..5ca9475228 100644 --- a/src/ov_SC02_005/ov_SC02_005_jr_80185060.c +++ b/src/ov_SC02_005/ov_SC02_005_jr_80185060.c @@ -368,7 +368,6 @@ void func_80185764(void *a0) extern s32 D_801E43C0; void func_80185858(s32 arg0, void *arg1, void *arg2) { - typedef struct { u8 pad[0x5C]; u16 f5C; } F5C_S; extern F5C_S *D_801E43CC[]; s32 *p = &D_801E43C0; diff --git a/src/ov_SC02_005/ov_SC02_005_jr_80185E80.c b/src/ov_SC02_005/ov_SC02_005_jr_80185E80.c index 98257e1336..bf95784984 100644 --- a/src/ov_SC02_005/ov_SC02_005_jr_80185E80.c +++ b/src/ov_SC02_005/ov_SC02_005_jr_80185E80.c @@ -687,10 +687,6 @@ void func_80186B08(s32 param_1) void func_80186BB8(void) { - typedef struct { - u8 pad[0x5C]; - u16 f5C; - } F5C_S; extern F5C_S *D_801E43CC[]; extern s8 D_80195ABC[]; s32 i; @@ -707,7 +703,6 @@ void func_80186BB8(void) { void func_80186C0C(void *a0) { - typedef struct { u8 pad[0x5C]; u16 f5C; } F5C_S; extern F5C_S *D_801E43CC[]; extern s8 D_80195ABC[]; s32 i; @@ -2799,7 +2794,6 @@ extern u16 D_80126B94; * both declarations draft-local and is byte-neutral. */ void func_80189B30(s32 arg0) { - typedef struct { char b[8]; } Blob8_80189B30; extern Blob8_80189B30 D_801E2F00; Blob8_80189B30 blob; s32 sub; @@ -5973,7 +5967,6 @@ void func_8018DFC4(void *a0) { and carry an anonymous struct typedef that cannot be forward-referenced or re-spelled here. At block scope gcc-2.7.2 downgrades the clash to a warning; at file scope it is a hard "conflicting types" error. */ - typedef struct { u32 f0; u32 f4; } Pair8; extern Pair8 D_801E4998[]; extern Pair8 D_801E499C[]; struct { s16 f00, f02, f04, f06, f08, f0A, f0C, f0E; s32 f10; u8 pad14[0x14]; } sp18; diff --git a/src/ov_SC02_011/ov_SC02_011_after.c b/src/ov_SC02_011/ov_SC02_011_after.c index 96e2a1385d..bae86cef7c 100644 --- a/src/ov_SC02_011/ov_SC02_011_after.c +++ b/src/ov_SC02_011/ov_SC02_011_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC02_011/ov_SC02_011_jr_8012ACE0.c b/src/ov_SC02_011/ov_SC02_011_jr_8012ACE0.c index 80d8a812c5..b5ad68ef3f 100644 --- a/src/ov_SC02_011/ov_SC02_011_jr_8012ACE0.c +++ b/src/ov_SC02_011/ov_SC02_011_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC02_011_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC02_011_80131340 D_801911E8; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801912D4; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801912C0[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC02_011_80133CD4; *(Blk8_SC02_011_80133CD4 *)&D_801152B0 = *(Blk8_SC02_011_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC02_011/ov_SC02_011_jr_80135A4C.c b/src/ov_SC02_011/ov_SC02_011_jr_80135A4C.c index aa1a35a7f2..edc2020c90 100644 --- a/src/ov_SC02_011/ov_SC02_011_jr_80135A4C.c +++ b/src/ov_SC02_011/ov_SC02_011_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC02_011_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC02_011/ov_SC02_011_jr_8017AE2C.c b/src/ov_SC02_011/ov_SC02_011_jr_8017AE2C.c index c056daa87f..b45a626346 100644 --- a/src/ov_SC02_011/ov_SC02_011_jr_8017AE2C.c +++ b/src/ov_SC02_011/ov_SC02_011_jr_8017AE2C.c @@ -7098,7 +7098,6 @@ void func_80180E74(void *a0) void func_80180FE4(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC02_011_80180FE4; extern s32 func_800491EC(void); extern void func_800547D8(s32, MTX80180FE4 *); @@ -7571,7 +7570,6 @@ void func_80181E40(s32 param_1) { void func_80181EF4(s32 param_1) { - typedef struct { u8 b[8]; } Blk8L; extern Blk8L D_801E9DA0; Blk8L buffer; @@ -7971,7 +7969,6 @@ void func_801826D8(void *a0) { #include "common.h" void func_80182714(s32 param_1) { - typedef struct { s16 x0, x1, x2, x3; } Blk8S16; extern s32 D_801E9DA8; extern s32 D_80126B58; extern s16 D_80195058[]; diff --git a/src/ov_SC02_011/ov_SC02_011_jr_80183178.c b/src/ov_SC02_011/ov_SC02_011_jr_80183178.c index d2204c335e..04ea0478a8 100644 --- a/src/ov_SC02_011/ov_SC02_011_jr_80183178.c +++ b/src/ov_SC02_011/ov_SC02_011_jr_80183178.c @@ -2454,7 +2454,6 @@ void func_80186734(void *a0) { s32 func_80186740(void) { - typedef struct { unsigned char b[4]; } __attribute__((packed, aligned(1))) Block4_SC02_011_80186740; extern Block4_SC02_011_80186740 D_801EB524; extern unsigned char D_801EB525; @@ -2587,7 +2586,7 @@ void func_80186868(s32 a0) } if ((*(s32 *)(self + 0x1C) & 0x1F) >= 8) { if (func_80186B1C((void *)self, D_80195D30) != 0) { - ((struct { u16 w; } *)&D_80126B96)->w |= 0x4000; + ((Unkstruct_80126B96 *)&D_80126B96)->w |= 0x4000; D_80126B98 = 0xC; } } diff --git a/src/ov_SC02_015/ov_SC02_015_after.c b/src/ov_SC02_015/ov_SC02_015_after.c index e91e23a67b..7f1b597e85 100644 --- a/src/ov_SC02_015/ov_SC02_015_after.c +++ b/src/ov_SC02_015/ov_SC02_015_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC02_015/ov_SC02_015_jr_8012ACE0.c b/src/ov_SC02_015/ov_SC02_015_jr_8012ACE0.c index d31b299187..ba963132e2 100644 --- a/src/ov_SC02_015/ov_SC02_015_jr_8012ACE0.c +++ b/src/ov_SC02_015/ov_SC02_015_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC02_015_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC02_015_80131340 D_8017E6FC; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017E7E8; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017E7D4[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC02_015_80133CD4; *(Blk8_SC02_015_80133CD4 *)&D_801152B0 = *(Blk8_SC02_015_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC02_015/ov_SC02_015_jr_80135A4C.c b/src/ov_SC02_015/ov_SC02_015_jr_80135A4C.c index 4e1c972812..965a43e1cc 100644 --- a/src/ov_SC02_015/ov_SC02_015_jr_80135A4C.c +++ b/src/ov_SC02_015/ov_SC02_015_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC02_015_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC02_016/ov_SC02_016_after.c b/src/ov_SC02_016/ov_SC02_016_after.c index 28f7d2104f..6d55ef36b3 100644 --- a/src/ov_SC02_016/ov_SC02_016_after.c +++ b/src/ov_SC02_016/ov_SC02_016_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC02_016/ov_SC02_016_jr_8012ACE0.c b/src/ov_SC02_016/ov_SC02_016_jr_8012ACE0.c index 8d07af150c..0fd06e1f93 100644 --- a/src/ov_SC02_016/ov_SC02_016_jr_8012ACE0.c +++ b/src/ov_SC02_016/ov_SC02_016_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC02_016_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC02_016_80131340 D_80184934; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80184A20; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80184A0C[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC02_016_80133CD4; *(Blk8_SC02_016_80133CD4 *)&D_801152B0 = *(Blk8_SC02_016_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC02_016/ov_SC02_016_jr_80135A4C.c b/src/ov_SC02_016/ov_SC02_016_jr_80135A4C.c index 6b5877094a..8a469ed2c9 100644 --- a/src/ov_SC02_016/ov_SC02_016_jr_80135A4C.c +++ b/src/ov_SC02_016/ov_SC02_016_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC02_016_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC02_016/ov_SC02_016_jr_8017DC70.c b/src/ov_SC02_016/ov_SC02_016_jr_8017DC70.c index f04bae86b6..f7bc6490b5 100644 --- a/src/ov_SC02_016/ov_SC02_016_jr_8017DC70.c +++ b/src/ov_SC02_016/ov_SC02_016_jr_8017DC70.c @@ -2708,7 +2708,6 @@ extern void func_8017D9B4(void *a0); void func_8017DC70(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC02_016_8017DC70; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC02_017/ov_SC02_017_after.c b/src/ov_SC02_017/ov_SC02_017_after.c index 27b3b80b12..5fb7cf63bb 100644 --- a/src/ov_SC02_017/ov_SC02_017_after.c +++ b/src/ov_SC02_017/ov_SC02_017_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC02_017/ov_SC02_017_jr_8012ACE0.c b/src/ov_SC02_017/ov_SC02_017_jr_8012ACE0.c index 2a6388f2a1..bad397df10 100644 --- a/src/ov_SC02_017/ov_SC02_017_jr_8012ACE0.c +++ b/src/ov_SC02_017/ov_SC02_017_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC02_017_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC02_017_80131340 D_8018A98C; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018AA78; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018AA64[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC02_017_80133CD4; *(Blk8_SC02_017_80133CD4 *)&D_801152B0 = *(Blk8_SC02_017_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC02_017/ov_SC02_017_jr_80135A4C.c b/src/ov_SC02_017/ov_SC02_017_jr_80135A4C.c index 2d5b3c38c3..058ece4b18 100644 --- a/src/ov_SC02_017/ov_SC02_017_jr_80135A4C.c +++ b/src/ov_SC02_017/ov_SC02_017_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC02_017_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC02_017/ov_SC02_017_jr_8017DF34.c b/src/ov_SC02_017/ov_SC02_017_jr_8017DF34.c index b8e672b100..83f5059e2a 100644 --- a/src/ov_SC02_017/ov_SC02_017_jr_8017DF34.c +++ b/src/ov_SC02_017/ov_SC02_017_jr_8017DF34.c @@ -2713,7 +2713,6 @@ extern void func_8017DE98(void *a0); void func_8017DF34(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC02_017_8017DF34; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC02_021/ov_SC02_021_after.c b/src/ov_SC02_021/ov_SC02_021_after.c index 4bafdf4d52..e27109c9ef 100644 --- a/src/ov_SC02_021/ov_SC02_021_after.c +++ b/src/ov_SC02_021/ov_SC02_021_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC02_021/ov_SC02_021_jr_8012ACE0.c b/src/ov_SC02_021/ov_SC02_021_jr_8012ACE0.c index 4697032eb1..96690cd24e 100644 --- a/src/ov_SC02_021/ov_SC02_021_jr_8012ACE0.c +++ b/src/ov_SC02_021/ov_SC02_021_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC02_021_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC02_021_80131340 D_8017FF80; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018006C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80180058[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC02_021_80133CD4; *(Blk8_SC02_021_80133CD4 *)&D_801152B0 = *(Blk8_SC02_021_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC02_021/ov_SC02_021_jr_80135A4C.c b/src/ov_SC02_021/ov_SC02_021_jr_80135A4C.c index 1f97035418..68cc3aa38f 100644 --- a/src/ov_SC02_021/ov_SC02_021_jr_80135A4C.c +++ b/src/ov_SC02_021/ov_SC02_021_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC02_021_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC02_021/ov_SC02_021_jr_8017C294.c b/src/ov_SC02_021/ov_SC02_021_jr_8017C294.c index 5ccec29507..578c64853c 100644 --- a/src/ov_SC02_021/ov_SC02_021_jr_8017C294.c +++ b/src/ov_SC02_021/ov_SC02_021_jr_8017C294.c @@ -3183,15 +3183,6 @@ extern u8 *D_800A5E60; s32 func_8017DC10(s32 *a) { - typedef struct { s16 vx, vy, vz, pad; } SVEC8; - typedef struct { - u32 tag; - u32 rgbc; - s16 x0, y0; u32 uv0; - s16 x1, y1; u32 uv1; - s16 x2, y2; u32 uv2; - s16 x3, y3; u32 uv3; - } FT4; SVEC8 v[4]; u32 buf[6]; diff --git a/src/ov_SC02_026/ov_SC02_026_after.c b/src/ov_SC02_026/ov_SC02_026_after.c index f52836353f..0093cbe95c 100644 --- a/src/ov_SC02_026/ov_SC02_026_after.c +++ b/src/ov_SC02_026/ov_SC02_026_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC02_026/ov_SC02_026_jr_8012ACE0.c b/src/ov_SC02_026/ov_SC02_026_jr_8012ACE0.c index 5b0b8e486d..ca34c9c8d1 100644 --- a/src/ov_SC02_026/ov_SC02_026_jr_8012ACE0.c +++ b/src/ov_SC02_026/ov_SC02_026_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC02_026_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC02_026_80131340 D_801865D4; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801866C0; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801866AC[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC02_026_80133CD4; *(Blk8_SC02_026_80133CD4 *)&D_801152B0 = *(Blk8_SC02_026_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC02_026/ov_SC02_026_jr_80135A4C.c b/src/ov_SC02_026/ov_SC02_026_jr_80135A4C.c index bbf749bbb3..5716188f90 100644 --- a/src/ov_SC02_026/ov_SC02_026_jr_80135A4C.c +++ b/src/ov_SC02_026/ov_SC02_026_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC02_026_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC02_026/ov_SC02_026_jr_8017C180.c b/src/ov_SC02_026/ov_SC02_026_jr_8017C180.c index 307ea9811f..a4579cdc80 100644 --- a/src/ov_SC02_026/ov_SC02_026_jr_8017C180.c +++ b/src/ov_SC02_026/ov_SC02_026_jr_8017C180.c @@ -2936,7 +2936,6 @@ extern void func_8017D780(s32 param_1, s16 *param_2); void func_8017D508(s32 a0) { - typedef struct { s16 v[4]; } Blk8_80126940_8017D508; extern s32 D_80126B58; extern s16 D_80189BEC[]; @@ -4074,9 +4073,6 @@ extern s32 func_8017F400(s32 a0); extern u8 D_801A9C08[]; void func_8017EF64(s32 a0) { - typedef struct { - u8 c[8]; - } Blk8_80186594; s32 s0; s32 t0; @@ -4169,9 +4165,7 @@ extern s32 func_8017F390(s32 param_1); extern void func_8017F5DC(s32 a0); void func_8017F17C(s32 a0) { - typedef struct { - u8 c[8]; - } Blk8_md_SC03_076; /* alignment 1 -> lwl/lwr + swl/swr block move (S160a) */ + /* alignment 1 -> lwl/lwr + swl/swr block move (S160a) */ extern Blk8_md_SC03_076 D_801A5458; Blk8_md_SC03_076 sv; s32 obj; @@ -4322,7 +4316,6 @@ void func_8017F47C(s32 a0) { void func_8017F538(s32 a0, s32 a1) { - typedef struct { s32 w[8]; } Blk32_8017F76C_80186D9C; extern Blk32_8017F76C_80186D9C D_800AE620; Blk32_8017F76C_80186D9C mtx; @@ -6953,9 +6946,6 @@ extern u8 D_801BC098[]; extern u8 D_801BBA08[]; void func_801832A8(s32 a0) { - typedef struct { - u16 x, y, z, w; - } V8_SC02_026_801832A8; s32 mv[4]; /* sp+0x10 : the 4-word block handed to func_8012B1B4 */ V8_SC02_026_801832A8 pad[2]; /* sp+0x20 : gcc's own area (vars must be 0x48 for a 0x68 frame) */ V8_SC02_026_801832A8 sp30; /* sp+0x30 : func_80133784 arg1 */ @@ -7085,9 +7075,6 @@ extern u8 D_801BC318[]; extern u8 D_801BCBA0[]; void func_8018365C(s32 a0) { - typedef struct { - u16 x, y, z, w; - } V8_SC02_026_8018365C; s32 sp10[4]; V8_SC02_026_8018365C pad[2]; V8_SC02_026_8018365C sp30; @@ -7321,9 +7308,6 @@ extern u8 D_801AF950[]; extern u8 D_801BC658[]; void func_80183B04(s32 a0) { - typedef struct { - u16 x, y, z, w; - } V8_SC02_026_80183B04; V8_SC02_026_80183B04 pad[2]; V8_SC02_026_80183B04 sp20; V8_SC02_026_80183B04 sp28; @@ -7838,7 +7822,6 @@ extern s32 func_80133784(s32 a0, void *a1, s32 a2); extern u8 D_801AF66C[]; void func_80184690(s32 a0) { - typedef struct { u16 x, y, z, w; } V8_SC02_026_80184690; V8_SC02_026_80184690 sp10; V8_SC02_026_80184690 sp18; diff --git a/src/ov_SC02_027/ov_SC02_027_after.c b/src/ov_SC02_027/ov_SC02_027_after.c index d85230fa7c..49ddff4d08 100644 --- a/src/ov_SC02_027/ov_SC02_027_after.c +++ b/src/ov_SC02_027/ov_SC02_027_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC02_027/ov_SC02_027_jr_8012ACE0.c b/src/ov_SC02_027/ov_SC02_027_jr_8012ACE0.c index d98a7d2ec8..0ec5c02c94 100644 --- a/src/ov_SC02_027/ov_SC02_027_jr_8012ACE0.c +++ b/src/ov_SC02_027/ov_SC02_027_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC02_027_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC02_027_80131340 D_8018B6F8; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018B7E4; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018B7D0[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC02_027_80133CD4; *(Blk8_SC02_027_80133CD4 *)&D_801152B0 = *(Blk8_SC02_027_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC02_027/ov_SC02_027_jr_80135A4C.c b/src/ov_SC02_027/ov_SC02_027_jr_80135A4C.c index be6ccb2d79..b91b808b7d 100644 --- a/src/ov_SC02_027/ov_SC02_027_jr_80135A4C.c +++ b/src/ov_SC02_027/ov_SC02_027_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC02_027_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC02_027/ov_SC02_027_jr_8017D898.c b/src/ov_SC02_027/ov_SC02_027_jr_8017D898.c index 5e0eb19e55..6af3ad5947 100644 --- a/src/ov_SC02_027/ov_SC02_027_jr_8017D898.c +++ b/src/ov_SC02_027/ov_SC02_027_jr_8017D898.c @@ -7979,9 +7979,6 @@ extern s32 func_80186A30(void *a0); extern u8 D_801B4380; void func_80186594(s32 a0) { - typedef struct { - u8 c[8]; - } Blk8_80186594; s32 s0; s32 t0; @@ -8076,9 +8073,7 @@ extern s32 func_801869C0(s32 param_1); extern void func_80186C0C(s32 a0); void func_801867AC(s32 a0) { - typedef struct { - u8 c[8]; - } Blk8_801867AC; /* alignment 1 -> lwl/lwr + swl/swr block move (S160a) */ + /* alignment 1 -> lwl/lwr + swl/swr block move (S160a) */ extern Blk8_801867AC D_801AFBD0; Blk8_801867AC sv; s32 obj; @@ -8223,7 +8218,6 @@ void func_80186AAC(s32 a0) { void func_80186B68(s32 a0, s32 a1) { - typedef struct { s32 w[8]; } Blk32_8017F76C_80186D9C; extern Blk32_8017F76C_80186D9C D_800AE620; Blk32_8017F76C_80186D9C mtx; @@ -8668,12 +8662,6 @@ void func_80187400(s32 a0) { /* 8-byte, align-2 vector — align < 4 is what makes the aggregate copies * unaligned lwl/lwr + swl/swr block moves (§ sibling func_80131340). */ - struct V8_SC02_027_80187400 { - u16 vx, vy, vz, pad; - }; - struct Cnt { - s32 c; - }; struct V8_SC02_027_80187400 sp10; struct V8_SC02_027_80187400 sp18; diff --git a/src/ov_SC02_028/ov_SC02_028_after.c b/src/ov_SC02_028/ov_SC02_028_after.c index 5b51dcec47..44046db3a2 100644 --- a/src/ov_SC02_028/ov_SC02_028_after.c +++ b/src/ov_SC02_028/ov_SC02_028_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC02_028/ov_SC02_028_jr_8012ACE0.c b/src/ov_SC02_028/ov_SC02_028_jr_8012ACE0.c index 83215c78e8..a77fc9cf2b 100644 --- a/src/ov_SC02_028/ov_SC02_028_jr_8012ACE0.c +++ b/src/ov_SC02_028/ov_SC02_028_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC02_028_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC02_028_80131340 D_8018B8FC; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018B9E8; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018B9D4[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC02_028_80133CD4; *(Blk8_SC02_028_80133CD4 *)&D_801152B0 = *(Blk8_SC02_028_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC02_028/ov_SC02_028_jr_80135A4C.c b/src/ov_SC02_028/ov_SC02_028_jr_80135A4C.c index 074c2b5585..88cf97ec95 100644 --- a/src/ov_SC02_028/ov_SC02_028_jr_80135A4C.c +++ b/src/ov_SC02_028/ov_SC02_028_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC02_028_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC02_028/ov_SC02_028_jr_8017D898.c b/src/ov_SC02_028/ov_SC02_028_jr_8017D898.c index 86902b4b15..5ae409b363 100644 --- a/src/ov_SC02_028/ov_SC02_028_jr_8017D898.c +++ b/src/ov_SC02_028/ov_SC02_028_jr_8017D898.c @@ -4335,8 +4335,6 @@ void func_80180C04(void *arg0) /* stride-8 tables, field 0 only — the TU already declares these two typedefs * at file scope (above func_80180970); repeated at block scope so this * function also compiles standalone. */ - typedef struct { u16 v; u16 pad[3]; } Stride8_u16_80182868_80180970; - typedef struct { s16 v; s16 pad[3]; } Stride8_s16_80182868_80180970; extern s16 D_801A4D04; extern Stride8_u16_80182868_80180970 D_801A4D0C[]; @@ -5591,7 +5589,6 @@ void func_8018248C(s32 a0, s32 a1) { * file-scope decl in this TU: it is already declared twice, block-scoped and * with two different types (Blk32_8018AA98_80183D30 @5594, s32 @6053). This * body follows that existing TU precedent verbatim. */ - typedef struct { s32 w[8]; } Blk32_8018AA98_80183D30; extern Blk8 D_801D1A9C; extern s32 D_800AE620; Msg_8018248C msg; /* sp+0x10 (24-byte stride, §193-I) */ diff --git a/src/ov_SC02_028/ov_SC02_028_jr_80184BD8.c b/src/ov_SC02_028/ov_SC02_028_jr_80184BD8.c index 2b7034d8c1..659640e18a 100644 --- a/src/ov_SC02_028/ov_SC02_028_jr_80184BD8.c +++ b/src/ov_SC02_028/ov_SC02_028_jr_80184BD8.c @@ -4147,9 +4147,6 @@ extern s32 func_80187414(void *a0); extern u8 D_801AE220[]; void func_80186F78(s32 a0) { - typedef struct { - u8 c[8]; - } Blk8_80186F78; s32 s0; s32 t0; @@ -4189,9 +4186,6 @@ extern s32 D_801A9788; void func_801870AC(s32 a0) { - typedef struct { - u8 c[8]; - } Blk8_801870AC; Blk8_801870AC sv; s32 obj; s32 p; @@ -4241,9 +4235,7 @@ extern s32 func_801873A4(s32 param_1); extern void func_801875F0(s32 a0); void func_80187190(s32 a0) { - typedef struct { - u8 c[8]; - } Blk8_80187190; /* alignment 1 -> lwl/lwr + swl/swr block move (S160a) */ + /* alignment 1 -> lwl/lwr + swl/swr block move (S160a) */ extern Blk8_80187190 D_801A9A70; Blk8_80187190 sv; s32 obj; @@ -4402,7 +4394,6 @@ void func_80187490(s32 a0) { void func_8018754C(s32 a0, s32 a1) { - typedef struct { s32 w[8]; } Blk32_8017F76C_80186D9C; extern Blk32_8017F76C_80186D9C D_800AE620; Blk32_8017F76C_80186D9C mtx; @@ -4849,12 +4840,6 @@ void func_80187DE4(s32 a0) extern s32 D_801D3380; /* 8-byte, align-2 vector — align < 4 is what makes the aggregate copies * unaligned lwl/lwr + swl/swr block moves (§ sibling func_80131340). */ - struct V8_80187DE4 { - u16 vx, vy, vz, pad; - }; - struct Cnt_80187DE4 { - s32 c; - }; struct V8_80187DE4 sp10; struct V8_80187DE4 sp18; diff --git a/src/ov_SC02_031/ov_SC02_031_after.c b/src/ov_SC02_031/ov_SC02_031_after.c index c09be8d854..f8f608eafb 100644 --- a/src/ov_SC02_031/ov_SC02_031_after.c +++ b/src/ov_SC02_031/ov_SC02_031_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC02_031/ov_SC02_031_jr_8012ACE0.c b/src/ov_SC02_031/ov_SC02_031_jr_8012ACE0.c index 4b792af88b..434073c79b 100644 --- a/src/ov_SC02_031/ov_SC02_031_jr_8012ACE0.c +++ b/src/ov_SC02_031/ov_SC02_031_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC02_031_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC02_031_80131340 D_80185128; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80185214; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80185200[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC02_031_80133CD4; *(Blk8_SC02_031_80133CD4 *)&D_801152B0 = *(Blk8_SC02_031_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC02_031/ov_SC02_031_jr_80135A4C.c b/src/ov_SC02_031/ov_SC02_031_jr_80135A4C.c index 1cbde0c2d0..0db300f56d 100644 --- a/src/ov_SC02_031/ov_SC02_031_jr_80135A4C.c +++ b/src/ov_SC02_031/ov_SC02_031_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC02_031_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC02_031/ov_SC02_031_jr_8017AE2C.c b/src/ov_SC02_031/ov_SC02_031_jr_8017AE2C.c index 3cc63a85e0..ee54b89093 100644 --- a/src/ov_SC02_031/ov_SC02_031_jr_8017AE2C.c +++ b/src/ov_SC02_031/ov_SC02_031_jr_8017AE2C.c @@ -5627,7 +5627,6 @@ extern s32 D_801B7A00; void func_8017F5B4(s32 arg0, s32 arg1, s32 arg2) { - typedef struct { u32 w0, w1, w2; } Prim_SC02_031_8017F5B4; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC02_035/ov_SC02_035_after.c b/src/ov_SC02_035/ov_SC02_035_after.c index 79d29390e9..f343930640 100644 --- a/src/ov_SC02_035/ov_SC02_035_after.c +++ b/src/ov_SC02_035/ov_SC02_035_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC02_035/ov_SC02_035_jr_8012ACE0.c b/src/ov_SC02_035/ov_SC02_035_jr_8012ACE0.c index 3b85e32e81..9a494ff1da 100644 --- a/src/ov_SC02_035/ov_SC02_035_jr_8012ACE0.c +++ b/src/ov_SC02_035/ov_SC02_035_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC02_035_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC02_035_80131340 D_80184988; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80184A74; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80184A60[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC02_035_80133CD4; *(Blk8_SC02_035_80133CD4 *)&D_801152B0 = *(Blk8_SC02_035_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC02_035/ov_SC02_035_jr_80135A4C.c b/src/ov_SC02_035/ov_SC02_035_jr_80135A4C.c index 1319a07a70..9542575325 100644 --- a/src/ov_SC02_035/ov_SC02_035_jr_80135A4C.c +++ b/src/ov_SC02_035/ov_SC02_035_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC02_035_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC02_037/ov_SC02_037_jr_80131340.c b/src/ov_SC02_037/ov_SC02_037_jr_80131340.c index f7a7d1941f..cecc7d2e69 100644 --- a/src/ov_SC02_037/ov_SC02_037_jr_80131340.c +++ b/src/ov_SC02_037/ov_SC02_037_jr_80131340.c @@ -623,9 +623,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_80131340 { - u16 vx, vy, vz, pad; - }; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 * with the stale 1-arg engine_core canonical. A file-scope `extern int @@ -1641,7 +1638,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801841B0; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -1707,7 +1704,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018419C[3] = y; { - typedef struct { s8 c[8]; } Blk8_80133CD4; *(Blk8_80133CD4 *)&D_801152B0 = *(Blk8_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC02_037/ov_SC02_037_jr_80135A4C.c b/src/ov_SC02_037/ov_SC02_037_jr_80135A4C.c index cc29c43164..80d0addcbe 100644 --- a/src/ov_SC02_037/ov_SC02_037_jr_80135A4C.c +++ b/src/ov_SC02_037/ov_SC02_037_jr_80135A4C.c @@ -600,7 +600,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC02_037_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC02_037/ov_SC02_037_jr_801458E0.c b/src/ov_SC02_037/ov_SC02_037_jr_801458E0.c index 692bc3f837..a612a26c76 100644 --- a/src/ov_SC02_037/ov_SC02_037_jr_801458E0.c +++ b/src/ov_SC02_037/ov_SC02_037_jr_801458E0.c @@ -3059,13 +3059,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2x) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent_8014D820` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4_8014D820; typedef Unkstruct_800B5CB8 Ent_8014D820; int new_var2; s16 new_var3; diff --git a/src/ov_SC02_037/ov_SC02_037_jr_8017AE2C.c b/src/ov_SC02_037/ov_SC02_037_jr_8017AE2C.c index fa34c63ebc..95a1fb9527 100644 --- a/src/ov_SC02_037/ov_SC02_037_jr_8017AE2C.c +++ b/src/ov_SC02_037/ov_SC02_037_jr_8017AE2C.c @@ -5180,7 +5180,6 @@ extern short D_800B9A02; void func_8017D898(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC02_037_8017D898; DVECTOR2 tmpxy[4]; SVECTOR2 box[8]; @@ -6567,9 +6566,6 @@ void func_8017FBEC(s32 a0) { extern u8 D_800AF648; extern u8 D_801B03F8[]; extern u8 D_801AFD68[]; - typedef struct { - u16 x, y, z, w; - } V8_8017FBEC; s32 mv[4]; /* sp+0x10 : the 4-word block handed to func_8012B1B4 */ V8_8017FBEC pad[2]; /* sp+0x20 : gcc's own area (vars must be 0x48 for a 0x68 frame) */ V8_8017FBEC sp30; /* sp+0x30 : func_80133784 arg1 */ @@ -6699,9 +6695,6 @@ void func_8017FFA0(s32 a0) { extern u8 D_801B0CF8[]; extern u8 D_801B0678[]; extern u8 D_801B0F00[]; - typedef struct { - u16 x, y, z, w; - } V8_8017FFA0; s32 sp10[4]; V8_8017FFA0 pad[2]; V8_8017FFA0 sp30; @@ -6936,9 +6929,6 @@ void func_80180448(s32 a0) { extern u8 D_801A3CB0[]; extern u8 D_801B09B8[]; - typedef struct { - u16 x, y, z, w; - } V8_80180448; V8_80180448 pad[2]; V8_80180448 sp20; V8_80180448 sp28; @@ -7483,7 +7473,6 @@ extern s32 func_80133784(s32 a0, void *a1, s32 a2); void func_80180FD4(s32 a0) { extern u8 D_801A39CC[]; - typedef struct { u16 x, y, z, w; } V8_80180FD4; V8_80180FD4 sp10; V8_80180FD4 sp18; diff --git a/src/ov_SC02_039/ov_SC02_039_after.c b/src/ov_SC02_039/ov_SC02_039_after.c index 2c9e873deb..c5ae0e94c5 100644 --- a/src/ov_SC02_039/ov_SC02_039_after.c +++ b/src/ov_SC02_039/ov_SC02_039_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC02_039/ov_SC02_039_jr_8012ACE0.c b/src/ov_SC02_039/ov_SC02_039_jr_8012ACE0.c index 3d0b1f2f49..51fe25eb2f 100644 --- a/src/ov_SC02_039/ov_SC02_039_jr_8012ACE0.c +++ b/src/ov_SC02_039/ov_SC02_039_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC02_039_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC02_039_80131340 D_8017F5B4; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017F6A0; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017F68C[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC02_039_80133CD4; *(Blk8_SC02_039_80133CD4 *)&D_801152B0 = *(Blk8_SC02_039_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC02_039/ov_SC02_039_jr_80135A4C.c b/src/ov_SC02_039/ov_SC02_039_jr_80135A4C.c index e578eb0843..ca8942d7c8 100644 --- a/src/ov_SC02_039/ov_SC02_039_jr_80135A4C.c +++ b/src/ov_SC02_039/ov_SC02_039_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC02_039_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC02_041/ov_SC02_041_after.c b/src/ov_SC02_041/ov_SC02_041_after.c index 8bcca6e3a9..377a9b35a7 100644 --- a/src/ov_SC02_041/ov_SC02_041_after.c +++ b/src/ov_SC02_041/ov_SC02_041_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC02_041/ov_SC02_041_jr_8012ACE0.c b/src/ov_SC02_041/ov_SC02_041_jr_8012ACE0.c index beba12021c..7afc1dc8d1 100644 --- a/src/ov_SC02_041/ov_SC02_041_jr_8012ACE0.c +++ b/src/ov_SC02_041/ov_SC02_041_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC02_041_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC02_041_80131340 D_80185284; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80185370; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018535C[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC02_041_80133CD4; *(Blk8_SC02_041_80133CD4 *)&D_801152B0 = *(Blk8_SC02_041_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC02_041/ov_SC02_041_jr_80135A4C.c b/src/ov_SC02_041/ov_SC02_041_jr_80135A4C.c index e1e6801c09..0263c9aae1 100644 --- a/src/ov_SC02_041/ov_SC02_041_jr_80135A4C.c +++ b/src/ov_SC02_041/ov_SC02_041_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC02_041_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC02_041/ov_SC02_041_jr_8017BEBC.c b/src/ov_SC02_041/ov_SC02_041_jr_8017BEBC.c index 31ce9ada18..a3f1b90618 100644 --- a/src/ov_SC02_041/ov_SC02_041_jr_8017BEBC.c +++ b/src/ov_SC02_041/ov_SC02_041_jr_8017BEBC.c @@ -8123,15 +8123,8 @@ void func_80183D78(s32 a0, void *a1, s32 a2) void func_80183FE0(s32 a0, s32 a1, s32 a2) { - typedef struct { - s16 vx, vy, vz, pad; - } SV_80183FE0; - typedef struct { - SV_80183FE0 v[4]; /* 0x00 */ - u8 c[4][4]; /* 0x20 */ - u32 code; /* 0x30 */ - } Prim_80183FE0; /* 0x34 */ + /* 0x34 */ extern void func_8018428C(s32 a0, s32 a1, s32 a2, void *a3); extern s32 func_80017758(void *a0, void *a1); diff --git a/src/ov_SC03_001/ov_SC03_001_after.c b/src/ov_SC03_001/ov_SC03_001_after.c index d8595a4764..cfd618109f 100644 --- a/src/ov_SC03_001/ov_SC03_001_after.c +++ b/src/ov_SC03_001/ov_SC03_001_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_001/ov_SC03_001_jr_8012ACE0.c b/src/ov_SC03_001/ov_SC03_001_jr_8012ACE0.c index e3992847a0..7c5284ba6f 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_8012ACE0.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_001_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_001_80131340 D_8018D9C4; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2400,7 +2397,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018DAB0; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2459,7 +2456,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018DA9C[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_001_80133CD4; *(Blk8_SC03_001_80133CD4 *)&D_801152B0 = *(Blk8_SC03_001_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_001/ov_SC03_001_jr_80135A4C.c b/src/ov_SC03_001/ov_SC03_001_jr_80135A4C.c index 1e1c8257d4..6900df3b15 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_80135A4C.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_001_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_001/ov_SC03_001_jr_8018631C.c b/src/ov_SC03_001/ov_SC03_001_jr_8018631C.c index 6155039ab9..ecef60e9b5 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_8018631C.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_8018631C.c @@ -3438,7 +3438,6 @@ void func_80186A8C(void *arg0) { extern void func_8012C218(void *a0); void func_80186B54(unsigned int ent, unsigned int arg1) { - typedef struct { s8 c[8]; } Blk8_SC03_001_80186B54; Blk8_SC03_001_80186B54 *src; Blk8_SC03_001_80186B54 *dst; int val; diff --git a/src/ov_SC03_001/ov_SC03_001_jr_801870B0.c b/src/ov_SC03_001/ov_SC03_001_jr_801870B0.c index a4ef9ba191..8a9d86c073 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_801870B0.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_801870B0.c @@ -3363,7 +3363,7 @@ s32 func_80187420(s32 a0) { idx = D_801C0AD0[idx] - 1; } - ((struct { s32 w; } *)&D_801EF2D8)->w = 1; + ((Unkstruct_801EF2D8 *)&D_801EF2D8)->w = 1; return D_801C099C[idx][s0]; } diff --git a/src/ov_SC03_001/ov_SC03_001_jr_8018B8DC.c b/src/ov_SC03_001/ov_SC03_001_jr_8018B8DC.c index 2fe4c90301..dbc32221dd 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_8018B8DC.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_8018B8DC.c @@ -3766,12 +3766,6 @@ s32 func_8018C000(s32 param_1, s16 param_2) case 11: { - typedef struct Rec { - s32 unk0; - s32 unk4; - s32 unk8; - void (*unkC)(void); - } Rec; extern Rec *D_801EF254[]; Rec **pp; Rec *r; @@ -3930,19 +3924,8 @@ extern s16 D_801EF1F0; void func_8018C960(void) { /* §100/§120: draft-local, uniquely-named types — they live in the BODY so * they cannot collide with the TU's own Env_8018BCD4 / PTag_8018BCD4. */ - typedef struct { u32 addr : 24; u32 len : 8; } PTag_8018C960; - typedef struct { u32 *ot; u32 pad[4]; } Env_8018C960; /* 0x14 stride */ - typedef struct { - u32 tag; /* 0x00 */ - u8 r0, g0, b0, code; /* 0x04..0x07 */ - s16 x0, y0; /* 0x08, 0x0A */ - u8 r1, g1, b1, p1; /* 0x0C..0x0F */ - s16 x1, y1; /* 0x10, 0x12 */ - u8 r2, g2, b2, p2; /* 0x14..0x17 */ - s16 x2, y2; /* 0x18, 0x1A */ - u8 r3, g3, b3, p3; /* 0x1C..0x1F */ - s16 x3, y3; /* 0x20, 0x22 */ - } PG4_8018C960; /* -> 0x24 */ + /* 0x14 stride */ + /* -> 0x24 */ extern Env_8018C960 D_800AE7BC[]; extern u8 aD801EF1EC __asm__("D_801EF1EC"); diff --git a/src/ov_SC03_002/ov_SC03_002_after.c b/src/ov_SC03_002/ov_SC03_002_after.c index bf22c55fd7..2d549f9567 100644 --- a/src/ov_SC03_002/ov_SC03_002_after.c +++ b/src/ov_SC03_002/ov_SC03_002_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_002/ov_SC03_002_jr_8012ACE0.c b/src/ov_SC03_002/ov_SC03_002_jr_8012ACE0.c index 7b18fa230d..c21a34885c 100644 --- a/src/ov_SC03_002/ov_SC03_002_jr_8012ACE0.c +++ b/src/ov_SC03_002/ov_SC03_002_jr_8012ACE0.c @@ -1430,9 +1430,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_002_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_002_80131340 D_801859B4; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2404,7 +2401,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80185AA0; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2463,7 +2460,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80185A8C[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_002_80133CD4; *(Blk8_SC03_002_80133CD4 *)&D_801152B0 = *(Blk8_SC03_002_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_002/ov_SC03_002_jr_80135A4C.c b/src/ov_SC03_002/ov_SC03_002_jr_80135A4C.c index a14c3727fc..473bbf5066 100644 --- a/src/ov_SC03_002/ov_SC03_002_jr_80135A4C.c +++ b/src/ov_SC03_002/ov_SC03_002_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_002_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_002/ov_SC03_002_jr_8017D604.c b/src/ov_SC03_002/ov_SC03_002_jr_8017D604.c index 066af3d1a1..31763649a7 100644 --- a/src/ov_SC03_002/ov_SC03_002_jr_8017D604.c +++ b/src/ov_SC03_002/ov_SC03_002_jr_8017D604.c @@ -2690,7 +2690,6 @@ extern void func_8017CF30(void *a0); void func_8017D604(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_002_8017D604; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); @@ -3348,7 +3347,6 @@ extern s32 func_8012AD50(void *a0); extern void func_8017EC98(); void func_8017EBD0(void *a0) { - typedef struct { short vx, vy, vz, pad; } SVFD98; extern SVFD98 D_801CA324; extern SVFD98 D_801CA32C; extern void func_80015978(s32 a0, s32 *a1); @@ -3575,10 +3573,6 @@ void func_8017F290(s32 *a0) { void func_8017F304(s32 arg0) { extern u8 * func_8012913C(s32 a0); - typedef struct { - u32 unk00; u32 unk04; u32 unk08; u32 unk0C; u32 unk10; u32 unk14; - u16 unk18; - } Rec_80189334; extern Rec_80189334 D_80189334[]; Rec_80189334 *src; u8 *temp; diff --git a/src/ov_SC03_002/ov_SC03_002_jr_80181D78.c b/src/ov_SC03_002/ov_SC03_002_jr_80181D78.c index b710a1c0ad..b3424ee759 100644 --- a/src/ov_SC03_002/ov_SC03_002_jr_80181D78.c +++ b/src/ov_SC03_002/ov_SC03_002_jr_80181D78.c @@ -3737,7 +3737,7 @@ s32 func_80182F0C(s32 a0) { idx = D_801A8474[idx] - 1; } - ((struct { s32 w; } *)&D_801CB9C0)->w = 1; + ((Unkstruct_801CB9C0 *)&D_801CB9C0)->w = 1; return D_801A8340[idx][s0]; } diff --git a/src/ov_SC03_003/ov_SC03_003_after.c b/src/ov_SC03_003/ov_SC03_003_after.c index c7491cbc19..adb4838a4b 100644 --- a/src/ov_SC03_003/ov_SC03_003_after.c +++ b/src/ov_SC03_003/ov_SC03_003_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_003/ov_SC03_003_jr_8012ACE0.c b/src/ov_SC03_003/ov_SC03_003_jr_8012ACE0.c index c89fe1f806..18f82416a1 100644 --- a/src/ov_SC03_003/ov_SC03_003_jr_8012ACE0.c +++ b/src/ov_SC03_003/ov_SC03_003_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_003_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_003_80131340 D_8017F77C; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017F868; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017F854[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_003_80133CD4; *(Blk8_SC03_003_80133CD4 *)&D_801152B0 = *(Blk8_SC03_003_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_003/ov_SC03_003_jr_80135A4C.c b/src/ov_SC03_003/ov_SC03_003_jr_80135A4C.c index b410944fc0..49a5313e36 100644 --- a/src/ov_SC03_003/ov_SC03_003_jr_80135A4C.c +++ b/src/ov_SC03_003/ov_SC03_003_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_003_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_003/ov_SC03_003_jr_8017D5C0.c b/src/ov_SC03_003/ov_SC03_003_jr_8017D5C0.c index 31e689dfd9..beafb7c80d 100644 --- a/src/ov_SC03_003/ov_SC03_003_jr_8017D5C0.c +++ b/src/ov_SC03_003/ov_SC03_003_jr_8017D5C0.c @@ -2680,7 +2680,6 @@ extern void func_8017C688(s32 a0, s32 a1); void func_8017D5C0(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_003_8017D5C0; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC03_006/ov_SC03_006_after.c b/src/ov_SC03_006/ov_SC03_006_after.c index 9b360d3c87..59a57ad070 100644 --- a/src/ov_SC03_006/ov_SC03_006_after.c +++ b/src/ov_SC03_006/ov_SC03_006_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_006/ov_SC03_006_jr_8012ACE0.c b/src/ov_SC03_006/ov_SC03_006_jr_8012ACE0.c index c0dc25e295..e82b3fe5e2 100644 --- a/src/ov_SC03_006/ov_SC03_006_jr_8012ACE0.c +++ b/src/ov_SC03_006/ov_SC03_006_jr_8012ACE0.c @@ -1430,9 +1430,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_006_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_006_80131340 D_8018CA98; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2404,7 +2401,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018CB84; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2463,7 +2460,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018CB70[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_006_80133CD4; *(Blk8_SC03_006_80133CD4 *)&D_801152B0 = *(Blk8_SC03_006_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_006/ov_SC03_006_jr_80135A4C.c b/src/ov_SC03_006/ov_SC03_006_jr_80135A4C.c index 553e323371..4bda42b8b1 100644 --- a/src/ov_SC03_006/ov_SC03_006_jr_80135A4C.c +++ b/src/ov_SC03_006/ov_SC03_006_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_006_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_006/ov_SC03_006_jr_8017AE2C.c b/src/ov_SC03_006/ov_SC03_006_jr_8017AE2C.c index 987c7b7008..826af72cd9 100644 --- a/src/ov_SC03_006/ov_SC03_006_jr_8017AE2C.c +++ b/src/ov_SC03_006/ov_SC03_006_jr_8017AE2C.c @@ -5719,7 +5719,6 @@ extern s32 D_801F77A8; void func_8017F510(s32 arg0, s32 arg1, s32 arg2) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_006_8017F510; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); @@ -6767,11 +6766,6 @@ void func_80181C50(int param_1) void func_80181C9C(void *arg0) { - typedef struct { - u8 unk00[0x1C]; - s32 unk1C; - u8 unk20[4]; - } Ent_801F7618; extern u8 D_80078EB1; extern Ent_801F7618 D_801F7618[]; extern void func_80181FC4(void *arg0); @@ -8635,7 +8629,6 @@ extern void RotMatrixY(s32 a0, void *a1); extern void func_800484EC(s32 a0, s32 a1, s32 a2); void func_8018450C(s32 a0, s32 a1) { - typedef struct { s32 m[8]; } Mtx8_8017DE10_8017E710_SC03_006_8018450C; extern Mtx8_8017DE10_8017E710_SC03_006_8018450C D_800AE620; s32 obj; s32 cur; @@ -9720,7 +9713,6 @@ void func_801859E4(s32 a0) { * func_80185F5C is declared with an UNSPECIFIED parameter list on purpose: * its real definition later in this TU takes the file-scope SVECTOR*, and * an empty list is compatible with any prototype in C89 (pack §195-A). */ - typedef struct { s32 w[8]; } Mtx8_8017DE10_8017E710; extern void func_8012B23C(s32 a0); extern s32 func_80185EFC(s32 a0); @@ -11549,9 +11541,6 @@ void func_80188134(s32 a0) extern s32 D_801CA0A4; /* 8 bytes of frame that the body never references: a declared aggregate local * gets assign_stack_local'd (var_size 8) and emits zero instructions (§193-I). */ - struct V8_80188134 { - u16 vx, vy, vz, pad; - }; struct V8_80188134 sp10; s32 var_s1; s32 var_s2; diff --git a/src/ov_SC03_007/ov_SC03_007_after.c b/src/ov_SC03_007/ov_SC03_007_after.c index 1072be0dd8..d8dd281079 100644 --- a/src/ov_SC03_007/ov_SC03_007_after.c +++ b/src/ov_SC03_007/ov_SC03_007_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_007/ov_SC03_007_jr_8012ACE0.c b/src/ov_SC03_007/ov_SC03_007_jr_8012ACE0.c index f395ce234a..5549d72fcb 100644 --- a/src/ov_SC03_007/ov_SC03_007_jr_8012ACE0.c +++ b/src/ov_SC03_007/ov_SC03_007_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_007_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_007_80131340 D_80187890; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018797C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80187968[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_007_80133CD4; *(Blk8_SC03_007_80133CD4 *)&D_801152B0 = *(Blk8_SC03_007_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_007/ov_SC03_007_jr_80135A4C.c b/src/ov_SC03_007/ov_SC03_007_jr_80135A4C.c index a05ad7eaa0..b37903f98b 100644 --- a/src/ov_SC03_007/ov_SC03_007_jr_80135A4C.c +++ b/src/ov_SC03_007/ov_SC03_007_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_007_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_007/ov_SC03_007_jr_8017AE2C.c b/src/ov_SC03_007/ov_SC03_007_jr_8017AE2C.c index c0078c2ad8..937d079925 100644 --- a/src/ov_SC03_007/ov_SC03_007_jr_8017AE2C.c +++ b/src/ov_SC03_007/ov_SC03_007_jr_8017AE2C.c @@ -4112,7 +4112,6 @@ void func_8017DBDC(void) { void func_8017DC04(void) { - typedef struct { char c[8]; } Blk8_8017DC54; extern s16 D_801274E8; extern s16 D_8018BC18; @@ -4122,7 +4121,6 @@ void func_8017DC04(void) { void func_8017DC54(void) { - typedef struct { char c[8]; } Blk8_8017DC54; extern s16 D_801274E8; extern s16 D_8018BC20; @@ -4133,7 +4131,6 @@ void func_8017DC54(void) { void func_8017DCA4(void) { - typedef struct { char c[8]; } Blk8_8017DC54; extern s16 D_801274E8; extern s16 D_8018BC28; diff --git a/src/ov_SC03_010/ov_SC03_010_after.c b/src/ov_SC03_010/ov_SC03_010_after.c index 9f3e45b41c..cd2361bb7a 100644 --- a/src/ov_SC03_010/ov_SC03_010_after.c +++ b/src/ov_SC03_010/ov_SC03_010_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_010/ov_SC03_010_jr_8012ACE0.c b/src/ov_SC03_010/ov_SC03_010_jr_8012ACE0.c index 5587a0579f..d20910bbfa 100644 --- a/src/ov_SC03_010/ov_SC03_010_jr_8012ACE0.c +++ b/src/ov_SC03_010/ov_SC03_010_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_010_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_010_80131340 D_801803B0; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018049C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80180488[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_010_80133CD4; *(Blk8_SC03_010_80133CD4 *)&D_801152B0 = *(Blk8_SC03_010_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_010/ov_SC03_010_jr_80135A4C.c b/src/ov_SC03_010/ov_SC03_010_jr_80135A4C.c index fcf140110e..5553559551 100644 --- a/src/ov_SC03_010/ov_SC03_010_jr_80135A4C.c +++ b/src/ov_SC03_010/ov_SC03_010_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_010_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_011/ov_SC03_011_after.c b/src/ov_SC03_011/ov_SC03_011_after.c index 21468da925..cec425dcf2 100644 --- a/src/ov_SC03_011/ov_SC03_011_after.c +++ b/src/ov_SC03_011/ov_SC03_011_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_011/ov_SC03_011_jr_8012ACE0.c b/src/ov_SC03_011/ov_SC03_011_jr_8012ACE0.c index c98c012962..17c11160c7 100644 --- a/src/ov_SC03_011/ov_SC03_011_jr_8012ACE0.c +++ b/src/ov_SC03_011/ov_SC03_011_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_011_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_011_80131340 D_80181720; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018180C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801817F8[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_011_80133CD4; *(Blk8_SC03_011_80133CD4 *)&D_801152B0 = *(Blk8_SC03_011_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_011/ov_SC03_011_jr_80135A4C.c b/src/ov_SC03_011/ov_SC03_011_jr_80135A4C.c index 1252e1f5cf..bf208eb799 100644 --- a/src/ov_SC03_011/ov_SC03_011_jr_80135A4C.c +++ b/src/ov_SC03_011/ov_SC03_011_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_011_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_011/ov_SC03_011_jr_8017C730.c b/src/ov_SC03_011/ov_SC03_011_jr_8017C730.c index 271b5a3887..26fc623101 100644 --- a/src/ov_SC03_011/ov_SC03_011_jr_8017C730.c +++ b/src/ov_SC03_011/ov_SC03_011_jr_8017C730.c @@ -2696,7 +2696,6 @@ extern void func_8017C214(void); void func_8017C730(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_011_8017C730; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC03_012/ov_SC03_012_after.c b/src/ov_SC03_012/ov_SC03_012_after.c index 2131a0acda..837435d4b8 100644 --- a/src/ov_SC03_012/ov_SC03_012_after.c +++ b/src/ov_SC03_012/ov_SC03_012_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_012/ov_SC03_012_jr_8012ACE0.c b/src/ov_SC03_012/ov_SC03_012_jr_8012ACE0.c index 084f6e6fcc..a65cb25b82 100644 --- a/src/ov_SC03_012/ov_SC03_012_jr_8012ACE0.c +++ b/src/ov_SC03_012/ov_SC03_012_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_012_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_012_80131340 D_8017E600; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017E6EC; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017E6D8[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_012_80133CD4; *(Blk8_SC03_012_80133CD4 *)&D_801152B0 = *(Blk8_SC03_012_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_012/ov_SC03_012_jr_80135A4C.c b/src/ov_SC03_012/ov_SC03_012_jr_80135A4C.c index f8f002339e..babf887841 100644 --- a/src/ov_SC03_012/ov_SC03_012_jr_80135A4C.c +++ b/src/ov_SC03_012/ov_SC03_012_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_012_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_013/ov_SC03_013_after.c b/src/ov_SC03_013/ov_SC03_013_after.c index fbaa7638eb..5821f741d7 100644 --- a/src/ov_SC03_013/ov_SC03_013_after.c +++ b/src/ov_SC03_013/ov_SC03_013_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_013/ov_SC03_013_jr_8012ACE0.c b/src/ov_SC03_013/ov_SC03_013_jr_8012ACE0.c index c55162cffc..53d619d974 100644 --- a/src/ov_SC03_013/ov_SC03_013_jr_8012ACE0.c +++ b/src/ov_SC03_013/ov_SC03_013_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_013_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_013_80131340 D_801813E8; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801814D4; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801814C0[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_013_80133CD4; *(Blk8_SC03_013_80133CD4 *)&D_801152B0 = *(Blk8_SC03_013_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_013/ov_SC03_013_jr_80135A4C.c b/src/ov_SC03_013/ov_SC03_013_jr_80135A4C.c index a9a1b1d9a7..ac88bc168a 100644 --- a/src/ov_SC03_013/ov_SC03_013_jr_80135A4C.c +++ b/src/ov_SC03_013/ov_SC03_013_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_013_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_014/ov_SC03_014_after.c b/src/ov_SC03_014/ov_SC03_014_after.c index 982e2a4ffb..4170fecf29 100644 --- a/src/ov_SC03_014/ov_SC03_014_after.c +++ b/src/ov_SC03_014/ov_SC03_014_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_014/ov_SC03_014_jr_8012ACE0.c b/src/ov_SC03_014/ov_SC03_014_jr_8012ACE0.c index 7cc386bdcd..a00b2ad872 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_8012ACE0.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_8012ACE0.c @@ -1426,9 +1426,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_014_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_014_80131340 D_8018BA24; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2400,7 +2397,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018BB10; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2459,7 +2456,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018BAFC[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_014_80133CD4; *(Blk8_SC03_014_80133CD4 *)&D_801152B0 = *(Blk8_SC03_014_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_014/ov_SC03_014_jr_80135A4C.c b/src/ov_SC03_014/ov_SC03_014_jr_80135A4C.c index a38fa7056a..e9e4803511 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_80135A4C.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_014_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_014/ov_SC03_014_jr_8017AE2C.c b/src/ov_SC03_014/ov_SC03_014_jr_8017AE2C.c index 8034b98f7e..54ec8c5fbb 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_8017AE2C.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_8017AE2C.c @@ -3941,7 +3941,6 @@ void func_8017CE90(void *a0) void func_8017CFBC(void *a0) { - typedef struct { u8 d[4]; } Blk4_8017CE90_8017CE90; extern Blk4_8017CE90 D_801EA840; extern s32 func_80012F74(s32 a0, s32 a1, s32 a2, s32 a3); extern void func_80146C3C(u8 *a0); @@ -4611,9 +4610,7 @@ extern void func_80171A1C(u8 *a0); void func_8017DF84(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_014_8017DF84; /* vy UNSIGNED: the `+=` reads it with lhu, not lh. */ - typedef struct { s16 vx; u16 vy; s16 vz, pad; } SVec_SC03_014_8017DF84; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC03_014/ov_SC03_014_jr_8017EB7C.c b/src/ov_SC03_014/ov_SC03_014_jr_8017EB7C.c index df59e6261b..63b8b4f58f 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_8017EB7C.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_8017EB7C.c @@ -2705,7 +2705,6 @@ extern void func_8017DF7C(s32 param_1); void func_8017EB7C(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_014_8017EB7C; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); @@ -3216,9 +3215,7 @@ void func_8017EB7C(s32 arg0) void func_8017FA5C(s32 arg0, s32 arg1, s32 arg2) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_014_8017FA5C; /* vy UNSIGNED: the `+= xoff` reads it with lhu, not lh. */ - typedef struct { s16 vx; u16 vy; s16 vz, pad; } SVec_SC03_014_8017FA5C; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC03_014/ov_SC03_014_jr_801848E4.c b/src/ov_SC03_014/ov_SC03_014_jr_801848E4.c index 6f19d8d826..a648bcae5b 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_801848E4.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_801848E4.c @@ -4674,7 +4674,6 @@ void func_80187EE8(s32 a0) * file-scope copy in src/shared/engine_types.h:2810, which is byte-identical. * `(u8 *)&D_800A651C` is the same address under either element type, so the * emitted code is unchanged (re-verified MATCH with match_one). */ - typedef struct { s32 a; s32 b[4]; } Ot_8018B23C; extern Ot_8018B23C D_800A651C[]; extern u8 D_800AE610[]; @@ -6482,7 +6481,7 @@ void aF8018A860(s32 a0, s16 *a1, u8 *a2, u8 *a3) __asm__("func_8018A860"); void aF8018A860(s32 a0, s16 *a1, u8 *a2, u8 *a3) { - typedef struct { u8 b0, b1, b2, b3; } B4_SC03_014_8018A860; /* align 1 — §48-C2 */ + /* align 1 — §48-C2 */ s16 *s1; u16 temp_u16; s16 temp_s16; @@ -6868,7 +6867,6 @@ extern s32 RotTransPers(s32 a0, s32 a1, s32 *a2, s32 *a3); extern void func_8018AE30(void *arg0, void *arg1, s32 arg2, s32 arg3); void func_8018ADA8(s32 a0) { - typedef struct { u8 a, b, c, d; } V4_SC03_014_8018ADA8; extern u8 D_800AF648; extern V4_SC03_014_8018ADA8 D_801E94F8; u16 sxy[4]; diff --git a/src/ov_SC03_023/ov_SC03_023_after.c b/src/ov_SC03_023/ov_SC03_023_after.c index 17367e180e..9518dc3649 100644 --- a/src/ov_SC03_023/ov_SC03_023_after.c +++ b/src/ov_SC03_023/ov_SC03_023_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_023/ov_SC03_023_jr_8012ACE0.c b/src/ov_SC03_023/ov_SC03_023_jr_8012ACE0.c index 71f14670c6..3272bd9d9d 100644 --- a/src/ov_SC03_023/ov_SC03_023_jr_8012ACE0.c +++ b/src/ov_SC03_023/ov_SC03_023_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_023_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_023_80131340 D_8017F3A0; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017F48C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017F478[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_023_80133CD4; *(Blk8_SC03_023_80133CD4 *)&D_801152B0 = *(Blk8_SC03_023_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_023/ov_SC03_023_jr_80135A4C.c b/src/ov_SC03_023/ov_SC03_023_jr_80135A4C.c index e24dd42309..b91db5fb8d 100644 --- a/src/ov_SC03_023/ov_SC03_023_jr_80135A4C.c +++ b/src/ov_SC03_023/ov_SC03_023_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_023_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_024/ov_SC03_024_after.c b/src/ov_SC03_024/ov_SC03_024_after.c index 99a6aed53a..bc851e2bed 100644 --- a/src/ov_SC03_024/ov_SC03_024_after.c +++ b/src/ov_SC03_024/ov_SC03_024_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_024/ov_SC03_024_jr_8012ACE0.c b/src/ov_SC03_024/ov_SC03_024_jr_8012ACE0.c index 986c3af87e..3a643e68ef 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_8012ACE0.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_024_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_024_80131340 D_801873C4; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801874B0; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018749C[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_024_80133CD4; *(Blk8_SC03_024_80133CD4 *)&D_801152B0 = *(Blk8_SC03_024_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_024/ov_SC03_024_jr_80135A4C.c b/src/ov_SC03_024/ov_SC03_024_jr_80135A4C.c index ce6f896949..5495c5d72e 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_80135A4C.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_024_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_024/ov_SC03_024_jr_8017AE2C.c b/src/ov_SC03_024/ov_SC03_024_jr_8017AE2C.c index 56bdb9a07f..7a946eb9df 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_8017AE2C.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_8017AE2C.c @@ -3947,7 +3947,6 @@ void func_8017CE90(void *a0) void func_8017CFBC(void *a0) { - typedef struct { u8 d[4]; } Blk4_8017CE90_8017CE90; extern Blk4_8017CE90_8017CE90 D_801C11B0; extern s32 func_80012F74(s32 a0, s32 a1, s32 a2, s32 a3); extern void func_80146C3C(u8 *a0); diff --git a/src/ov_SC03_024/ov_SC03_024_jr_8017DF84.c b/src/ov_SC03_024/ov_SC03_024_jr_8017DF84.c index 6c8ad386c9..65bc12ac31 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_8017DF84.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_8017DF84.c @@ -2708,7 +2708,6 @@ extern void func_8017DF7C(s32 param_1); void func_8017DF84(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_024_8017DF84; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC03_024/ov_SC03_024_jr_80183BF8.c b/src/ov_SC03_024/ov_SC03_024_jr_80183BF8.c index bb300bf0f3..9ddd983e2e 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_80183BF8.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_80183BF8.c @@ -4048,7 +4048,6 @@ extern void func_800D0694(void); void func_801856BC(s32 a0, s32 a1) { - typedef struct { short x, y, z, w; } Rec8T; extern s32 func_8012C658(s32 a0, s32 a1, s32 a2); extern Rec8T D_801B9330[]; diff --git a/src/ov_SC03_028/ov_SC03_028_after.c b/src/ov_SC03_028/ov_SC03_028_after.c index d49e6f2b7f..af9cb647c3 100644 --- a/src/ov_SC03_028/ov_SC03_028_after.c +++ b/src/ov_SC03_028/ov_SC03_028_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_028/ov_SC03_028_jr_8012ACE0.c b/src/ov_SC03_028/ov_SC03_028_jr_8012ACE0.c index 87c29103ba..6a5e96ca7b 100644 --- a/src/ov_SC03_028/ov_SC03_028_jr_8012ACE0.c +++ b/src/ov_SC03_028/ov_SC03_028_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_028_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_028_80131340 D_8018BE90; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018BF7C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018BF68[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_028_80133CD4; *(Blk8_SC03_028_80133CD4 *)&D_801152B0 = *(Blk8_SC03_028_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_028/ov_SC03_028_jr_80135A4C.c b/src/ov_SC03_028/ov_SC03_028_jr_80135A4C.c index 7f3a4db44b..1624a8e537 100644 --- a/src/ov_SC03_028/ov_SC03_028_jr_80135A4C.c +++ b/src/ov_SC03_028/ov_SC03_028_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_028_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_029/ov_SC03_029_after.c b/src/ov_SC03_029/ov_SC03_029_after.c index 315bd6774e..7a14bad2a1 100644 --- a/src/ov_SC03_029/ov_SC03_029_after.c +++ b/src/ov_SC03_029/ov_SC03_029_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_029/ov_SC03_029_jr_8012ACE0.c b/src/ov_SC03_029/ov_SC03_029_jr_8012ACE0.c index 962464a8d6..f3bd5448c7 100644 --- a/src/ov_SC03_029/ov_SC03_029_jr_8012ACE0.c +++ b/src/ov_SC03_029/ov_SC03_029_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_029_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_029_80131340 D_80187CC8; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80187DB4; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80187DA0[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_029_80133CD4; *(Blk8_SC03_029_80133CD4 *)&D_801152B0 = *(Blk8_SC03_029_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_029/ov_SC03_029_jr_80135A4C.c b/src/ov_SC03_029/ov_SC03_029_jr_80135A4C.c index e2922fd185..6211851afd 100644 --- a/src/ov_SC03_029/ov_SC03_029_jr_80135A4C.c +++ b/src/ov_SC03_029/ov_SC03_029_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_029_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_029/ov_SC03_029_jr_8017DC70.c b/src/ov_SC03_029/ov_SC03_029_jr_8017DC70.c index ab552bde92..696f0186c0 100644 --- a/src/ov_SC03_029/ov_SC03_029_jr_8017DC70.c +++ b/src/ov_SC03_029/ov_SC03_029_jr_8017DC70.c @@ -2711,7 +2711,6 @@ extern void func_8017D9B4(void *a0); void func_8017DC70(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_029_8017DC70; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC03_029/ov_SC03_029_jr_8017FF7C.c b/src/ov_SC03_029/ov_SC03_029_jr_8017FF7C.c index 39e56ad644..4a86823527 100644 --- a/src/ov_SC03_029/ov_SC03_029_jr_8017FF7C.c +++ b/src/ov_SC03_029/ov_SC03_029_jr_8017FF7C.c @@ -3806,7 +3806,6 @@ void func_80181708(void *a0) { extern void func_8012F214(s32 a0, s32 a1, s32 a2); extern void func_8012B260(u8 *a0); - typedef struct { s32 w[8]; } Blk32_80181708; Blk32_80181708 *dst; Blk32_80181708 *src; @@ -7547,9 +7546,6 @@ void func_80186758(s32 a0) { /* 8 bytes of frame that the body never references: a declared aggregate local * gets assign_stack_local'd (var_size 8) and emits zero instructions (§193-I). */ - struct V8_SC03_029_80186758 { - u16 vx, vy, vz, pad; - }; struct V8_SC03_029_80186758 sp10; s32 var_s1; s32 var_s2; diff --git a/src/ov_SC03_030/ov_SC03_030_after.c b/src/ov_SC03_030/ov_SC03_030_after.c index 2bb894473a..1535d1dff5 100644 --- a/src/ov_SC03_030/ov_SC03_030_after.c +++ b/src/ov_SC03_030/ov_SC03_030_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_030/ov_SC03_030_jr_8012ACE0.c b/src/ov_SC03_030/ov_SC03_030_jr_8012ACE0.c index 07f1b450da..c4d1b7c7b5 100644 --- a/src/ov_SC03_030/ov_SC03_030_jr_8012ACE0.c +++ b/src/ov_SC03_030/ov_SC03_030_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_030_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_030_80131340 D_80182304; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801823F0; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801823DC[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_030_80133CD4; *(Blk8_SC03_030_80133CD4 *)&D_801152B0 = *(Blk8_SC03_030_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_030/ov_SC03_030_jr_80135A4C.c b/src/ov_SC03_030/ov_SC03_030_jr_80135A4C.c index db8b340862..0c0477b9d8 100644 --- a/src/ov_SC03_030/ov_SC03_030_jr_80135A4C.c +++ b/src/ov_SC03_030/ov_SC03_030_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_030_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_031/ov_SC03_031_after.c b/src/ov_SC03_031/ov_SC03_031_after.c index c33d0f5e67..9d6bfe5ce9 100644 --- a/src/ov_SC03_031/ov_SC03_031_after.c +++ b/src/ov_SC03_031/ov_SC03_031_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_031/ov_SC03_031_jr_8012ACE0.c b/src/ov_SC03_031/ov_SC03_031_jr_8012ACE0.c index 680febff51..b6dd375a08 100644 --- a/src/ov_SC03_031/ov_SC03_031_jr_8012ACE0.c +++ b/src/ov_SC03_031/ov_SC03_031_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_031_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_031_80131340 D_80182820; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018290C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801828F8[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_031_80133CD4; *(Blk8_SC03_031_80133CD4 *)&D_801152B0 = *(Blk8_SC03_031_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_031/ov_SC03_031_jr_80135A4C.c b/src/ov_SC03_031/ov_SC03_031_jr_80135A4C.c index 266a22a43d..34aec1cc11 100644 --- a/src/ov_SC03_031/ov_SC03_031_jr_80135A4C.c +++ b/src/ov_SC03_031/ov_SC03_031_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_031_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_031/ov_SC03_031_jr_8017DB5C.c b/src/ov_SC03_031/ov_SC03_031_jr_8017DB5C.c index 3c66b01655..46d5c27cda 100644 --- a/src/ov_SC03_031/ov_SC03_031_jr_8017DB5C.c +++ b/src/ov_SC03_031/ov_SC03_031_jr_8017DB5C.c @@ -2710,7 +2710,6 @@ extern void func_8017D8A0(void *a0); void func_8017DB5C(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_031_8017DB5C; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC03_089/ov_SC03_089_after.c b/src/ov_SC03_089/ov_SC03_089_after.c index 4c7e5048b7..78e8b5c4fe 100644 --- a/src/ov_SC03_089/ov_SC03_089_after.c +++ b/src/ov_SC03_089/ov_SC03_089_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_089/ov_SC03_089_jr_8012ACE0.c b/src/ov_SC03_089/ov_SC03_089_jr_8012ACE0.c index f74a4b7017..3196882bab 100644 --- a/src/ov_SC03_089/ov_SC03_089_jr_8012ACE0.c +++ b/src/ov_SC03_089/ov_SC03_089_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_089_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_089_80131340 D_80189B1C; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80189C08; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80189BF4[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_089_80133CD4; *(Blk8_SC03_089_80133CD4 *)&D_801152B0 = *(Blk8_SC03_089_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_089/ov_SC03_089_jr_80135A4C.c b/src/ov_SC03_089/ov_SC03_089_jr_80135A4C.c index 518f688d80..d2e05b1a23 100644 --- a/src/ov_SC03_089/ov_SC03_089_jr_80135A4C.c +++ b/src/ov_SC03_089/ov_SC03_089_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_089_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_089/ov_SC03_089_jr_8017CA80.c b/src/ov_SC03_089/ov_SC03_089_jr_8017CA80.c index 3b8b71f062..97d7179bc3 100644 --- a/src/ov_SC03_089/ov_SC03_089_jr_8017CA80.c +++ b/src/ov_SC03_089/ov_SC03_089_jr_8017CA80.c @@ -2870,7 +2870,6 @@ extern s32 D_801C683C; void func_8017D960(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_089_8017D960; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC03_090/ov_SC03_090_after.c b/src/ov_SC03_090/ov_SC03_090_after.c index 1d94288de4..6075eba653 100644 --- a/src/ov_SC03_090/ov_SC03_090_after.c +++ b/src/ov_SC03_090/ov_SC03_090_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_090/ov_SC03_090_jr_8012ACE0.c b/src/ov_SC03_090/ov_SC03_090_jr_8012ACE0.c index 1a761f662b..348d67521d 100644 --- a/src/ov_SC03_090/ov_SC03_090_jr_8012ACE0.c +++ b/src/ov_SC03_090/ov_SC03_090_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_090_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_090_80131340 D_8018BF40; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018C02C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018C018[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_090_80133CD4; *(Blk8_SC03_090_80133CD4 *)&D_801152B0 = *(Blk8_SC03_090_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_090/ov_SC03_090_jr_80135A4C.c b/src/ov_SC03_090/ov_SC03_090_jr_80135A4C.c index 156d129aae..9a79d6cbf6 100644 --- a/src/ov_SC03_090/ov_SC03_090_jr_80135A4C.c +++ b/src/ov_SC03_090/ov_SC03_090_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_090_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_090/ov_SC03_090_jr_8017CA80.c b/src/ov_SC03_090/ov_SC03_090_jr_8017CA80.c index 6ce14dcf54..213bc5c867 100644 --- a/src/ov_SC03_090/ov_SC03_090_jr_8017CA80.c +++ b/src/ov_SC03_090/ov_SC03_090_jr_8017CA80.c @@ -2867,7 +2867,6 @@ extern s32 D_801CBCAC; void func_8017D960(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_090_8017D960; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC03_091/ov_SC03_091_after.c b/src/ov_SC03_091/ov_SC03_091_after.c index 96df13c3d8..a30ead764b 100644 --- a/src/ov_SC03_091/ov_SC03_091_after.c +++ b/src/ov_SC03_091/ov_SC03_091_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_091/ov_SC03_091_jr_8012ACE0.c b/src/ov_SC03_091/ov_SC03_091_jr_8012ACE0.c index 20f3161c87..bc15afbc30 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_8012ACE0.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_091_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_091_80131340 D_8018CDE8; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018CED4; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018CEC0[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_091_80133CD4; *(Blk8_SC03_091_80133CD4 *)&D_801152B0 = *(Blk8_SC03_091_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_091/ov_SC03_091_jr_80135A4C.c b/src/ov_SC03_091/ov_SC03_091_jr_80135A4C.c index 9bc663bc89..fed4311821 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_80135A4C.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_091_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_091/ov_SC03_091_jr_8017D898.c b/src/ov_SC03_091/ov_SC03_091_jr_8017D898.c index ad5d481a96..b22298a6f0 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_8017D898.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_8017D898.c @@ -2887,7 +2887,6 @@ extern s32 D_801D25FC; void func_8017E778(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_091_8017E778; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC03_091/ov_SC03_091_jr_80182268.c b/src/ov_SC03_091/ov_SC03_091_jr_80182268.c index e0b5b25c2f..54e4877fcd 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_80182268.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_80182268.c @@ -2886,7 +2886,6 @@ extern void func_80182B48(s32 param_1, s16 *param_2); void func_801826C8(s32 a0) { - typedef struct { s16 v[4]; } Blk8_80126940_8017D6D0_801826C8; extern s32 D_80126B58; extern s16 D_80190710[]; diff --git a/src/ov_SC03_091/ov_SC03_091_jr_8018326C.c b/src/ov_SC03_091/ov_SC03_091_jr_8018326C.c index 092c528db1..fc56928667 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_8018326C.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_8018326C.c @@ -4569,7 +4569,6 @@ void func_80186060(s32 a0) extern u8 D_801A5FEC[]; extern u8 D_801A5FED; extern u8 D_801A5FEE; - typedef struct { u8 r, g, b, pad[13]; } Row_80186060; s32 v1; s32 i; s32 j; diff --git a/src/ov_SC03_092/ov_SC03_092_after.c b/src/ov_SC03_092/ov_SC03_092_after.c index 2878b9948d..f109c86deb 100644 --- a/src/ov_SC03_092/ov_SC03_092_after.c +++ b/src/ov_SC03_092/ov_SC03_092_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_092/ov_SC03_092_jr_8012ACE0.c b/src/ov_SC03_092/ov_SC03_092_jr_8012ACE0.c index f84c5335fd..dada3133da 100644 --- a/src/ov_SC03_092/ov_SC03_092_jr_8012ACE0.c +++ b/src/ov_SC03_092/ov_SC03_092_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_092_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_092_80131340 D_801851B8; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801852A4; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80185290[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_092_80133CD4; *(Blk8_SC03_092_80133CD4 *)&D_801152B0 = *(Blk8_SC03_092_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_092/ov_SC03_092_jr_80135A4C.c b/src/ov_SC03_092/ov_SC03_092_jr_80135A4C.c index 864d6f11f6..d9b3ec5b7a 100644 --- a/src/ov_SC03_092/ov_SC03_092_jr_80135A4C.c +++ b/src/ov_SC03_092/ov_SC03_092_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_092_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_092/ov_SC03_092_jr_8017AE2C.c b/src/ov_SC03_092/ov_SC03_092_jr_8017AE2C.c index bc2f39fa27..5eec95de58 100644 --- a/src/ov_SC03_092/ov_SC03_092_jr_8017AE2C.c +++ b/src/ov_SC03_092/ov_SC03_092_jr_8017AE2C.c @@ -3851,7 +3851,6 @@ extern void func_80146C3C(); // K&R: ? of 1 args (P37 rung D t4_D22) void func_8017CE58(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_092_8017CE58; /* DECLARATION ORDER IS LOAD-BEARING: gcc-2.7.2/mips grows the frame UPWARD * from sp+0x10 (the 16-byte outgoing-arg area) in declaration order, so this @@ -5458,10 +5457,6 @@ void func_8017FA74(s32 arg0) * second file-scope copy is a C89 redefinition -- gcc-2.7.2 exits 33 * ("conflicting types for `Tbl8_8017FC44'"), which is what the whole-binary * gate kept rejecting even though the body is byte-identical. */ - typedef struct { - /* 0x00 */ s32 unk00; - /* 0x04 */ s32 unk04; - } Tbl8_8017FC44; extern s32 D_801B2E70; extern void func_8017FE04(s32 a0); diff --git a/src/ov_SC03_093/ov_SC03_093_after.c b/src/ov_SC03_093/ov_SC03_093_after.c index fd2cdc78fc..20c6e381ad 100644 --- a/src/ov_SC03_093/ov_SC03_093_after.c +++ b/src/ov_SC03_093/ov_SC03_093_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_093/ov_SC03_093_jr_8012ACE0.c b/src/ov_SC03_093/ov_SC03_093_jr_8012ACE0.c index 325e443407..8b81d3f478 100644 --- a/src/ov_SC03_093/ov_SC03_093_jr_8012ACE0.c +++ b/src/ov_SC03_093/ov_SC03_093_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_093_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_093_80131340 D_80186390; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018647C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80186468[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_093_80133CD4; *(Blk8_SC03_093_80133CD4 *)&D_801152B0 = *(Blk8_SC03_093_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_093/ov_SC03_093_jr_80135A4C.c b/src/ov_SC03_093/ov_SC03_093_jr_80135A4C.c index e33ada21ac..3bdd283b6b 100644 --- a/src/ov_SC03_093/ov_SC03_093_jr_80135A4C.c +++ b/src/ov_SC03_093/ov_SC03_093_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_093_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_093/ov_SC03_093_jr_801825B8.c b/src/ov_SC03_093/ov_SC03_093_jr_801825B8.c index b4d6d49b3d..e6114e2f10 100644 --- a/src/ov_SC03_093/ov_SC03_093_jr_801825B8.c +++ b/src/ov_SC03_093/ov_SC03_093_jr_801825B8.c @@ -5003,7 +5003,6 @@ void func_80185720(void *a0) { void func_8018575C(s32 a0) { - typedef struct { s16 a, b, c, d; } SV4_8017B368; extern SV4_8017B368 D_801C5E34; extern u8 D_80186204[]; diff --git a/src/ov_SC03_094/ov_SC03_094_after.c b/src/ov_SC03_094/ov_SC03_094_after.c index 15d9cff93d..83bf4308bb 100644 --- a/src/ov_SC03_094/ov_SC03_094_after.c +++ b/src/ov_SC03_094/ov_SC03_094_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_094/ov_SC03_094_jr_8012ACE0.c b/src/ov_SC03_094/ov_SC03_094_jr_8012ACE0.c index 912134d2d8..9160df8769 100644 --- a/src/ov_SC03_094/ov_SC03_094_jr_8012ACE0.c +++ b/src/ov_SC03_094/ov_SC03_094_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_094_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_094_80131340 D_80187D8C; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80187E78; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80187E64[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_094_80133CD4; *(Blk8_SC03_094_80133CD4 *)&D_801152B0 = *(Blk8_SC03_094_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_094/ov_SC03_094_jr_80135A4C.c b/src/ov_SC03_094/ov_SC03_094_jr_80135A4C.c index 457b053583..d65b5cfcd7 100644 --- a/src/ov_SC03_094/ov_SC03_094_jr_80135A4C.c +++ b/src/ov_SC03_094/ov_SC03_094_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_094_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_095/ov_SC03_095_after.c b/src/ov_SC03_095/ov_SC03_095_after.c index 1c99c6bfcd..e1d12915ae 100644 --- a/src/ov_SC03_095/ov_SC03_095_after.c +++ b/src/ov_SC03_095/ov_SC03_095_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_095/ov_SC03_095_jr_8012ACE0.c b/src/ov_SC03_095/ov_SC03_095_jr_8012ACE0.c index 53f0f1a87f..6bb5d16324 100644 --- a/src/ov_SC03_095/ov_SC03_095_jr_8012ACE0.c +++ b/src/ov_SC03_095/ov_SC03_095_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_095_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_095_80131340 D_801813EC; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801814D8; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801814C4[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_095_80133CD4; *(Blk8_SC03_095_80133CD4 *)&D_801152B0 = *(Blk8_SC03_095_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_095/ov_SC03_095_jr_80135A4C.c b/src/ov_SC03_095/ov_SC03_095_jr_80135A4C.c index 581abe0c06..519658bffd 100644 --- a/src/ov_SC03_095/ov_SC03_095_jr_80135A4C.c +++ b/src/ov_SC03_095/ov_SC03_095_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_095_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_095/ov_SC03_095_jr_8017BEBC.c b/src/ov_SC03_095/ov_SC03_095_jr_8017BEBC.c index 7ec04cf367..b2bd8714ec 100644 --- a/src/ov_SC03_095/ov_SC03_095_jr_8017BEBC.c +++ b/src/ov_SC03_095/ov_SC03_095_jr_8017BEBC.c @@ -4860,7 +4860,6 @@ void func_80180550(s32 param_1, s32 param_2) { s32 func_801805C8(s32 arg0) { - typedef struct { s32 w0; s32 w1; } Cmd_801805C8; Cmd_801805C8 *ptr; s32 val; s32 next; diff --git a/src/ov_SC03_096/ov_SC03_096_after.c b/src/ov_SC03_096/ov_SC03_096_after.c index eb82be7b2d..2d0a1402e6 100644 --- a/src/ov_SC03_096/ov_SC03_096_after.c +++ b/src/ov_SC03_096/ov_SC03_096_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_096/ov_SC03_096_jr_8012ACE0.c b/src/ov_SC03_096/ov_SC03_096_jr_8012ACE0.c index c35806fdfa..a1cdbb9b36 100644 --- a/src/ov_SC03_096/ov_SC03_096_jr_8012ACE0.c +++ b/src/ov_SC03_096/ov_SC03_096_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_096_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_096_80131340 D_80180F6C; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80181058; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80181044[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_096_80133CD4; *(Blk8_SC03_096_80133CD4 *)&D_801152B0 = *(Blk8_SC03_096_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_096/ov_SC03_096_jr_80135A4C.c b/src/ov_SC03_096/ov_SC03_096_jr_80135A4C.c index 8d14c5d0ac..f65890da7d 100644 --- a/src/ov_SC03_096/ov_SC03_096_jr_80135A4C.c +++ b/src/ov_SC03_096/ov_SC03_096_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_096_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_097/ov_SC03_097_after.c b/src/ov_SC03_097/ov_SC03_097_after.c index 104976ae31..921f971d88 100644 --- a/src/ov_SC03_097/ov_SC03_097_after.c +++ b/src/ov_SC03_097/ov_SC03_097_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_097/ov_SC03_097_jr_8012ACE0.c b/src/ov_SC03_097/ov_SC03_097_jr_8012ACE0.c index 19f5c6be7e..8d595ee24a 100644 --- a/src/ov_SC03_097/ov_SC03_097_jr_8012ACE0.c +++ b/src/ov_SC03_097/ov_SC03_097_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_097_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_097_80131340 D_8018634C; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80186438; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80186424[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_097_80133CD4; *(Blk8_SC03_097_80133CD4 *)&D_801152B0 = *(Blk8_SC03_097_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_097/ov_SC03_097_jr_80135A4C.c b/src/ov_SC03_097/ov_SC03_097_jr_80135A4C.c index ebd4fbf104..16c14a26ff 100644 --- a/src/ov_SC03_097/ov_SC03_097_jr_80135A4C.c +++ b/src/ov_SC03_097/ov_SC03_097_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_097_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_097/ov_SC03_097_jr_8017D898.c b/src/ov_SC03_097/ov_SC03_097_jr_8017D898.c index ecf945b706..56a2947e21 100644 --- a/src/ov_SC03_097/ov_SC03_097_jr_8017D898.c +++ b/src/ov_SC03_097/ov_SC03_097_jr_8017D898.c @@ -4002,7 +4002,6 @@ void func_801802B4(int param_1) void func_80180304(s32 arg0) { - typedef struct { u8 b[4]; } Blk4_80181EDC_8017FEA0; extern void func_8012B2CC(s32 a0); extern void func_801819A0(s32 arg0, s32 arg1, s32 arg2); extern void func_801819D0(s32 a0); @@ -4077,8 +4076,6 @@ void func_80180450(s32 a0, s32 a1) { * file-scope decl in this TU: it is already declared twice, block-scoped and * with two different types (Blk32_8018AA98_80183D30_80180450 @5594, s32 @6053). This * body follows that existing TU precedent verbatim. */ - typedef struct { u8 b[8]; } Blk8_80180450; - typedef struct { s32 w[8]; } Blk32_8018AA98_80183D30_80180450; extern Blk8_80180450 D_801A94CC; extern s32 D_800AE620; Msg_8018248C_80180450 msg; /* sp+0x10 (24-byte stride, §193-I) */ diff --git a/src/ov_SC03_098/ov_SC03_098_after.c b/src/ov_SC03_098/ov_SC03_098_after.c index 8a8c24bb39..d45436eb4a 100644 --- a/src/ov_SC03_098/ov_SC03_098_after.c +++ b/src/ov_SC03_098/ov_SC03_098_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_098/ov_SC03_098_jr_8012ACE0.c b/src/ov_SC03_098/ov_SC03_098_jr_8012ACE0.c index 5446b0f8be..ab990ac507 100644 --- a/src/ov_SC03_098/ov_SC03_098_jr_8012ACE0.c +++ b/src/ov_SC03_098/ov_SC03_098_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_098_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_098_80131340 D_801857D8; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801858C4; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801858B0[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_098_80133CD4; *(Blk8_SC03_098_80133CD4 *)&D_801152B0 = *(Blk8_SC03_098_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_098/ov_SC03_098_jr_80135A4C.c b/src/ov_SC03_098/ov_SC03_098_jr_80135A4C.c index 377d8c39d8..5fdb3a1d62 100644 --- a/src/ov_SC03_098/ov_SC03_098_jr_80135A4C.c +++ b/src/ov_SC03_098/ov_SC03_098_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_098_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_098/ov_SC03_098_jr_80184E24.c b/src/ov_SC03_098/ov_SC03_098_jr_80184E24.c index eadb8eadf9..a416cfbccb 100644 --- a/src/ov_SC03_098/ov_SC03_098_jr_80184E24.c +++ b/src/ov_SC03_098/ov_SC03_098_jr_80184E24.c @@ -2939,7 +2939,6 @@ void func_80185018(void *a0) { void func_801850C8(void *a0) { - struct B16_80185634 { s32 w[4]; }; extern struct B16_80185634 D_800A5EA8; extern struct B16_80185634 D_801C2A0C; diff --git a/src/ov_SC03_099/ov_SC03_099_after.c b/src/ov_SC03_099/ov_SC03_099_after.c index 732b413342..0d5fce13df 100644 --- a/src/ov_SC03_099/ov_SC03_099_after.c +++ b/src/ov_SC03_099/ov_SC03_099_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_099/ov_SC03_099_jr_8012ACE0.c b/src/ov_SC03_099/ov_SC03_099_jr_8012ACE0.c index 1bf11c6136..e9ae9f9f99 100644 --- a/src/ov_SC03_099/ov_SC03_099_jr_8012ACE0.c +++ b/src/ov_SC03_099/ov_SC03_099_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_099_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_099_80131340 D_801838D8; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801839C4; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801839B0[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_099_80133CD4; *(Blk8_SC03_099_80133CD4 *)&D_801152B0 = *(Blk8_SC03_099_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_099/ov_SC03_099_jr_80135A4C.c b/src/ov_SC03_099/ov_SC03_099_jr_80135A4C.c index 6facae0c53..4e48b8fbac 100644 --- a/src/ov_SC03_099/ov_SC03_099_jr_80135A4C.c +++ b/src/ov_SC03_099/ov_SC03_099_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_099_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_100/ov_SC03_100_after.c b/src/ov_SC03_100/ov_SC03_100_after.c index 90f1720cbf..463a970114 100644 --- a/src/ov_SC03_100/ov_SC03_100_after.c +++ b/src/ov_SC03_100/ov_SC03_100_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_100/ov_SC03_100_jr_8012ACE0.c b/src/ov_SC03_100/ov_SC03_100_jr_8012ACE0.c index 478a5f67ca..3a26e788f1 100644 --- a/src/ov_SC03_100/ov_SC03_100_jr_8012ACE0.c +++ b/src/ov_SC03_100/ov_SC03_100_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_100_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_100_80131340 D_80184DA4; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80184E90; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80184E7C[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_100_80133CD4; *(Blk8_SC03_100_80133CD4 *)&D_801152B0 = *(Blk8_SC03_100_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_100/ov_SC03_100_jr_80135A4C.c b/src/ov_SC03_100/ov_SC03_100_jr_80135A4C.c index 566c7cc3a7..a4269f5f21 100644 --- a/src/ov_SC03_100/ov_SC03_100_jr_80135A4C.c +++ b/src/ov_SC03_100/ov_SC03_100_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_100_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_100/ov_SC03_100_jr_80183C10.c b/src/ov_SC03_100/ov_SC03_100_jr_80183C10.c index 0570c4b19d..c579cdd665 100644 --- a/src/ov_SC03_100/ov_SC03_100_jr_80183C10.c +++ b/src/ov_SC03_100/ov_SC03_100_jr_80183C10.c @@ -2922,7 +2922,6 @@ void func_80183E04(void *a0) { void func_80183EB4(void *a0) { - struct B16_80185634 { s32 w[4]; }; extern struct B16_80185634 D_800A5EA8; extern struct B16_80185634 D_801C4F2C; diff --git a/src/ov_SC03_101/ov_SC03_101_after.c b/src/ov_SC03_101/ov_SC03_101_after.c index 2b4df38b52..2a2d907925 100644 --- a/src/ov_SC03_101/ov_SC03_101_after.c +++ b/src/ov_SC03_101/ov_SC03_101_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_101/ov_SC03_101_jr_8012ACE0.c b/src/ov_SC03_101/ov_SC03_101_jr_8012ACE0.c index 118f4b5b24..702e39a54a 100644 --- a/src/ov_SC03_101/ov_SC03_101_jr_8012ACE0.c +++ b/src/ov_SC03_101/ov_SC03_101_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_101_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_101_80131340 D_80183D80; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80183E6C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80183E58[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_101_80133CD4; *(Blk8_SC03_101_80133CD4 *)&D_801152B0 = *(Blk8_SC03_101_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_101/ov_SC03_101_jr_80135A4C.c b/src/ov_SC03_101/ov_SC03_101_jr_80135A4C.c index 8347a88153..1952f8d46a 100644 --- a/src/ov_SC03_101/ov_SC03_101_jr_80135A4C.c +++ b/src/ov_SC03_101/ov_SC03_101_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_101_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_101/ov_SC03_101_jr_8017CA80.c b/src/ov_SC03_101/ov_SC03_101_jr_8017CA80.c index a950079ce0..ead38b0b1b 100644 --- a/src/ov_SC03_101/ov_SC03_101_jr_8017CA80.c +++ b/src/ov_SC03_101/ov_SC03_101_jr_8017CA80.c @@ -3049,7 +3049,6 @@ void func_8017E01C(s32 a0) { void func_8017E0BC(s32 a0) { - typedef struct { s16 v[4]; } Blk8_80126940_8017E01C; extern s32 D_80126B58; extern s16 D_80187400[]; extern Blk8_80126940_8017E01C D_80126940; @@ -4672,8 +4671,6 @@ void func_801809B0(s32 a0, s32 a1) { * file-scope decl in this TU: it is already declared twice, block-scoped and * with two different types (Blk32_8018AA98_80183D30_801809B0 @5594, s32 @6053). This * body follows that existing TU precedent verbatim. */ - typedef struct { u8 b[8]; } Blk8_801809B0; - typedef struct { s32 w[8]; } Blk32_8018AA98_80183D30_801809B0; extern Blk8_801809B0 D_8019C988; extern s32 D_800AE620; Msg_8018248C_801809B0 msg; /* sp+0x10 (24-byte stride, §193-I) */ diff --git a/src/ov_SC03_102/ov_SC03_102_after.c b/src/ov_SC03_102/ov_SC03_102_after.c index 43f1bc7fb8..918b82b596 100644 --- a/src/ov_SC03_102/ov_SC03_102_after.c +++ b/src/ov_SC03_102/ov_SC03_102_after.c @@ -1554,31 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; - typedef struct EntD820 - { - u16 f0; - u16 f2; - u16 f4; - u16 x; - u16 f8; - u16 y; - u16 fC; - u16 z; - u8 p10[0x10]; - s32 f20; - u8 p24[0x34]; - s32 f58; - u16 f5C; - u16 f5E; - u8 p60[0x10C - 0x60]; - } Ent_SC03_102_8014D820; int new_var2; s16 new_var3; V4 out[3]; diff --git a/src/ov_SC03_102/ov_SC03_102_jr_8012ACE0.c b/src/ov_SC03_102/ov_SC03_102_jr_8012ACE0.c index 043a9154c5..07f84231d5 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_8012ACE0.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_102_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_102_80131340 D_80186638; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80186724; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80186710[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_102_80133CD4; *(Blk8_SC03_102_80133CD4 *)&D_801152B0 = *(Blk8_SC03_102_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_102/ov_SC03_102_jr_80135A4C.c b/src/ov_SC03_102/ov_SC03_102_jr_80135A4C.c index cbad00add3..6a141149d4 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_80135A4C.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_102_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_102/ov_SC03_102_jr_8017BEBC.c b/src/ov_SC03_102/ov_SC03_102_jr_8017BEBC.c index c64f8d9cad..c3ddc15c68 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_8017BEBC.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_8017BEBC.c @@ -2688,7 +2688,6 @@ extern void func_8017BEB4(void); void func_8017BEBC(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_102_8017BEBC; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); @@ -3213,7 +3212,6 @@ extern s32 D_801B9B44; void func_8017CD9C(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_102_8017CD9C; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); @@ -4019,7 +4017,6 @@ void func_80180A38(s32 param_1) extern void func_8012BE98(s32 a0, u16 *a1); extern s32 func_80181260(s32 param_1, s16 param_2); - typedef struct { s16 v[4]; } Blk8_80180A38; Blk8_80180A38 pos; u16 buf[3]; diff --git a/src/ov_SC03_102/ov_SC03_102_jr_801855D0.c b/src/ov_SC03_102/ov_SC03_102_jr_801855D0.c index 5af669e3b8..e574938cf8 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_801855D0.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_801855D0.c @@ -2917,7 +2917,6 @@ extern s32 func_8004787C(s32 a0); extern void func_80028620(s32 a0, void *a1); void func_80185874(void *a0) { - struct B16_80185634 { s32 w[4]; }; extern struct B16_80185634 D_800A5EA8; extern struct B16_80185634 D_801B6E44; diff --git a/src/ov_SC03_103/ov_SC03_103_after.c b/src/ov_SC03_103/ov_SC03_103_after.c index 566eb06da6..cd2be27a64 100644 --- a/src/ov_SC03_103/ov_SC03_103_after.c +++ b/src/ov_SC03_103/ov_SC03_103_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_103/ov_SC03_103_jr_8012ACE0.c b/src/ov_SC03_103/ov_SC03_103_jr_8012ACE0.c index f5666f34fd..0a339678ef 100644 --- a/src/ov_SC03_103/ov_SC03_103_jr_8012ACE0.c +++ b/src/ov_SC03_103/ov_SC03_103_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_103_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_103_80131340 D_801845E8; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801846D4; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801846C0[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_103_80133CD4; *(Blk8_SC03_103_80133CD4 *)&D_801152B0 = *(Blk8_SC03_103_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_103/ov_SC03_103_jr_80135A4C.c b/src/ov_SC03_103/ov_SC03_103_jr_80135A4C.c index 00793d7336..47c6b8c64d 100644 --- a/src/ov_SC03_103/ov_SC03_103_jr_80135A4C.c +++ b/src/ov_SC03_103/ov_SC03_103_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_103_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_103/ov_SC03_103_jr_8017C294.c b/src/ov_SC03_103/ov_SC03_103_jr_8017C294.c index 7dc0f7794c..eb599fe382 100644 --- a/src/ov_SC03_103/ov_SC03_103_jr_8017C294.c +++ b/src/ov_SC03_103/ov_SC03_103_jr_8017C294.c @@ -2776,7 +2776,6 @@ extern void func_8017C230(int a0); void func_8017D174(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_103_8017D174; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC03_103/ov_SC03_103_jr_80183C34.c b/src/ov_SC03_103/ov_SC03_103_jr_80183C34.c index 7ccee702b8..3fe1ce5f09 100644 --- a/src/ov_SC03_103/ov_SC03_103_jr_80183C34.c +++ b/src/ov_SC03_103/ov_SC03_103_jr_80183C34.c @@ -2954,7 +2954,6 @@ extern s32 func_8004787C(s32 a0); extern void func_80028620(s32 a0, void *a1); void func_80183ED8(void *a0) { - struct B16_80183ED8 { s32 w[4]; }; extern struct B16_80183ED8 D_800A5EA8; extern struct B16_80183ED8 D_801C205C; diff --git a/src/ov_SC03_104/ov_SC03_104_after.c b/src/ov_SC03_104/ov_SC03_104_after.c index bd8df43abf..976a096ab0 100644 --- a/src/ov_SC03_104/ov_SC03_104_after.c +++ b/src/ov_SC03_104/ov_SC03_104_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_104/ov_SC03_104_jr_8012ACE0.c b/src/ov_SC03_104/ov_SC03_104_jr_8012ACE0.c index 1fe4e07429..9b6990b4a5 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_8012ACE0.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_104_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_104_80131340 D_8018B178; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018B264; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018B250[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_104_80133CD4; *(Blk8_SC03_104_80133CD4 *)&D_801152B0 = *(Blk8_SC03_104_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_104/ov_SC03_104_jr_80135A4C.c b/src/ov_SC03_104/ov_SC03_104_jr_80135A4C.c index b11ef8b4d8..ab7f9d3a7b 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_80135A4C.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_104_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_104/ov_SC03_104_jr_8017CA80.c b/src/ov_SC03_104/ov_SC03_104_jr_8017CA80.c index 37df55494d..61374479e1 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_8017CA80.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_8017CA80.c @@ -2878,7 +2878,6 @@ extern s32 D_801C03B4; void func_8017D960(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_104_8017D960; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); @@ -3650,7 +3649,6 @@ void func_80181404(void *a0) { void func_80181440(s32 a0) { - typedef struct { s16 v[4]; } Blk8_80126940_80181440; extern s32 D_80126B58; extern s16 D_8018E7F4[]; extern s16 D_80126940[4]; diff --git a/src/ov_SC03_104/ov_SC03_104_jr_80182038.c b/src/ov_SC03_104/ov_SC03_104_jr_80182038.c index 5c973a36ab..aa2a5fa7df 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_80182038.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_80182038.c @@ -4148,8 +4148,6 @@ void func_80183DEC(s32 a0, s32 a1) { * file-scope decl in this TU: it is already declared twice, block-scoped and * with two different types (Blk32_8018AA98_80183D30_80183DEC @5594, s32 @6053). This * body follows that existing TU precedent verbatim. */ - typedef struct { u8 b[8]; } Blk8_80183DEC; - typedef struct { s32 w[8]; } Blk32_8018AA98_80183D30_80183DEC; extern Blk8_80183DEC D_801BED1C; extern s32 D_800AE620; Msg_8018248C_80183DEC msg; /* sp+0x10 (24-byte stride, §193-I) */ diff --git a/src/ov_SC03_104/ov_SC03_104_jr_80189FE4.c b/src/ov_SC03_104/ov_SC03_104_jr_80189FE4.c index 0a34438481..096e019173 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_80189FE4.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_80189FE4.c @@ -2991,7 +2991,6 @@ void func_8018A1D8(void *a0) { void func_8018A288(void *a0) { - struct B16_80185634 { s32 w[4]; }; extern struct B16_80185634 D_800A5EA8; extern struct B16_80185634 D_801BCB84; extern s32 D_800A5EB0; diff --git a/src/ov_SC03_105/ov_SC03_105_after.c b/src/ov_SC03_105/ov_SC03_105_after.c index ed823b290a..d7f64246f8 100644 --- a/src/ov_SC03_105/ov_SC03_105_after.c +++ b/src/ov_SC03_105/ov_SC03_105_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_105/ov_SC03_105_jr_8012ACE0.c b/src/ov_SC03_105/ov_SC03_105_jr_8012ACE0.c index 086d50b98d..8b62f7a09f 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_8012ACE0.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_105_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_105_80131340 D_8018A800; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018A8EC; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018A8D8[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_105_80133CD4; *(Blk8_SC03_105_80133CD4 *)&D_801152B0 = *(Blk8_SC03_105_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_105/ov_SC03_105_jr_80135A4C.c b/src/ov_SC03_105/ov_SC03_105_jr_80135A4C.c index ceed29646e..47dbd20452 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_80135A4C.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_105_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_105/ov_SC03_105_jr_80181C84.c b/src/ov_SC03_105/ov_SC03_105_jr_80181C84.c index 72fd62fbf3..68a1f354bf 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_80181C84.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_80181C84.c @@ -3278,7 +3278,6 @@ void func_801829CC(s32 arg0) { * "conflicting types for `SVEC_801BA5A8'" (anonymous struct bodies are never * compatible), which is what killed the previous whole-binary gate on this * function. Block scope keeps the same codegen and no file-scope clash. */ - typedef struct { s16 vx, vy, vz, pad; } SVEC_801BA5A8; extern SVEC_801BA5A8 D_801BA5A8[]; s16 sp20[3]; @@ -5259,9 +5258,6 @@ extern void func_8001F730(s32 a0, void *a1, void *a2); void func_80185810(s32 a0) { - typedef struct { u16 vx, vy, vz, pad; } UV_85810; - typedef struct { short m[3][3]; long t[3]; } MTX_85810; - typedef struct { u32 addr : 24; u32 len : 8; } PTag_85810; UV_85810 v[5]; /* sp+0x10 .. sp+0x37 */ MTX_85810 m; /* sp+0x38 */ diff --git a/src/ov_SC03_105/ov_SC03_105_jr_80186DDC.c b/src/ov_SC03_105/ov_SC03_105_jr_80186DDC.c index 15e94cb948..4cb493766c 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_80186DDC.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_80186DDC.c @@ -3031,17 +3031,6 @@ extern s32 func_8012C51C(void *a0, s32 a1); extern void func_8002D4C8(s32 a0, s32 a1); s32 func_801870E8(s32 a0) { - typedef struct { - u16 f0; - u16 f1; - u16 f2; - u16 f3; - u16 f4; - u16 f5; - u16 f6; - u16 f7; - s32 f8; - } Local_801870E8; s32 s0 = a0; Local_801870E8 local; diff --git a/src/ov_SC03_105/ov_SC03_105_jr_80189798.c b/src/ov_SC03_105/ov_SC03_105_jr_80189798.c index 2411170481..0e136c5929 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_80189798.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_80189798.c @@ -2876,7 +2876,6 @@ void func_8018998C(void *a0) { void func_80189A3C(void *a0) { - struct B16_80185634 { s32 w[4]; }; extern struct B16_80185634 D_800A5EA8; extern struct B16_80185634 D_801B6850; extern s32 D_800A5EB0; diff --git a/src/ov_SC03_107/ov_SC03_107_jr_80131340.c b/src/ov_SC03_107/ov_SC03_107_jr_80131340.c index 26f5df60c8..38662a9a14 100644 --- a/src/ov_SC03_107/ov_SC03_107_jr_80131340.c +++ b/src/ov_SC03_107/ov_SC03_107_jr_80131340.c @@ -624,9 +624,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_80131340 { - u16 vx, vy, vz, pad; - }; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 * with the stale 1-arg engine_core canonical. A file-scope `extern int @@ -1642,7 +1639,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80182A4C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -1708,7 +1705,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80182A38[3] = y; { - typedef struct { s8 c[8]; } Blk8_80133CD4; *(Blk8_80133CD4 *)&D_801152B0 = *(Blk8_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_107/ov_SC03_107_jr_80135A4C.c b/src/ov_SC03_107/ov_SC03_107_jr_80135A4C.c index 0639e46911..20ca87c9c9 100644 --- a/src/ov_SC03_107/ov_SC03_107_jr_80135A4C.c +++ b/src/ov_SC03_107/ov_SC03_107_jr_80135A4C.c @@ -601,7 +601,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_107_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_107/ov_SC03_107_jr_801458E0.c b/src/ov_SC03_107/ov_SC03_107_jr_801458E0.c index cd7385b7dd..9a6327cbc3 100644 --- a/src/ov_SC03_107/ov_SC03_107_jr_801458E0.c +++ b/src/ov_SC03_107/ov_SC03_107_jr_801458E0.c @@ -3023,13 +3023,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2x) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent_8014D820` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4_8014D820; typedef Unkstruct_800B5CB8 Ent_8014D820; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_107/ov_SC03_107_jr_801789AC.c b/src/ov_SC03_107/ov_SC03_107_jr_801789AC.c index 9ca032de76..b36f9c68ec 100644 --- a/src/ov_SC03_107/ov_SC03_107_jr_801789AC.c +++ b/src/ov_SC03_107/ov_SC03_107_jr_801789AC.c @@ -5641,15 +5641,6 @@ extern u16 aD800B9A02 __asm__("D_800B9A02"); void func_8017BEBC(s32 arg0) { - typedef struct { u16 vx, vy, vz, pad; } UV8; - typedef struct { s16 vx, vy; } XDV2; - typedef struct { s16 vx, vy, vz, pad; } XSV2; - typedef struct { u32 xx, yy, zz; u32 nprim; u32 *prim; } XPart; - typedef struct { u32 w0, w1, w2; } XPrim; - typedef struct { u32 tag, rgbc; s16 x0, y0; u32 uvc0; s16 x1, y1; u32 uvp1; - s16 x2, y2; u16 uv2, p2; } XFT3; - typedef struct { u32 tag, rgbc; s16 x0, y0; u32 uvc0; s16 x1, y1; u32 uvp1; - s16 x2, y2; u16 uv2, p2; s16 x3, y3; u16 uv3, p3; } XFT4; XDV2 tmpxy[4]; /* 0x10 */ XSV2 box[8]; /* 0x20 */ diff --git a/src/ov_SC03_108/ov_SC03_108_after.c b/src/ov_SC03_108/ov_SC03_108_after.c index ed214d2a7d..db282076a7 100644 --- a/src/ov_SC03_108/ov_SC03_108_after.c +++ b/src/ov_SC03_108/ov_SC03_108_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_108/ov_SC03_108_jr_8012ACE0.c b/src/ov_SC03_108/ov_SC03_108_jr_8012ACE0.c index 89f4e5ae9d..644b4a946d 100644 --- a/src/ov_SC03_108/ov_SC03_108_jr_8012ACE0.c +++ b/src/ov_SC03_108/ov_SC03_108_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_108_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_108_80131340 D_80181158; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80181244; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80181230[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_108_80133CD4; *(Blk8_SC03_108_80133CD4 *)&D_801152B0 = *(Blk8_SC03_108_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_108/ov_SC03_108_jr_80135A4C.c b/src/ov_SC03_108/ov_SC03_108_jr_80135A4C.c index 2e7cf8ff22..98d57f514c 100644 --- a/src/ov_SC03_108/ov_SC03_108_jr_80135A4C.c +++ b/src/ov_SC03_108/ov_SC03_108_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_108_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_108/ov_SC03_108_jr_8017F83C.c b/src/ov_SC03_108/ov_SC03_108_jr_8017F83C.c index d6be949509..b6d31c56a6 100644 --- a/src/ov_SC03_108/ov_SC03_108_jr_8017F83C.c +++ b/src/ov_SC03_108/ov_SC03_108_jr_8017F83C.c @@ -2968,7 +2968,6 @@ void func_8017FD64(s32 param_1) /* block-scope so it cannot collide with engine_types.h's SVECTOR_8016E7C8; * the 8-byte (vx,vy,vz,pad) shape is what puts `in` at 0x10(sp) and * `out` at 0x18(sp). */ - typedef struct { short vx, vy, vz, pad; } SVec_80181D08; s32 sp20; s32 ret; diff --git a/src/ov_SC03_109/ov_SC03_109_after.c b/src/ov_SC03_109/ov_SC03_109_after.c index 5f9d869f13..e9b07e0b6c 100644 --- a/src/ov_SC03_109/ov_SC03_109_after.c +++ b/src/ov_SC03_109/ov_SC03_109_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_109/ov_SC03_109_jr_8012ACE0.c b/src/ov_SC03_109/ov_SC03_109_jr_8012ACE0.c index b4713b45ba..3c3092b449 100644 --- a/src/ov_SC03_109/ov_SC03_109_jr_8012ACE0.c +++ b/src/ov_SC03_109/ov_SC03_109_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_109_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_109_80131340 D_8017E804; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017E8F0; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017E8DC[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_109_80133CD4; *(Blk8_SC03_109_80133CD4 *)&D_801152B0 = *(Blk8_SC03_109_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_109/ov_SC03_109_jr_80135A4C.c b/src/ov_SC03_109/ov_SC03_109_jr_80135A4C.c index 60f61d49b4..28696864cf 100644 --- a/src/ov_SC03_109/ov_SC03_109_jr_80135A4C.c +++ b/src/ov_SC03_109/ov_SC03_109_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_109_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_110/ov_SC03_110_after.c b/src/ov_SC03_110/ov_SC03_110_after.c index 3bf27561d3..6740dcf38f 100644 --- a/src/ov_SC03_110/ov_SC03_110_after.c +++ b/src/ov_SC03_110/ov_SC03_110_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_110/ov_SC03_110_jr_8012ACE0.c b/src/ov_SC03_110/ov_SC03_110_jr_8012ACE0.c index 00cf8f4284..ccfbb93733 100644 --- a/src/ov_SC03_110/ov_SC03_110_jr_8012ACE0.c +++ b/src/ov_SC03_110/ov_SC03_110_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_110_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_110_80131340 D_80182224; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80182310; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801822FC[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_110_80133CD4; *(Blk8_SC03_110_80133CD4 *)&D_801152B0 = *(Blk8_SC03_110_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_110/ov_SC03_110_jr_80135A4C.c b/src/ov_SC03_110/ov_SC03_110_jr_80135A4C.c index e4f46d59e0..5fac1e64ad 100644 --- a/src/ov_SC03_110/ov_SC03_110_jr_80135A4C.c +++ b/src/ov_SC03_110/ov_SC03_110_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_110_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_110/ov_SC03_110_jr_8017FBC8.c b/src/ov_SC03_110/ov_SC03_110_jr_8017FBC8.c index dd62cfe2ef..6536a7daa5 100644 --- a/src/ov_SC03_110/ov_SC03_110_jr_8017FBC8.c +++ b/src/ov_SC03_110/ov_SC03_110_jr_8017FBC8.c @@ -2952,7 +2952,6 @@ void func_801800F0(s32 param_1) /* block-scope so it cannot collide with engine_types.h's SVECTOR_8016E7C8; * the 8-byte (vx,vy,vz,pad) shape is what puts `in` at 0x10(sp) and * `out` at 0x18(sp). */ - typedef struct { short vx, vy, vz, pad; } SVec_80181D08; s32 sp20; s32 ret; diff --git a/src/ov_SC03_111/ov_SC03_111_after.c b/src/ov_SC03_111/ov_SC03_111_after.c index 959c2d0923..09835284f6 100644 --- a/src/ov_SC03_111/ov_SC03_111_after.c +++ b/src/ov_SC03_111/ov_SC03_111_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_111/ov_SC03_111_jr_8012ACE0.c b/src/ov_SC03_111/ov_SC03_111_jr_8012ACE0.c index 39da1f94bc..b7842280de 100644 --- a/src/ov_SC03_111/ov_SC03_111_jr_8012ACE0.c +++ b/src/ov_SC03_111/ov_SC03_111_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_111_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_111_80131340 D_80184DD8; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80184EC4; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80184EB0[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_111_80133CD4; *(Blk8_SC03_111_80133CD4 *)&D_801152B0 = *(Blk8_SC03_111_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_111/ov_SC03_111_jr_80135A4C.c b/src/ov_SC03_111/ov_SC03_111_jr_80135A4C.c index 80ae2765fd..832077a5e5 100644 --- a/src/ov_SC03_111/ov_SC03_111_jr_80135A4C.c +++ b/src/ov_SC03_111/ov_SC03_111_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_111_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_111/ov_SC03_111_jr_8017EC58.c b/src/ov_SC03_111/ov_SC03_111_jr_8017EC58.c index f94d4e520e..0098aec765 100644 --- a/src/ov_SC03_111/ov_SC03_111_jr_8017EC58.c +++ b/src/ov_SC03_111/ov_SC03_111_jr_8017EC58.c @@ -2718,7 +2718,6 @@ extern void func_8017E99C(void *a0); void func_8017EC58(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_111_8017EC58; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC03_112/ov_SC03_112_after.c b/src/ov_SC03_112/ov_SC03_112_after.c index c227d2d3cd..2d6f4c209a 100644 --- a/src/ov_SC03_112/ov_SC03_112_after.c +++ b/src/ov_SC03_112/ov_SC03_112_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_112/ov_SC03_112_jr_8012ACE0.c b/src/ov_SC03_112/ov_SC03_112_jr_8012ACE0.c index ac7247c97f..c87a5e5dfc 100644 --- a/src/ov_SC03_112/ov_SC03_112_jr_8012ACE0.c +++ b/src/ov_SC03_112/ov_SC03_112_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_112_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_112_80131340 D_80185BE0; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80185CCC; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80185CB8[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_112_80133CD4; *(Blk8_SC03_112_80133CD4 *)&D_801152B0 = *(Blk8_SC03_112_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_112/ov_SC03_112_jr_80135A4C.c b/src/ov_SC03_112/ov_SC03_112_jr_80135A4C.c index d9bac7dbb8..9815e09d8a 100644 --- a/src/ov_SC03_112/ov_SC03_112_jr_80135A4C.c +++ b/src/ov_SC03_112/ov_SC03_112_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_112_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_112/ov_SC03_112_jr_801817E0.c b/src/ov_SC03_112/ov_SC03_112_jr_801817E0.c index 2a50e95ea7..fd6b22f8ea 100644 --- a/src/ov_SC03_112/ov_SC03_112_jr_801817E0.c +++ b/src/ov_SC03_112/ov_SC03_112_jr_801817E0.c @@ -2990,7 +2990,6 @@ void func_80181D08(s32 param_1) /* block-scope so it cannot collide with engine_types.h's SVECTOR_8016E7C8; * the 8-byte (vx,vy,vz,pad) shape is what puts `in` at 0x10(sp) and * `out` at 0x18(sp). */ - typedef struct { short vx, vy, vz, pad; } SVec_80181D08; s32 sp20; s32 ret; diff --git a/src/ov_SC03_113/ov_SC03_113_after.c b/src/ov_SC03_113/ov_SC03_113_after.c index d80e94722f..03a4e5191a 100644 --- a/src/ov_SC03_113/ov_SC03_113_after.c +++ b/src/ov_SC03_113/ov_SC03_113_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_113/ov_SC03_113_jr_8012ACE0.c b/src/ov_SC03_113/ov_SC03_113_jr_8012ACE0.c index 56196791fc..627812221f 100644 --- a/src/ov_SC03_113/ov_SC03_113_jr_8012ACE0.c +++ b/src/ov_SC03_113/ov_SC03_113_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_113_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_113_80131340 D_80183290; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018337C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80183368[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_113_80133CD4; *(Blk8_SC03_113_80133CD4 *)&D_801152B0 = *(Blk8_SC03_113_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_113/ov_SC03_113_jr_80135A4C.c b/src/ov_SC03_113/ov_SC03_113_jr_80135A4C.c index e80f0685d6..cd41cd9df2 100644 --- a/src/ov_SC03_113/ov_SC03_113_jr_80135A4C.c +++ b/src/ov_SC03_113/ov_SC03_113_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_113_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_114/ov_SC03_114_after.c b/src/ov_SC03_114/ov_SC03_114_after.c index 5fcbd70711..63b0e03154 100644 --- a/src/ov_SC03_114/ov_SC03_114_after.c +++ b/src/ov_SC03_114/ov_SC03_114_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_114/ov_SC03_114_jr_8012ACE0.c b/src/ov_SC03_114/ov_SC03_114_jr_8012ACE0.c index 58ffce7caf..9d48638aad 100644 --- a/src/ov_SC03_114/ov_SC03_114_jr_8012ACE0.c +++ b/src/ov_SC03_114/ov_SC03_114_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_114_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_114_80131340 D_8017EEF8; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017EFE4; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017EFD0[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_114_80133CD4; *(Blk8_SC03_114_80133CD4 *)&D_801152B0 = *(Blk8_SC03_114_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_114/ov_SC03_114_jr_80135A4C.c b/src/ov_SC03_114/ov_SC03_114_jr_80135A4C.c index 49f6f3b4a6..b4be3b096b 100644 --- a/src/ov_SC03_114/ov_SC03_114_jr_80135A4C.c +++ b/src/ov_SC03_114/ov_SC03_114_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_114_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_115/ov_SC03_115_after.c b/src/ov_SC03_115/ov_SC03_115_after.c index 9525e1e039..c3f84a9925 100644 --- a/src/ov_SC03_115/ov_SC03_115_after.c +++ b/src/ov_SC03_115/ov_SC03_115_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_115/ov_SC03_115_jr_8012ACE0.c b/src/ov_SC03_115/ov_SC03_115_jr_8012ACE0.c index 3f1d77810b..5db7531f63 100644 --- a/src/ov_SC03_115/ov_SC03_115_jr_8012ACE0.c +++ b/src/ov_SC03_115/ov_SC03_115_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_115_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_115_80131340 D_80180964; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80180A50; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80180A3C[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_115_80133CD4; *(Blk8_SC03_115_80133CD4 *)&D_801152B0 = *(Blk8_SC03_115_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_115/ov_SC03_115_jr_80135A4C.c b/src/ov_SC03_115/ov_SC03_115_jr_80135A4C.c index 236afa63a5..fbe8aa3a54 100644 --- a/src/ov_SC03_115/ov_SC03_115_jr_80135A4C.c +++ b/src/ov_SC03_115/ov_SC03_115_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_115_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_115/ov_SC03_115_jr_8017BEBC.c b/src/ov_SC03_115/ov_SC03_115_jr_8017BEBC.c index 521c340f62..9cefee234a 100644 --- a/src/ov_SC03_115/ov_SC03_115_jr_8017BEBC.c +++ b/src/ov_SC03_115/ov_SC03_115_jr_8017BEBC.c @@ -2685,7 +2685,6 @@ extern void func_8017BEB4(void); void func_8017BEBC(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_115_8017BEBC; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC03_116/ov_SC03_116_after.c b/src/ov_SC03_116/ov_SC03_116_after.c index d3819a9b6f..da3ff2090c 100644 --- a/src/ov_SC03_116/ov_SC03_116_after.c +++ b/src/ov_SC03_116/ov_SC03_116_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_116/ov_SC03_116_jr_8012ACE0.c b/src/ov_SC03_116/ov_SC03_116_jr_8012ACE0.c index 72478f42c1..5f19e95aa4 100644 --- a/src/ov_SC03_116/ov_SC03_116_jr_8012ACE0.c +++ b/src/ov_SC03_116/ov_SC03_116_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_116_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_116_80131340 D_80182D68; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80182E54; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80182E40[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_116_80133CD4; *(Blk8_SC03_116_80133CD4 *)&D_801152B0 = *(Blk8_SC03_116_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_116/ov_SC03_116_jr_80135A4C.c b/src/ov_SC03_116/ov_SC03_116_jr_80135A4C.c index 0ce14b78ab..31d8b078b0 100644 --- a/src/ov_SC03_116/ov_SC03_116_jr_80135A4C.c +++ b/src/ov_SC03_116/ov_SC03_116_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_116_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_116/ov_SC03_116_jr_8017AE2C.c b/src/ov_SC03_116/ov_SC03_116_jr_8017AE2C.c index f4865ccc18..1c87f449ca 100644 --- a/src/ov_SC03_116/ov_SC03_116_jr_8017AE2C.c +++ b/src/ov_SC03_116/ov_SC03_116_jr_8017AE2C.c @@ -3291,7 +3291,6 @@ void func_8017BE60(void *a0) { void func_8017BEBC(s32 arg0) { - typedef struct { s16 m[3][3]; s16 pad; s32 t[3]; } MTX; extern s32 func_800491EC(void); extern void func_800547D8(s32, MTX *); @@ -3583,7 +3582,6 @@ extern u16 D_80197C88; void func_8017BF14(s32 arg0, s32 lim) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_116_8017BF14; extern u8 *D_800A5E60; extern u8 D_800A6610[]; @@ -5241,7 +5239,6 @@ void func_801825A8(void *a0) { void func_80182658(void *a0) { - struct B16_80185634 { s32 w[4]; }; extern struct B16_80185634 D_800A5EA8; extern struct B16_80185634 D_801950F4; diff --git a/src/ov_SC03_117/ov_SC03_117_after.c b/src/ov_SC03_117/ov_SC03_117_after.c index 8fbf8b496e..71fe78ca0a 100644 --- a/src/ov_SC03_117/ov_SC03_117_after.c +++ b/src/ov_SC03_117/ov_SC03_117_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_117/ov_SC03_117_jr_8012ACE0.c b/src/ov_SC03_117/ov_SC03_117_jr_8012ACE0.c index d5856df174..86c604c9a0 100644 --- a/src/ov_SC03_117/ov_SC03_117_jr_8012ACE0.c +++ b/src/ov_SC03_117/ov_SC03_117_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_117_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_117_80131340 D_80184D74; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80184E60; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80184E4C[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_117_80133CD4; *(Blk8_SC03_117_80133CD4 *)&D_801152B0 = *(Blk8_SC03_117_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_117/ov_SC03_117_jr_80135A4C.c b/src/ov_SC03_117/ov_SC03_117_jr_80135A4C.c index d9b393d360..c34a152959 100644 --- a/src/ov_SC03_117/ov_SC03_117_jr_80135A4C.c +++ b/src/ov_SC03_117/ov_SC03_117_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_117_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_117/ov_SC03_117_jr_8017BEBC.c b/src/ov_SC03_117/ov_SC03_117_jr_8017BEBC.c index 89f25069b8..d38f99b716 100644 --- a/src/ov_SC03_117/ov_SC03_117_jr_8017BEBC.c +++ b/src/ov_SC03_117/ov_SC03_117_jr_8017BEBC.c @@ -2689,7 +2689,6 @@ extern void func_8017BEB4(void); void func_8017BEBC(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_117_8017BEBC; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC03_118/ov_SC03_118_after.c b/src/ov_SC03_118/ov_SC03_118_after.c index a99da6a45c..026b26a85a 100644 --- a/src/ov_SC03_118/ov_SC03_118_after.c +++ b/src/ov_SC03_118/ov_SC03_118_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_118/ov_SC03_118_jr_8012ACE0.c b/src/ov_SC03_118/ov_SC03_118_jr_8012ACE0.c index 393c7b01e7..007af76a54 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_8012ACE0.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_8012ACE0.c @@ -1177,9 +1177,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_118_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_118_80131340 D_80189E20; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2151,7 +2148,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80189F0C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2210,7 +2207,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80189EF8[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_118_80133CD4; *(Blk8_SC03_118_80133CD4 *)&D_801152B0 = *(Blk8_SC03_118_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_118/ov_SC03_118_jr_80135A4C.c b/src/ov_SC03_118/ov_SC03_118_jr_80135A4C.c index 4d92ccbd0d..d3f3c52425 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_80135A4C.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_118_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_118/ov_SC03_118_jr_8017AE2C.c b/src/ov_SC03_118/ov_SC03_118_jr_8017AE2C.c index aeb730feb9..fd34569424 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_8017AE2C.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_8017AE2C.c @@ -3908,7 +3908,6 @@ void func_8017CE90(void *a0) void func_8017CFBC(void *a0) { - typedef struct { u8 d[4]; } Blk4_8017CE90_8017CE90; extern Blk4_8017CE90_8017CE90 D_801D4228; extern s32 func_80012F74(s32 a0, s32 a1, s32 a2, s32 a3); extern void func_80146C3C(); // K&R: 0 of 1 args (P37 rung D t4_D24) diff --git a/src/ov_SC03_118/ov_SC03_118_jr_8017FB84.c b/src/ov_SC03_118/ov_SC03_118_jr_8017FB84.c index ec441fd546..13f0d5cc1a 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_8017FB84.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_8017FB84.c @@ -2739,7 +2739,6 @@ extern s32 func_8017F4E8(void); void func_8017FB84(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_118_8017FB84; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC03_118/ov_SC03_118_jr_80183830.c b/src/ov_SC03_118/ov_SC03_118_jr_80183830.c index fbe6204976..d5f0234ab4 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_80183830.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_80183830.c @@ -3279,10 +3279,6 @@ extern s32 D_801D435C; extern s32 func_80012C6C(s32 a0, s32 a1, s32 a2); void func_80184334(int param_1) { - struct W80184334 { - s32 pad[15]; - s32 f3C, f40, f44, f48, f4C, f50; - }; struct W80184334 *p = (struct W80184334 *)param_1; p->f48 = (short)func_80012C6C((int)*(short *)&p->f48, (int)*(short *)D_801D4358, 0x20); diff --git a/src/ov_SC03_118/ov_SC03_118_o0d.c b/src/ov_SC03_118/ov_SC03_118_o0d.c index 6cccd6fd71..fb3a7587cc 100644 --- a/src/ov_SC03_118/ov_SC03_118_o0d.c +++ b/src/ov_SC03_118/ov_SC03_118_o0d.c @@ -2929,19 +2929,6 @@ void func_801833C4(s32 arg0) extern u8 D_801B86B4[]; extern s32 D_801270C8; - typedef struct { - u8 pad0[2]; - union { s16 s; u16 u; } f02; - u8 pad1[0xD8]; - union { s16 s; u16 u; } fDC; - u8 pad2[4]; - s16 fE2; - u8 pad3[2]; - s16 fE6; - u8 pad4[4]; - u16 fEC; - u16 fEE; - } St_SC03_118_801833C4; #define P ((St_SC03_118_801833C4 *)arg0) @@ -2965,19 +2952,6 @@ void func_801834DC(s32 arg0) extern s32 (*D_8018A0C4[])(void *); extern u16 D_800B99DC; - typedef struct { - u8 pad0[2]; - union { s16 s; u16 u; } f02; - u8 pad1[0xD8]; - union { s16 s; u16 u; } fDC; - u8 pad2[4]; - s16 fE2; - u8 pad3[2]; - s16 fE6; - u8 pad4[4]; - s16 fEC; - s16 fEE; - } St_SC03_118_801834DC; #define P ((St_SC03_118_801834DC *)arg0) @@ -3021,16 +2995,6 @@ void func_80183634(Work_80183634 *work) void func_801837B0(s32 arg0) { - typedef struct { - u8 _[0xDC]; - s16 fDC; - u8 _2[4]; - s16 fE2; - } Args_801837B0; - typedef struct { - u8 _[0xDC]; - u16 fDC; - } Rmw_801837B0; extern s32 D_801D47E0; extern s32 D_801B5D38; diff --git a/src/ov_SC03_121/ov_SC03_121_after.c b/src/ov_SC03_121/ov_SC03_121_after.c index 808ddd9526..d59507c1c0 100644 --- a/src/ov_SC03_121/ov_SC03_121_after.c +++ b/src/ov_SC03_121/ov_SC03_121_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_121/ov_SC03_121_jr_8012ACE0.c b/src/ov_SC03_121/ov_SC03_121_jr_8012ACE0.c index fffa85936d..20a0ead6f2 100644 --- a/src/ov_SC03_121/ov_SC03_121_jr_8012ACE0.c +++ b/src/ov_SC03_121/ov_SC03_121_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_121_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_121_80131340 D_8018263C; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80182728; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80182714[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_121_80133CD4; *(Blk8_SC03_121_80133CD4 *)&D_801152B0 = *(Blk8_SC03_121_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_121/ov_SC03_121_jr_80135A4C.c b/src/ov_SC03_121/ov_SC03_121_jr_80135A4C.c index f949d454ba..e037883c5a 100644 --- a/src/ov_SC03_121/ov_SC03_121_jr_80135A4C.c +++ b/src/ov_SC03_121/ov_SC03_121_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_121_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_124/ov_SC03_124_after.c b/src/ov_SC03_124/ov_SC03_124_after.c index 36d2c9f69b..1914afc3f2 100644 --- a/src/ov_SC03_124/ov_SC03_124_after.c +++ b/src/ov_SC03_124/ov_SC03_124_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_124/ov_SC03_124_jr_8012ACE0.c b/src/ov_SC03_124/ov_SC03_124_jr_8012ACE0.c index 0ccfd1a168..186b11d5db 100644 --- a/src/ov_SC03_124/ov_SC03_124_jr_8012ACE0.c +++ b/src/ov_SC03_124/ov_SC03_124_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_124_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_124_80131340 D_8018B068; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018B154; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018B140[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_124_80133CD4; *(Blk8_SC03_124_80133CD4 *)&D_801152B0 = *(Blk8_SC03_124_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_124/ov_SC03_124_jr_80135A4C.c b/src/ov_SC03_124/ov_SC03_124_jr_80135A4C.c index d084659d1a..d2d0550c92 100644 --- a/src/ov_SC03_124/ov_SC03_124_jr_80135A4C.c +++ b/src/ov_SC03_124/ov_SC03_124_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_124_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_124/ov_SC03_124_jr_8017AE2C.c b/src/ov_SC03_124/ov_SC03_124_jr_8017AE2C.c index 0818bd7237..c88e9bd560 100644 --- a/src/ov_SC03_124/ov_SC03_124_jr_8017AE2C.c +++ b/src/ov_SC03_124/ov_SC03_124_jr_8017AE2C.c @@ -5026,7 +5026,6 @@ void func_8017F2E8(void *arg0) { #include "common.h" void func_8017F380(s32 arg0) { - typedef struct { short vx, vy, vz, pad; } SVECTOR_8017F40C; extern SVECTOR_8017F40C D_8018F784[4]; extern void func_80029514(s32); diff --git a/src/ov_SC03_124/ov_SC03_124_jr_80181B44.c b/src/ov_SC03_124/ov_SC03_124_jr_80181B44.c index 20ef7cd229..c695fc3c8c 100644 --- a/src/ov_SC03_124/ov_SC03_124_jr_80181B44.c +++ b/src/ov_SC03_124/ov_SC03_124_jr_80181B44.c @@ -4723,7 +4723,7 @@ s32 func_80184088(s32 a0) { idx = D_801BBE38[idx] - 1; } - ((struct { s32 w; } *)&D_801E2458)->w = 1; + ((Unkstruct_801E2458 *)&D_801E2458)->w = 1; return D_801BBD04[idx][s0]; } diff --git a/src/ov_SC03_124/ov_SC03_124_jr_80188544.c b/src/ov_SC03_124/ov_SC03_124_jr_80188544.c index 2866561c43..c9fed9501e 100644 --- a/src/ov_SC03_124/ov_SC03_124_jr_80188544.c +++ b/src/ov_SC03_124/ov_SC03_124_jr_80188544.c @@ -3615,12 +3615,6 @@ s32 func_80188C68(s32 arg0, s16 arg1) case 10: { - typedef struct Rec { - s32 unk0; - s32 unk4; - s32 unk8; - void (*unkC)(void); - } Rec; extern Rec *D_801E23CC[]; Rec **pp; Rec *r; @@ -3777,19 +3771,8 @@ void func_801895C8(void) { extern s16 D_801E2368; /* §100/§120: draft-local, uniquely-named types — they live in the BODY so * they cannot collide with the TU's own Env_8018BCD4 / PTag_8018BCD4. */ - typedef struct { u32 addr : 24; u32 len : 8; } PTag_8018C960_801895C8; - typedef struct { u32 *ot; u32 pad[4]; } Env_8018C960_801895C8; /* 0x14 stride */ - typedef struct { - u32 tag; /* 0x00 */ - u8 r0, g0, b0, code; /* 0x04..0x07 */ - s16 x0, y0; /* 0x08, 0x0A */ - u8 r1, g1, b1, p1; /* 0x0C..0x0F */ - s16 x1, y1; /* 0x10, 0x12 */ - u8 r2, g2, b2, p2; /* 0x14..0x17 */ - s16 x2, y2; /* 0x18, 0x1A */ - u8 r3, g3, b3, p3; /* 0x1C..0x1F */ - s16 x3, y3; /* 0x20, 0x22 */ - } PG4_8018C960_801895C8; /* -> 0x24 */ + /* 0x14 stride */ + /* -> 0x24 */ extern Env_8018C960_801895C8 D_800AE7BC[]; extern u8 aD801EF1EC __asm__("D_801E2364"); diff --git a/src/ov_SC03_125/ov_SC03_125_after.c b/src/ov_SC03_125/ov_SC03_125_after.c index 59b046e98a..839d5985bb 100644 --- a/src/ov_SC03_125/ov_SC03_125_after.c +++ b/src/ov_SC03_125/ov_SC03_125_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC03_125/ov_SC03_125_jr_8012ACE0.c b/src/ov_SC03_125/ov_SC03_125_jr_8012ACE0.c index 4dbeea30fe..971c1d9ef3 100644 --- a/src/ov_SC03_125/ov_SC03_125_jr_8012ACE0.c +++ b/src/ov_SC03_125/ov_SC03_125_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC03_125_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC03_125_80131340 D_80184238; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80184324; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80184310[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC03_125_80133CD4; *(Blk8_SC03_125_80133CD4 *)&D_801152B0 = *(Blk8_SC03_125_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC03_125/ov_SC03_125_jr_80135A4C.c b/src/ov_SC03_125/ov_SC03_125_jr_80135A4C.c index 53d953ced2..ddca7fe164 100644 --- a/src/ov_SC03_125/ov_SC03_125_jr_80135A4C.c +++ b/src/ov_SC03_125/ov_SC03_125_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC03_125_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC03_125/ov_SC03_125_jr_8017D604.c b/src/ov_SC03_125/ov_SC03_125_jr_8017D604.c index ebb3752e55..fb5627a87c 100644 --- a/src/ov_SC03_125/ov_SC03_125_jr_8017D604.c +++ b/src/ov_SC03_125/ov_SC03_125_jr_8017D604.c @@ -2689,7 +2689,6 @@ extern void func_8017CF30(void *a0); void func_8017D604(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC03_125_8017D604; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); @@ -4111,7 +4110,6 @@ extern s32 func_8012AD50(void *a0); extern void func_8017FE60(); void func_8017FD98(void *a0) { - typedef struct { short vx, vy, vz, pad; } SVFD98; extern SVFD98 D_801C2D6C; extern SVFD98 D_801C2D74; extern void func_80015978(s32 a0, s32 *a1); @@ -4305,10 +4303,6 @@ void func_80180458(s32 *a0) { void func_801804CC(s32 arg0) { extern u8 * func_8012913C(s32 a0); - typedef struct { - u32 unk00; u32 unk04; u32 unk08; u32 unk0C; u32 unk10; u32 unk14; - u16 unk18; - } Rec_80189334; extern Rec_80189334 D_80188140[]; Rec_80189334 *src; u8 *temp; @@ -5368,7 +5362,7 @@ s32 func_80181790(s32 a0) { idx = D_801A6740[idx] - 1; } - ((struct { s32 w; } *)&D_801C43B0)->w = 1; + ((Unkstruct_801C43B0 *)&D_801C43B0)->w = 1; return D_801A660C[idx][s0]; } diff --git a/src/ov_SC04_000/ov_SC04_000_after.c b/src/ov_SC04_000/ov_SC04_000_after.c index 41a23cbc01..837acc4835 100644 --- a/src/ov_SC04_000/ov_SC04_000_after.c +++ b/src/ov_SC04_000/ov_SC04_000_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC04_000/ov_SC04_000_jr_8012ACE0.c b/src/ov_SC04_000/ov_SC04_000_jr_8012ACE0.c index 96cdd8f3d7..8725397530 100644 --- a/src/ov_SC04_000/ov_SC04_000_jr_8012ACE0.c +++ b/src/ov_SC04_000/ov_SC04_000_jr_8012ACE0.c @@ -1430,9 +1430,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC04_000_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC04_000_80131340 D_8018373C; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2404,7 +2401,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80183828; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2463,7 +2460,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80183814[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC04_000_80133CD4; *(Blk8_SC04_000_80133CD4 *)&D_801152B0 = *(Blk8_SC04_000_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC04_000/ov_SC04_000_jr_80135A4C.c b/src/ov_SC04_000/ov_SC04_000_jr_80135A4C.c index ac18fc2988..b0613285a3 100644 --- a/src/ov_SC04_000/ov_SC04_000_jr_80135A4C.c +++ b/src/ov_SC04_000/ov_SC04_000_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC04_000_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC04_000/ov_SC04_000_jr_8017BEBC.c b/src/ov_SC04_000/ov_SC04_000_jr_8017BEBC.c index 7a39a585cf..5a90ec274b 100644 --- a/src/ov_SC04_000/ov_SC04_000_jr_8017BEBC.c +++ b/src/ov_SC04_000/ov_SC04_000_jr_8017BEBC.c @@ -2693,7 +2693,6 @@ extern void func_8017BEB4(void); void func_8017BEBC(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC04_000_8017BEBC; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); @@ -4296,7 +4295,6 @@ void func_8017EE20(void *a0) { void func_8017EE5C(s32 a0) { - typedef struct { s16 v[4]; } Blk8_80126940_8017D6D0; extern s32 D_80126B58; extern s16 D_80186FE8[]; extern Blk8_80126940_8017D6D0 D_80126940; diff --git a/src/ov_SC04_002/ov_SC04_002_after.c b/src/ov_SC04_002/ov_SC04_002_after.c index de5b0a0c60..8fe2fd3107 100644 --- a/src/ov_SC04_002/ov_SC04_002_after.c +++ b/src/ov_SC04_002/ov_SC04_002_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC04_002/ov_SC04_002_jr_8012ACE0.c b/src/ov_SC04_002/ov_SC04_002_jr_8012ACE0.c index 1279470758..c06d80c1fc 100644 --- a/src/ov_SC04_002/ov_SC04_002_jr_8012ACE0.c +++ b/src/ov_SC04_002/ov_SC04_002_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC04_002_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC04_002_80131340 D_801888A8; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80188994; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80188980[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC04_002_80133CD4; *(Blk8_SC04_002_80133CD4 *)&D_801152B0 = *(Blk8_SC04_002_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC04_002/ov_SC04_002_jr_80135A4C.c b/src/ov_SC04_002/ov_SC04_002_jr_80135A4C.c index b72cb9293c..95a6df65ba 100644 --- a/src/ov_SC04_002/ov_SC04_002_jr_80135A4C.c +++ b/src/ov_SC04_002/ov_SC04_002_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC04_002_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC04_002/ov_SC04_002_jr_8017BEBC.c b/src/ov_SC04_002/ov_SC04_002_jr_8017BEBC.c index 3c38cad146..21d25d4391 100644 --- a/src/ov_SC04_002/ov_SC04_002_jr_8017BEBC.c +++ b/src/ov_SC04_002/ov_SC04_002_jr_8017BEBC.c @@ -2677,7 +2677,6 @@ extern void func_8017BEB4(void); void func_8017BEBC(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC04_002_8017BEBC; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); @@ -4893,7 +4892,6 @@ void func_8017FC98(s32 a0) { void func_8017FD38(s32 a0) { - typedef struct { s16 v[4]; } Blk8_80126940_8017FC98; extern s32 D_80126B58; extern s16 D_8018C490[]; extern Blk8_80126940_8017FC98 D_80126940; @@ -10509,15 +10507,8 @@ void func_8018739C(s32 a0, void *a1, s32 a2) void func_80187604(s32 a0, s32 a1, s32 a2) { - typedef struct { - s16 vx, vy, vz, pad; - } SV_80183FE0_80187604; - typedef struct { - SV_80183FE0_80187604 v[4]; /* 0x00 */ - u8 c[4][4]; /* 0x20 */ - u32 code; /* 0x30 */ - } Prim_80183FE0_80187604; /* 0x34 */ + /* 0x34 */ extern void func_801878B0(s32 a0, s32 a1, s32 a2, void *a3); extern s32 func_80017758(void *a0, void *a1); diff --git a/src/ov_SC04_003/ov_SC04_003_after.c b/src/ov_SC04_003/ov_SC04_003_after.c index 0711533492..bf184b7946 100644 --- a/src/ov_SC04_003/ov_SC04_003_after.c +++ b/src/ov_SC04_003/ov_SC04_003_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC04_003/ov_SC04_003_jr_8012ACE0.c b/src/ov_SC04_003/ov_SC04_003_jr_8012ACE0.c index a4c18efdc4..949e596434 100644 --- a/src/ov_SC04_003/ov_SC04_003_jr_8012ACE0.c +++ b/src/ov_SC04_003/ov_SC04_003_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC04_003_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC04_003_80131340 D_80182644; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80182730; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018271C[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC04_003_80133CD4; *(Blk8_SC04_003_80133CD4 *)&D_801152B0 = *(Blk8_SC04_003_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC04_003/ov_SC04_003_jr_80135A4C.c b/src/ov_SC04_003/ov_SC04_003_jr_80135A4C.c index ab6c2fb97a..e0238a5b1b 100644 --- a/src/ov_SC04_003/ov_SC04_003_jr_80135A4C.c +++ b/src/ov_SC04_003/ov_SC04_003_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC04_003_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC04_003/ov_SC04_003_jr_8017BEBC.c b/src/ov_SC04_003/ov_SC04_003_jr_8017BEBC.c index f69116f2c4..10ec0d8177 100644 --- a/src/ov_SC04_003/ov_SC04_003_jr_8017BEBC.c +++ b/src/ov_SC04_003/ov_SC04_003_jr_8017BEBC.c @@ -3544,7 +3544,7 @@ void func_8017E040(void *a0) { void func_8017E07C(void *a0, s32 a1) { extern s32 func_8012C51C(void *a0, s32 a1); - struct S80143BDC { s16 f0, f2, f4, f6, f8, fA, fC, fE; s32 f10; } sp; + struct S80143BDC sp; if (a0 != 0 && *(u16 *)a0 != 0) { sp.f0 = *(u16 *)((s32)a0 + 0x6); @@ -4754,17 +4754,7 @@ extern void func_8012B2CC(s32 a0); extern void func_8002D4C8(s32 a0, s32 a1); void func_8017FF9C(void *a0) { - struct S8017FF9C_sp { - u16 unk0; - u16 unk2; - u16 unk4; - s16 unk6; - s16 unk8; - s16 unkA; - s16 unkC; - s16 unkE; - s32 unk10; - } sp; + struct S8017FF9C_sp sp; s32 vec[3]; s32 out[3]; s32 ret; diff --git a/src/ov_SC04_004/ov_SC04_004_after.c b/src/ov_SC04_004/ov_SC04_004_after.c index 312835fa87..53d45fabd7 100644 --- a/src/ov_SC04_004/ov_SC04_004_after.c +++ b/src/ov_SC04_004/ov_SC04_004_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC04_004/ov_SC04_004_jr_8012ACE0.c b/src/ov_SC04_004/ov_SC04_004_jr_8012ACE0.c index 443c1b26fa..1bc21f791c 100644 --- a/src/ov_SC04_004/ov_SC04_004_jr_8012ACE0.c +++ b/src/ov_SC04_004/ov_SC04_004_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC04_004_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC04_004_80131340 D_80184B78; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80184C64; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80184C50[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC04_004_80133CD4; *(Blk8_SC04_004_80133CD4 *)&D_801152B0 = *(Blk8_SC04_004_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC04_004/ov_SC04_004_jr_80135A4C.c b/src/ov_SC04_004/ov_SC04_004_jr_80135A4C.c index e5d7974829..5de52e5654 100644 --- a/src/ov_SC04_004/ov_SC04_004_jr_80135A4C.c +++ b/src/ov_SC04_004/ov_SC04_004_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC04_004_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC04_004/ov_SC04_004_jr_8017AE2C.c b/src/ov_SC04_004/ov_SC04_004_jr_8017AE2C.c index e1fbc47d99..6b7a95cf9f 100644 --- a/src/ov_SC04_004/ov_SC04_004_jr_8017AE2C.c +++ b/src/ov_SC04_004/ov_SC04_004_jr_8017AE2C.c @@ -3292,7 +3292,6 @@ void func_8017BE60(void *a0) { void func_8017BEBC(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC04_004_8017BEBC; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC04_005/ov_SC04_005_after.c b/src/ov_SC04_005/ov_SC04_005_after.c index c6acb8bfec..1fce3a7d54 100644 --- a/src/ov_SC04_005/ov_SC04_005_after.c +++ b/src/ov_SC04_005/ov_SC04_005_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC04_005/ov_SC04_005_jr_8012ACE0.c b/src/ov_SC04_005/ov_SC04_005_jr_8012ACE0.c index f3e7a692b1..64287b8f37 100644 --- a/src/ov_SC04_005/ov_SC04_005_jr_8012ACE0.c +++ b/src/ov_SC04_005/ov_SC04_005_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC04_005_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC04_005_80131340 D_80187FAC; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80188098; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80188084[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC04_005_80133CD4; *(Blk8_SC04_005_80133CD4 *)&D_801152B0 = *(Blk8_SC04_005_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC04_005/ov_SC04_005_jr_80135A4C.c b/src/ov_SC04_005/ov_SC04_005_jr_80135A4C.c index 95a7bb9368..1ed20124a1 100644 --- a/src/ov_SC04_005/ov_SC04_005_jr_80135A4C.c +++ b/src/ov_SC04_005/ov_SC04_005_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC04_005_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC04_005/ov_SC04_005_jr_8017BEBC.c b/src/ov_SC04_005/ov_SC04_005_jr_8017BEBC.c index d3a95f1f75..8388feca17 100644 --- a/src/ov_SC04_005/ov_SC04_005_jr_8017BEBC.c +++ b/src/ov_SC04_005/ov_SC04_005_jr_8017BEBC.c @@ -2676,7 +2676,6 @@ extern void func_8017BEB4(void); void func_8017BEBC(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC04_005_8017BEBC; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); @@ -9772,15 +9771,8 @@ void func_8018676C(s32 a0, void *a1, s32 a2) void func_801869D4(s32 a0, s32 a1, s32 a2) { - typedef struct { - s16 vx, vy, vz, pad; - } SV_80183FE0_801869D4; - typedef struct { - SV_80183FE0_801869D4 v[4]; /* 0x00 */ - u8 c[4][4]; /* 0x20 */ - u32 code; /* 0x30 */ - } Prim_80183FE0_801869D4; /* 0x34 */ + /* 0x34 */ extern void func_80186C80(s32 a0, s32 a1, s32 a2, void *a3); extern s32 func_80017758(void *a0, void *a1); diff --git a/src/ov_SC04_006/ov_SC04_006_after.c b/src/ov_SC04_006/ov_SC04_006_after.c index 07d398148f..81d2751e13 100644 --- a/src/ov_SC04_006/ov_SC04_006_after.c +++ b/src/ov_SC04_006/ov_SC04_006_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC04_006/ov_SC04_006_jr_8012ACE0.c b/src/ov_SC04_006/ov_SC04_006_jr_8012ACE0.c index 65f27d9d86..91fe2f4095 100644 --- a/src/ov_SC04_006/ov_SC04_006_jr_8012ACE0.c +++ b/src/ov_SC04_006/ov_SC04_006_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC04_006_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC04_006_80131340 D_8018008C; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80180178; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80180164[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC04_006_80133CD4; *(Blk8_SC04_006_80133CD4 *)&D_801152B0 = *(Blk8_SC04_006_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC04_006/ov_SC04_006_jr_80135A4C.c b/src/ov_SC04_006/ov_SC04_006_jr_80135A4C.c index 943e180dfb..112b43c32a 100644 --- a/src/ov_SC04_006/ov_SC04_006_jr_80135A4C.c +++ b/src/ov_SC04_006/ov_SC04_006_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC04_006_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC04_007/ov_SC04_007_after.c b/src/ov_SC04_007/ov_SC04_007_after.c index 51bb700bd0..9b01bbd0d0 100644 --- a/src/ov_SC04_007/ov_SC04_007_after.c +++ b/src/ov_SC04_007/ov_SC04_007_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC04_007/ov_SC04_007_jr_8012ACE0.c b/src/ov_SC04_007/ov_SC04_007_jr_8012ACE0.c index 067307e190..2a066df7cd 100644 --- a/src/ov_SC04_007/ov_SC04_007_jr_8012ACE0.c +++ b/src/ov_SC04_007/ov_SC04_007_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC04_007_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC04_007_80131340 D_80186044; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80186130; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018611C[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC04_007_80133CD4; *(Blk8_SC04_007_80133CD4 *)&D_801152B0 = *(Blk8_SC04_007_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC04_007/ov_SC04_007_jr_80135A4C.c b/src/ov_SC04_007/ov_SC04_007_jr_80135A4C.c index 752b9cf888..f2b6b1f6db 100644 --- a/src/ov_SC04_007/ov_SC04_007_jr_80135A4C.c +++ b/src/ov_SC04_007/ov_SC04_007_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC04_007_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c b/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c index b4ab5e8402..1a1bbe832f 100644 --- a/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c +++ b/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c @@ -2677,7 +2677,6 @@ extern void func_8017BEB4(void); void func_8017BEBC(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC04_007_8017BEBC; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); @@ -7086,15 +7085,8 @@ void func_80182DD8(s32 a0, void *a1, s32 a2) void func_80183040(s32 a0, s32 a1, s32 a2) { - typedef struct { - s16 vx, vy, vz, pad; - } SV_80183FE0_80183040; - typedef struct { - SV_80183FE0_80183040 v[4]; /* 0x00 */ - u8 c[4][4]; /* 0x20 */ - u32 code; /* 0x30 */ - } Prim_80183FE0_80183040; /* 0x34 */ + /* 0x34 */ extern void func_801832EC(s32 a0, s32 a1, s32 a2, void *a3); extern s32 func_80017758(void *a0, void *a1); diff --git a/src/ov_SC04_008/ov_SC04_008_jr_8012ACE0.c b/src/ov_SC04_008/ov_SC04_008_jr_8012ACE0.c index ae5650e407..32e0cd452f 100644 --- a/src/ov_SC04_008/ov_SC04_008_jr_8012ACE0.c +++ b/src/ov_SC04_008/ov_SC04_008_jr_8012ACE0.c @@ -1049,9 +1049,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC04_008_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC04_008_80131340 D_8017EF7C; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -1880,7 +1877,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017F068; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -1939,7 +1936,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017F054[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC04_008_80133CD4; *(Blk8_SC04_008_80133CD4 *)&D_801152B0 = *(Blk8_SC04_008_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC04_008/ov_SC04_008_jr_80135A4C.c b/src/ov_SC04_008/ov_SC04_008_jr_80135A4C.c index ca55bdf3c2..5301dfac18 100644 --- a/src/ov_SC04_008/ov_SC04_008_jr_80135A4C.c +++ b/src/ov_SC04_008/ov_SC04_008_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC04_008_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC04_009/ov_SC04_009_after.c b/src/ov_SC04_009/ov_SC04_009_after.c index 1a6ba3e8c2..7b43ed25f1 100644 --- a/src/ov_SC04_009/ov_SC04_009_after.c +++ b/src/ov_SC04_009/ov_SC04_009_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC04_009/ov_SC04_009_jr_8012ACE0.c b/src/ov_SC04_009/ov_SC04_009_jr_8012ACE0.c index bec059e69f..b14f35d4e4 100644 --- a/src/ov_SC04_009/ov_SC04_009_jr_8012ACE0.c +++ b/src/ov_SC04_009/ov_SC04_009_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC04_009_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC04_009_80131340 D_8017EFA8; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017F094; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017F080[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC04_009_80133CD4; *(Blk8_SC04_009_80133CD4 *)&D_801152B0 = *(Blk8_SC04_009_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC04_009/ov_SC04_009_jr_80135A4C.c b/src/ov_SC04_009/ov_SC04_009_jr_80135A4C.c index 1464084f57..fafe86f21d 100644 --- a/src/ov_SC04_009/ov_SC04_009_jr_80135A4C.c +++ b/src/ov_SC04_009/ov_SC04_009_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC04_009_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC04_010/ov_SC04_010_after.c b/src/ov_SC04_010/ov_SC04_010_after.c index d8f3e47994..2d65f0fc97 100644 --- a/src/ov_SC04_010/ov_SC04_010_after.c +++ b/src/ov_SC04_010/ov_SC04_010_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC04_010/ov_SC04_010_jr_8012ACE0.c b/src/ov_SC04_010/ov_SC04_010_jr_8012ACE0.c index b59a58ef4d..a220f10ccd 100644 --- a/src/ov_SC04_010/ov_SC04_010_jr_8012ACE0.c +++ b/src/ov_SC04_010/ov_SC04_010_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC04_010_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC04_010_80131340 D_8017E654; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017E740; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017E72C[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC04_010_80133CD4; *(Blk8_SC04_010_80133CD4 *)&D_801152B0 = *(Blk8_SC04_010_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC04_010/ov_SC04_010_jr_80135A4C.c b/src/ov_SC04_010/ov_SC04_010_jr_80135A4C.c index 9ecf7f2f76..afa94c858e 100644 --- a/src/ov_SC04_010/ov_SC04_010_jr_80135A4C.c +++ b/src/ov_SC04_010/ov_SC04_010_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC04_010_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC04_011/ov_SC04_011_after.c b/src/ov_SC04_011/ov_SC04_011_after.c index ff62538498..7584ce4051 100644 --- a/src/ov_SC04_011/ov_SC04_011_after.c +++ b/src/ov_SC04_011/ov_SC04_011_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.c b/src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.c index 99eaa2d975..cec5a654e1 100644 --- a/src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.c +++ b/src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC04_011_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC04_011_80131340 D_801908E4; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801909D0; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801909BC[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC04_011_80133CD4; *(Blk8_SC04_011_80133CD4 *)&D_801152B0 = *(Blk8_SC04_011_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC04_011/ov_SC04_011_jr_80135A4C.c b/src/ov_SC04_011/ov_SC04_011_jr_80135A4C.c index e944e5031d..a0f62eda67 100644 --- a/src/ov_SC04_011/ov_SC04_011_jr_80135A4C.c +++ b/src/ov_SC04_011/ov_SC04_011_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC04_011_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC04_011/ov_SC04_011_jr_8017D494.c b/src/ov_SC04_011/ov_SC04_011_jr_8017D494.c index d2341c0fdc..3d2fe5af4a 100644 --- a/src/ov_SC04_011/ov_SC04_011_jr_8017D494.c +++ b/src/ov_SC04_011/ov_SC04_011_jr_8017D494.c @@ -2699,7 +2699,6 @@ extern void func_8017CCD8(void *a0); void func_8017D494(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC04_011_8017D494; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); @@ -10120,7 +10119,6 @@ extern u8 D_801EFE04[]; void func_80187B40(void *a0) { /* align-1 4-byte RGB+code block, block-scoped -- see the header note */ - typedef struct { u8 c[4]; } Blk4_80187B40; extern Blk4_80187B40 D_801ED990; extern Blk4_80187B40 D_801ED994; extern Blk4_80187B40 D_801ED998; @@ -10354,9 +10352,9 @@ extern void ApplyMatrixSV(void *a0, void *a1, void *a2); extern s32 rand(void); void func_80188094(s32 arg0) { - typedef struct { u8 b[4]; } B4_80188094; /* align 1 -> ulw/usw */ - typedef struct { s16 m[3][3]; s32 t[3]; } M32_80188094; /* 0x20, align 4 */ - typedef struct { u16 vx, vy, vz, pad; } SV_80188094; /* 8, align 2 */ + /* align 1 -> ulw/usw */ + /* 0x20, align 4 */ + /* 8, align 2 */ extern M32_80188094 D_800AE620; extern B4_80188094 D_801ED994; @@ -11688,7 +11686,7 @@ void func_8018A0E0(s32 arg0) /* All declaration surface kept block-scope (house style, cf. * func_80188094): private types + __asm__ label aliases reach the * assembler symbols without touching the TU's own decls. */ - typedef struct { s32 w[8]; } Mtx_8018A0E0; /* 0x20, align 4 */ + /* 0x20, align 4 */ extern Mtx_8018A0E0 D_800AE620; extern u8 D_80194A68[]; @@ -12426,8 +12424,6 @@ void func_8018B0B0(void *param_1, void *param_2, void *param_3, u32 param_4) */ void func_8018B1B4(s32 arg0) { - typedef struct { u8 d[4]; } Blk4_8018B1B4; - typedef struct { u8 d[8]; } Blk8_8018B1B4; extern s16 D_80194B6A[]; extern u16 D_80194B64[]; diff --git a/src/ov_SC04_012/ov_SC04_012_after.c b/src/ov_SC04_012/ov_SC04_012_after.c index 5158ff4cae..dfed5a5e04 100644 --- a/src/ov_SC04_012/ov_SC04_012_after.c +++ b/src/ov_SC04_012/ov_SC04_012_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC04_012/ov_SC04_012_jr_8012ACE0.c b/src/ov_SC04_012/ov_SC04_012_jr_8012ACE0.c index 079fb8a2c2..3099023aad 100644 --- a/src/ov_SC04_012/ov_SC04_012_jr_8012ACE0.c +++ b/src/ov_SC04_012/ov_SC04_012_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC04_012_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC04_012_80131340 D_8017EAB8; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017EBA4; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017EB90[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC04_012_80133CD4; *(Blk8_SC04_012_80133CD4 *)&D_801152B0 = *(Blk8_SC04_012_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC04_012/ov_SC04_012_jr_80135A4C.c b/src/ov_SC04_012/ov_SC04_012_jr_80135A4C.c index dd98cde21b..a6df9dcaab 100644 --- a/src/ov_SC04_012/ov_SC04_012_jr_80135A4C.c +++ b/src/ov_SC04_012/ov_SC04_012_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC04_012_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC04_015/ov_SC04_015_after.c b/src/ov_SC04_015/ov_SC04_015_after.c index 1733f76e97..9f053707a0 100644 --- a/src/ov_SC04_015/ov_SC04_015_after.c +++ b/src/ov_SC04_015/ov_SC04_015_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC04_015/ov_SC04_015_jr_8012ACE0.c b/src/ov_SC04_015/ov_SC04_015_jr_8012ACE0.c index 37335b91bb..90c706dc01 100644 --- a/src/ov_SC04_015/ov_SC04_015_jr_8012ACE0.c +++ b/src/ov_SC04_015/ov_SC04_015_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC04_015_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC04_015_80131340 D_801849F0; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80184ADC; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80184AC8[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC04_015_80133CD4; *(Blk8_SC04_015_80133CD4 *)&D_801152B0 = *(Blk8_SC04_015_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC04_015/ov_SC04_015_jr_80135A4C.c b/src/ov_SC04_015/ov_SC04_015_jr_80135A4C.c index 75cf864beb..52e6f42bbf 100644 --- a/src/ov_SC04_015/ov_SC04_015_jr_80135A4C.c +++ b/src/ov_SC04_015/ov_SC04_015_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC04_015_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC04_015/ov_SC04_015_jr_8017AE2C.c b/src/ov_SC04_015/ov_SC04_015_jr_8017AE2C.c index bfdf74adc6..86da884032 100644 --- a/src/ov_SC04_015/ov_SC04_015_jr_8017AE2C.c +++ b/src/ov_SC04_015/ov_SC04_015_jr_8017AE2C.c @@ -3690,7 +3690,6 @@ void func_8017C6CC(int a0) { void func_8017C730(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC04_015_8017C730; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); @@ -6738,7 +6737,7 @@ s32 func_80180CCC(s32 a0) { idx = D_801B2924[idx] - 1; } - ((struct { s32 w; } *)&D_801C9250)->w = 1; + ((Unkstruct_801C9250 *)&D_801C9250)->w = 1; return D_801B27F0[idx][s0]; } diff --git a/src/ov_SC04_016/ov_SC04_016_after.c b/src/ov_SC04_016/ov_SC04_016_after.c index e619679848..4bccfb3115 100644 --- a/src/ov_SC04_016/ov_SC04_016_after.c +++ b/src/ov_SC04_016/ov_SC04_016_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC04_016/ov_SC04_016_jr_8012ACE0.c b/src/ov_SC04_016/ov_SC04_016_jr_8012ACE0.c index b962f342b3..e027dcbc74 100644 --- a/src/ov_SC04_016/ov_SC04_016_jr_8012ACE0.c +++ b/src/ov_SC04_016/ov_SC04_016_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC04_016_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC04_016_80131340 D_801804B4; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801805A0; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018058C[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC04_016_80133CD4; *(Blk8_SC04_016_80133CD4 *)&D_801152B0 = *(Blk8_SC04_016_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC04_016/ov_SC04_016_jr_80135A4C.c b/src/ov_SC04_016/ov_SC04_016_jr_80135A4C.c index cf8ca521a7..1ac3081de9 100644 --- a/src/ov_SC04_016/ov_SC04_016_jr_80135A4C.c +++ b/src/ov_SC04_016/ov_SC04_016_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC04_016_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC04_016/ov_SC04_016_jr_8017BEBC.c b/src/ov_SC04_016/ov_SC04_016_jr_8017BEBC.c index 7c3234342f..7f7f3517ea 100644 --- a/src/ov_SC04_016/ov_SC04_016_jr_8017BEBC.c +++ b/src/ov_SC04_016/ov_SC04_016_jr_8017BEBC.c @@ -3206,11 +3206,6 @@ void func_8017DA50(void *arg) { extern void func_80028428(s32 a0, s32 a1, s32 a2, s32 a3); extern void func_8012C218(void *a0); extern void (*D_801849F8[])(void *); - typedef struct { - s16 w[16]; - u8 b[16]; - s32 tail; - } Str_8017DA50; Str_8017DA50 sp10; s32 var_s0; s32 var_fp; diff --git a/src/ov_SC04_018/ov_SC04_018_after.c b/src/ov_SC04_018/ov_SC04_018_after.c index 509e1dca7d..4f6b7365da 100644 --- a/src/ov_SC04_018/ov_SC04_018_after.c +++ b/src/ov_SC04_018/ov_SC04_018_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC04_018/ov_SC04_018_jr_8012ACE0.c b/src/ov_SC04_018/ov_SC04_018_jr_8012ACE0.c index 1844c926b1..8cb319e521 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_8012ACE0.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC04_018_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC04_018_80131340 D_8018D6CC; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018D7B8; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018D7A4[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC04_018_80133CD4; *(Blk8_SC04_018_80133CD4 *)&D_801152B0 = *(Blk8_SC04_018_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC04_018/ov_SC04_018_jr_80135A4C.c b/src/ov_SC04_018/ov_SC04_018_jr_80135A4C.c index 0ac1ac7678..10a097cb49 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_80135A4C.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC04_018_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC04_018/ov_SC04_018_jr_80183E6C.c b/src/ov_SC04_018/ov_SC04_018_jr_80183E6C.c index 2228a680c2..a60939244b 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_80183E6C.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_80183E6C.c @@ -3645,7 +3645,7 @@ s32 func_80184960(s32 a0) { idx = D_801B86F0[idx] - 1; } - ((struct { s32 w; } *)&D_801E7998)->w = 1; + ((Unkstruct_801E7998 *)&D_801E7998)->w = 1; return D_801B85BC[idx][s0]; } diff --git a/src/ov_SC04_018/ov_SC04_018_jr_80188E1C.c b/src/ov_SC04_018/ov_SC04_018_jr_80188E1C.c index 53c13e59e7..20f798287a 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_80188E1C.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_80188E1C.c @@ -3266,7 +3266,7 @@ extern s16 func_8014168C(s16 a0); s32 *func_80189214(s32 *ot, void *a1p, s32 idx, void *a3p, s32 tag) { - typedef struct { u32 *ot; u32 pad[4]; } Env_8018C960_80189EA0; /* 0x14 stride */ + /* 0x14 stride */ extern u8 D_80115138[]; extern u8 D_80115140[]; @@ -3816,12 +3816,6 @@ s32 func_80189540(s16 arg0, s16 arg1) case 11: { - typedef struct Rec { - s32 unk0; - s32 unk4; - s32 unk8; - void (*unkC)(void); - } Rec; extern Rec *D_801E7774[]; Rec **pp; Rec *r; @@ -3969,19 +3963,8 @@ void func_80189EA0(void) { extern s16 D_801E7710; /* §100/§120: draft-local, uniquely-named types — they live in the BODY so * they cannot collide with the TU's own Env_8018BCD4 / PTag_8018BCD4. */ - typedef struct { u32 addr : 24; u32 len : 8; } PTag_8018C960_80189EA0; - typedef struct { u32 *ot; u32 pad[4]; } Env_8018C960_80189EA0; /* 0x14 stride */ - typedef struct { - u32 tag; /* 0x00 */ - u8 r0, g0, b0, code; /* 0x04..0x07 */ - s16 x0, y0; /* 0x08, 0x0A */ - u8 r1, g1, b1, p1; /* 0x0C..0x0F */ - s16 x1, y1; /* 0x10, 0x12 */ - u8 r2, g2, b2, p2; /* 0x14..0x17 */ - s16 x2, y2; /* 0x18, 0x1A */ - u8 r3, g3, b3, p3; /* 0x1C..0x1F */ - s16 x3, y3; /* 0x20, 0x22 */ - } PG4_8018C960_80189EA0; /* -> 0x24 */ + /* 0x14 stride */ + /* -> 0x24 */ extern Env_8018C960_80189EA0 D_800AE7BC[]; extern u8 aD801EF1EC __asm__("D_801E770C"); diff --git a/src/ov_SC04_020/ov_SC04_020_after.c b/src/ov_SC04_020/ov_SC04_020_after.c index d35c85fc1a..fbc2d38bce 100644 --- a/src/ov_SC04_020/ov_SC04_020_after.c +++ b/src/ov_SC04_020/ov_SC04_020_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC04_020/ov_SC04_020_jr_8012ACE0.c b/src/ov_SC04_020/ov_SC04_020_jr_8012ACE0.c index 7ab28657a1..dd96d66822 100644 --- a/src/ov_SC04_020/ov_SC04_020_jr_8012ACE0.c +++ b/src/ov_SC04_020/ov_SC04_020_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC04_020_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC04_020_80131340 D_80183804; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801838F0; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801838DC[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC04_020_80133CD4; *(Blk8_SC04_020_80133CD4 *)&D_801152B0 = *(Blk8_SC04_020_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC04_020/ov_SC04_020_jr_80135A4C.c b/src/ov_SC04_020/ov_SC04_020_jr_80135A4C.c index 1b524ca3b6..d2442b9135 100644 --- a/src/ov_SC04_020/ov_SC04_020_jr_80135A4C.c +++ b/src/ov_SC04_020/ov_SC04_020_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC04_020_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC04_020/ov_SC04_020_jr_8017D604.c b/src/ov_SC04_020/ov_SC04_020_jr_8017D604.c index d402aef973..404113a650 100644 --- a/src/ov_SC04_020/ov_SC04_020_jr_8017D604.c +++ b/src/ov_SC04_020/ov_SC04_020_jr_8017D604.c @@ -2688,7 +2688,6 @@ extern void func_8017CF30(void *a0); void func_8017D604(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC04_020_8017D604; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); @@ -3731,7 +3730,6 @@ extern s32 func_8012AD50(void *a0); extern void func_8017F704(); void func_8017F63C(void *a0) { - typedef struct { short vx, vy, vz, pad; } SVF63C; extern SVF63C D_801BAFD8; extern SVF63C D_801BAFE0; extern void func_80015978(s32 a0, s32 *a1); @@ -3926,10 +3924,6 @@ void func_8017FCFC(void *a0) void func_8017FD70(s32 arg0) { extern u8 * func_8012913C(s32 a0); - typedef struct { - u32 unk00; u32 unk04; u32 unk08; u32 unk0C; u32 unk10; u32 unk14; - u16 unk18; - } Rec_80189334; extern Rec_80189334 D_801874CC[]; Rec_80189334 *src; u8 *temp; @@ -5064,7 +5058,7 @@ s32 func_8018113C(s32 a0) { idx = D_801B5E64[idx] - 1; } - ((struct { s32 w; } *)&D_801BC620)->w = 1; + ((Unkstruct_801BC620 *)&D_801BC620)->w = 1; return D_801B5D30[idx][s0]; } diff --git a/src/ov_SC05_000/ov_SC05_000_after.c b/src/ov_SC05_000/ov_SC05_000_after.c index d4653bf4ba..d86d901aaf 100644 --- a/src/ov_SC05_000/ov_SC05_000_after.c +++ b/src/ov_SC05_000/ov_SC05_000_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC05_000/ov_SC05_000_jr_8012ACE0.c b/src/ov_SC05_000/ov_SC05_000_jr_8012ACE0.c index f33dffc8fa..0a6874bfb3 100644 --- a/src/ov_SC05_000/ov_SC05_000_jr_8012ACE0.c +++ b/src/ov_SC05_000/ov_SC05_000_jr_8012ACE0.c @@ -1430,9 +1430,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC05_000_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC05_000_80131340 D_8017E744; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2404,7 +2401,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017E830; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2463,7 +2460,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017E81C[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC05_000_80133CD4; *(Blk8_SC05_000_80133CD4 *)&D_801152B0 = *(Blk8_SC05_000_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC05_000/ov_SC05_000_jr_80135A4C.c b/src/ov_SC05_000/ov_SC05_000_jr_80135A4C.c index ed3b08eab2..873d052fd1 100644 --- a/src/ov_SC05_000/ov_SC05_000_jr_80135A4C.c +++ b/src/ov_SC05_000/ov_SC05_000_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC05_000_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC05_000/ov_SC05_000_jr_8017BEBC.c b/src/ov_SC05_000/ov_SC05_000_jr_8017BEBC.c index 181a7982e4..f2445e5320 100644 --- a/src/ov_SC05_000/ov_SC05_000_jr_8017BEBC.c +++ b/src/ov_SC05_000/ov_SC05_000_jr_8017BEBC.c @@ -2688,7 +2688,6 @@ extern void func_8017BEB4(void); void func_8017BEBC(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC05_000_8017BEBC; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC05_001/ov_SC05_001_after.c b/src/ov_SC05_001/ov_SC05_001_after.c index a1510ef002..1e0af76cf4 100644 --- a/src/ov_SC05_001/ov_SC05_001_after.c +++ b/src/ov_SC05_001/ov_SC05_001_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC05_001/ov_SC05_001_jr_8012ACE0.c b/src/ov_SC05_001/ov_SC05_001_jr_8012ACE0.c index eac8c2b0bf..89447f8267 100644 --- a/src/ov_SC05_001/ov_SC05_001_jr_8012ACE0.c +++ b/src/ov_SC05_001/ov_SC05_001_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC05_001_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC05_001_80131340 D_80185F20; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018600C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80185FF8[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC05_001_80133CD4; *(Blk8_SC05_001_80133CD4 *)&D_801152B0 = *(Blk8_SC05_001_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC05_001/ov_SC05_001_jr_80135A4C.c b/src/ov_SC05_001/ov_SC05_001_jr_80135A4C.c index e2967a7df9..2788c6845e 100644 --- a/src/ov_SC05_001/ov_SC05_001_jr_80135A4C.c +++ b/src/ov_SC05_001/ov_SC05_001_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC05_001_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC05_001/ov_SC05_001_jr_8017BEBC.c b/src/ov_SC05_001/ov_SC05_001_jr_8017BEBC.c index 968a91f5b7..640d632ba7 100644 --- a/src/ov_SC05_001/ov_SC05_001_jr_8017BEBC.c +++ b/src/ov_SC05_001/ov_SC05_001_jr_8017BEBC.c @@ -2695,7 +2695,6 @@ extern void func_8017BEB4(void); void func_8017BEBC(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC05_001_8017BEBC; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC05_001/ov_SC05_001_jr_80183508.c b/src/ov_SC05_001/ov_SC05_001_jr_80183508.c index 82e0c8f3e3..e5a777b598 100644 --- a/src/ov_SC05_001/ov_SC05_001_jr_80183508.c +++ b/src/ov_SC05_001/ov_SC05_001_jr_80183508.c @@ -3053,7 +3053,6 @@ void func_80183A30(s32 param_1) /* block-scope so it cannot collide with engine_types.h's SVECTOR_8016E7C8; * the 8-byte (vx,vy,vz,pad) shape is what puts `in` at 0x10(sp) and * `out` at 0x18(sp). */ - typedef struct { short vx, vy, vz, pad; } SVec_80181D08; s32 sp20; s32 ret; diff --git a/src/ov_SC05_002/ov_SC05_002_after.c b/src/ov_SC05_002/ov_SC05_002_after.c index 18beae94f0..00f72e9e1b 100644 --- a/src/ov_SC05_002/ov_SC05_002_after.c +++ b/src/ov_SC05_002/ov_SC05_002_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC05_002/ov_SC05_002_jr_8012ACE0.c b/src/ov_SC05_002/ov_SC05_002_jr_8012ACE0.c index c73a4573a8..6d46bd4778 100644 --- a/src/ov_SC05_002/ov_SC05_002_jr_8012ACE0.c +++ b/src/ov_SC05_002/ov_SC05_002_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC05_002_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC05_002_80131340 D_801806E0; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801807CC; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801807B8[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC05_002_80133CD4; *(Blk8_SC05_002_80133CD4 *)&D_801152B0 = *(Blk8_SC05_002_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC05_002/ov_SC05_002_jr_80135A4C.c b/src/ov_SC05_002/ov_SC05_002_jr_80135A4C.c index f2b1074099..61311ec58d 100644 --- a/src/ov_SC05_002/ov_SC05_002_jr_80135A4C.c +++ b/src/ov_SC05_002/ov_SC05_002_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC05_002_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC05_003/ov_SC05_003_after.c b/src/ov_SC05_003/ov_SC05_003_after.c index 6ee43ec556..828a8c9d36 100644 --- a/src/ov_SC05_003/ov_SC05_003_after.c +++ b/src/ov_SC05_003/ov_SC05_003_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC05_003/ov_SC05_003_jr_8012ACE0.c b/src/ov_SC05_003/ov_SC05_003_jr_8012ACE0.c index 7c30e0c533..c89b7113e0 100644 --- a/src/ov_SC05_003/ov_SC05_003_jr_8012ACE0.c +++ b/src/ov_SC05_003/ov_SC05_003_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC05_003_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC05_003_80131340 D_80182A18; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80182B04; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80182AF0[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC05_003_80133CD4; *(Blk8_SC05_003_80133CD4 *)&D_801152B0 = *(Blk8_SC05_003_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC05_003/ov_SC05_003_jr_80135A4C.c b/src/ov_SC05_003/ov_SC05_003_jr_80135A4C.c index 0209e5825a..2a634110eb 100644 --- a/src/ov_SC05_003/ov_SC05_003_jr_80135A4C.c +++ b/src/ov_SC05_003/ov_SC05_003_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC05_003_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC05_003/ov_SC05_003_jr_8017BEBC.c b/src/ov_SC05_003/ov_SC05_003_jr_8017BEBC.c index a624e5e09a..2bf2e0d164 100644 --- a/src/ov_SC05_003/ov_SC05_003_jr_8017BEBC.c +++ b/src/ov_SC05_003/ov_SC05_003_jr_8017BEBC.c @@ -5620,7 +5620,6 @@ extern void VectorNormal(); extern void func_8012F568(s32 a0, s32 a1, s32 a2, s32 a3, s32 a4, s32 a5); s32 func_80181720(void *arg0) { - typedef struct { s32 vx, vy, vz; } VEC3L; VEC3L v; s16 raw[4]; s16 buf[4]; diff --git a/src/ov_SC05_004/ov_SC05_004_after.c b/src/ov_SC05_004/ov_SC05_004_after.c index 848110459c..21808f71e2 100644 --- a/src/ov_SC05_004/ov_SC05_004_after.c +++ b/src/ov_SC05_004/ov_SC05_004_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC05_004/ov_SC05_004_jr_8012ACE0.c b/src/ov_SC05_004/ov_SC05_004_jr_8012ACE0.c index 981366fc87..e1c99879ba 100644 --- a/src/ov_SC05_004/ov_SC05_004_jr_8012ACE0.c +++ b/src/ov_SC05_004/ov_SC05_004_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC05_004_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC05_004_80131340 D_80181B24; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80181C10; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80181BFC[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC05_004_80133CD4; *(Blk8_SC05_004_80133CD4 *)&D_801152B0 = *(Blk8_SC05_004_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC05_004/ov_SC05_004_jr_80135A4C.c b/src/ov_SC05_004/ov_SC05_004_jr_80135A4C.c index f6026fe0fd..5376a36626 100644 --- a/src/ov_SC05_004/ov_SC05_004_jr_80135A4C.c +++ b/src/ov_SC05_004/ov_SC05_004_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC05_004_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC05_004/ov_SC05_004_jr_8017BEBC.c b/src/ov_SC05_004/ov_SC05_004_jr_8017BEBC.c index 4a1c43a1b0..9d68347106 100644 --- a/src/ov_SC05_004/ov_SC05_004_jr_8017BEBC.c +++ b/src/ov_SC05_004/ov_SC05_004_jr_8017BEBC.c @@ -2686,7 +2686,6 @@ extern void func_8017BEB4(void); void func_8017BEBC(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC05_004_8017BEBC; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC05_005/ov_SC05_005_after.c b/src/ov_SC05_005/ov_SC05_005_after.c index 514ac4a9cd..6ea76abcc8 100644 --- a/src/ov_SC05_005/ov_SC05_005_after.c +++ b/src/ov_SC05_005/ov_SC05_005_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC05_005/ov_SC05_005_jr_8012ACE0.c b/src/ov_SC05_005/ov_SC05_005_jr_8012ACE0.c index de8930c489..d7e6d91ac2 100644 --- a/src/ov_SC05_005/ov_SC05_005_jr_8012ACE0.c +++ b/src/ov_SC05_005/ov_SC05_005_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC05_005_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC05_005_80131340 D_801828F8; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801829E4; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801829D0[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC05_005_80133CD4; *(Blk8_SC05_005_80133CD4 *)&D_801152B0 = *(Blk8_SC05_005_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC05_005/ov_SC05_005_jr_80135A4C.c b/src/ov_SC05_005/ov_SC05_005_jr_80135A4C.c index 2dd3db700a..4f1a01a0eb 100644 --- a/src/ov_SC05_005/ov_SC05_005_jr_80135A4C.c +++ b/src/ov_SC05_005/ov_SC05_005_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC05_005_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC05_005/ov_SC05_005_jr_8017D898.c b/src/ov_SC05_005/ov_SC05_005_jr_8017D898.c index bc70d8652a..7dc5a56694 100644 --- a/src/ov_SC05_005/ov_SC05_005_jr_8017D898.c +++ b/src/ov_SC05_005/ov_SC05_005_jr_8017D898.c @@ -4829,7 +4829,6 @@ extern void VectorNormal(); extern void func_8012F568(s32 a0, s32 a1, s32 a2, s32 a3, s32 a4, s32 a5); s32 func_80181828(void *arg0) { - typedef struct { s32 vx, vy, vz; } VEC3L; VEC3L v; s16 raw[4]; s16 buf[4]; diff --git a/src/ov_SC05_006/ov_SC05_006_after.c b/src/ov_SC05_006/ov_SC05_006_after.c index 0366bfa3aa..d1a6ee08ca 100644 --- a/src/ov_SC05_006/ov_SC05_006_after.c +++ b/src/ov_SC05_006/ov_SC05_006_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC05_006/ov_SC05_006_jr_8012ACE0.c b/src/ov_SC05_006/ov_SC05_006_jr_8012ACE0.c index 81dc70de59..4424faa0ea 100644 --- a/src/ov_SC05_006/ov_SC05_006_jr_8012ACE0.c +++ b/src/ov_SC05_006/ov_SC05_006_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC05_006_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC05_006_80131340 D_8017F918; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017FA04; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017F9F0[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC05_006_80133CD4; *(Blk8_SC05_006_80133CD4 *)&D_801152B0 = *(Blk8_SC05_006_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC05_006/ov_SC05_006_jr_80135A4C.c b/src/ov_SC05_006/ov_SC05_006_jr_80135A4C.c index 2ae12071ee..37d1ba0ed9 100644 --- a/src/ov_SC05_006/ov_SC05_006_jr_80135A4C.c +++ b/src/ov_SC05_006/ov_SC05_006_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC05_006_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC05_006/ov_SC05_006_jr_8017BEBC.c b/src/ov_SC05_006/ov_SC05_006_jr_8017BEBC.c index 477afd5b66..24ed434508 100644 --- a/src/ov_SC05_006/ov_SC05_006_jr_8017BEBC.c +++ b/src/ov_SC05_006/ov_SC05_006_jr_8017BEBC.c @@ -2692,7 +2692,6 @@ extern void func_8017BEB4(void); void func_8017BEBC(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC05_006_8017BEBC; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); diff --git a/src/ov_SC05_007/ov_SC05_007_after.c b/src/ov_SC05_007/ov_SC05_007_after.c index 9d0aa13224..c8967c4f4d 100644 --- a/src/ov_SC05_007/ov_SC05_007_after.c +++ b/src/ov_SC05_007/ov_SC05_007_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC05_007/ov_SC05_007_jr_8012ACE0.c b/src/ov_SC05_007/ov_SC05_007_jr_8012ACE0.c index e2135eb4c3..236ffe94e8 100644 --- a/src/ov_SC05_007/ov_SC05_007_jr_8012ACE0.c +++ b/src/ov_SC05_007/ov_SC05_007_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC05_007_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC05_007_80131340 D_80180F14; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80181000; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80180FEC[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC05_007_80133CD4; *(Blk8_SC05_007_80133CD4 *)&D_801152B0 = *(Blk8_SC05_007_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC05_007/ov_SC05_007_jr_80135A4C.c b/src/ov_SC05_007/ov_SC05_007_jr_80135A4C.c index c699f875e3..7e84c41316 100644 --- a/src/ov_SC05_007/ov_SC05_007_jr_80135A4C.c +++ b/src/ov_SC05_007/ov_SC05_007_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC05_007_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC05_008/ov_SC05_008_after.c b/src/ov_SC05_008/ov_SC05_008_after.c index ccfbba3117..0083762e20 100644 --- a/src/ov_SC05_008/ov_SC05_008_after.c +++ b/src/ov_SC05_008/ov_SC05_008_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC05_008/ov_SC05_008_jr_8012ACE0.c b/src/ov_SC05_008/ov_SC05_008_jr_8012ACE0.c index f29b7bef5f..56b96022d4 100644 --- a/src/ov_SC05_008/ov_SC05_008_jr_8012ACE0.c +++ b/src/ov_SC05_008/ov_SC05_008_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC05_008_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC05_008_80131340 D_80182E6C; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80182F58; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80182F44[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC05_008_80133CD4; *(Blk8_SC05_008_80133CD4 *)&D_801152B0 = *(Blk8_SC05_008_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC05_008/ov_SC05_008_jr_80135A4C.c b/src/ov_SC05_008/ov_SC05_008_jr_80135A4C.c index 3ab3b08998..14090f91a8 100644 --- a/src/ov_SC05_008/ov_SC05_008_jr_80135A4C.c +++ b/src/ov_SC05_008/ov_SC05_008_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC05_008_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC05_009/ov_SC05_009_jr_8012ACE0.c b/src/ov_SC05_009/ov_SC05_009_jr_8012ACE0.c index 2f7f5f2057..e94140f823 100644 --- a/src/ov_SC05_009/ov_SC05_009_jr_8012ACE0.c +++ b/src/ov_SC05_009/ov_SC05_009_jr_8012ACE0.c @@ -1049,9 +1049,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC05_009_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC05_009_80131340 D_8017EF7C; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -1880,7 +1877,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017F068; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -1939,7 +1936,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017F054[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC05_009_80133CD4; *(Blk8_SC05_009_80133CD4 *)&D_801152B0 = *(Blk8_SC05_009_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC05_009/ov_SC05_009_jr_80135A4C.c b/src/ov_SC05_009/ov_SC05_009_jr_80135A4C.c index 07a19a6006..2e9f8bc9d9 100644 --- a/src/ov_SC05_009/ov_SC05_009_jr_80135A4C.c +++ b/src/ov_SC05_009/ov_SC05_009_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC05_009_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC05_010/ov_SC05_010_after.c b/src/ov_SC05_010/ov_SC05_010_after.c index e4b250ae82..1cb3867b65 100644 --- a/src/ov_SC05_010/ov_SC05_010_after.c +++ b/src/ov_SC05_010/ov_SC05_010_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC05_010/ov_SC05_010_jr_8012ACE0.c b/src/ov_SC05_010/ov_SC05_010_jr_8012ACE0.c index 84074dea2f..47568b41f0 100644 --- a/src/ov_SC05_010/ov_SC05_010_jr_8012ACE0.c +++ b/src/ov_SC05_010/ov_SC05_010_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC05_010_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC05_010_80131340 D_80188E58; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80188F44; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80188F30[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC05_010_80133CD4; *(Blk8_SC05_010_80133CD4 *)&D_801152B0 = *(Blk8_SC05_010_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC05_010/ov_SC05_010_jr_80135A4C.c b/src/ov_SC05_010/ov_SC05_010_jr_80135A4C.c index eea2eb4465..24c46c5cf9 100644 --- a/src/ov_SC05_010/ov_SC05_010_jr_80135A4C.c +++ b/src/ov_SC05_010/ov_SC05_010_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC05_010_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC05_011/ov_SC05_011_after.c b/src/ov_SC05_011/ov_SC05_011_after.c index 6e37b9551a..6542903a9d 100644 --- a/src/ov_SC05_011/ov_SC05_011_after.c +++ b/src/ov_SC05_011/ov_SC05_011_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC05_011/ov_SC05_011_jr_8012ACE0.c b/src/ov_SC05_011/ov_SC05_011_jr_8012ACE0.c index 74e7698141..4429f636ac 100644 --- a/src/ov_SC05_011/ov_SC05_011_jr_8012ACE0.c +++ b/src/ov_SC05_011/ov_SC05_011_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC05_011_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC05_011_80131340 D_8017E1D0; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017E2BC; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017E2A8[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC05_011_80133CD4; *(Blk8_SC05_011_80133CD4 *)&D_801152B0 = *(Blk8_SC05_011_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC05_011/ov_SC05_011_jr_80135A4C.c b/src/ov_SC05_011/ov_SC05_011_jr_80135A4C.c index cafef59e2e..099f88efc2 100644 --- a/src/ov_SC05_011/ov_SC05_011_jr_80135A4C.c +++ b/src/ov_SC05_011/ov_SC05_011_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC05_011_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC05_017/ov_SC05_017_after.c b/src/ov_SC05_017/ov_SC05_017_after.c index bab17c48f9..05787cef88 100644 --- a/src/ov_SC05_017/ov_SC05_017_after.c +++ b/src/ov_SC05_017/ov_SC05_017_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC05_017/ov_SC05_017_jr_8012ACE0.c b/src/ov_SC05_017/ov_SC05_017_jr_8012ACE0.c index defb83069d..d79d28be05 100644 --- a/src/ov_SC05_017/ov_SC05_017_jr_8012ACE0.c +++ b/src/ov_SC05_017/ov_SC05_017_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC05_017_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC05_017_80131340 D_8018D690; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018D77C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018D768[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC05_017_80133CD4; *(Blk8_SC05_017_80133CD4 *)&D_801152B0 = *(Blk8_SC05_017_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC05_017/ov_SC05_017_jr_80135A4C.c b/src/ov_SC05_017/ov_SC05_017_jr_80135A4C.c index dd269ce688..3c18f0d769 100644 --- a/src/ov_SC05_017/ov_SC05_017_jr_80135A4C.c +++ b/src/ov_SC05_017/ov_SC05_017_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC05_017_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC05_017/ov_SC05_017_jr_80182A74.c b/src/ov_SC05_017/ov_SC05_017_jr_80182A74.c index ecb222c449..d1fa32a006 100644 --- a/src/ov_SC05_017/ov_SC05_017_jr_80182A74.c +++ b/src/ov_SC05_017/ov_SC05_017_jr_80182A74.c @@ -4390,7 +4390,7 @@ s32 func_80184660(s32 a0) { idx = D_801B86AC[idx] - 1; } - ((struct { s32 w; } *)&D_801ED7F8)->w = 1; + ((Unkstruct_801ED7F8 *)&D_801ED7F8)->w = 1; return D_801B8578[idx][s0]; } diff --git a/src/ov_SC05_017/ov_SC05_017_jr_80188B1C.c b/src/ov_SC05_017/ov_SC05_017_jr_80188B1C.c index d82fb8b77c..5cfbbc8dec 100644 --- a/src/ov_SC05_017/ov_SC05_017_jr_80188B1C.c +++ b/src/ov_SC05_017/ov_SC05_017_jr_80188B1C.c @@ -3175,7 +3175,6 @@ s32 *func_80188F14(s32 *ot, void *a1p, s32 idx, void *a3p, s32 tag) { extern u16 D_801B8DAA; extern s16 D_800B9A02; /* 0x14 stride */ - typedef struct { u32 *ot; u32 pad[4]; } Env_8017E804_80188F14; extern Env_8017E804_80188F14 D_800AE7BC[]; u16 *pb; @@ -3609,12 +3608,6 @@ s32 func_80189240(s32 a0, s16 arg1) case 11: { - typedef struct Rec { - s32 unk0; - s32 unk4; - s32 unk8; - void (*unkC)(void); - } Rec; extern Rec *D_801ED5D4[]; Rec **pp; Rec *r; @@ -3774,19 +3767,8 @@ void func_80189BA0(void) { extern s16 D_801ED570; /* §100/§120: draft-local, uniquely-named types — they live in the BODY so * they cannot collide with the TU's own Env_8018BCD4 / PTag_8018BCD4. */ - typedef struct { u32 addr : 24; u32 len : 8; } PTag_8018C960_80189BA0; - typedef struct { u32 *ot; u32 pad[4]; } Env_8018C960_80189BA0; /* 0x14 stride */ - typedef struct { - u32 tag; /* 0x00 */ - u8 r0, g0, b0, code; /* 0x04..0x07 */ - s16 x0, y0; /* 0x08, 0x0A */ - u8 r1, g1, b1, p1; /* 0x0C..0x0F */ - s16 x1, y1; /* 0x10, 0x12 */ - u8 r2, g2, b2, p2; /* 0x14..0x17 */ - s16 x2, y2; /* 0x18, 0x1A */ - u8 r3, g3, b3, p3; /* 0x1C..0x1F */ - s16 x3, y3; /* 0x20, 0x22 */ - } PG4_8018C960_80189BA0; /* -> 0x24 */ + /* 0x14 stride */ + /* -> 0x24 */ extern Env_8018C960_80189BA0 D_800AE7BC[]; extern u8 aD801EF1EC __asm__("D_801ED56C"); diff --git a/src/ov_SC05_018/ov_SC05_018_after.c b/src/ov_SC05_018/ov_SC05_018_after.c index bb92ad5444..6db2e3f047 100644 --- a/src/ov_SC05_018/ov_SC05_018_after.c +++ b/src/ov_SC05_018/ov_SC05_018_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC05_018/ov_SC05_018_jr_8012ACE0.c b/src/ov_SC05_018/ov_SC05_018_jr_8012ACE0.c index 3176004ae3..473722efae 100644 --- a/src/ov_SC05_018/ov_SC05_018_jr_8012ACE0.c +++ b/src/ov_SC05_018/ov_SC05_018_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC05_018_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC05_018_80131340 D_80186DEC; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80186ED8; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80186EC4[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC05_018_80133CD4; *(Blk8_SC05_018_80133CD4 *)&D_801152B0 = *(Blk8_SC05_018_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC05_018/ov_SC05_018_jr_80135A4C.c b/src/ov_SC05_018/ov_SC05_018_jr_80135A4C.c index c153953400..2e85246290 100644 --- a/src/ov_SC05_018/ov_SC05_018_jr_80135A4C.c +++ b/src/ov_SC05_018/ov_SC05_018_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC05_018_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC05_018/ov_SC05_018_jr_8017D604.c b/src/ov_SC05_018/ov_SC05_018_jr_8017D604.c index 2349757b34..b906e571d6 100644 --- a/src/ov_SC05_018/ov_SC05_018_jr_8017D604.c +++ b/src/ov_SC05_018/ov_SC05_018_jr_8017D604.c @@ -2688,7 +2688,6 @@ extern void func_8017CF30(void *a0); void func_8017D604(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC05_018_8017D604; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); @@ -4035,7 +4034,6 @@ extern void func_8012A094(s32 a0); extern void func_8017FF9C(u8 *a0); void func_8017FC74(void) { - typedef struct { s8 c[8]; } Blk8_SC05_018_8017FC74; extern u8 D_80126948[]; extern s32 D_80126954; extern s32 D_8012695C; @@ -4606,7 +4604,7 @@ extern void func_8012F14C(s32 a0, s32 a1, s32 a2); void func_80180ACC(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { - struct St80180ACC { s16 a[3]; u16 b[3]; } st; + struct St80180ACC st; u16 v[3]; s16 out[6]; s32 r[4]; @@ -6102,10 +6100,6 @@ void func_80182F04(s32 *a0) void func_80182F78(s32 arg0) { extern u8 * func_8012913C(s32 a0); - typedef struct { - u32 unk00; u32 unk04; u32 unk08; u32 unk0C; u32 unk10; u32 unk14; - u16 unk18; - } Rec_80189334; extern Rec_80189334 D_8018B0CC[]; Rec_80189334 *src; u8 *temp; @@ -7270,7 +7264,7 @@ s32 func_80184344(s32 a0) { idx = D_801E01FC[idx] - 1; } - ((struct { s32 w; } *)&D_801E66F8)->w = 1; + ((Unkstruct_801E66F8 *)&D_801E66F8)->w = 1; return D_801E00C8[idx][s0]; } diff --git a/src/ov_SC06_000/ov_SC06_000_after.c b/src/ov_SC06_000/ov_SC06_000_after.c index c9fb60a4da..36fbf43dfc 100644 --- a/src/ov_SC06_000/ov_SC06_000_after.c +++ b/src/ov_SC06_000/ov_SC06_000_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC06_000/ov_SC06_000_jr_8012ACE0.c b/src/ov_SC06_000/ov_SC06_000_jr_8012ACE0.c index 625656b8cd..e6183794af 100644 --- a/src/ov_SC06_000/ov_SC06_000_jr_8012ACE0.c +++ b/src/ov_SC06_000/ov_SC06_000_jr_8012ACE0.c @@ -1430,9 +1430,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC06_000_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC06_000_80131340 D_80188740; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2404,7 +2401,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018882C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2463,7 +2460,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80188818[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC06_000_80133CD4; *(Blk8_SC06_000_80133CD4 *)&D_801152B0 = *(Blk8_SC06_000_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC06_000/ov_SC06_000_jr_80135A4C.c b/src/ov_SC06_000/ov_SC06_000_jr_80135A4C.c index 6a9512a887..1f98221d12 100644 --- a/src/ov_SC06_000/ov_SC06_000_jr_80135A4C.c +++ b/src/ov_SC06_000/ov_SC06_000_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC06_000_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c b/src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c index 4d6441dda2..871dbff4a2 100644 --- a/src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c +++ b/src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c @@ -3905,7 +3905,6 @@ void func_8017CE90(void *a0) void func_8017CFBC(void *a0) { - typedef struct { u8 d[4]; } Blk4_8017CE90_8017CE90; extern Blk4_8017CE90_8017CE90 D_801AE628; extern s32 func_80012F74(s32 a0, s32 a1, s32 a2, s32 a3); extern void func_80146C3C(); // K&R: 0 of 1 args (P37 rung D t4_D22) @@ -4755,8 +4754,6 @@ void func_8017E35C(s32 arg0) LATER function in this TU, which blocks a byte-true decl of a different type. Declaration-only move (cookbook §103); the whole-binary byte-gate is the arbiter. */ extern u8 *D_800A5E60; - typedef struct { u32 w0, w1, w2; } Prim_SC06_000_8017E35C; - typedef struct { u8 b[8]; } V8_SC06_000_8017E35C; DVec35C tmpxy[4]; SVec35C box[8]; @@ -5234,7 +5231,6 @@ extern void func_80052E38(MATRIX2 *); void func_8017EF68(s32 arg0, s32 arg1, s32 arg2) { - typedef struct { u32 w0, w1, w2; } Prim_SC06_000_8017EF68; extern s32 func_800491EC(void); extern u8 *D_800A5E60; @@ -6815,7 +6811,6 @@ void func_80181918(void) { void func_80181940(void) { - typedef struct { u8 b[8]; } Blk8_80181940; extern Blk8_80181940 D_8018C0F8; extern Blk8_80181940 D_801274E8; extern s32 D_80126954; @@ -6911,8 +6906,6 @@ void func_80181AB4(s32 a0) { void func_80181BA4(s32 param_1) { - typedef struct { u8 b[8]; } Blk8_80181774; - typedef struct { s16 m0, m1, m2, m3; } Sp10_80181BA4; extern Blk8_80181774 D_801274E8; extern s32 ratan2(s32 dx, s32 dy); extern void func_80181CCC(s32 param_1, s32 param_2, s32 param_3); @@ -6929,8 +6922,6 @@ void func_80181BA4(s32 param_1) void func_80181C38(s32 param_1) { - typedef struct { u8 b[8]; } Blk8_80181774; - typedef struct { s16 m0, m1, m2, m3; } Sp10_80181C38; extern Blk8_80181774 D_801274E8; extern void func_80181CCC(s32 param_1, s32 param_2, s32 param_3); extern void func_80181EA0(s32 param_1, s32 param_2, s16 param_3); @@ -7188,7 +7179,7 @@ void func_801824D4(void *a0) { func_8017EF08((s32)&D_801AEC08); D_801AEAFC = 0x1310000; D_801AEC60 = 0; - ((struct { u8 pad[2]; u16 f; } *)a0)->f += 1; + ((Unkstruct_801824D4 *)a0)->f += 1; *(s16 *)((s32)a0 + 0xE0) = 1; } @@ -7211,7 +7202,7 @@ void func_80182560(void *arg0) *p = D_801AEAFE; func_8017EF68((s32)&D_801B20E0, (s32)&D_8019FD8C, (s32)q); if (D_801AEC60 != 0) { - ((struct { u8 pad[2]; u16 f; } *)arg0)->f += 1; + ((Unkstruct_80182560 *)arg0)->f += 1; } } diff --git a/src/ov_SC06_006/ov_SC06_006_after.c b/src/ov_SC06_006/ov_SC06_006_after.c index 3b8be0a91b..abc9567015 100644 --- a/src/ov_SC06_006/ov_SC06_006_after.c +++ b/src/ov_SC06_006/ov_SC06_006_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC06_006/ov_SC06_006_jr_8012ACE0.c b/src/ov_SC06_006/ov_SC06_006_jr_8012ACE0.c index c8c00574a2..5d2a54fc24 100644 --- a/src/ov_SC06_006/ov_SC06_006_jr_8012ACE0.c +++ b/src/ov_SC06_006/ov_SC06_006_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC06_006_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC06_006_80131340 D_80182264; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80182350; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018233C[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC06_006_80133CD4; *(Blk8_SC06_006_80133CD4 *)&D_801152B0 = *(Blk8_SC06_006_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC06_006/ov_SC06_006_jr_80135A4C.c b/src/ov_SC06_006/ov_SC06_006_jr_80135A4C.c index 0ab89ee920..cbfbe4c4f1 100644 --- a/src/ov_SC06_006/ov_SC06_006_jr_80135A4C.c +++ b/src/ov_SC06_006/ov_SC06_006_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC06_006_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC06_006/ov_SC06_006_jr_8017DB90.c b/src/ov_SC06_006/ov_SC06_006_jr_8017DB90.c index 634fb3695e..1bb5614a8e 100644 --- a/src/ov_SC06_006/ov_SC06_006_jr_8017DB90.c +++ b/src/ov_SC06_006/ov_SC06_006_jr_8017DB90.c @@ -4712,16 +4712,6 @@ extern void func_8001CD9C(s32 a0, void *a1); void func_80180AE8(void *arg0) { - typedef struct { - u8 pad00[4]; - u32 flags; /* 0x04 */ - u8 pad08[0x10]; - u16 f18, f1A; /* 0x18 */ - u8 pad1C[2]; - u16 f1E; /* 0x1E */ - u8 pad20[0xC]; - s16 f2C; /* 0x2C */ - } Ent_80180AE8; extern void func_8017EEA4(void *arg); Rec_80180AE8 *rec; Ent_80180AE8 *ent; @@ -4969,7 +4959,6 @@ void func_80180F90(u8 *a0) { s32 func_80180FE8(u8 *a0, u8 *a1, s32 a2) { - typedef struct { s16 x, y, z; } Shake_80180FE8; extern s32 D_801F89E0; extern s16 D_801F8A10; extern s16 D_801F8A12; diff --git a/src/ov_SC06_008/ov_SC06_008_after.c b/src/ov_SC06_008/ov_SC06_008_after.c index 099fef43ff..35b7e39ea9 100644 --- a/src/ov_SC06_008/ov_SC06_008_after.c +++ b/src/ov_SC06_008/ov_SC06_008_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC06_008/ov_SC06_008_jr_8012ACE0.c b/src/ov_SC06_008/ov_SC06_008_jr_8012ACE0.c index f13242d86e..0de8e9bed3 100644 --- a/src/ov_SC06_008/ov_SC06_008_jr_8012ACE0.c +++ b/src/ov_SC06_008/ov_SC06_008_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC06_008_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC06_008_80131340 D_80185CCC; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80185DB8; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80185DA4[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC06_008_80133CD4; *(Blk8_SC06_008_80133CD4 *)&D_801152B0 = *(Blk8_SC06_008_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC06_008/ov_SC06_008_jr_80135A4C.c b/src/ov_SC06_008/ov_SC06_008_jr_80135A4C.c index 3e462da987..973905d4e9 100644 --- a/src/ov_SC06_008/ov_SC06_008_jr_80135A4C.c +++ b/src/ov_SC06_008/ov_SC06_008_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC06_008_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC06_010/ov_SC06_010_after.c b/src/ov_SC06_010/ov_SC06_010_after.c index 775eec3dbc..24f61217ca 100644 --- a/src/ov_SC06_010/ov_SC06_010_after.c +++ b/src/ov_SC06_010/ov_SC06_010_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC06_010/ov_SC06_010_jr_8012ACE0.c b/src/ov_SC06_010/ov_SC06_010_jr_8012ACE0.c index a85d455407..479b6634a2 100644 --- a/src/ov_SC06_010/ov_SC06_010_jr_8012ACE0.c +++ b/src/ov_SC06_010/ov_SC06_010_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC06_010_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC06_010_80131340 D_80186EA8; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80186F94; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80186F80[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC06_010_80133CD4; *(Blk8_SC06_010_80133CD4 *)&D_801152B0 = *(Blk8_SC06_010_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC06_010/ov_SC06_010_jr_80135A4C.c b/src/ov_SC06_010/ov_SC06_010_jr_80135A4C.c index 9dc2aafd7f..66fa51029d 100644 --- a/src/ov_SC06_010/ov_SC06_010_jr_80135A4C.c +++ b/src/ov_SC06_010/ov_SC06_010_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC06_010_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC06_011/ov_SC06_011_after.c b/src/ov_SC06_011/ov_SC06_011_after.c index d440cdfe42..ff7c2f042f 100644 --- a/src/ov_SC06_011/ov_SC06_011_after.c +++ b/src/ov_SC06_011/ov_SC06_011_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC06_011/ov_SC06_011_jr_8012ACE0.c b/src/ov_SC06_011/ov_SC06_011_jr_8012ACE0.c index c696546752..0a63398809 100644 --- a/src/ov_SC06_011/ov_SC06_011_jr_8012ACE0.c +++ b/src/ov_SC06_011/ov_SC06_011_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC06_011_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC06_011_80131340 D_80180908; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801809F4; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801809E0[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC06_011_80133CD4; *(Blk8_SC06_011_80133CD4 *)&D_801152B0 = *(Blk8_SC06_011_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC06_011/ov_SC06_011_jr_80135A4C.c b/src/ov_SC06_011/ov_SC06_011_jr_80135A4C.c index 2ae5784823..cc76428768 100644 --- a/src/ov_SC06_011/ov_SC06_011_jr_80135A4C.c +++ b/src/ov_SC06_011/ov_SC06_011_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC06_011_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC06_013/ov_SC06_013_after.c b/src/ov_SC06_013/ov_SC06_013_after.c index 361fbe1dcc..46ec269975 100644 --- a/src/ov_SC06_013/ov_SC06_013_after.c +++ b/src/ov_SC06_013/ov_SC06_013_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC06_013/ov_SC06_013_jr_8012ACE0.c b/src/ov_SC06_013/ov_SC06_013_jr_8012ACE0.c index 3b3ccf1f3f..dec7cfffd2 100644 --- a/src/ov_SC06_013/ov_SC06_013_jr_8012ACE0.c +++ b/src/ov_SC06_013/ov_SC06_013_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC06_013_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC06_013_80131340 D_8017F084; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017F170; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017F15C[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC06_013_80133CD4; *(Blk8_SC06_013_80133CD4 *)&D_801152B0 = *(Blk8_SC06_013_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC06_013/ov_SC06_013_jr_80135A4C.c b/src/ov_SC06_013/ov_SC06_013_jr_80135A4C.c index d7cc87d0ea..db4fac0c1b 100644 --- a/src/ov_SC06_013/ov_SC06_013_jr_80135A4C.c +++ b/src/ov_SC06_013/ov_SC06_013_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC06_013_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC06_014/ov_SC06_014_after.c b/src/ov_SC06_014/ov_SC06_014_after.c index 65462aa8d5..9c9f3a1bf0 100644 --- a/src/ov_SC06_014/ov_SC06_014_after.c +++ b/src/ov_SC06_014/ov_SC06_014_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC06_014/ov_SC06_014_jr_8012ACE0.c b/src/ov_SC06_014/ov_SC06_014_jr_8012ACE0.c index c1d22e1552..7c75484265 100644 --- a/src/ov_SC06_014/ov_SC06_014_jr_8012ACE0.c +++ b/src/ov_SC06_014/ov_SC06_014_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC06_014_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC06_014_80131340 D_801803E8; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801804D4; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801804C0[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC06_014_80133CD4; *(Blk8_SC06_014_80133CD4 *)&D_801152B0 = *(Blk8_SC06_014_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC06_014/ov_SC06_014_jr_80135A4C.c b/src/ov_SC06_014/ov_SC06_014_jr_80135A4C.c index 39b04b9054..89e19c7032 100644 --- a/src/ov_SC06_014/ov_SC06_014_jr_80135A4C.c +++ b/src/ov_SC06_014/ov_SC06_014_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC06_014_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC06_015/ov_SC06_015_after.c b/src/ov_SC06_015/ov_SC06_015_after.c index 471c59a78d..ce4b658195 100644 --- a/src/ov_SC06_015/ov_SC06_015_after.c +++ b/src/ov_SC06_015/ov_SC06_015_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC06_015/ov_SC06_015_jr_8012ACE0.c b/src/ov_SC06_015/ov_SC06_015_jr_8012ACE0.c index 95b18c9570..9f9fc4c685 100644 --- a/src/ov_SC06_015/ov_SC06_015_jr_8012ACE0.c +++ b/src/ov_SC06_015/ov_SC06_015_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC06_015_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC06_015_80131340 D_8017EF40; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017F02C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017F018[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC06_015_80133CD4; *(Blk8_SC06_015_80133CD4 *)&D_801152B0 = *(Blk8_SC06_015_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC06_015/ov_SC06_015_jr_80135A4C.c b/src/ov_SC06_015/ov_SC06_015_jr_80135A4C.c index f97f2f4c44..fc7350dd44 100644 --- a/src/ov_SC06_015/ov_SC06_015_jr_80135A4C.c +++ b/src/ov_SC06_015/ov_SC06_015_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC06_015_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC06_016/ov_SC06_016_after.c b/src/ov_SC06_016/ov_SC06_016_after.c index 9cb01936d8..64ac38d32b 100644 --- a/src/ov_SC06_016/ov_SC06_016_after.c +++ b/src/ov_SC06_016/ov_SC06_016_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC06_016/ov_SC06_016_jr_8012ACE0.c b/src/ov_SC06_016/ov_SC06_016_jr_8012ACE0.c index d126e9e921..f573bd3499 100644 --- a/src/ov_SC06_016/ov_SC06_016_jr_8012ACE0.c +++ b/src/ov_SC06_016/ov_SC06_016_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC06_016_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC06_016_80131340 D_80185350; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018543C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80185428[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC06_016_80133CD4; *(Blk8_SC06_016_80133CD4 *)&D_801152B0 = *(Blk8_SC06_016_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC06_016/ov_SC06_016_jr_80135A4C.c b/src/ov_SC06_016/ov_SC06_016_jr_80135A4C.c index 89040f6e4e..a12699cb13 100644 --- a/src/ov_SC06_016/ov_SC06_016_jr_80135A4C.c +++ b/src/ov_SC06_016/ov_SC06_016_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC06_016_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC06_016/ov_SC06_016_jr_8017C8D0.c b/src/ov_SC06_016/ov_SC06_016_jr_8017C8D0.c index 310081a2c0..de7e98ac4a 100644 --- a/src/ov_SC06_016/ov_SC06_016_jr_8017C8D0.c +++ b/src/ov_SC06_016/ov_SC06_016_jr_8017C8D0.c @@ -3852,9 +3852,9 @@ extern void func_80184578(void *a0, void *a1, s16 a2); extern s32 rand(void); void func_8017F154(s32 arg0) { - typedef struct { u8 b[4]; } B4_8017F154; /* align 1 -> ulw/usw (lwl/lwr) */ - typedef struct { s16 m[3][3]; s32 t[3]; } M32_8017F154; /* 0x20, align 4 */ - typedef struct { u16 vx, vy, vz, pad; } SV_8017F154; /* 8, align 2 */ + /* align 1 -> ulw/usw (lwl/lwr) */ + /* 0x20, align 4 */ + /* 8, align 2 */ extern M32_8017F154 D_800AE620; extern B4_8017F154 D_8019E28C; diff --git a/src/ov_SC06_018/ov_SC06_018_after.c b/src/ov_SC06_018/ov_SC06_018_after.c index 2a34f28070..794029e42f 100644 --- a/src/ov_SC06_018/ov_SC06_018_after.c +++ b/src/ov_SC06_018/ov_SC06_018_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC06_018/ov_SC06_018_jr_8012ACE0.c b/src/ov_SC06_018/ov_SC06_018_jr_8012ACE0.c index 0865a47e97..568ee07ef5 100644 --- a/src/ov_SC06_018/ov_SC06_018_jr_8012ACE0.c +++ b/src/ov_SC06_018/ov_SC06_018_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC06_018_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC06_018_80131340 D_80193A8C; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2405,7 +2402,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80193B78; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2464,7 +2461,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80193B64[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC06_018_80133CD4; *(Blk8_SC06_018_80133CD4 *)&D_801152B0 = *(Blk8_SC06_018_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC06_018/ov_SC06_018_jr_80135A4C.c b/src/ov_SC06_018/ov_SC06_018_jr_80135A4C.c index 42cf0dce51..12f7615555 100644 --- a/src/ov_SC06_018/ov_SC06_018_jr_80135A4C.c +++ b/src/ov_SC06_018/ov_SC06_018_jr_80135A4C.c @@ -639,7 +639,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) #include "common.h" s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC06_018_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC06_018/ov_SC06_018_jr_80186270.c b/src/ov_SC06_018/ov_SC06_018_jr_80186270.c index 6262a4c0bd..9f626885e9 100644 --- a/src/ov_SC06_018/ov_SC06_018_jr_80186270.c +++ b/src/ov_SC06_018/ov_SC06_018_jr_80186270.c @@ -3369,9 +3369,6 @@ void func_80186994(s32 a0) { void func_80186D80(s32 a0, s32 a1) { - struct V8_SC06_018_80186D80 { - u16 vx, vy, vz, pad; - }; extern s32 func_8012CEB0(s32 a0, s32 a1, s32 a2); struct V8_SC06_018_80186D80 sp10; diff --git a/src/ov_SC06_018/ov_SC06_018_jr_80187AEC.c b/src/ov_SC06_018/ov_SC06_018_jr_80187AEC.c index ede232f912..9b5f1d90f8 100644 --- a/src/ov_SC06_018/ov_SC06_018_jr_80187AEC.c +++ b/src/ov_SC06_018/ov_SC06_018_jr_80187AEC.c @@ -5010,7 +5010,6 @@ s32 func_8018A86C(s32 param_1) extern u16 D_800B99D8; extern u8 D_801CD458[]; - typedef struct { s16 a, b, c, d; } SV4_8018A86C; s32 diff; s16 sdiff; diff --git a/src/ov_SC06_020/ov_SC06_020_after.c b/src/ov_SC06_020/ov_SC06_020_after.c index ca07db7dc8..0d622ff4eb 100644 --- a/src/ov_SC06_020/ov_SC06_020_after.c +++ b/src/ov_SC06_020/ov_SC06_020_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC06_020/ov_SC06_020_jr_8012ACE0.c b/src/ov_SC06_020/ov_SC06_020_jr_8012ACE0.c index d7dc96175d..c8f77606fc 100644 --- a/src/ov_SC06_020/ov_SC06_020_jr_8012ACE0.c +++ b/src/ov_SC06_020/ov_SC06_020_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC06_020_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC06_020_80131340 D_80185514; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80185600; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801855EC[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC06_020_80133CD4; *(Blk8_SC06_020_80133CD4 *)&D_801152B0 = *(Blk8_SC06_020_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC06_020/ov_SC06_020_jr_80135A4C.c b/src/ov_SC06_020/ov_SC06_020_jr_80135A4C.c index ff82c7df77..c70e7b535f 100644 --- a/src/ov_SC06_020/ov_SC06_020_jr_80135A4C.c +++ b/src/ov_SC06_020/ov_SC06_020_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC06_020_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC06_020/ov_SC06_020_jr_80180B04.c b/src/ov_SC06_020/ov_SC06_020_jr_80180B04.c index b8da3164a9..3a52764bee 100644 --- a/src/ov_SC06_020/ov_SC06_020_jr_80180B04.c +++ b/src/ov_SC06_020/ov_SC06_020_jr_80180B04.c @@ -2891,9 +2891,6 @@ void func_80180B04(s32 a0) { void func_80180EF0(s32 a0, s32 a1) { - struct V8_80180EF0 { - u16 vx, vy, vz, pad; - }; extern s32 func_8012CEB0(void*, void*, s32); struct V8_80180EF0 sp10; diff --git a/src/ov_SC06_022/ov_SC06_022_after.c b/src/ov_SC06_022/ov_SC06_022_after.c index deb3d92513..c3e70cb221 100644 --- a/src/ov_SC06_022/ov_SC06_022_after.c +++ b/src/ov_SC06_022/ov_SC06_022_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC06_022/ov_SC06_022_jr_8012ACE0.c b/src/ov_SC06_022/ov_SC06_022_jr_8012ACE0.c index 91236c9b68..5a5dba8c8b 100644 --- a/src/ov_SC06_022/ov_SC06_022_jr_8012ACE0.c +++ b/src/ov_SC06_022/ov_SC06_022_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC06_022_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC06_022_80131340 D_8018D7D0; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018D8BC; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018D8A8[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC06_022_80133CD4; *(Blk8_SC06_022_80133CD4 *)&D_801152B0 = *(Blk8_SC06_022_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC06_022/ov_SC06_022_jr_80135A4C.c b/src/ov_SC06_022/ov_SC06_022_jr_80135A4C.c index 85bcdf65c5..d17915a09a 100644 --- a/src/ov_SC06_022/ov_SC06_022_jr_80135A4C.c +++ b/src/ov_SC06_022/ov_SC06_022_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC06_022_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC06_022/ov_SC06_022_jr_80180CD0.c b/src/ov_SC06_022/ov_SC06_022_jr_80180CD0.c index 08118c6638..bee60161e3 100644 --- a/src/ov_SC06_022/ov_SC06_022_jr_80180CD0.c +++ b/src/ov_SC06_022/ov_SC06_022_jr_80180CD0.c @@ -2811,7 +2811,6 @@ void func_80180CD0(s32 s0) extern void func_8001C1E4(void *a0, void *a1); extern void func_8012AD44(s32 *a0, s16 a1); extern u8 D_801AD394[]; - struct RowC_80180CD0 { void *p; }; extern struct RowC_80180CD0 D_801AD3DC[]; s32 a0; @@ -3047,7 +3046,6 @@ void func_801811A4(s32 param_1) { it survives to alter_reg with reg_n_refs>0 and no hard reg, so assign_stack_local grows var_size by 8 with nothing ever stored there. Byte-checked: pointer-arith spelling -> frame 0x20, this -> frame 0x18. */ - struct Row8_8018367C_801811A4 { u16 h; u16 pad[3]; }; extern struct Row8_8018367C_801811A4 D_801AD46E[]; extern struct Row8_8018367C_801811A4 D_801AD468[]; extern struct Row8_8018367C_801811A4 D_801AD46A[]; diff --git a/src/ov_SC06_022/ov_SC06_022_jr_80184A28.c b/src/ov_SC06_022/ov_SC06_022_jr_80184A28.c index 64e526a360..9140c5743f 100644 --- a/src/ov_SC06_022/ov_SC06_022_jr_80184A28.c +++ b/src/ov_SC06_022/ov_SC06_022_jr_80184A28.c @@ -2923,9 +2923,6 @@ void func_80184A28(s32 a0) { void func_80184E14(s32 a0, s32 a1) { - struct V8_80184E14 { - u16 vx, vy, vz, pad; - }; extern s32 func_8012CEB0(void*, void*, s32); struct V8_80184E14 sp10; diff --git a/src/ov_SC06_024/ov_SC06_024_after.c b/src/ov_SC06_024/ov_SC06_024_after.c index 11e2958f34..da451a1e72 100644 --- a/src/ov_SC06_024/ov_SC06_024_after.c +++ b/src/ov_SC06_024/ov_SC06_024_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC06_024/ov_SC06_024_jr_8012ACE0.c b/src/ov_SC06_024/ov_SC06_024_jr_8012ACE0.c index 3932b9c7ae..8f34bf6ede 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_8012ACE0.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC06_024_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC06_024_80131340 D_8018FCA8; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018FD94; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018FD80[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC06_024_80133CD4; *(Blk8_SC06_024_80133CD4 *)&D_801152B0 = *(Blk8_SC06_024_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC06_024/ov_SC06_024_jr_80135A4C.c b/src/ov_SC06_024/ov_SC06_024_jr_80135A4C.c index 93991b7ecb..ada37bb4b5 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_80135A4C.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC06_024_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC06_024/ov_SC06_024_jr_8017BEBC.c b/src/ov_SC06_024/ov_SC06_024_jr_8017BEBC.c index 6fd91e4b05..ef4f66fa57 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_8017BEBC.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_8017BEBC.c @@ -2982,9 +2982,6 @@ void func_8017D34C(void *a0) { void func_8017D388(s32 a0) { - typedef struct { - s16 v[4]; - } Blk8_80126940_8017D388; extern s32 D_80126B58; extern s16 D_801932E0[]; diff --git a/src/ov_SC06_024/ov_SC06_024_jr_80181D34.c b/src/ov_SC06_024/ov_SC06_024_jr_80181D34.c index 31d58361fc..08f2bcb104 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_80181D34.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_80181D34.c @@ -3588,7 +3588,6 @@ void func_801831A8(s32 s0) extern void func_8001C1E4(void *a0, void *a1); extern void func_8012AD44(s32 *a0, s16 a1); extern u8 D_801AC4D8[]; - struct RowC_80180CD0 { void *p; }; extern struct RowC_80180CD0 D_801AC520[]; s32 a0; @@ -3832,7 +3831,6 @@ void func_8018367C(s32 param_1) { it survives to alter_reg with reg_n_refs>0 and no hard reg, so assign_stack_local grows var_size by 8 with nothing ever stored there. Byte-checked: pointer-arith spelling -> frame 0x20, this -> frame 0x18. */ - struct Row8_8018367C { u16 h; u16 pad[3]; }; extern struct Row8_8018367C D_801AC5B2[]; extern struct Row8_8018367C D_801AC5AC[]; extern struct Row8_8018367C D_801AC5AE[]; diff --git a/src/ov_SC06_024/ov_SC06_024_jr_80186F00.c b/src/ov_SC06_024/ov_SC06_024_jr_80186F00.c index b35a68ce46..932ae70210 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_80186F00.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_80186F00.c @@ -2956,9 +2956,6 @@ void func_80186F00(s32 a0) { void func_801872EC(s32 a0, s32 a1) { - struct V8_801872EC { - u16 vx, vy, vz, pad; - }; extern s32 func_8012CEB0(void*, void*, s32); struct V8_801872EC sp10; @@ -4638,17 +4635,6 @@ u16 a4; s32 a5; { extern s32 func_8012C51C(void *a0, s32 a1); - typedef struct { - u16 f10; /* 0x10 */ - u16 f12; /* 0x12 */ - u16 f14; /* 0x14 */ - s16 f16; /* 0x16 */ - s16 f18; /* 0x18 */ - s16 f1a; /* 0x1A */ - s16 f1c; /* 0x1C */ - u16 f1e; /* 0x1E */ - s32 f20; /* 0x20 */ - } buf_80189888; buf_80189888 sp; u16 t; diff --git a/src/ov_SC06_025/ov_SC06_025_after.c b/src/ov_SC06_025/ov_SC06_025_after.c index 4da121adca..2075691494 100644 --- a/src/ov_SC06_025/ov_SC06_025_after.c +++ b/src/ov_SC06_025/ov_SC06_025_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC06_025/ov_SC06_025_jr_8012ACE0.c b/src/ov_SC06_025/ov_SC06_025_jr_8012ACE0.c index b6c8488e0e..6accde483c 100644 --- a/src/ov_SC06_025/ov_SC06_025_jr_8012ACE0.c +++ b/src/ov_SC06_025/ov_SC06_025_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC06_025_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC06_025_80131340 D_8018514C; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80185238; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80185224[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC06_025_80133CD4; *(Blk8_SC06_025_80133CD4 *)&D_801152B0 = *(Blk8_SC06_025_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC06_025/ov_SC06_025_jr_80135A4C.c b/src/ov_SC06_025/ov_SC06_025_jr_80135A4C.c index 5b892ab564..fc902afbd7 100644 --- a/src/ov_SC06_025/ov_SC06_025_jr_80135A4C.c +++ b/src/ov_SC06_025/ov_SC06_025_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC06_025_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC06_025/ov_SC06_025_jr_8017EEC4.c b/src/ov_SC06_025/ov_SC06_025_jr_8017EEC4.c index 1722fa8b46..88b697951d 100644 --- a/src/ov_SC06_025/ov_SC06_025_jr_8017EEC4.c +++ b/src/ov_SC06_025/ov_SC06_025_jr_8017EEC4.c @@ -3830,17 +3830,6 @@ void func_801805BC(void *arg0) { * on the p-> accesses (gcc-2.7.2 true_dependence lets a varying in-struct MEM * pass a non-struct constant-address MEM), which a raw *(u16*)(x+K) cast * cannot give. Named uniquely so it can never collide with a TU typedef. */ - typedef struct { - u8 pad_0[0x8]; - s16 unk8; /* 0x08 */ - s16 unkA; /* 0x0A */ - u8 pad_C[0x10]; - s32 unk1C; /* 0x1C */ - u8 pad_20[0x14]; - u16 unk34; /* 0x34 */ - u8 pad_36[0xA6]; - s16 unkDC; /* 0xDC */ - } Obj801805BC; extern s32 func_8012BEE8(s32); extern void func_80181700(void *arg0); @@ -3946,7 +3935,6 @@ void func_801807F8(s32 a0) { * or (max < pos*2) << 1 when the selector itself is unset. */ s32 func_80180808() { - typedef struct { s32 f0; s16 f4; s16 f6; } Rec_80180808; extern s16 D_801B1704; extern s16 D_801B1720; @@ -4012,17 +4000,6 @@ void func_801808AC(void *arg0) void func_80180950(void *arg0) { - typedef struct { - u8 pad0[0x2]; - s16 unk2; /* 0x02 */ - u8 pad4[0x18]; - s32 unk1C; /* 0x1C */ - u8 pad20[0x14]; - s16 unk34; /* 0x34 */ - u8 pad36[0xA6]; - s16 unkDC; /* 0xDC */ - s16 unkDE; /* 0xDE */ - } Obj80180950; extern s32 D_801270C8; extern s16 D_801B1708; @@ -4034,7 +4011,7 @@ void func_80180950(void *arg0) { p->unk34 = 0; p->unkDC = 0; p->unkDE = 0; - ((struct { s32 f; } *)&D_801270C8)->f = 3; + ((Unkstruct_801270C8 *)&D_801270C8)->f = 3; D_801B1708 = 0; D_801B1710 = 0; p->unk1C = 0x16; @@ -4052,12 +4029,6 @@ void func_80180950(void *arg0) { * no-prototype decl. */ void func_8018098C(void *arg0) { - typedef struct { - u8 pad_0[0x1C]; - s32 unk1C; /* 0x1C */ - u8 pad_20[0x14]; - u16 unk34; /* 0x34 */ - } Obj8018098C; extern void func_80180B7C(s32 a0); extern void func_80181700(void *a0); @@ -4112,7 +4083,7 @@ void func_8018098C(void *arg0) { * the varying /s p->unk34 store and hoists above it (sched.c:817). The * COMPONENT_REF spelling -- this TU's own idiom, see func_80180950 -- * sets MEM_IN_STRUCT_P and keeps the store in source order. */ - ((struct { s32 f; } *)&D_801270C8)->f = 0; + ((Unkstruct_801270C8 *)&D_801270C8)->f = 0; } break; @@ -4238,10 +4209,6 @@ void func_80180D84(void *arg0) { /* block-scope layout type, named uniquely so it can never collide with the * TU's file-scope typedef St_8017E95C_r (gcc-2.7.2 rejects typedef * redefinition; cookbook §120: rename, don't remove) */ - typedef struct { - s16 unk0; /* 0x00 */ - u8 pad[0x102]; /* -> 0x104 */ - } Obj80180D84; extern s32 D_801270C8; extern St_8017E95C_r D_801B12F0[4]; @@ -4746,18 +4713,6 @@ extern void func_8012E28C(s32, s32); extern s32 func_801823D4(s32, s32); void func_801818D8(u16 *pv, s32 arg1, s32 n, s32 col) { - typedef struct { - s32 tag; /* 0x00 */ - s32 rgb0; /* 0x04 code byte lives at +3 of this word */ - s32 xy0; /* 0x08 */ - s32 rgb1; /* 0x0C */ - s32 xy1; /* 0x10 */ - s32 rgb2; /* 0x14 */ - s32 xy2; /* 0x18 */ - s32 rgb3; /* 0x1C */ - s32 xy3; /* 0x20 */ - } G4; - typedef struct { s16 vx, vy, vz, pad; } V8_SC06_025_801818D8; V8_SC06_025_801818D8 sv[4]; /* sp+0x10 .. 0x2F */ s32 v[2]; /* sp+0x30 */ @@ -4950,27 +4905,7 @@ extern OtBlk D_800A651C[]; */ void func_80181E08(s32 arg0) { /* --- packet layouts (word offsets verified against the target's sw/sb) ------ */ - typedef struct { - s32 tag; /* 0x00 */ - s32 rgb0; /* 0x04 code byte lives at +3 of this word */ - s32 xy0; /* 0x08 */ - s32 rgb1; /* 0x0C */ - s32 xy1; /* 0x10 */ - s32 rgb2; /* 0x14 */ - s32 xy2; /* 0x18 */ - s32 rgb3; /* 0x1C */ - s32 xy3; /* 0x20 */ - } G4; - typedef struct { - s32 tag; /* 0x00 */ - s32 rgb0; /* 0x04 */ - s32 xy0; /* 0x08 */ - s32 rgb1; /* 0x0C */ - s32 xy1; /* 0x10 */ - s32 rgb2; /* 0x14 */ - s32 xy2; /* 0x18 */ - } G3; - typedef struct { s16 vx, vy, vz, pad; } V8_SC06_025_80181E08; /* 8-byte ring stride */ + /* 8-byte ring stride */ extern void *func_80010A08(s32); extern s32 RotTransPers4(s32, s32, s32, s32, s32 *, s32 *, s32 *, s32 *, s32 *, s32 *); diff --git a/src/ov_SC06_027/ov_SC06_027_after.c b/src/ov_SC06_027/ov_SC06_027_after.c index 3e399b1d3e..9eb033cc86 100644 --- a/src/ov_SC06_027/ov_SC06_027_after.c +++ b/src/ov_SC06_027/ov_SC06_027_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC06_027/ov_SC06_027_jr_8012ACE0.c b/src/ov_SC06_027/ov_SC06_027_jr_8012ACE0.c index 564a171c7b..bce6a5a237 100644 --- a/src/ov_SC06_027/ov_SC06_027_jr_8012ACE0.c +++ b/src/ov_SC06_027/ov_SC06_027_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC06_027_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC06_027_80131340 D_8017E48C; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017E578; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017E564[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC06_027_80133CD4; *(Blk8_SC06_027_80133CD4 *)&D_801152B0 = *(Blk8_SC06_027_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC06_027/ov_SC06_027_jr_80135A4C.c b/src/ov_SC06_027/ov_SC06_027_jr_80135A4C.c index f449aff8c4..82c85dd1d2 100644 --- a/src/ov_SC06_027/ov_SC06_027_jr_80135A4C.c +++ b/src/ov_SC06_027/ov_SC06_027_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC06_027_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC06_027/ov_SC06_027_jr_8017BEBC.c b/src/ov_SC06_027/ov_SC06_027_jr_8017BEBC.c index 627cfaa810..05c0b0980f 100644 --- a/src/ov_SC06_027/ov_SC06_027_jr_8017BEBC.c +++ b/src/ov_SC06_027/ov_SC06_027_jr_8017BEBC.c @@ -2866,8 +2866,6 @@ void func_8017D0C8(void *a0) { void func_8017D104(s32 param_1) { - typedef struct { s16 v[4]; } Blk8L_SC06_027_8017D104; - typedef struct { Blk8L_SC06_027_8017D104 pad; Blk8L_SC06_027_8017D104 a; Blk8L_SC06_027_8017D104 b; } Locs; extern Blk8L_SC06_027_8017D104 D_80126940; extern s32 ratan2(s32 a0, s32 a1); extern void func_8017D1C0(u8* arg0, s16* arg1, s16* arg2, s32 arg3); diff --git a/src/ov_SC06_029/ov_SC06_029_after.c b/src/ov_SC06_029/ov_SC06_029_after.c index 71785224dd..aa950b95c1 100644 --- a/src/ov_SC06_029/ov_SC06_029_after.c +++ b/src/ov_SC06_029/ov_SC06_029_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC06_029/ov_SC06_029_jr_8012ACE0.c b/src/ov_SC06_029/ov_SC06_029_jr_8012ACE0.c index e3d096d700..215b54f4b7 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_8012ACE0.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC06_029_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC06_029_80131340 D_8018CA20; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018CB0C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018CAF8[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC06_029_80133CD4; *(Blk8_SC06_029_80133CD4 *)&D_801152B0 = *(Blk8_SC06_029_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC06_029/ov_SC06_029_jr_80135A4C.c b/src/ov_SC06_029/ov_SC06_029_jr_80135A4C.c index 275814a04d..93cc8eef8d 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_80135A4C.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC06_029_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC06_029/ov_SC06_029_jr_8017C954.c b/src/ov_SC06_029/ov_SC06_029_jr_8017C954.c index 1e3460cd69..1a73d5fdcf 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_8017C954.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_8017C954.c @@ -2851,7 +2851,6 @@ extern void func_8017C8D0(void); void func_8017C954(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC06_029_8017C954; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); @@ -3366,27 +3365,9 @@ void func_8017DC38(s32 param_1) * Delete the two inner typedefs if a file-scope-only form is preferred. */ void func_8017DDE0(void *arg0) { - typedef struct { - u16 f0; - u16 f2; - u16 f4; - u16 f6; - u16 f8; - u16 fA; - s32 fC; - s32 f10; - s32 f14; - s32 f18; - } SubRec_801EB5C8_8017DC38; /* 0x1C */ + /* 0x1C */ - typedef struct { - u16 g0; - u16 g2; - s32 g4; - s32 g8; - s32 gC; - SubRec_801EB5C8_8017DC38 subs[16]; - } GroupRec_801EB5C8_8017DC38; /* 0x1D0 */ + /* 0x1D0 */ extern GroupRec_801EB5C8_8017DC38 D_801DCCA8[8]; /* §17a-1: the fleet canonical for these callees is the NO-PROTOTYPE form, @@ -3836,7 +3817,6 @@ extern s32 ratan2(s32, s32); extern void func_8017E95C(s32 param_1, s16 *param_2, s16 *param_3, s32 param_4); void func_8017E83C(s32 a0) { - typedef struct { s16 v[4]; } Blk8_80126940_8017E8DC; extern Blk8_80126940_8017E8DC D_80126940; Blk8_80126940_8017E8DC sp10a; Blk8_80126940_8017E8DC sp10b; @@ -5084,17 +5064,6 @@ void func_80180A70(s32 param_1) { /* the same 0x14-byte packet func_801825D8 / func_80184FF8 feed to * func_8012C51C, spelled all-s16 here because every field is written * from a signed literal (`addiu $v0,$zero,-0x100`, not `ori`). */ - typedef struct { - s16 s0; /* 0x00 */ - s16 s2; /* 0x02 */ - s16 s4; /* 0x04 */ - s16 s6; /* 0x06 */ - s16 s8; /* 0x08 */ - s16 sA; /* 0x0A */ - s16 sC; /* 0x0C */ - s16 sE; /* 0x0E */ - s32 w10; /* 0x10 */ - } Rec_SC06_029_80180A70; Rec_SC06_029_80180A70 rec; /* sp+0x10 */ u16 pt[3]; /* sp+0x28 */ @@ -5596,7 +5565,6 @@ extern s32 D_801DFD90; extern s32 func_80012CB8(s32 a0, s32 a1, s32 a2); void func_80181708(int param_1) { - typedef struct { u8 pad[0x3C]; s32 x3C; s32 x40; s32 x44; s32 x48; s32 x4C; s32 x50; } OB; extern s16 D_801904C6_a[] __asm__("D_801904C6"); extern s16 D_801904CE_a[] __asm__("D_801904CE"); SV *p1 = (SV *)D_801DFD8C; @@ -5967,7 +5935,7 @@ s32 func_80181DF8(s32 param_1) s32 func_80182334(s32 a0) { - typedef struct { u16 x; s16 y; s16 z; u16 pad; s32 w1, w2; } Ent_801DFBF8_SC06_029_80182334; /* 0x10 */ + /* 0x10 */ extern Ent_801DFBF8_SC06_029_80182334 D_801DFBF8[]; Ent_801DFBF8_SC06_029_80182334 *e; @@ -6007,7 +5975,7 @@ void func_80182388(s32 a0, s32 a1) * these types (the TU also DEFINES func_801859F4 later with a different, * struct-typed prototype, so a file-scope copy would be a hard conflict). */ /* §183.1-safe: same NAME *and* same BODY as func_801825D8's copy. */ - typedef struct { u16 x, y, z, pad; s32 w1, w2; } Ent_801DFBF8; /* 0x10 */ + /* 0x10 */ extern Ent_801DFBF8 D_801DFBF8[]; extern void func_801859F4(void *a0, s32 a1, s32 a2, s32 a3, s32 a4, @@ -6097,19 +6065,7 @@ void func_80182388(s32 a0, s32 a1) void func_801825D8(s32 arg0, s32 arg1) { - typedef struct { u16 x, y, z, pad; s32 w1, w2; } Ent_801DFBF8; /* 0x10 */ - typedef struct { s16 vx, vy, vz, pad; } SV_801825D8; - typedef struct { - u16 u0; /* 0x00 */ - u16 u1; /* 0x02 */ - u16 u2; /* 0x04 */ - s16 s6; /* 0x06 */ - s16 s8; /* 0x08 */ - s16 sA; /* 0x0A */ - s16 sC; /* 0x0C */ - s16 sE; /* 0x0E */ - s32 w10; /* 0x10 */ - } Rec_801825D8; + /* 0x10 */ extern Ent_801DFBF8 D_801DFBF8[]; extern u8 D_801DFD94[]; @@ -7784,17 +7740,6 @@ extern void func_8012C218(void *a0); void func_80184FF8(s32 param_1) { /* same packet shape func_801825D8 feeds to func_8012C51C */ - typedef struct { - u16 u0; /* 0x00 */ - u16 u1; /* 0x02 */ - u16 u2; /* 0x04 */ - s16 s6; /* 0x06 */ - s16 s8; /* 0x08 */ - s16 sA; /* 0x0A */ - s16 sC; /* 0x0C */ - s16 sE; /* 0x0E */ - s32 w10; /* 0x10 */ - } Rec_80184FF8; Rec_80184FF8 rec; Blk8_801828E4 local; diff --git a/src/ov_SC06_029/ov_SC06_029_jr_801867D0.c b/src/ov_SC06_029/ov_SC06_029_jr_801867D0.c index 2ff72fdea6..480bd2349b 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_801867D0.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_801867D0.c @@ -4235,8 +4235,8 @@ void func_8018865C(void) { /* function-local type/decl layer (byte-neutral): keeps the file-scope * environment of ov_SC06_029_jr_8017C954.c untouched. */ - typedef struct { s32 w[8]; } B20; /* == shared Blk20 */ - typedef struct { s32 vx, vy, vz, pad; } V32; /* == shared Vec32 */ + /* == shared Blk20 */ + /* == shared Vec32 */ extern u16 D_800B99DA; extern Blk20 D_800AE620; @@ -4369,7 +4369,7 @@ void func_80188988(int param_1) { psVar3 = (s16 *)D_801DFFE8; *(s32 *)(param_1 + 0x44) = psVar2[2]; sVar4 = func_80012CB8(*psVar3, *psVar1, 0x80); - ((struct { s32 f; } *)(param_1 + 0x48))->f += sVar4; + ((Unkstruct_80188988 *)(param_1 + 0x48))->f += sVar4; sVar4 = func_80012CB8(*(s16 *)D_801DFFEC, *(s16 *)D_801DFFE4, 0x80); psVar5 = (s16 *)D_801DFFE0; *(s32 *)(param_1 + 0x3C) += sVar4; @@ -4405,7 +4405,7 @@ void func_80188A90(int param_1) { *(s32 *)(param_1 + 0x44) = psVar2[2]; D_801DFFEC = (s32)&D_801913E4 + 8; sVar4 = func_80012CB8((s16)D_801913E4[1], psVar1[1], 0x80); - ((struct { s32 f; } *)(param_1 + 0x4C))->f += sVar4; + ((Unkstruct_80188A90 *)(param_1 + 0x4C))->f += sVar4; sVar4 = func_80012CB8(*(s16 *)(D_801DFFEC + 2), *(s16 *)(D_801DFFE4 + 2), 0x80); psVar5 = (s16 *)D_801DFFE0; *(s32 *)(param_1 + 0x40) += sVar4; @@ -4651,7 +4651,6 @@ void func_80189440(s32 arg0, SV_189440 *v) { /* block-scope copies so the draft compiles standalone under match_one; the * TU's ../shared/engine_core.h already provides both -- delete when banking. */ - typedef struct { s16 m[3][3]; s16 pad; s32 t[3]; } MTX; extern u8 *D_800A5E60; extern u8 D_800A6610[]; diff --git a/src/ov_SC06_030/ov_SC06_030_after.c b/src/ov_SC06_030/ov_SC06_030_after.c index f199aa5fb7..65cf17ec38 100644 --- a/src/ov_SC06_030/ov_SC06_030_after.c +++ b/src/ov_SC06_030/ov_SC06_030_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC06_030/ov_SC06_030_jr_8012ACE0.c b/src/ov_SC06_030/ov_SC06_030_jr_8012ACE0.c index cc18f087ca..fdd9540af4 100644 --- a/src/ov_SC06_030/ov_SC06_030_jr_8012ACE0.c +++ b/src/ov_SC06_030/ov_SC06_030_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC06_030_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC06_030_80131340 D_80182310; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801823FC; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801823E8[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC06_030_80133CD4; *(Blk8_SC06_030_80133CD4 *)&D_801152B0 = *(Blk8_SC06_030_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC06_030/ov_SC06_030_jr_80135A4C.c b/src/ov_SC06_030/ov_SC06_030_jr_80135A4C.c index 1b1354b15c..7269517b66 100644 --- a/src/ov_SC06_030/ov_SC06_030_jr_80135A4C.c +++ b/src/ov_SC06_030/ov_SC06_030_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC06_030_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC06_030/ov_SC06_030_jr_8017F65C.c b/src/ov_SC06_030/ov_SC06_030_jr_8017F65C.c index 842693fb95..04c9e063e5 100644 --- a/src/ov_SC06_030/ov_SC06_030_jr_8017F65C.c +++ b/src/ov_SC06_030/ov_SC06_030_jr_8017F65C.c @@ -3188,7 +3188,6 @@ void func_80180228(s32 a0) /* §183 TYPE-shadowed-block-scope: adopt the twin's spelling for D_800A651C. * The typedef is declared BLOCK-SCOPE here so it shadows (never redefines) * the file-scope copy in src/shared/engine_types.h, which is byte-identical. */ - typedef struct { s32 a; s32 b[4]; } Ot_8018B23C; extern Ot_8018B23C D_800A651C[]; extern u8 D_800AE610[]; diff --git a/src/ov_SC06_032/ov_SC06_032_after.c b/src/ov_SC06_032/ov_SC06_032_after.c index 01c1a8cd08..35d156cd9d 100644 --- a/src/ov_SC06_032/ov_SC06_032_after.c +++ b/src/ov_SC06_032/ov_SC06_032_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC06_032/ov_SC06_032_jr_8012ACE0.c b/src/ov_SC06_032/ov_SC06_032_jr_8012ACE0.c index 103fe8b1b5..666c3a917d 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_8012ACE0.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC06_032_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC06_032_80131340 D_801937DC; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801938C8; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801938B4[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC06_032_80133CD4; *(Blk8_SC06_032_80133CD4 *)&D_801152B0 = *(Blk8_SC06_032_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC06_032/ov_SC06_032_jr_80135A4C.c b/src/ov_SC06_032/ov_SC06_032_jr_80135A4C.c index 0a47b79266..8feba7dc8d 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_80135A4C.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC06_032_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC06_032/ov_SC06_032_jr_80181014.c b/src/ov_SC06_032/ov_SC06_032_jr_80181014.c index c773e4e813..80c4c96ca7 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_80181014.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_80181014.c @@ -3223,9 +3223,6 @@ void func_80181738(s32 a0) { void func_80181B24(s32 a0, s32 a1) { - struct V8_80181B24 { - u16 vx, vy, vz, pad; - }; extern s32 func_8012CEB0(void*, void*, s32); struct V8_80181B24 sp10; diff --git a/src/ov_SC06_032/ov_SC06_032_jr_80182890.c b/src/ov_SC06_032/ov_SC06_032_jr_80182890.c index 4b40728e8b..7f754779e2 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_80182890.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_80182890.c @@ -3549,8 +3549,8 @@ void func_801838A4(s32 p) { void func_80183940(s32 param_1) { - typedef struct { short vx, vy, vz, pad; } SVEC_80183940; /* == SVECTOR */ - typedef struct { short m[3][3]; long t[3]; } MTX_80183940; /* == MATRIX */ + /* == SVECTOR */ + /* == MATRIX */ extern s32 *D_80126B78; extern s32 *D_80126B90; @@ -11245,7 +11245,7 @@ void func_8018F3E4(void) void func_8018FB5C(s32 arg0, s32 arg1, s32 arg2) { - typedef struct { s32 a; s32 b[4]; } OtBlk_80182890_8018FB5C; /* == engine_types.h OtBlk (0x14); BLOCK scope per §94 type-carry */ + /* == engine_types.h OtBlk (0x14); BLOCK scope per §94 type-carry */ extern OtBlk_80182890_8018FB5C D_800A651C_v[] __asm__("D_800A651C"); /* §200 alias: TU spells it `extern u8 D_800A651C[]` */ extern void *func_80010A08(s32); extern void func_8004914C(void *); diff --git a/src/ov_SC06_033/ov_SC06_033_after.c b/src/ov_SC06_033/ov_SC06_033_after.c index dd0acf991b..4fb2413c39 100644 --- a/src/ov_SC06_033/ov_SC06_033_after.c +++ b/src/ov_SC06_033/ov_SC06_033_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC06_033/ov_SC06_033_jr_8012ACE0.c b/src/ov_SC06_033/ov_SC06_033_jr_8012ACE0.c index 59949090ed..42bede4177 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_8012ACE0.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC06_033_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC06_033_80131340 D_80191CEC; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80191DD8; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80191DC4[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC06_033_80133CD4; *(Blk8_SC06_033_80133CD4 *)&D_801152B0 = *(Blk8_SC06_033_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC06_033/ov_SC06_033_jr_80135A4C.c b/src/ov_SC06_033/ov_SC06_033_jr_80135A4C.c index 0e75efa764..ea02d12dc5 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_80135A4C.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC06_033_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC06_033/ov_SC06_033_jr_8017C24C.c b/src/ov_SC06_033/ov_SC06_033_jr_8017C24C.c index 01cd26c3f7..c81a598933 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_8017C24C.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_8017C24C.c @@ -3010,7 +3010,6 @@ void func_8017D7A4(void *a0) { #include "common.h" void func_8017D7E0(s32 param_1) { - typedef struct { s16 x0, x1, x2, x3; } UnalignedShortBlock; extern u16 func_80148800(s32 *a0); extern s32 func_80012C6C(s32 a0, s32 a1, s32 a2); diff --git a/src/ov_SC06_033/ov_SC06_033_jr_80184CF8.c b/src/ov_SC06_033/ov_SC06_033_jr_80184CF8.c index dbd8023168..3d3897f09c 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_80184CF8.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_80184CF8.c @@ -3308,9 +3308,6 @@ void func_8018541C(s32 a0) { void func_80185808(s32 a0, s32 a1) { - struct V8_80185808 { - u16 vx, vy, vz, pad; - }; extern s32 func_8012CEB0(void*, void*, s32); struct V8_80185808 sp10; diff --git a/src/ov_SC07_000/ov_SC07_000_after.c b/src/ov_SC07_000/ov_SC07_000_after.c index 04ad1257f1..9564099fb6 100644 --- a/src/ov_SC07_000/ov_SC07_000_after.c +++ b/src/ov_SC07_000/ov_SC07_000_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC07_000/ov_SC07_000_jr_8012ACE0.c b/src/ov_SC07_000/ov_SC07_000_jr_8012ACE0.c index 383f44c8c1..a3966d0fee 100644 --- a/src/ov_SC07_000/ov_SC07_000_jr_8012ACE0.c +++ b/src/ov_SC07_000/ov_SC07_000_jr_8012ACE0.c @@ -1430,9 +1430,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC07_000_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC07_000_80131340 D_80182B34; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2404,7 +2401,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80182C20; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2463,7 +2460,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80182C0C[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC07_000_80133CD4; *(Blk8_SC07_000_80133CD4 *)&D_801152B0 = *(Blk8_SC07_000_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC07_000/ov_SC07_000_jr_80135A4C.c b/src/ov_SC07_000/ov_SC07_000_jr_80135A4C.c index d6fa7ffec5..5b5dd8ec01 100644 --- a/src/ov_SC07_000/ov_SC07_000_jr_80135A4C.c +++ b/src/ov_SC07_000/ov_SC07_000_jr_80135A4C.c @@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC07_000_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC07_000/ov_SC07_000_jr_8017BEBC.c b/src/ov_SC07_000/ov_SC07_000_jr_8017BEBC.c index 2823644cab..4f8e67ed46 100644 --- a/src/ov_SC07_000/ov_SC07_000_jr_8017BEBC.c +++ b/src/ov_SC07_000/ov_SC07_000_jr_8017BEBC.c @@ -2700,7 +2700,6 @@ extern void func_8017BEB4(void); void func_8017BEBC(s32 arg0) { - typedef struct { u32 w0, w1, w2; } Prim_SC07_000_8017BEBC; extern s32 func_800491EC(void); extern void func_800547D8(s32, MATRIX2 *); @@ -3255,9 +3254,6 @@ void func_8017DB64(void *a0) { extern void func_8017DC68(s32 param_1, s16 *param_2); void func_8017DBA0(s32 param_1) { - typedef struct { - s16 v[4]; - } Blk8_80126940_8017D20C; extern Blk8_80126940_8017D20C D_80126940; Blk8_80126940_8017D20C sp10; diff --git a/src/ov_SC07_001/ov_SC07_001_after.c b/src/ov_SC07_001/ov_SC07_001_after.c index 5b99ad5e88..54a3f12324 100644 --- a/src/ov_SC07_001/ov_SC07_001_after.c +++ b/src/ov_SC07_001/ov_SC07_001_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC07_001/ov_SC07_001_jr_8012ACE0.c b/src/ov_SC07_001/ov_SC07_001_jr_8012ACE0.c index 1f101897bc..8a58a75060 100644 --- a/src/ov_SC07_001/ov_SC07_001_jr_8012ACE0.c +++ b/src/ov_SC07_001/ov_SC07_001_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC07_001_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC07_001_80131340 D_801819E4; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80181AD0; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80181ABC[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC07_001_80133CD4; *(Blk8_SC07_001_80133CD4 *)&D_801152B0 = *(Blk8_SC07_001_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC07_001/ov_SC07_001_jr_80135A4C.c b/src/ov_SC07_001/ov_SC07_001_jr_80135A4C.c index 3d0ff112ef..23474f9757 100644 --- a/src/ov_SC07_001/ov_SC07_001_jr_80135A4C.c +++ b/src/ov_SC07_001/ov_SC07_001_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC07_001_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC07_001/ov_SC07_001_jr_8017BEBC.c b/src/ov_SC07_001/ov_SC07_001_jr_8017BEBC.c index a556e7e63f..01f8940f3c 100644 --- a/src/ov_SC07_001/ov_SC07_001_jr_8017BEBC.c +++ b/src/ov_SC07_001/ov_SC07_001_jr_8017BEBC.c @@ -3203,7 +3203,6 @@ void func_8017E4DC(s32 arg0) extern s32 D_8019E150; extern void (*D_80185000[])(void); extern s16 D_801AAD6C[]; - typedef struct { char c[0x14]; } Rec_80int; extern Rec_80int D_801850BC[]; s32 i; @@ -4131,7 +4130,7 @@ void func_8017FE38(s32 p) extern short D_800B9A02; extern u8 D_800AF648; - typedef struct { s16 m[3][3]; s16 pad; s32 t[3]; } MTX_8017FE38; /* 0x20 */ + /* 0x20 */ MTX_8017FE38 mat; /* sp+0x00 */ struct { s32 flag, flag2, otz; } g; /* sp+0x20 */ @@ -4376,7 +4375,6 @@ extern s32 D_801AAD60; extern s32 func_80180754(void *a0, void *a1, void *a2, void *a3); s32 func_80180570(void *arg0) { - typedef struct { s16 vx, vy, vz, pad; } SVec_80180570; SVec_80180570 p0; SVec_80180570 p1; diff --git a/src/ov_SC07_002/ov_SC07_002_after.c b/src/ov_SC07_002/ov_SC07_002_after.c index d2f66df67c..2c445bee4c 100644 --- a/src/ov_SC07_002/ov_SC07_002_after.c +++ b/src/ov_SC07_002/ov_SC07_002_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC07_002/ov_SC07_002_jr_8012ACE0.c b/src/ov_SC07_002/ov_SC07_002_jr_8012ACE0.c index 7c57f8330c..e4f56d3eb8 100644 --- a/src/ov_SC07_002/ov_SC07_002_jr_8012ACE0.c +++ b/src/ov_SC07_002/ov_SC07_002_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC07_002_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC07_002_80131340 D_80186CA0; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80186D8C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80186D78[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC07_002_80133CD4; *(Blk8_SC07_002_80133CD4 *)&D_801152B0 = *(Blk8_SC07_002_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC07_002/ov_SC07_002_jr_80135A4C.c b/src/ov_SC07_002/ov_SC07_002_jr_80135A4C.c index 95be8db4d5..8967992fce 100644 --- a/src/ov_SC07_002/ov_SC07_002_jr_80135A4C.c +++ b/src/ov_SC07_002/ov_SC07_002_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC07_002_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC07_002/ov_SC07_002_jr_8017C8D0.c b/src/ov_SC07_002/ov_SC07_002_jr_8017C8D0.c index 6c45cc7d18..95223057cc 100644 --- a/src/ov_SC07_002/ov_SC07_002_jr_8017C8D0.c +++ b/src/ov_SC07_002/ov_SC07_002_jr_8017C8D0.c @@ -4418,7 +4418,6 @@ void func_8017FB84(s32 a0) { void func_8017FBD0(s32 s0) { - typedef struct { s16 vx, vy, vz, pad; } SVfbd0; extern SVfbd0 D_80126940; extern s32 func_8012E544(s32 a0); extern void func_80015978(s32 a0, s32 *a1); @@ -4447,7 +4446,6 @@ void func_8017FBD0(s32 s0) { void func_8017FCA8(s32 a0) { - typedef struct { s16 m0, m1, m2, m3; } PosFCA8; extern s16 D_80126940[4]; extern s32 func_8012E544(s32 a0); extern void func_80015978(s32 a0, s32 *a1); @@ -4509,7 +4507,6 @@ void func_8017FE78(s32 a0) { void func_8017FEC4(s32 s0) { - typedef struct { s16 vx, vy, vz, pad; } SVfec4; extern SVfec4 D_80126940; extern s32 func_8012E544(s32 a0); extern void func_80015978(s32 a0, s32 *a1); @@ -4532,7 +4529,6 @@ void func_8017FEC4(s32 s0) { void func_8017FF84(s32 s1) { - typedef struct { s16 vx, vy, vz, pad; } SVff84; extern s16 D_80126940[4]; extern s32 func_8012E544(s32 a0); extern void func_80015978(s32 a0, s32 *a1); @@ -4571,7 +4567,6 @@ void func_80180044(s32 a0) { void func_80180090(s32 a0) { - typedef struct { s16 vx, vy, vz, pad; } SV180090; extern SV180090 D_80126940; extern s32 func_8012E544(s32 a0); extern void func_80015978(s32 a0, s32 *a1); @@ -4612,7 +4607,6 @@ void func_80180090(s32 a0) void func_80180248(s32 s0) { - typedef struct { s16 vx, vy, vz, pad; } SVfbd0; extern s16 D_80126940[4]; extern s32 func_8012E544(s32 a0); extern void func_80015978(s32 a0, s32 *a1); @@ -4856,7 +4850,6 @@ extern s32 func_80180A2C(); // K&R: 0 of 1 args (P37 rung D t4_D1) s32 func_80180A2C(s32 s1) { - typedef struct { s16 vx, vy, vz, pad; } SVfbd0; extern s16 D_80126940[4]; extern s32 func_8012E544(s32 a0); extern void func_80015978(s32 a0, s32 *a1); @@ -4885,7 +4878,6 @@ void func_80180AEC(void) { void func_80180B0C(s32 s1) { - typedef struct { s16 vx, vy, vz, pad; } SVfbd0; extern s16 D_80126940[4]; extern s32 func_8012E544(s32 a0); extern void func_80015978(s32 a0, s32 *a1); @@ -4938,7 +4930,6 @@ void func_80180BCC(void) { * ov_SC07_002_jr_8017C8D0.c is cc1 rc=0 with 0 masked diffs for this function. */ void func_80180BEC(void) { - typedef struct { s16 vx, vy, vz, pad; } SVfbd0; extern s16 D_80126940[4]; extern s32 func_8012E544(s32 a0); extern void func_80015978(s32 a0, s32 *a1); @@ -4971,7 +4962,6 @@ void func_80180CAC(void) { #include "common.h" void func_80180CCC(s32 s1) { - typedef struct { s16 vx, vy, vz, pad; } SVfbd0; extern s16 D_80126940[4]; extern s32 func_8012E544(s32 a0); extern void func_80015978(s32 a0, s32 *a1); @@ -5958,7 +5948,6 @@ void func_801829F0(s32* a0) extern void func_800491AC(void *a0); extern void RotTransSV(void *a0, void *a1, void *a2); - typedef struct { u16 a, b, c; } SV3_SC07_002_801829F0; u8 buf[32]; SV3_SC07_002_801829F0 sv; @@ -6849,7 +6838,7 @@ void func_80183FE0(s32 p) extern u8 D_800A6610[]; extern u8 D_800AF648; - typedef struct { s16 m[3][3]; s16 pad; s32 t[3]; } MTX_8017FE38_80183FE0; /* 0x20 */ + /* 0x20 */ MTX_8017FE38_80183FE0 mat; /* sp+0x00 */ struct { s32 flag, flag2, otz; } g; /* sp+0x20 */ @@ -8717,7 +8706,7 @@ extern void func_80151664(void); void func_8018637C(s32 param_1) { D_80127518 = 0; - *(u16 *)(((struct { s32 a, b, c, d, e, f, g, h, f20; } *)param_1)->f20 + 0x10) = 0; + *(u16 *)(((Unkstruct_8018637C *)param_1)->f20 + 0x10) = 0; *(u8 *)(param_1 + 0xA8) = 0x20; func_80151664(); } diff --git a/src/ov_SC07_006/ov_SC07_006_jr_80131340.c b/src/ov_SC07_006/ov_SC07_006_jr_80131340.c index 6e20a85f76..5df80e0458 100644 --- a/src/ov_SC07_006/ov_SC07_006_jr_80131340.c +++ b/src/ov_SC07_006/ov_SC07_006_jr_80131340.c @@ -574,9 +574,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC07_006_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC07_006_80131340 D_8018A8C4; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -1591,7 +1588,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8018A9B0; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -1650,7 +1647,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8018A99C[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC07_006_80133CD4; *(Blk8_SC07_006_80133CD4 *)&D_801152B0 = *(Blk8_SC07_006_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC07_006/ov_SC07_006_jr_80135A4C.c b/src/ov_SC07_006/ov_SC07_006_jr_80135A4C.c index dde4104fb4..bf1dc370d0 100644 --- a/src/ov_SC07_006/ov_SC07_006_jr_80135A4C.c +++ b/src/ov_SC07_006/ov_SC07_006_jr_80135A4C.c @@ -538,7 +538,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC07_006_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC07_006/ov_SC07_006_jr_801457A4.c b/src/ov_SC07_006/ov_SC07_006_jr_801457A4.c index 5b397bd26d..35ec79836e 100644 --- a/src/ov_SC07_006/ov_SC07_006_jr_801457A4.c +++ b/src/ov_SC07_006/ov_SC07_006_jr_801457A4.c @@ -3148,13 +3148,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2x) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC07_007/ov_SC07_007_jr_80131340.c b/src/ov_SC07_007/ov_SC07_007_jr_80131340.c index 3d8ca78744..0e527a9d4f 100644 --- a/src/ov_SC07_007/ov_SC07_007_jr_80131340.c +++ b/src/ov_SC07_007/ov_SC07_007_jr_80131340.c @@ -574,9 +574,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC07_007_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC07_007_80131340 D_801833E8; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -1588,7 +1585,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_801834D4; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -1647,7 +1644,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_801834C0[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC07_007_80133CD4; *(Blk8_SC07_007_80133CD4 *)&D_801152B0 = *(Blk8_SC07_007_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC07_007/ov_SC07_007_jr_80135A4C.c b/src/ov_SC07_007/ov_SC07_007_jr_80135A4C.c index 230bb61228..d808c83b8e 100644 --- a/src/ov_SC07_007/ov_SC07_007_jr_80135A4C.c +++ b/src/ov_SC07_007/ov_SC07_007_jr_80135A4C.c @@ -538,7 +538,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC07_007_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC07_007/ov_SC07_007_jr_801457A4.c b/src/ov_SC07_007/ov_SC07_007_jr_801457A4.c index 5f74f34fbc..e21619a753 100644 --- a/src/ov_SC07_007/ov_SC07_007_jr_801457A4.c +++ b/src/ov_SC07_007/ov_SC07_007_jr_801457A4.c @@ -2949,13 +2949,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2x) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC07_007/ov_SC07_007_jr_8017BEBC.c b/src/ov_SC07_007/ov_SC07_007_jr_8017BEBC.c index 5bf4728318..6143ecf79a 100644 --- a/src/ov_SC07_007/ov_SC07_007_jr_8017BEBC.c +++ b/src/ov_SC07_007/ov_SC07_007_jr_8017BEBC.c @@ -3463,7 +3463,6 @@ extern void func_8012A094(s32 a0); extern void func_8017D648(void *a0); void func_8017D288(void) { - typedef struct { s8 c[8]; } Blk8_SC07_007_8017D288; extern u8 D_80126948[]; extern s32 D_80126954; extern s32 D_8012695C; @@ -3499,7 +3498,6 @@ extern void func_8012A094(s32 a0); extern void func_8017D648(void *a0); void func_8017D350(void) { - typedef struct { s16 x0, x1, x2, x3; } BlkT; extern u8 D_80126948[]; extern s32 D_80126954; extern s32 D_8012695C; @@ -3535,7 +3533,6 @@ extern void func_8012A094(s32 a0); extern void func_8017D648(void *a0); void func_8017D41C(void) { - typedef struct { s16 x0, x1, x2, x3; } BlkT; extern u8 D_80126948[]; extern s32 D_80126954; extern s32 D_8012695C; @@ -3648,7 +3645,6 @@ extern u8 D_801274E8[]; extern void (*D_80186A00[])(void); void func_8017D684(s32 a0) { - typedef struct { s8 c[8]; } Blk8_SC07_007_8017D684; u8 *base = D_801274E8; Blk8_SC07_007_8017D684 buffer; @@ -3819,7 +3815,6 @@ void func_8017DAA8(void *a0) { void func_8017DAE8(void *a0, void *a1) { - typedef struct { s16 a, b, c, d; } SV4; extern s32 func_8012E544(s32); extern void func_80015978(s32, s32 *); extern s16 func_800130D0(s16, s16, s16); @@ -7532,7 +7527,6 @@ extern u32 D_800A6618[]; #define F184_IDX (aB9A02[0] * 0x18 + n * 0x30) void func_80182184(s32 arg0, s32 arg1) { - typedef struct { u32 addr : 24; u32 len : 8; } PTag; s32 n = arg1 & 0xFF; u8 *p = D_801C78D4; u8 *p4 = p + 4; diff --git a/src/ov_SC07_008/ov_SC07_008_after.c b/src/ov_SC07_008/ov_SC07_008_after.c index 7122562078..79e6462b90 100644 --- a/src/ov_SC07_008/ov_SC07_008_after.c +++ b/src/ov_SC07_008/ov_SC07_008_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC07_008/ov_SC07_008_jr_8012ACE0.c b/src/ov_SC07_008/ov_SC07_008_jr_8012ACE0.c index 8025556183..9347daf4d8 100644 --- a/src/ov_SC07_008/ov_SC07_008_jr_8012ACE0.c +++ b/src/ov_SC07_008/ov_SC07_008_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC07_008_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC07_008_80131340 D_8017D7B8; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017D8A4; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017D890[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC07_008_80133CD4; *(Blk8_SC07_008_80133CD4 *)&D_801152B0 = *(Blk8_SC07_008_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC07_008/ov_SC07_008_jr_80135A4C.c b/src/ov_SC07_008/ov_SC07_008_jr_80135A4C.c index 7f0799202f..b16c73a30e 100644 --- a/src/ov_SC07_008/ov_SC07_008_jr_80135A4C.c +++ b/src/ov_SC07_008/ov_SC07_008_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC07_008_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC07_009/ov_SC07_009_after.c b/src/ov_SC07_009/ov_SC07_009_after.c index 6b0b4745c7..f6a15bd385 100644 --- a/src/ov_SC07_009/ov_SC07_009_after.c +++ b/src/ov_SC07_009/ov_SC07_009_after.c @@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC07_009/ov_SC07_009_jr_8012ACE0.c b/src/ov_SC07_009/ov_SC07_009_jr_8012ACE0.c index 46243a3ca7..802783f61b 100644 --- a/src/ov_SC07_009/ov_SC07_009_jr_8012ACE0.c +++ b/src/ov_SC07_009/ov_SC07_009_jr_8012ACE0.c @@ -1428,9 +1428,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC07_009_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC07_009_80131340 D_8017E25C; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -2402,7 +2399,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017E348; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -2461,7 +2458,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017E334[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC07_009_80133CD4; *(Blk8_SC07_009_80133CD4 *)&D_801152B0 = *(Blk8_SC07_009_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC07_009/ov_SC07_009_jr_80135A4C.c b/src/ov_SC07_009/ov_SC07_009_jr_80135A4C.c index 9ea9a4d481..05573c9ae1 100644 --- a/src/ov_SC07_009/ov_SC07_009_jr_80135A4C.c +++ b/src/ov_SC07_009/ov_SC07_009_jr_80135A4C.c @@ -616,7 +616,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC07_009_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC07_010/ov_SC07_010_jr_80131340.c b/src/ov_SC07_010/ov_SC07_010_jr_80131340.c index 5e9bcb4c30..dae9ba4a92 100644 --- a/src/ov_SC07_010/ov_SC07_010_jr_80131340.c +++ b/src/ov_SC07_010/ov_SC07_010_jr_80131340.c @@ -579,9 +579,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC07_010_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC07_010_80131340 D_80182478; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -1593,7 +1590,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_80182564; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -1652,7 +1649,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_80182550[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC07_010_80133CD4; *(Blk8_SC07_010_80133CD4 *)&D_801152B0 = *(Blk8_SC07_010_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC07_010/ov_SC07_010_jr_80135A4C.c b/src/ov_SC07_010/ov_SC07_010_jr_80135A4C.c index 18d5a38c6b..98c8eeb5c1 100644 --- a/src/ov_SC07_010/ov_SC07_010_jr_80135A4C.c +++ b/src/ov_SC07_010/ov_SC07_010_jr_80135A4C.c @@ -543,7 +543,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC07_010_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC07_010/ov_SC07_010_jr_801457A4.c b/src/ov_SC07_010/ov_SC07_010_jr_801457A4.c index f17c1cb28b..3875d43d80 100644 --- a/src/ov_SC07_010/ov_SC07_010_jr_801457A4.c +++ b/src/ov_SC07_010/ov_SC07_010_jr_801457A4.c @@ -2298,13 +2298,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/ov_SC07_010/ov_SC07_010_jr_8017AE2C.c b/src/ov_SC07_010/ov_SC07_010_jr_8017AE2C.c index 84dab09463..0a41e2ab0b 100644 --- a/src/ov_SC07_010/ov_SC07_010_jr_8017AE2C.c +++ b/src/ov_SC07_010/ov_SC07_010_jr_8017AE2C.c @@ -4609,9 +4609,6 @@ void func_8017E520(s32 a0) { void func_8017E5B8(s32 a0, s32 a1) { - struct P8 { s16 unk0; u8 pad[6]; }; - struct P4 { u16 unk0; u16 pad; }; - struct EntA { u8 pad[0xDC]; s32 unkDC; u8 pad2[0x1C]; u16 unkFC; }; extern struct P8 D_80185D28[]; extern struct P8 D_80185D2A[]; extern struct P8 D_80185D2C[]; @@ -5587,7 +5584,6 @@ void func_8017FD54(void *param_1) { extern u8 D_80185E90[]; extern u8 D_80185EA0[]; extern u8 D_80185EB0[]; - typedef struct { u16 w[4]; } Blk8017FD54; u16 idx; *(u16 *)((s32)param_1 + 0x0) = 0; diff --git a/src/ov_SC07_011/ov_SC07_011_jr_80131340.c b/src/ov_SC07_011/ov_SC07_011_jr_80131340.c index af932309af..b6b56e328b 100644 --- a/src/ov_SC07_011/ov_SC07_011_jr_80131340.c +++ b/src/ov_SC07_011/ov_SC07_011_jr_80131340.c @@ -574,9 +574,6 @@ void func_80131340(s32 a0) /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */ - struct V8_SC07_011_80131340 { - u16 vx, vy, vz, pad; - }; extern struct V8_SC07_011_80131340 D_8017EB38; /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4 @@ -1588,7 +1585,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017EC24; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } @@ -1647,7 +1644,6 @@ s32 func_80133CD4(arg0, cmd, base, arr) if (y >= -0xBCB) { D_8017EC10[3] = y; { - typedef struct { s8 c[8]; } Blk8_SC07_011_80133CD4; *(Blk8_SC07_011_80133CD4 *)&D_801152B0 = *(Blk8_SC07_011_80133CD4 *)s3; } if (*(u8 *)cmd != 0) diff --git a/src/ov_SC07_011/ov_SC07_011_jr_80135A4C.c b/src/ov_SC07_011/ov_SC07_011_jr_80135A4C.c index c96f3dd491..98e24a46ff 100644 --- a/src/ov_SC07_011/ov_SC07_011_jr_80135A4C.c +++ b/src/ov_SC07_011/ov_SC07_011_jr_80135A4C.c @@ -538,7 +538,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4) s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) { - typedef struct { s8 c[8]; } Blk8_SC07_011_80135A4C; extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4); extern s32 func_80135EB0(void *arg0, s32 arg1_); extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3); diff --git a/src/ov_SC07_011/ov_SC07_011_jr_801457A4.c b/src/ov_SC07_011/ov_SC07_011_jr_801457A4.c index c4a2dff629..9a3f24cdb6 100644 --- a/src/ov_SC07_011/ov_SC07_011_jr_801457A4.c +++ b/src/ov_SC07_011/ov_SC07_011_jr_801457A4.c @@ -2950,13 +2950,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2x) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/shared/engine_types.h b/src/shared/engine_types.h index 1ce56659bb..e42e5a4b36 100644 --- a/src/shared/engine_types.h +++ b/src/shared/engine_types.h @@ -7465,6 +7465,1254 @@ typedef struct { u16 v; } Unkstruct_8018F02C; typedef struct { u32 v; } Unkstruct_8018F02C_2; typedef struct { u16 a, b, c, d; } V8_SC07_002_8017C8D0; +/* --- lift_types.py --census (P38 T5.1.c2, batch ov-block) --- */ +typedef struct { + u8 _[0xDC]; + s16 fDC; + u8 _2[4]; + s16 fE2; +} Args_801837B0; +struct B16_80183ED8 { s32 w[4]; }; +typedef struct { s32 w[8]; } B20; +typedef struct { u8 b[4]; } B4_8017F154; +typedef struct { u8 b[4]; } B4_80188094; +typedef struct { u8 b0, b1, b2, b3; } B4_SC03_014_8018A860; +struct B8_17F474 { u8 b[8]; }; +typedef struct { s32 words[41]; } Blk164; +typedef struct { s32 w[41]; } Blk164_SC02_005_8017E798; +typedef struct { s32 w[4]; } Blk16_E898; +typedef struct { s32 w[4]; } Blk16_SC01_084_8017DAF8; +typedef struct { s32 w[4]; } Blk16_SC02_000_80182CB4; +typedef struct { s32 w[8]; } Blk32_80181708; +typedef struct { s32 w[8]; } Blk32_8018AA98_80183D30_80180450; +typedef struct { s32 w[8]; } Blk32_8018AA98_80183D30_801809B0; +typedef struct { s32 w[8]; } Blk32_8018AA98_80183D30_80183DEC; +typedef struct { u8 c[4]; } Blk4_80187B40; +typedef struct { u8 d[4]; } Blk4_8018B1B4; +typedef struct { u16 w[4]; } Blk8017FD54; +typedef struct { + s16 a, b, c, d, e, f, g, h; + s32 w; +} Blk801819B0; +typedef struct { + s16 a, b, c, d, e, f, g, h; + s32 w; +} Blk80181A1C; +typedef struct { + s16 a, b, c, d, e, f, g, h; + s32 w; +} Blk80182030; +typedef struct { + s16 a, b, c, d, e, f, g, h; + s32 w; +} Blk801821E8; +typedef struct { + s16 a, b, c, d, e, f, g, h; + s32 w; +} Blk80182634; +typedef struct { u8 b[8]; } Blk8L; +typedef struct { s16 v[4]; } Blk8L_SC06_027_8017D104; +typedef struct { s16 x0, x1, x2, x3; } Blk8S16; +typedef struct { + s16 v[4]; +} Blk8_80126940_8017D388; +typedef struct { s16 v[4]; } Blk8_80126940_8017D508; +typedef struct { s16 v[4]; } Blk8_80126940_8017D6D0_801826C8; +typedef struct { s16 v[4]; } Blk8_80126940_80181440; +typedef struct { s8 c[8]; } Blk8_80133CD4; +typedef struct { char c[8]; } Blk8_8017DC54; +typedef struct { u8 b[8]; } Blk8_80180450; +typedef struct { u8 b[8]; } Blk8_801809B0; +typedef struct { s16 v[4]; } Blk8_80180A38; +typedef struct { u8 b[8]; } Blk8_80181940; +typedef struct { u8 b[8]; } Blk8_80183DEC; +typedef struct { + u8 c[8]; +} Blk8_80186594; +typedef struct { + u8 c[8]; +} Blk8_801867AC; +typedef struct { + u8 c[8]; +} Blk8_80186F78; +typedef struct { + u8 c[8]; +} Blk8_801870AC; +typedef struct { + u8 c[8]; +} Blk8_80187190; +typedef struct { u8 d[8]; } Blk8_8018B1B4; +typedef struct { u8 b[8]; } Blk8_FE08; +typedef struct { s8 c[8]; } Blk8_MAIN_012_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC01_000_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC01_000_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC01_001_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC01_001_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC01_004_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC01_004_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC01_005_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC01_005_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC01_008_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC01_008_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC01_009_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC01_009_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC01_074_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC01_074_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC01_077_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC01_077_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC01_077_801842C8; +typedef struct { s8 c[8]; } Blk8_SC01_080_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC01_080_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC01_084_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC01_084_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC02_000_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC02_000_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC02_004_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC02_004_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC02_005_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC02_005_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC02_011_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC02_011_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC02_015_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC02_015_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC02_016_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC02_016_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC02_017_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC02_017_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC02_021_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC02_021_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC02_026_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC02_026_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC02_027_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC02_027_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC02_028_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC02_028_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC02_031_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC02_031_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC02_035_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC02_035_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC02_037_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC02_039_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC02_039_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC02_041_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC02_041_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_001_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_001_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_001_80186B54; +typedef struct { s8 c[8]; } Blk8_SC03_002_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_002_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_003_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_003_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_006_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_006_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_007_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_007_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_010_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_010_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_011_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_011_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_012_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_012_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_013_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_013_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_014_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_014_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_023_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_023_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_024_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_024_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_028_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_028_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_029_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_029_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_030_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_030_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_031_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_031_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_089_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_089_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_090_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_090_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_091_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_091_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_092_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_092_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_093_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_093_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_094_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_094_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_095_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_095_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_096_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_096_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_097_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_097_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_098_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_098_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_099_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_099_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_100_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_100_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_101_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_101_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_102_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_102_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_103_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_103_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_104_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_104_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_105_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_105_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_107_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_108_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_108_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_109_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_109_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_110_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_110_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_111_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_111_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_112_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_112_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_113_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_113_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_114_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_114_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_115_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_115_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_116_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_116_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_117_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_117_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_118_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_118_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_121_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_121_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_124_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_124_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC03_125_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC03_125_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC04_000_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC04_000_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC04_002_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC04_002_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC04_003_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC04_003_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC04_004_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC04_004_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC04_005_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC04_005_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC04_006_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC04_006_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC04_007_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC04_007_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC04_008_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC04_008_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC04_009_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC04_009_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC04_010_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC04_010_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC04_011_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC04_011_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC04_012_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC04_012_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC04_015_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC04_015_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC04_016_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC04_016_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC04_018_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC04_018_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC04_020_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC04_020_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC05_000_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC05_000_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC05_001_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC05_001_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC05_002_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC05_002_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC05_003_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC05_003_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC05_004_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC05_004_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC05_005_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC05_005_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC05_006_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC05_006_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC05_007_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC05_007_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC05_008_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC05_008_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC05_009_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC05_009_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC05_010_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC05_010_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC05_011_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC05_011_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC05_017_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC05_017_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC05_018_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC05_018_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC05_018_8017FC74; +typedef struct { s8 c[8]; } Blk8_SC06_000_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC06_000_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC06_006_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC06_006_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC06_008_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC06_008_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC06_010_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC06_010_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC06_011_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC06_011_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC06_013_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC06_013_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC06_014_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC06_014_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC06_015_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC06_015_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC06_016_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC06_016_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC06_018_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC06_018_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC06_020_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC06_020_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC06_022_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC06_022_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC06_024_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC06_024_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC06_025_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC06_025_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC06_027_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC06_027_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC06_029_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC06_029_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC06_030_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC06_030_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC06_032_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC06_032_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC06_033_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC06_033_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC07_000_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC07_000_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC07_001_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC07_001_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC07_002_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC07_002_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC07_006_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC07_006_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC07_007_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC07_007_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC07_007_8017D288; +typedef struct { s8 c[8]; } Blk8_SC07_007_8017D684; +typedef struct { s8 c[8]; } Blk8_SC07_008_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC07_008_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC07_009_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC07_009_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC07_010_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC07_010_80135A4C; +typedef struct { s8 c[8]; } Blk8_SC07_011_80133CD4; +typedef struct { s8 c[8]; } Blk8_SC07_011_80135A4C; +typedef struct { s16 x0, x1, x2, x3; } BlkT; +typedef struct { char b[8]; } Blob8_80189B30; +typedef struct { unsigned char b[4]; } __attribute__((packed, aligned(1))) Block4_SC02_011_80186740; +typedef struct { s32 w0; s32 w1; } Cmd_801805C8; +struct Cnt { + s32 c; +}; +struct Cnt_80187DE4 { + s32 c; +}; +struct EntA { u8 pad[0xDC]; s32 unkDC; u8 pad2[0x1C]; u16 unkFC; }; +typedef struct { + u8 pad00[4]; + u32 flags; /* 0x04 */ + u8 pad08[0x10]; + u16 f18, f1A; /* 0x18 */ + u8 pad1C[2]; + u16 f1E; /* 0x1E */ + u8 pad20[0xC]; + s16 f2C; /* 0x2C */ +} Ent_80180AE8; +typedef struct { u16 x, y, z, pad; s32 w1, w2; } Ent_801DFBF8; +typedef struct { u16 x; s16 y; s16 z; u16 pad; s32 w1, w2; } Ent_801DFBF8_SC06_029_80182334; +typedef struct EntD820 +{ + u16 f0; + u16 f2; + u16 f4; + u16 x; + u16 f8; + u16 y; + u16 fC; + u16 z; + u8 p10[0x10]; + s32 f20; + u8 p24[0x34]; + s32 f58; + u16 f5C; + u16 f5E; + u8 p60[0x10C - 0x60]; +} Ent_SC03_102_8014D820; +typedef struct { u32 *ot; u32 pad[4]; } Env_8017DD28; +typedef struct { u32 *ot; u32 pad[4]; } Env_8017E804_80188F14; +typedef struct { u32 *ot; u32 pad[4]; } Env_8018C960; +typedef struct { u32 *ot; u32 pad[4]; } Env_8018C960_801895C8; +typedef struct { u32 *ot; u32 pad[4]; } Env_8018C960_80189BA0; +typedef struct { u32 *ot; u32 pad[4]; } Env_8018C960_80189EA0; +typedef struct { + u32 tag; + u32 rgbc; + s16 x0, y0; u32 uv0; + s16 x1, y1; u32 uv1; + s16 x2, y2; u32 uv2; + s16 x3, y3; u32 uv3; +} FT4; +typedef struct { + s32 tag; /* 0x00 */ + s32 rgb0; /* 0x04 */ + s32 xy0; /* 0x08 */ + s32 rgb1; /* 0x0C */ + s32 xy1; /* 0x10 */ + s32 rgb2; /* 0x14 */ + s32 xy2; /* 0x18 */ +} G3; +typedef struct { + s32 tag; /* 0x00 */ + s32 rgb0; /* 0x04 code byte lives at +3 of this word */ + s32 xy0; /* 0x08 */ + s32 rgb1; /* 0x0C */ + s32 xy1; /* 0x10 */ + s32 rgb2; /* 0x14 */ + s32 xy2; /* 0x18 */ + s32 rgb3; /* 0x1C */ + s32 xy3; /* 0x20 */ +} G4; +typedef struct { + u16 f0; + u16 f1; + u16 f2; + u16 f3; + u16 f4; + u16 f5; + u16 f6; + u16 f7; + s32 f8; +} Local_801870E8; +typedef struct { Blk8L_SC06_027_8017D104 pad; Blk8L_SC06_027_8017D104 a; Blk8L_SC06_027_8017D104 b; } Locs; +typedef struct { s16 m[3][3]; s32 t[3]; } M32_8017F154; +typedef struct { s16 m[3][3]; s32 t[3]; } M32_80188094; +typedef struct { u8 b[8]; } M8_SC02_005_8017F7CC; +typedef struct { s16 m[3][3]; s16 pad; s32 t[3]; } MTX_8017FE38; +typedef struct { s16 m[3][3]; s16 pad; s32 t[3]; } MTX_8017FE38_80183FE0; +typedef struct { short m[3][3]; long t[3]; } MTX_80183940; +typedef struct { short m[3][3]; long t[3]; } MTX_85810; +typedef struct { s32 m[8]; } Mtx8_8017DE10_8017E710_SC03_006_8018450C; +typedef struct { s32 w[8]; } Mtx_8018A0E0; +typedef struct { u8 pad[0x3C]; s32 x3C; s32 x40; s32 x44; s32 x48; s32 x4C; s32 x50; } OB; +typedef struct { + u8 pad_0[0x8]; + s16 unk8; /* 0x08 */ + s16 unkA; /* 0x0A */ + u8 pad_C[0x10]; + s32 unk1C; /* 0x1C */ + u8 pad_20[0x14]; + u16 unk34; /* 0x34 */ + u8 pad_36[0xA6]; + s16 unkDC; /* 0xDC */ +} Obj801805BC; +typedef struct { + u8 pad0[0x2]; + s16 unk2; /* 0x02 */ + u8 pad4[0x18]; + s32 unk1C; /* 0x1C */ + u8 pad20[0x14]; + s16 unk34; /* 0x34 */ + u8 pad36[0xA6]; + s16 unkDC; /* 0xDC */ + s16 unkDE; /* 0xDE */ +} Obj80180950; +typedef struct { + u8 pad_0[0x1C]; + s32 unk1C; /* 0x1C */ + u8 pad_20[0x14]; + u16 unk34; /* 0x34 */ +} Obj8018098C; +typedef struct { + s16 unk0; /* 0x00 */ + u8 pad[0x102]; /* -> 0x104 */ +} Obj80180D84; +typedef struct { s32 a; s32 b[4]; } OtBlk_80182890_8018FB5C; +struct P4 { u16 unk0; u16 pad; }; +struct P8 { s16 unk0; u8 pad[6]; }; +typedef struct { + u32 tag; /* 0x00 */ + u32 c0; /* 0x04 */ + u16 x0, y0; /* 0x08, 0x0A */ + u32 c1; /* 0x0C */ + u16 x1, y1; /* 0x10, 0x12 */ + u32 c2; /* 0x14 */ + u16 x2, y2; /* 0x18, 0x1A */ + u32 c3; /* 0x1C */ + u16 x3, y3; /* 0x20, 0x22 */ +} PG4_80189340; +typedef struct { + u32 tag; /* 0x00 */ + u8 r0, g0, b0, code; /* 0x04..0x07 */ + s16 x0, y0; /* 0x08, 0x0A */ + u8 r1, g1, b1, p1; /* 0x0C..0x0F */ + s16 x1, y1; /* 0x10, 0x12 */ + u8 r2, g2, b2, p2; /* 0x14..0x17 */ + s16 x2, y2; /* 0x18, 0x1A */ + u8 r3, g3, b3, p3; /* 0x1C..0x1F */ + s16 x3, y3; /* 0x20, 0x22 */ +} PG4_8018C960; +typedef struct { + u32 tag; /* 0x00 */ + u8 r0, g0, b0, code; /* 0x04..0x07 */ + s16 x0, y0; /* 0x08, 0x0A */ + u8 r1, g1, b1, p1; /* 0x0C..0x0F */ + s16 x1, y1; /* 0x10, 0x12 */ + u8 r2, g2, b2, p2; /* 0x14..0x17 */ + s16 x2, y2; /* 0x18, 0x1A */ + u8 r3, g3, b3, p3; /* 0x1C..0x1F */ + s16 x3, y3; /* 0x20, 0x22 */ +} PG4_8018C960_801895C8; +typedef struct { + u32 tag; /* 0x00 */ + u8 r0, g0, b0, code; /* 0x04..0x07 */ + s16 x0, y0; /* 0x08, 0x0A */ + u8 r1, g1, b1, p1; /* 0x0C..0x0F */ + s16 x1, y1; /* 0x10, 0x12 */ + u8 r2, g2, b2, p2; /* 0x14..0x17 */ + s16 x2, y2; /* 0x18, 0x1A */ + u8 r3, g3, b3, p3; /* 0x1C..0x1F */ + s16 x3, y3; /* 0x20, 0x22 */ +} PG4_8018C960_80189BA0; +typedef struct { + u32 tag; /* 0x00 */ + u8 r0, g0, b0, code; /* 0x04..0x07 */ + s16 x0, y0; /* 0x08, 0x0A */ + u8 r1, g1, b1, p1; /* 0x0C..0x0F */ + s16 x1, y1; /* 0x10, 0x12 */ + u8 r2, g2, b2, p2; /* 0x14..0x17 */ + s16 x2, y2; /* 0x18, 0x1A */ + u8 r3, g3, b3, p3; /* 0x1C..0x1F */ + s16 x3, y3; /* 0x20, 0x22 */ +} PG4_8018C960_80189EA0; +typedef struct { u8 pad0[3]; u8 len; u8 pad1[3]; u8 code; } PHdr_80189340; +typedef struct { u32 addr : 24; u32 len : 8; } PTag_8017DD28; +typedef struct { u32 addr : 24; u32 len : 8; } PTag_8018C960; +typedef struct { u32 addr : 24; u32 len : 8; } PTag_8018C960_801895C8; +typedef struct { u32 addr : 24; u32 len : 8; } PTag_8018C960_80189BA0; +typedef struct { u32 addr : 24; u32 len : 8; } PTag_8018C960_80189EA0; +typedef struct { u32 addr : 24; u32 len : 8; } PTag_85810; +typedef struct { u32 addr:24; u32 len:8; } P_TAG_SC01_000_8017DD04; +typedef struct { u32 f0; u32 f4; } Pair8; +typedef struct { s16 m0, m1, m2, m3; } PosFCA8; +typedef struct { u16 f0; u16 f2; } Prim4_8017DD28; +typedef struct { + s16 f0; /* 0x00 */ + s16 f2; /* 0x02 */ + void *f4; /* 0x04 */ + void *f8; /* 0x08 */ + s16 fC; /* 0x0C */ + s16 fE; /* 0x0E */ + s16 f10; /* 0x10 */ + s16 f12; /* 0x12 */ + void *f14; /* 0x14 */ + Prim4_8017DD28 *f18; /* 0x18 */ + void *f1C; /* 0x1C */ +} Panel_8017DD28; +typedef struct { u32 w0, w1, w2; } Prim_SC01_004_8017BE9C; +typedef struct { u32 w0, w1, w2; } Prim_SC01_005_8017C340; +typedef struct { u32 w0, w1, w2; } Prim_SC01_008_8017BE9C; +typedef struct { u32 w0, w1, w2; } Prim_SC01_009_8017BE9C; +typedef struct { u32 w0, w1, w2; } Prim_SC01_074_8017BE9C; +typedef struct { u32 w0, w1, w2; } Prim_SC02_011_80180FE4; +typedef struct { u32 w0, w1, w2; } Prim_SC02_016_8017DC70; +typedef struct { u32 w0, w1, w2; } Prim_SC02_017_8017DF34; +typedef struct { u32 w0, w1, w2; } Prim_SC02_031_8017F5B4; +typedef struct { u32 w0, w1, w2; } Prim_SC02_037_8017D898; +typedef struct { u32 w0, w1, w2; } Prim_SC03_002_8017D604; +typedef struct { u32 w0, w1, w2; } Prim_SC03_003_8017D5C0; +typedef struct { u32 w0, w1, w2; } Prim_SC03_006_8017F510; +typedef struct { u32 w0, w1, w2; } Prim_SC03_011_8017C730; +typedef struct { u32 w0, w1, w2; } Prim_SC03_014_8017DF84; +typedef struct { u32 w0, w1, w2; } Prim_SC03_014_8017EB7C; +typedef struct { u32 w0, w1, w2; } Prim_SC03_014_8017FA5C; +typedef struct { u32 w0, w1, w2; } Prim_SC03_024_8017DF84; +typedef struct { u32 w0, w1, w2; } Prim_SC03_029_8017DC70; +typedef struct { u32 w0, w1, w2; } Prim_SC03_031_8017DB5C; +typedef struct { u32 w0, w1, w2; } Prim_SC03_089_8017D960; +typedef struct { u32 w0, w1, w2; } Prim_SC03_090_8017D960; +typedef struct { u32 w0, w1, w2; } Prim_SC03_091_8017E778; +typedef struct { u32 w0, w1, w2; } Prim_SC03_092_8017CE58; +typedef struct { u32 w0, w1, w2; } Prim_SC03_102_8017BEBC; +typedef struct { u32 w0, w1, w2; } Prim_SC03_102_8017CD9C; +typedef struct { u32 w0, w1, w2; } Prim_SC03_103_8017D174; +typedef struct { u32 w0, w1, w2; } Prim_SC03_104_8017D960; +typedef struct { u32 w0, w1, w2; } Prim_SC03_111_8017EC58; +typedef struct { u32 w0, w1, w2; } Prim_SC03_115_8017BEBC; +typedef struct { u32 w0, w1, w2; } Prim_SC03_116_8017BF14; +typedef struct { u32 w0, w1, w2; } Prim_SC03_117_8017BEBC; +typedef struct { u32 w0, w1, w2; } Prim_SC03_118_8017FB84; +typedef struct { u32 w0, w1, w2; } Prim_SC03_125_8017D604; +typedef struct { u32 w0, w1, w2; } Prim_SC04_000_8017BEBC; +typedef struct { u32 w0, w1, w2; } Prim_SC04_002_8017BEBC; +typedef struct { u32 w0, w1, w2; } Prim_SC04_004_8017BEBC; +typedef struct { u32 w0, w1, w2; } Prim_SC04_005_8017BEBC; +typedef struct { u32 w0, w1, w2; } Prim_SC04_007_8017BEBC; +typedef struct { u32 w0, w1, w2; } Prim_SC04_011_8017D494; +typedef struct { u32 w0, w1, w2; } Prim_SC04_015_8017C730; +typedef struct { u32 w0, w1, w2; } Prim_SC04_020_8017D604; +typedef struct { u32 w0, w1, w2; } Prim_SC05_000_8017BEBC; +typedef struct { u32 w0, w1, w2; } Prim_SC05_001_8017BEBC; +typedef struct { u32 w0, w1, w2; } Prim_SC05_004_8017BEBC; +typedef struct { u32 w0, w1, w2; } Prim_SC05_006_8017BEBC; +typedef struct { u32 w0, w1, w2; } Prim_SC05_018_8017D604; +typedef struct { u32 w0, w1, w2; } Prim_SC06_000_8017E35C; +typedef struct { u32 w0, w1, w2; } Prim_SC06_000_8017EF68; +typedef struct { u32 w0, w1, w2; } Prim_SC06_029_8017C954; +typedef struct { u32 w0, w1, w2; } Prim_SC07_000_8017BEBC; +typedef struct Rec { + s32 unk0; + s32 unk4; + s32 unk8; + void (*unkC)(void); +} Rec; +typedef struct { short x, y, z, w; } Rec8T; +typedef struct { s32 f0; s16 f4; s16 f6; } Rec_80180808; +typedef struct { + u16 u0; /* 0x00 */ + u16 u1; /* 0x02 */ + u16 u2; /* 0x04 */ + s16 s6; /* 0x06 */ + s16 s8; /* 0x08 */ + s16 sA; /* 0x0A */ + s16 sC; /* 0x0C */ + s16 sE; /* 0x0E */ + s32 w10; /* 0x10 */ +} Rec_801825D8; +typedef struct { + u16 u0; /* 0x00 */ + u16 u1; /* 0x02 */ + u16 u2; /* 0x04 */ + s16 s6; /* 0x06 */ + s16 s8; /* 0x08 */ + s16 sA; /* 0x0A */ + s16 sC; /* 0x0C */ + s16 sE; /* 0x0E */ + s32 w10; /* 0x10 */ +} Rec_80184FF8; +typedef struct { + u32 unk00; u32 unk04; u32 unk08; u32 unk0C; u32 unk10; u32 unk14; + u16 unk18; +} Rec_80189334; +typedef struct { char c[0x14]; } Rec_80int; +typedef struct { + s16 s0; /* 0x00 */ + s16 s2; /* 0x02 */ + s16 s4; /* 0x04 */ + s16 s6; /* 0x06 */ + s16 s8; /* 0x08 */ + s16 sA; /* 0x0A */ + s16 sC; /* 0x0C */ + s16 sE; /* 0x0E */ + s32 w10; /* 0x10 */ +} Rec_SC06_029_80180A70; +typedef struct { + u8 _[0xDC]; + u16 fDC; +} Rmw_801837B0; +struct Row8_8018367C { u16 h; u16 pad[3]; }; +struct Row8_8018367C_801811A4 { u16 h; u16 pad[3]; }; +struct RowC_80180CD0 { void *p; }; +typedef struct { u8 r, g, b, pad[13]; } Row_80186060; +typedef struct { + s16 f0; s16 f2; s16 f4; u16 f6; s16 f8; + s16 fA; s16 fC; s16 fE; s16 f10; s16 f12; +} Row_801944F4; +typedef struct { u8 b[0x10]; } S16_SC02_005_8017F7CC; +struct S8017FF9C_sp { + u16 unk0; + u16 unk2; + u16 unk4; + s16 unk6; + s16 unk8; + s16 unkA; + s16 unkC; + s16 unkE; + s32 unk10; +}; +typedef struct { s16 vx, vy, vz, pad; } SV180090; +typedef struct { u16 a, b, c; } SV3_SC07_002_801829F0; +typedef struct { s16 a, b, c, d; } SV4_8018A86C; +typedef struct { s16 vx, vy, vz, pad; } SVEC8; +typedef struct { short vx, vy, vz, pad; } SVEC_80183940; +typedef struct { short vx, vy, vz, pad; } SVF63C; +typedef struct { u16 vx, vy, vz, pad; } SV_8017F154; +typedef struct { s16 vx, vy, vz, pad; } SV_801825D8; +typedef struct { + s16 vx, vy, vz, pad; +} SV_80183FE0; +typedef struct { + SV_80183FE0 v[4]; /* 0x00 */ + u8 c[4][4]; /* 0x20 */ + u32 code; /* 0x30 */ +} Prim_80183FE0; +typedef struct { + s16 vx, vy, vz, pad; +} SV_80183FE0_80183040; +typedef struct { + SV_80183FE0_80183040 v[4]; /* 0x00 */ + u8 c[4][4]; /* 0x20 */ + u32 code; /* 0x30 */ +} Prim_80183FE0_80183040; +typedef struct { + s16 vx, vy, vz, pad; +} SV_80183FE0_801869D4; +typedef struct { + SV_80183FE0_801869D4 v[4]; /* 0x00 */ + u8 c[4][4]; /* 0x20 */ + u32 code; /* 0x30 */ +} Prim_80183FE0_801869D4; +typedef struct { + s16 vx, vy, vz, pad; +} SV_80183FE0_80187604; +typedef struct { + SV_80183FE0_80187604 v[4]; /* 0x00 */ + u8 c[4][4]; /* 0x20 */ + u32 code; /* 0x30 */ +} Prim_80183FE0_80187604; +typedef struct { u16 vx, vy, vz, pad; } SV_80188094; +typedef struct { s16 vx, vy, vz, pad; } SVec8; +typedef struct { s16 vx, vy, vz, pad; } SVec_80180570; +typedef struct { short vx, vy, vz, pad; } SVec_80181D08; +typedef struct { s16 vx; u16 vy; s16 vz, pad; } SVec_SC03_014_8017DF84; +typedef struct { s16 vx; u16 vy; s16 vz, pad; } SVec_SC03_014_8017FA5C; +typedef struct { s16 vx, vy, vz, pad; } SVfec4; +typedef struct { s16 vx, vy, vz, pad; } SVff84; +typedef struct { s16 x, y, z; } Shake_80180FE8; +typedef struct { s16 m0, m1, m2, m3; } Sp10_80181BA4; +typedef struct { s16 m0, m1, m2, m3; } Sp10_80181C38; +struct St80180ACC { s16 a[3]; u16 b[3]; }; +typedef struct { + u8 pad0[2]; + union { s16 s; u16 u; } f02; + u8 pad1[0xD8]; + union { s16 s; u16 u; } fDC; + u8 pad2[4]; + s16 fE2; + u8 pad3[2]; + s16 fE6; + u8 pad4[4]; + u16 fEC; + u16 fEE; +} St_SC03_118_801833C4; +typedef struct { + u8 pad0[2]; + union { s16 s; u16 u; } f02; + u8 pad1[0xD8]; + union { s16 s; u16 u; } fDC; + u8 pad2[4]; + s16 fE2; + u8 pad3[2]; + s16 fE6; + u8 pad4[4]; + s16 fEC; + s16 fEE; +} St_SC03_118_801834DC; +typedef struct { + s16 w[16]; + u8 b[16]; + s32 tail; +} Str_8017DA50; +typedef struct { u16 vx, vy, vz, pad; } UV8; +typedef struct { u16 vx, vy, vz, pad; } UV_85810; +typedef struct { u16 vx, vy, vz, pad; } UVec8; +typedef struct { u16 w; } Unkstruct_80126B96; +typedef struct { s32 f; } Unkstruct_801270C8; +typedef struct { s32 w; } Unkstruct_801270D8; +typedef struct { s32 w; } Unkstruct_80133CD4; +typedef struct { s16 h; } Unkstruct_8017D2A4; +typedef struct { u8 pad[2]; u16 f; } Unkstruct_801824D4; +typedef struct { u8 pad[2]; u16 f; } Unkstruct_80182560; +typedef struct { unsigned short h; } Unkstruct_8018528C; +typedef struct { s32 f; } Unkstruct_8018528C_2; +typedef struct { s32 a, b, c, d, e, f, g, h, f20; } Unkstruct_8018637C; +typedef struct { s32 f; } Unkstruct_80188988; +typedef struct { s32 f; } Unkstruct_80188A90; +typedef struct { s32 w; } Unkstruct_801BC620; +typedef struct { s32 w; } Unkstruct_801C43B0; +typedef struct { s32 w; } Unkstruct_801C9250; +typedef struct { s32 w; } Unkstruct_801CB9C0; +typedef struct { s32 w; } Unkstruct_801E2458; +typedef struct { s32 w; } Unkstruct_801E66F8; +typedef struct { s32 w; } Unkstruct_801E7998; +typedef struct { s32 w; } Unkstruct_801ED7F8; +typedef struct { s32 w; } Unkstruct_801EF2D8; +typedef struct +{ + u16 x; + u16 y; + u16 z; + u16 w; +} V4; +typedef struct { u8 a, b, c, d; } V4_SC03_014_8018ADA8; +struct V8_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_80180EF0 { + u16 vx, vy, vz, pad; +}; +typedef struct { u16 x, y, z, w; } V8_80180FD4; +struct V8_80181B24 { + u16 vx, vy, vz, pad; +}; +struct V8_80184E14 { + u16 vx, vy, vz, pad; +}; +struct V8_80185808 { + u16 vx, vy, vz, pad; +}; +struct V8_801872EC { + u16 vx, vy, vz, pad; +}; +struct V8_80187DE4 { + u16 vx, vy, vz, pad; +}; +struct V8_80188134 { + u16 vx, vy, vz, pad; +}; +struct V8_SC01_000_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC01_001_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC01_004_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC01_005_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC01_008_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC01_009_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC01_074_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC01_077_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC01_080_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC01_084_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC02_000_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC02_004_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC02_005_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC02_011_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC02_015_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC02_016_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC02_017_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC02_021_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC02_026_80131340 { + u16 vx, vy, vz, pad; +}; +typedef struct { + u16 x, y, z, w; +} V8_SC02_026_801832A8; +typedef struct { + u16 x, y, z, w; +} V8_SC02_026_8018365C; +typedef struct { + u16 x, y, z, w; +} V8_SC02_026_80183B04; +typedef struct { u16 x, y, z, w; } V8_SC02_026_80184690; +struct V8_SC02_027_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC02_027_80187400 { + u16 vx, vy, vz, pad; +}; +struct V8_SC02_028_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC02_031_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC02_035_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC02_039_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC02_041_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_001_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_002_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_003_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_006_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_007_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_010_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_011_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_012_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_013_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_014_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_023_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_024_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_028_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_029_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_029_80186758 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_030_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_031_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_089_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_090_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_091_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_092_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_093_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_094_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_095_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_096_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_097_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_098_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_099_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_100_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_101_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_102_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_103_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_104_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_105_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_108_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_109_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_110_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_111_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_112_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_113_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_114_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_115_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_116_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_117_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_118_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_121_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_124_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC03_125_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC04_000_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC04_002_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC04_003_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC04_004_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC04_005_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC04_006_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC04_007_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC04_008_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC04_009_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC04_010_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC04_011_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC04_012_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC04_015_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC04_016_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC04_018_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC04_020_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC05_000_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC05_001_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC05_002_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC05_003_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC05_004_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC05_005_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC05_006_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC05_007_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC05_008_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC05_009_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC05_010_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC05_011_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC05_017_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC05_018_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC06_000_80131340 { + u16 vx, vy, vz, pad; +}; +typedef struct { u8 b[8]; } V8_SC06_000_8017E35C; +struct V8_SC06_006_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC06_008_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC06_010_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC06_011_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC06_013_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC06_014_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC06_015_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC06_016_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC06_018_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC06_018_80186D80 { + u16 vx, vy, vz, pad; +}; +struct V8_SC06_020_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC06_022_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC06_024_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC06_025_80131340 { + u16 vx, vy, vz, pad; +}; +typedef struct { s16 vx, vy, vz, pad; } V8_SC06_025_801818D8; +typedef struct { s16 vx, vy, vz, pad; } V8_SC06_025_80181E08; +struct V8_SC06_027_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC06_029_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC06_030_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC06_032_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC06_033_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC07_000_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC07_001_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC07_002_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC07_006_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC07_007_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC07_008_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC07_009_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC07_010_80131340 { + u16 vx, vy, vz, pad; +}; +struct V8_SC07_011_80131340 { + u16 vx, vy, vz, pad; +}; +typedef struct { s32 vx, vy, vz; } VEC3L; +typedef struct { s16 vx, vy, vz, pad; } Vec8_DB0; +struct W80184334 { + s32 pad[15]; + s32 f3C, f40, f44, f48, f4C, f50; +}; +typedef struct { + u16 f10; /* 0x10 */ + u16 f12; /* 0x12 */ + u16 f14; /* 0x14 */ + s16 f16; /* 0x16 */ + s16 f18; /* 0x18 */ + s16 f1a; /* 0x1A */ + s16 f1c; /* 0x1C */ + u16 f1e; /* 0x1E */ + s32 f20; /* 0x20 */ +} buf_80189888; + #endif /* BFM_ENGINE_TYPES_H */ /* SESSION-19: moved here — 11 typedefs (the * Phase-29 crack-wave lift onward) were sitting OUTSIDE the guard, so any TU that * included this header twice re-declared them. gcc-2.7.2 rejects a repeated typedef diff --git a/src/shared/ov/func_80133CD4__de6ea26c.h b/src/shared/ov/func_80133CD4__de6ea26c.h index 6d8f06ed03..2e9af2fe1c 100644 --- a/src/shared/ov/func_80133CD4__de6ea26c.h +++ b/src/shared/ov/func_80133CD4__de6ea26c.h @@ -73,7 +73,7 @@ s32 func_80133CD4(arg0, cmd, base, arr) { s32 *pw = D_8017F81C; - ((struct { s32 w; } *)pw)->w = s3[0]; + ((Unkstruct_80133CD4 *)pw)->w = s3[0]; pw[1] = s3[1]; pw[2] = s3[2]; } diff --git a/src/shared/ov/func_8014D820__9ab0f3b9.h b/src/shared/ov/func_8014D820__9ab0f3b9.h index 1a7c3a5c32..d4919f7353 100644 --- a/src/shared/ov/func_8014D820__9ab0f3b9.h +++ b/src/shared/ov/func_8014D820__9ab0f3b9.h @@ -9,13 +9,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3; diff --git a/src/shared/ov/func_8014D820__ce76d008.h b/src/shared/ov/func_8014D820__ce76d008.h index 02baa0adc9..eb27921819 100644 --- a/src/shared/ov/func_8014D820__ce76d008.h +++ b/src/shared/ov/func_8014D820__ce76d008.h @@ -9,13 +9,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2) extern s16 D_801152AC; /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */ - typedef struct - { - u16 x; - u16 y; - u16 z; - u16 w; - } V4; typedef Unkstruct_800B5CB8 Ent; int new_var2; s16 new_var3;