T5: batch t5_imS1 — restruct: batch t5_imS1 rung S — 17 files (TUs; 17 drawable) · 58 bodies: 0 sites → members / 0 kept / 0 skipped · levers off 0 · I/M recipes drawn 14 {'R2-extern-array': 14} / residual 279 {'R2-COMPILE-ERROR': 9, 'R2-DIFFERS': 26, 'R2-NO-SCALAR-EXTERN': 140, 'R2-REKEYS': 12, 'R2-WIDTH': 91, 'R3-NOT-CONTIGUOUS': 1} · compiles 59 in 19 s wall · final 17/17 identical · written 9 files | R22 check-all: 218 passed, 0 failed of 218 | type_census: 1650 definitions (523 layouts, 53 duplicate classes, 0 variant camps) · 337881 cast sites in 51036 bodies over 8 base classes (4 forms + A, coverage OK) · 229 lying declarations / 24 callees (+5293 K&R sites, +418 cross-binary apart) · controls 4/4 (restruct_cycle)

.run/P36/delever/calibration.json

@@ -1,7 +1,7 @@
 {
- "head": "773878d86a",
+ "head": "9d2c7e9dc6",
  "stamp": "588cbf38c6e4",
- "generated": "2026-10-02 04:35",
+ "generated": "2026-10-02 10:27",
  "aliases": [
   "main",
   "md_SC07_004",
@@ -21,176 +21,176 @@
   "main": {
    "objects": 85,
    "identical": 85,
-   "seconds": 6.648,
-   "mean_s": 0.078
+   "seconds": 7.054,
+   "mean_s": 0.083
   },
   "md_SC07_004": {
    "objects": 1,
    "identical": 1,
-   "seconds": 0.461,
-   "mean_s": 0.461
+   "seconds": 0.493,
+   "mean_s": 0.493
   },
   "ov_SC03_015": {
    "objects": 32,
    "identical": 32,
-   "seconds": 4.7669999999999995,
-   "mean_s": 0.149
+   "seconds": 4.964,
+   "mean_s": 0.155
   },
   "ov_SC04_011": {
    "objects": 28,
    "identical": 28,
-   "seconds": 4.100999999999999,
+   "seconds": 4.078000000000001,
    "mean_s": 0.146
   }
  },
  "per_object_seconds": {
-  "build/src/800.o": 0.743,
-  "build/src/800_b.o": 0.087,
-  "build/src/800_b_2.o": 0.306,
-  "build/src/800_b_o0a.o": 0.073,
-  "build/src/800_c.o": 0.201,
-  "build/src/800b2.o": 0.077,
-  "build/src/apicard1.o": 0.064,
-  "build/src/apicard2.o": 0.096,
-  "build/src/apicard3.o": 0.106,
-  "build/src/apicard4.o": 0.068,
-  "build/src/apicard5.o": 0.072,
-  "build/src/apicard6.o": 0.082,
-  "build/src/apicard7.o": 0.073,
-  "build/src/boot.o": 0.109,
-  "build/src/gap.o": 0.077,
-  "build/src/libapi1.o": 0.078,
-  "build/src/libapi2.o": 0.061,
-  "build/src/libc2_1.o": 0.063,
-  "build/src/libc2_2.o": 0.055,
-  "build/src/libcd1.o": 0.067,
-  "build/src/libcd2.o": 0.062,
-  "build/src/libetc.o": 0.061,
-  "build/src/libgpu.o": 0.066,
-  "build/src/libgpu2.o": 0.07,
-  "build/src/libgs1.o": 0.063,
-  "build/src/libgs2.o": 0.058,
-  "build/src/libgs3.o": 0.057,
-  "build/src/libgs4.o": 0.067,
-  "build/src/libgs5.o": 0.06,
-  "build/src/libgs6.o": 0.075,
-  "build/src/libgs7.o": 0.06,
-  "build/src/libgs8.o": 0.058,
-  "build/src/libgte1.o": 0.058,
+  "build/src/800.o": 0.759,
+  "build/src/800_b.o": 0.073,
+  "build/src/800_b_2.o": 0.311,
+  "build/src/800_b_o0a.o": 0.085,
+  "build/src/800_c.o": 0.206,
+  "build/src/800b2.o": 0.106,
+  "build/src/apicard1.o": 0.069,
+  "build/src/apicard2.o": 0.065,
+  "build/src/apicard3.o": 0.113,
+  "build/src/apicard4.o": 0.084,
+  "build/src/apicard5.o": 0.078,
+  "build/src/apicard6.o": 0.065,
+  "build/src/apicard7.o": 0.12,
+  "build/src/boot.o": 0.104,
+  "build/src/gap.o": 0.083,
+  "build/src/libapi1.o": 0.099,
+  "build/src/libapi2.o": 0.058,
+  "build/src/libc2_1.o": 0.068,
+  "build/src/libc2_2.o": 0.063,
+  "build/src/libcd1.o": 0.066,
+  "build/src/libcd2.o": 0.061,
+  "build/src/libetc.o": 0.071,
+  "build/src/libgpu.o": 0.067,
+  "build/src/libgpu2.o": 0.073,
+  "build/src/libgs1.o": 0.058,
+  "build/src/libgs2.o": 0.065,
+  "build/src/libgs3.o": 0.061,
+  "build/src/libgs4.o": 0.061,
+  "build/src/libgs5.o": 0.059,
+  "build/src/libgs6.o": 0.08,
+  "build/src/libgs7.o": 0.062,
+  "build/src/libgs8.o": 0.063,
+  "build/src/libgte1.o": 0.068,
   "build/src/libgte10.o": 0.063,
-  "build/src/libgte11.o": 0.055,
-  "build/src/libgte12.o": 0.062,
-  "build/src/libgte13.o": 0.062,
-  "build/src/libgte14.o": 0.056,
-  "build/src/libgte15.o": 0.055,
-  "build/src/libgte16.o": 0.06,
-  "build/src/libgte17.o": 0.064,
-  "build/src/libgte18.o": 0.061,
-  "build/src/libgte19.o": 0.06,
-  "build/src/libgte2.o": 0.057,
-  "build/src/libgte20.o": 0.062,
-  "build/src/libgte21.o": 0.062,
-  "build/src/libgte22.o": 0.06,
-  "build/src/libgte23.o": 0.06,
-  "build/src/libgte24.o": 0.066,
-  "build/src/libgte25.o": 0.061,
-  "build/src/libgte26.o": 0.062,
-  "build/src/libgte27.o": 0.055,
+  "build/src/libgte11.o": 0.065,
+  "build/src/libgte12.o": 0.067,
+  "build/src/libgte13.o": 0.068,
+  "build/src/libgte14.o": 0.065,
+  "build/src/libgte15.o": 0.064,
+  "build/src/libgte16.o": 0.062,
+  "build/src/libgte17.o": 0.066,
+  "build/src/libgte18.o": 0.066,
+  "build/src/libgte19.o": 0.068,
+  "build/src/libgte2.o": 0.065,
+  "build/src/libgte20.o": 0.07,
+  "build/src/libgte21.o": 0.068,
+  "build/src/libgte22.o": 0.066,
+  "build/src/libgte23.o": 0.068,
+  "build/src/libgte24.o": 0.065,
+  "build/src/libgte25.o": 0.065,
+  "build/src/libgte26.o": 0.061,
+  "build/src/libgte27.o": 0.068,
   "build/src/libgte28.o": 0.061,
-  "build/src/libgte29.o": 0.067,
-  "build/src/libgte3.o": 0.064,
-  "build/src/libgte30.o": 0.061,
-  "build/src/libgte4.o": 0.06,
-  "build/src/libgte5.o": 0.063,
-  "build/src/libgte6.o": 0.062,
-  "build/src/libgte7.o": 0.063,
-  "build/src/libgte8.o": 0.063,
-  "build/src/libgte9.o": 0.061,
-  "build/src/libmcrd1.o": 0.078,
-  "build/src/libmcrd2.o": 0.061,
-  "build/src/libpad1.o": 0.074,
-  "build/src/libpad2.o": 0.065,
-  "build/src/sgap.o": 0.067,
-  "build/src/sgap_2.o": 0.065,
-  "build/src/sgap_3.o": 0.062,
-  "build/src/sgap_4.o": 0.071,
-  "build/src/sgap_5.o": 0.06,
-  "build/src/sgap_6.o": 0.066,
-  "build/src/sgap_8.o": 0.066,
-  "build/src/snd1.o": 0.069,
-  "build/src/snd10.o": 0.065,
-  "build/src/snd11.o": 0.062,
-  "build/src/snd12.o": 0.061,
-  "build/src/snd2.o": 0.064,
-  "build/src/snd3.o": 0.064,
-  "build/src/snd4.o": 0.066,
-  "build/src/snd5.o": 0.066,
-  "build/src/snd6.o": 0.074,
-  "build/src/snd7.o": 0.063,
-  "build/src/snd8.o": 0.061,
-  "build/src/snd9.o": 0.057,
-  "build/src/md_SC07_004/md_SC07_004.o": 0.461,
+  "build/src/libgte29.o": 0.065,
+  "build/src/libgte3.o": 0.071,
+  "build/src/libgte30.o": 0.066,
+  "build/src/libgte4.o": 0.066,
+  "build/src/libgte5.o": 0.07,
+  "build/src/libgte6.o": 0.071,
+  "build/src/libgte7.o": 0.068,
+  "build/src/libgte8.o": 0.067,
+  "build/src/libgte9.o": 0.067,
+  "build/src/libmcrd1.o": 0.076,
+  "build/src/libmcrd2.o": 0.065,
+  "build/src/libpad1.o": 0.07,
+  "build/src/libpad2.o": 0.069,
+  "build/src/sgap.o": 0.066,
+  "build/src/sgap_2.o": 0.066,
+  "build/src/sgap_3.o": 0.066,
+  "build/src/sgap_4.o": 0.079,
+  "build/src/sgap_5.o": 0.065,
+  "build/src/sgap_6.o": 0.077,
+  "build/src/sgap_8.o": 0.071,
+  "build/src/snd1.o": 0.07,
+  "build/src/snd10.o": 0.064,
+  "build/src/snd11.o": 0.066,
+  "build/src/snd12.o": 0.093,
+  "build/src/snd2.o": 0.067,
+  "build/src/snd3.o": 0.066,
+  "build/src/snd4.o": 0.08,
+  "build/src/snd5.o": 0.064,
+  "build/src/snd6.o": 0.071,
+  "build/src/snd7.o": 0.066,
+  "build/src/snd8.o": 0.066,
+  "build/src/snd9.o": 0.065,
+  "build/src/md_SC07_004/md_SC07_004.o": 0.493,
   "build/src/ov_SC03_015/ov_SC03_015.o": 0.143,
-  "build/src/ov_SC03_015/ov_SC03_015_after.o": 0.522,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_8012ACE0.o": 0.382,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_80135888.o": 0.068,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_80135A4C.o": 0.067,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_80135D20.o": 0.135,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_801380E0.o": 0.179,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_8013C98C.o": 0.125,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_8013F350.o": 0.088,
+  "build/src/ov_SC03_015/ov_SC03_015_after.o": 0.513,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_8012ACE0.o": 0.386,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_80135888.o": 0.072,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_80135A4C.o": 0.071,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_80135D20.o": 0.128,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_801380E0.o": 0.174,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_8013C98C.o": 0.135,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_8013F350.o": 0.114,
   "build/src/ov_SC03_015/ov_SC03_015_jr_8013FFD8.o": 0.081,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_80140608.o": 0.175,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_8015444C.o": 0.097,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_80154C24.o": 0.17,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_801588CC.o": 0.109,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_80159C84.o": 0.076,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_8015A3C8.o": 0.076,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_8015AE2C.o": 0.098,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_8015C32C.o": 0.44,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_8016AB6C.o": 0.257,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_80171B4C.o": 0.108,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_801734BC.o": 0.19,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_801789AC.o": 0.067,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_80178D40.o": 0.109,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_8017A4AC.o": 0.07,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_8017AE2C.o": 0.163,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_8017EB7C.o": 0.2,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_80184440.o": 0.06,
-  "build/src/ov_SC03_015/ov_SC03_015_jr_801848E4.o": 0.261,
-  "build/src/ov_SC03_015/ov_SC03_015_o0b.o": 0.055,
-  "build/src/ov_SC03_015/ov_SC03_015_o0c.o": 0.056,
-  "build/src/ov_SC03_015/ov_SC03_015_o0d.o": 0.068,
-  "build/src/ov_SC03_015/ov_SC03_015_o0e.o": 0.072,
-  "build/src/ov_SC04_011/ov_SC04_011.o": 0.126,
-  "build/src/ov_SC04_011/ov_SC04_011_after.o": 0.434,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.o": 0.377,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_80135888.o": 0.055,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_80135A4C.o": 0.052,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_80135D20.o": 0.109,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_801380E0.o": 0.148,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_8013C98C.o": 0.125,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_8013F350.o": 0.078,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_80140608.o": 0.182,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_8015444C.o": 0.084,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_80154C24.o": 0.214,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_801588CC.o": 0.1,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_80159C84.o": 0.068,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_8015A3C8.o": 0.083,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_8015AE2C.o": 0.099,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_8015C32C.o": 0.476,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_8016AB6C.o": 0.268,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_80171B4C.o": 0.111,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_801734BC.o": 0.214,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_801789AC.o": 0.066,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_80178D40.o": 0.117,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_8017A4AC.o": 0.081,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_8017AE2C.o": 0.168,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_8017EB7C.o": 0.212,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_80184440.o": 0.062,
+  "build/src/ov_SC03_015/ov_SC03_015_jr_801848E4.o": 0.28,
+  "build/src/ov_SC03_015/ov_SC03_015_o0b.o": 0.044,
+  "build/src/ov_SC03_015/ov_SC03_015_o0c.o": 0.072,
+  "build/src/ov_SC03_015/ov_SC03_015_o0d.o": 0.067,
+  "build/src/ov_SC03_015/ov_SC03_015_o0e.o": 0.079,
+  "build/src/ov_SC04_011/ov_SC04_011.o": 0.128,
+  "build/src/ov_SC04_011/ov_SC04_011_after.o": 0.428,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_8012ACE0.o": 0.344,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_80135888.o": 0.058,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_80135A4C.o": 0.057,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_80135D20.o": 0.127,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_801380E0.o": 0.165,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_8013C98C.o": 0.116,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_8013F350.o": 0.079,
   "build/src/ov_SC04_011/ov_SC04_011_jr_8013FFD8.o": 0.07,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_80140608.o": 0.189,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_8015444C.o": 0.085,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_80154C24.o": 0.173,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_801588CC.o": 0.095,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_80159C84.o": 0.076,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_8015A3C8.o": 0.077,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_8015AE2C.o": 0.097,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_80140608.o": 0.18,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_8015444C.o": 0.083,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_80154C24.o": 0.151,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_801588CC.o": 0.104,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_80159C84.o": 0.077,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_8015A3C8.o": 0.072,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_8015AE2C.o": 0.1,
   "build/src/ov_SC04_011/ov_SC04_011_jr_8015C32C.o": 0.355,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_8016AB6C.o": 0.242,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_80171B4C.o": 0.101,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_801734BC.o": 0.163,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_801789AC.o": 0.073,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_80178D40.o": 0.102,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_8017A4AC.o": 0.077,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_8017AE2C.o": 0.101,
-  "build/src/ov_SC04_011/ov_SC04_011_jr_8017D494.o": 0.416,
-  "build/src/ov_SC04_011/ov_SC04_011_o0b.o": 0.042,
-  "build/src/ov_SC04_011/ov_SC04_011_o0c.o": 0.063
+  "build/src/ov_SC04_011/ov_SC04_011_jr_8016AB6C.o": 0.218,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_80171B4C.o": 0.103,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_801734BC.o": 0.172,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_801789AC.o": 0.067,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_80178D40.o": 0.106,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_8017A4AC.o": 0.071,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_8017AE2C.o": 0.108,
+  "build/src/ov_SC04_011/ov_SC04_011_jr_8017D494.o": 0.423,
+  "build/src/ov_SC04_011/ov_SC04_011_o0b.o": 0.057,
+  "build/src/ov_SC04_011/ov_SC04_011_o0c.o": 0.059
  },
  "ok": true,
- "seconds": 2.0
+ "seconds": 2.1
 }

.run/P37/census/type_census.json

@@ -1,9 +1,9 @@
 {
  "summary": {
-  "head": "773878d86a",
-  "src_stamp": "a6e1a0d177d94803",
-  "tool_stamp": "e17c5fa676",
-  "when": "2026-10-02T10:40:51Z",
+  "head": "eb4695b944",
+  "src_stamp": "ea7aa071e3724fd3",
+  "tool_stamp": "6041c32d81",
+  "when": "2026-10-02T16:34:59Z",
   "files": 7306,
   "tus": 4121,
   "headers": 3181,
@@ -37,7 +37,7 @@
   "casts": {
    "by_form": {
     "P": 257469,
-    "I": 51505,
+    "I": 51491,
     "X": 13790,
     "K": 20975,
     "A": 18889,
@@ -46,7 +46,7 @@
    },
    "raw_counts": {
     "P": 257469,
-    "I": 51505,
+    "I": 51491,
     "X": 13790,
     "K": 20975,
     "A": 18889,
@@ -55,25 +55,25 @@
    },
    "coverage_ok": true,
    "refused": 0,
-   "deref_total": 337895,
+   "deref_total": 337881,
    "addr_form": 18889,
    "typed_cast_member": 173103,
-   "bodies": 51038,
+   "bodies": 51036,
    "by_bclass": {
     "local": 124536,
     "param": 152069,
-    "global": 8616,
-    "gaddr": 40113,
+    "global": 8715,
+    "gaddr": 40000,
     "nested": 9446,
     "ident": 161,
     "other": 1616,
     "addr-of": 1338
    },
    "by_width": {
-    "s2": 103355,
-    "u2": 84324,
+    "s2": 103345,
+    "u2": 84321,
     "s4": 81447,
-    "u1": 34939,
+    "u1": 34938,
     "agg": 13409,
     "p4": 10966,
     "u4": 7574,
@@ -292,7 +292,7 @@
    },
    "check_raw": {
     "P": 257464,
-    "I": 51505,
+    "I": 51491,
     "X": 13790,
     "M": 15130
    },
@@ -225944,7 +225944,7 @@
      "tu": "src/ov_SC07_006/ov_SC07_006_jr_80140608.c",
      "fn": "func_80143D28",
      "line": 2072,
-     "pos": 63821,
+     "pos": 63820,
      "name": "CAST_WIDTH",
      "cls": "WIDTH",
      "base": "iVar3",
@@ -225955,7 +225955,7 @@
      "tu": "src/ov_SC07_006/ov_SC07_006_jr_80140608.c",
      "fn": "func_80143D28",
      "line": 2093,
-     "pos": 64745,
+     "pos": 64744,
      "name": "CAST_WIDTH",
      "cls": "WIDTH",
      "base": "iVar3",
@@ -225966,7 +225966,7 @@
      "tu": "src/ov_SC07_006/ov_SC07_006_jr_80140608.c",
      "fn": "func_801442F8",
      "line": 2152,
-     "pos": 66053,
+     "pos": 66052,
      "name": "CAST_SIGN",
      "cls": "SIGN",
      "base": "param_1",
@@ -225977,7 +225977,7 @@
      "tu": "src/ov_SC07_006/ov_SC07_006_jr_80140608.c",
      "fn": "func_80144364",
      "line": 2181,
-     "pos": 66845,
+     "pos": 66844,
      "name": "CAST_WIDTH",
      "cls": "WIDTH",
      "base": "iVar3",
@@ -225988,7 +225988,7 @@
      "tu": "src/ov_SC07_006/ov_SC07_006_jr_80140608.c",
      "fn": "func_8014477C",
      "line": 2279,
-     "pos": 70429,
+     "pos": 70428,
      "name": "CAST_NONSTRUCT",
      "cls": "NON-STRUCT",
      "base": null,
@@ -225999,7 +225999,7 @@
      "tu": "src/ov_SC07_006/ov_SC07_006_jr_80140608.c",
      "fn": "func_80144880",
      "line": 2324,
-     "pos": 71896,
+     "pos": 71895,
      "name": "CAST_WIDTH",
      "cls": "WIDTH",
      "base": "obj",
@@ -226109,7 +226109,7 @@
      "tu": "src/ov_SC07_006/ov_SC07_006_jr_8015C32C.c",
      "fn": "func_80169BBC",
      "line": 7394,
-     "pos": 224214,
+     "pos": 224222,
      "name": "CAST_WIDTH",
      "cls": "WIDTH",
      "base": "s2",
@@ -226120,7 +226120,7 @@
      "tu": "src/ov_SC07_006/ov_SC07_006_jr_8015C32C.c",
      "fn": "func_80169BBC",
      "line": 7399,
-     "pos": 224450,
+     "pos": 224458,
      "name": "CAST_WIDTH",
      "cls": "WIDTH",
      "base": "s2",
@@ -226131,7 +226131,7 @@
      "tu": "src/ov_SC07_006/ov_SC07_006_jr_8015C32C.c",
      "fn": "func_80169BBC",
      "line": 7399,
-     "pos": 224475,
+     "pos": 224483,
      "name": "CAST_WIDTH",
      "cls": "WIDTH",
      "base": "s2",
@@ -230899,9 +230899,9 @@
    "extern_data_decls": 1078766,
    "declared_fn_names": 12088,
    "multi_spelled_callees": 3773,
-   "multi_body_names": 6421,
+   "multi_body_names": 6423,
    "data_symbols_declared": 55542,
-   "multi_typed_data_symbols": 18498,
+   "multi_typed_data_symbols": 18505,
    "asm_label_aliases": 5148,
    "asm_label_alias_names": 159,
    "builtins": {
@@ -232071,43 +232071,43 @@
    "cross_callees": 96
   },
   "struct_map": {
-   "types": 18526,
-   "explained_sites": 333984,
-   "deref_sites": 337895,
+   "types": 18494,
+   "explained_sites": 333970,
+   "deref_sites": 337881,
    "explained_pct": 98.8,
    "unassigned_sites": 3911,
-   "conflicts": 837,
-   "suspect": 10,
+   "conflicts": 839,
+   "suspect": 11,
    "evidence": {
-    "param": 39246,
-    "assign": 19444,
-    "ret-of": 6041,
-    "arg": 10531,
-    "return": 1535,
-    "assign&": 1283,
+    "param": 39282,
+    "return": 1537,
+    "assign": 19475,
+    "assign&": 1293,
+    "ret-of": 6076,
+    "arg": 10532,
     "arg&": 286,
-    "field": 6585,
+    "field": 6600,
     "nested": 9
    },
    "vetoed": {
     "arg-conduit": 144259,
-    "ret-of-multisource": 6714,
-    "assign-multisource": 33677,
     "arg&-conduit": 14771,
+    "assign&-multisource": 12220,
+    "ret-of-multisource": 6714,
+    "assign-multisource": 33675,
     "field-multisource": 5264,
-    "ret-of": 460,
-    "assign&-multisource": 12225,
-    "arg&-no-overlap": 3114,
-    "assign": 309,
-    "arg-no-overlap": 28175,
+    "arg-no-overlap": 28177,
+    "arg&-no-overlap": 3118,
+    "ret-of": 143,
+    "assign": 293,
     "assign&": 320,
     "arg": 59,
     "return": 2,
     "field": 12
    },
-   "singletons": 14583,
-   "multi_body": 3943,
-   "sites_in_multi_body": 278952,
+   "singletons": 14560,
+   "multi_body": 3934,
+   "sites_in_multi_body": 279080,
    "top": [
     {
      "name": "Unkstruct_800D3888",
@@ -232121,9 +232121,9 @@
       "arg&": 265,
       "param": 11270,
       "arg": 7749,
-      "assign": 8307,
+      "assign": 8306,
       "return": 710,
-      "ret-of": 2006,
+      "ret-of": 2007,
       "assign&": 148,
       "field": 1174
      },
@@ -232323,7 +232323,7 @@
      "sign_mixed": 3,
      "merges": {
       "field": 1,
-      "assign": 123
+      "assign": 124
      },
      "globals_at": [],
      "globals_ptr": [
@@ -232437,6 +232437,27 @@
      "globals_at": [],
      "globals_ptr": []
     },
+    {
+     "name": "Unkstruct_8012D3B4",
+     "sites": 1905,
+     "bodies": 211,
+     "size_hint": 48,
+     "fields": 35,
+     "conflicts": 29,
+     "sign_mixed": 1,
+     "merges": {
+      "assign": 88,
+      "return": 5,
+      "param": 16,
+      "arg": 10,
+      "ret-of": 65
+     },
+     "globals_at": [],
+     "globals_ptr": [
+      "D_80074808",
+      "D_800A5E60"
+     ]
+    },
     {
      "name": "Unkstruct_568f7bda",
      "sites": 1875,
@@ -232465,21 +232486,6 @@
      },
      "globals_at": [],
      "globals_ptr": []
-    },
-    {
-     "name": "Unkstruct_cd1bacd2",
-     "sites": 1764,
-     "bodies": 126,
-     "size_hint": 56,
-     "fields": 10,
-     "conflicts": 0,
-     "sign_mixed": 0,
-     "merges": {
-      "param": 2,
-      "assign": 2
-     },
-     "globals_at": [],
-     "globals_ptr": []
     }
    ]
   },
@@ -232513,8 +232519,8 @@
    "block_frames": 629
   },
   "global_blocks": {
-   "n": 2124,
-   "members": 14253,
+   "n": 2122,
+   "members": 14245,
    "top": [
     {
      "base": "0x800cf10c",
@@ -232692,9 +232698,9 @@
    "path": ".run/P37/census/parked.tsv"
   },
   "timing": {
-   "walk_s": 39.9,
-   "decls_s": 184.2,
-   "total_s": 193.3
+   "walk_s": 43.8,
+   "decls_s": 202.0,
+   "total_s": 215.0
   }
  },
  "dup_layout_classes": [

.run/P37/census/type_census.txt

@@ -1,16 +1,16 @@
-type_census — 2026-10-02T10:40:51Z at 773878d86a (src stamp a6e1a0d177d94803, tool e17c5fa676); 7306 files (4121 TUs + 3181 headers), 99109 function definitions; walk 39.9 s, total 193.3 s
+type_census — 2026-10-02T16:34:59Z at eb4695b944 (src stamp ea7aa071e3724fd3, tool 6041c32d81); 7306 files (4121 TUs + 3181 headers), 99109 function definitions; walk 43.8 s, total 215.0 s
 
 DEFINITIONS  1650 struct/union bodies (+0 enums): canonical header 1021 · .c file-scope 0 · .c block-scope 600 · per-function shared headers 29 · other headers 0 · include/ 326
              1024 distinct names · 523 distinct layouts (0 unresolved) · 53 duplicate classes covering 496 names (tier 1 0 same-named, tier 2 53 opaque; 44 layout-twin classes / 472 names kept apart) · 42 exact-text classes / 546 copies · 0 VARIANT names (>1 layout) · 55 dead canonical names · 0 canonical names redefined in .c · 4300 scalar/alias typedefs · 145 forward decls
-CAST SITES   deref 337895 = P 257469 + I 51505 + X 13790 + M 15131   (+ A address-of 18889; + C typed cast-member 173103) in 51038 bodies · coverage OK (raw {'P': 257469, 'I': 51505, 'X': 13790, 'K': 20975, 'A': 18889, 'C': 173103, 'M': 15131}) · refused 0 · absolute 0 · readability regex over raw text 260306
-             by base: param 152069 · local 124536 · gaddr 40113 · nested 9446 · global 8616 · other 1616 · addr-of 1338 · ident 161
-             by width: s2 103355 · u2 84324 · s4 81447 · u1 34939 · agg 13409 · p4 10966 · u4 7574 · s1 1881
+CAST SITES   deref 337881 = P 257469 + I 51491 + X 13790 + M 15131   (+ A address-of 18889; + C typed cast-member 173103) in 51036 bodies · coverage OK (raw {'P': 257469, 'I': 51491, 'X': 13790, 'K': 20975, 'A': 18889, 'C': 173103, 'M': 15131}) · refused 0 · absolute 0 · readability regex over raw text 260306
+             by base: param 152069 · local 124536 · gaddr 40000 · nested 9446 · global 8715 · other 1616 · addr-of 1338 · ident 161
+             by width: s2 103345 · u2 84321 · s4 81447 · u1 34938 · agg 13409 · p4 10966 · u4 7574 · s1 1881
              top bases: param_1(param) 57137 · a0(param) 39555 · arg0(param) 30937 · p(local) 13172 · cach(local) 8246 · buf(local) 7056 · s0(local) 6634 · s1(local) 6388 · flag(local) 5453 · dst(local) 4853 · iVar2(local) 4394 · iVar1(local) 3464 · cur(local) 3375 · p(param) 3036 · e(local) 3002 · src(local) 2599
-DECLARATIONS 99109 function definitions (1894 K&R) · 4279260 extern function declarations over 12088 names (3773 spelled >1 way) · 6421 names with >1 body text · 1078766 data externs over 55542 symbols (18498 typed >1 way) · asm-label aliases 5148 (159 names) · builtins {'memcpy': 301, 'abs': 1} · attributes {'packed': 26, 'aligned': 6}
+DECLARATIONS 99109 function definitions (1894 K&R) · 4279260 extern function declarations over 12088 names (3773 spelled >1 way) · 6423 names with >1 body text · 1078766 data externs over 55542 symbols (18505 typed >1 way) · asm-label aliases 5148 (159 names) · builtins {'memcpy': 301, 'abs': 1} · attributes {'packed': 26, 'aligned': 6}
              lying declarations 229 over 24 callees {'K&R-empty': 216, 'narrow': 13} · K&R sites (marked, counted apart) 5293 over 200 callees · cross-binary (the fleet's definitions disagree, this binary has none) 418 over 96 callees
-STRUCT MAP   18526 types explain 333984/337895 deref sites (98.8 %); unassigned 3911; 3943 types span ≥2 bodies (278952 sites), 14583 single-body; types with conflicts 837, suspect 10
-             merges by evidence {'param': 39246, 'assign': 19444, 'ret-of': 6041, 'arg': 10531, 'return': 1535, 'assign&': 1283, 'arg&': 286, 'field': 6585, 'nested': 9}; vetoed {'arg-conduit': 144259, 'ret-of-multisource': 6714, 'assign-multisource': 33677, 'arg&-conduit': 14771, 'field-multisource': 5264, 'ret-of': 460, 'assign&-multisource': 12225, 'arg&-no-overlap': 3114, 'assign': 309, 'arg-no-overlap': 28175, 'assign&': 320, 'arg': 59, 'return': 2, 'field': 12}
-             Unkstruct_800D3888     sites   23205 bodies   7124 fields  216 size≥0x24c width-conflicts 50 sign-mixed 67 merges {'param': 11270, 'assign': 8307, 'arg': 7749, 'ret-of': 2006} at D_800D3888,D_800DE5A0,D_801269F0 ptr D_8006386C,D_80074778,D_80074780
+STRUCT MAP   18494 types explain 333970/337881 deref sites (98.8 %); unassigned 3911; 3934 types span ≥2 bodies (279080 sites), 14560 single-body; types with conflicts 839, suspect 11
+             merges by evidence {'param': 39282, 'return': 1537, 'assign': 19475, 'assign&': 1293, 'ret-of': 6076, 'arg': 10532, 'arg&': 286, 'field': 6600, 'nested': 9}; vetoed {'arg-conduit': 144259, 'arg&-conduit': 14771, 'assign&-multisource': 12220, 'ret-of-multisource': 6714, 'assign-multisource': 33675, 'field-multisource': 5264, 'arg-no-overlap': 28177, 'arg&-no-overlap': 3118, 'ret-of': 143, 'assign': 293, 'assign&': 320, 'arg': 59, 'return': 2, 'field': 12}
+             Unkstruct_800D3888     sites   23205 bodies   7124 fields  216 size≥0x24c width-conflicts 50 sign-mixed 67 merges {'param': 11270, 'assign': 8306, 'arg': 7749, 'ret-of': 2007} at D_800D3888,D_800DE5A0,D_801269F0 ptr D_8006386C,D_80074778,D_80074780
              Unkstruct_cb638a45     sites    6477 bodies    381 fields    6 size≥0x10 width-conflicts 0 sign-mixed 0 merges {'param': 12, 'arg': 5} 
              Unkstruct_dac960ce     sites    4464 bodies    124 fields   13 size≥0x24c width-conflicts 0 sign-mixed 2 merges {'param': 2} 
              Unkstruct_0caecd54     sites    4340 bodies    124 fields   23 size≥0xfe width-conflicts 0 sign-mixed 1 merges {'param': 2, 'assign': 1, 'return': 1} 
@@ -22,12 +22,12 @@ STRUCT MAP   18526 types explain 333984/337895 deref sites (98.8 %); unassigned
              Unkstruct_30b21035     sites    3100 bodies    124 fields   13 size≥0x54 width-conflicts 0 sign-mixed 0 merges {} 
              Unkstruct_80126948     sites    3034 bodies    848 fields   34 size≥0xa4 width-conflicts 0 sign-mixed 10 merges {'assign': 103, 'arg': 14, 'param': 6, 'assign&': 4} at D_80126948,D_80126E60 ptr D_80114EE8,D_801151D4,D_80126948
              Unkstruct_a2c8734a     sites    2646 bodies    126 fields    8 size≥0x34 width-conflicts 0 sign-mixed 3 merges {'param': 2} 
-GLOBAL BLOCKS 2124 runs of ≥4 adjacent scalar D_ symbols (14253 symbols): 0x800cf10c+0x34 ×29 (D_800CF10C..D_800CF13C) · 0x800a6580+0x3a ×27 (D_800A6580..D_800A65B8) · 0x801998a4+0x57 ×24 (D_801998A4..D_801998FA) · 0x80199840+0x56 ×23 (D_80199840..D_80199895) · 0x801a9608+0x50 ×22 (D_801A9608..D_801A9654) · 0x801ab708+0x54 ×21 (D_801AB708..D_801AB758) · 0x801b0df0+0x4b ×21 (D_801B0DF0..D_801B0E3A) · 0x801b83a0+0x4e ×21 (D_801B83A0..D_801B83ED)
+GLOBAL BLOCKS 2122 runs of ≥4 adjacent scalar D_ symbols (14245 symbols): 0x800cf10c+0x34 ×29 (D_800CF10C..D_800CF13C) · 0x800a6580+0x3a ×27 (D_800A6580..D_800A65B8) · 0x801998a4+0x57 ×24 (D_801998A4..D_801998FA) · 0x80199840+0x56 ×23 (D_80199840..D_80199895) · 0x801a9608+0x50 ×22 (D_801A9608..D_801A9654) · 0x801ab708+0x54 ×21 (D_801AB708..D_801AB758) · 0x801b0df0+0x4b ×21 (D_801B0DF0..D_801B0E3A) · 0x801b83a0+0x4e ×21 (D_801B83A0..D_801B83ED)
 PARKED (P36)  24 classes / 453 bodies / 691 needed sites → .run/P37/census/parked.tsv; needs {'signature': 13, 'struct': 7, '?': 4}; 22 PARK names are minimum-lever banks
 CONTROLS     4/4: player_block_widths OK (D_80078E8C:4/4 D_80078EB2:2/2 D_80078EB4:2/2 D_80078EB6:2/2 D_80078EB8:2/2 D_80078F08:4/4 D_80078F0C:4/4) · matrix_layouts OK (MATRIX=32 MATRIX_L48=48) · prim_layout_class OK (defs in 1 files, 1 spellings, 1/1 in one layout (64 B)) · tu_conflict_D_800A651C OK (s32:1202 | u8[]:9 | OtBlk[]:9 | OtBlk_80016450[]:8 | s32[]:7)
 
 duplicate-layout classes (top 12): 4B×56 names (0 defs): B4_80165140, B4_8017F154, B4_8018750C, B4_8018AD9C… | 8B×46 names (0 defs): Blk8S16, Blk8_80126940, Blk8_80180A38, D_80195AF4_t… | 8B×45 names (0 defs): B8, B8_17F474, B8_80165140, B8_801851A8… | 8B×34 names (0 defs): Args_80182194, Blk8017FD54, Blk8_801A6AD0, Blk8_801AD914… | 20B×32 names (0 defs): Blk20_8017D110, Buf8017BF34_8017BF34, Buf8017BF50_8017C234, Loc_80180E10… | 16B×28 names (0 defs): Blk16X, Blk16_8017ECD4, Blk16_8018A4C4, Blk16_8018A8B8… | 6B×25 names (0 defs): D80190448_t, Pt6_8017D65C, ResMapCol, S6… | 32B×25 names (0 defs): Blk20_8016DF5C, Blk20_80180B78, Blk20_80184694, Blk32L_80133298… | 8B×22 names (22 defs): B8014, Blk8_80133CD4, Blk8_801463A0, Blk8_8017FF80… | 12B×19 names (19 defs): Blk12, Prim126, PrimC59C, PrimC974… | 8B×14 names (0 defs): CdFileLoc, Cmd_801805C8, M8_8016B6BC, Pair8_8017DDC4… | 4B×14 names (0 defs): D_801D0660_s, Ent_80186AE4, P4, Pair4_801B02DC…
 VARIANT names (top 12): 
 
-type_census: 1650 definitions (523 layouts, 53 duplicate classes, 0 variant camps) · 337895 cast sites in 51038 bodies over 8 base classes (4 forms + A, coverage OK) · 229 lying declarations / 24 callees (+5293 K&R sites, +418 cross-binary apart) · controls 4/4
-struct_map: 18526 types over 18526 clusters explain 333984/337895 sites (98.8 %); 3911 unassigned sites; 837 types with conflicts
+type_census: 1650 definitions (523 layouts, 53 duplicate classes, 0 variant camps) · 337881 cast sites in 51036 bodies over 8 base classes (4 forms + A, coverage OK) · 229 lying declarations / 24 callees (+5293 K&R sites, +418 cross-binary apart) · controls 4/4
+struct_map: 18494 types over 18494 clusters explain 333970/337881 sites (98.8 %); 3911 unassigned sites; 839 types with conflicts

src/ov_SC07_006/ov_SC07_006.c

@@ -1081,7 +1081,7 @@ extern void  func_80016714(void *a0, s32 a1);
 s32 func_8012C890(s32 a0, s32 a1, s32 a2) {
 
     extern s32   D_8018DC1C;
-    extern s16 D_801270C4;
+    extern s16 D_801270C4[];
     extern u16   D_801274E4[];
     extern s32   D_8011DB08;
     u8 *src = (u8 *)a0;
@@ -1114,7 +1114,7 @@ s32 func_8012C890(s32 a0, s32 a1, s32 a2) {
 
     {
         u16 *pc;
-        pc = &(*(u16 *)&D_801270C4);
+        pc = &(D_801270C4[0]);
         *(u16 *)(dst + 0x36) = *(u16 *)pc;
         count = *(volatile u16 *)pc + 1;
         *pc = count;

src/ov_SC07_006/ov_SC07_006_jr_8013C98C.c

@@ -1723,7 +1723,7 @@ void func_8013E6AC(void) {
     extern u16 D_80115110;
     extern s32 D_80115188;
     extern s16 D_8018B784;
-    extern s16 D_8018B786;
+    extern s16 D_8018B786[];
     extern unsigned short D_80115112;
     short i;
 
@@ -1748,12 +1748,12 @@ void func_8013E6AC(void) {
             *(s32 *)((char *)&D_80115188 + (i << 2)) = v;
         }
         D_8018B784 = 2;
-        D_8018B786 = 1;
+        D_8018B786[0] = 1;
         { u16 *q = &D_80115112; *q += 1; }
     } else {
         func_8013E83C();
         D_8011511A = 7;
-        D_8018B786 = 0;
+        D_8018B786[0] = 0;
         D_8018B784 = 0;
         D_80115112 = 6;
     }
@@ -1775,7 +1775,7 @@ void func_8013E83C() {
     extern void func_8002D4C8(int, int);
     extern void func_80141C0C(int);
     extern unsigned short D_80115118;
-    extern unsigned short D_80115128;
+    extern unsigned short D_80115128[];
     extern unsigned short D_8011512E;
     extern unsigned int D_80115130;
     extern unsigned short D_80115158;
@@ -1811,7 +1811,7 @@ void func_8013E83C() {
     D_8011515E = 0x129;
     D_80115162 = 0x103;
     D_80115166 = 0x105;
-    D_80115128 = 0;
+    D_80115128[0] = 0;
     D_8011512E = 0;
 
     if (D_80115110 == 3) {
@@ -1904,11 +1904,11 @@ void func_8013EB7C(void) {
     extern s32 D_801151D0;
     extern u16 D_8011511A;
     extern u16 D_8011511E;
-    extern short D_80115128;
+    extern short D_80115128[0];
     extern unsigned short D_80115112;
     extern s16 D_8011512A;
     extern s32 D_80115130;
-    extern unsigned char D_8018B788;
+    extern unsigned char D_8018B788[];
     s32 sp10[2];
     short sVar1;
     s32 iVar4;
@@ -1930,15 +1930,15 @@ void func_8013EB7C(void) {
             if (iVar4 != *p130) {
                 *p130 = iVar4;
                 func_80139954();
-                func_801376E8(iVar4, (s32)&(*(u8 *)&D_8018B788));
+                func_801376E8(iVar4, (s32)&(D_8018B788[0]));
             }
         }
         func_80137B80();
         if ((D_8011511E & 0x10) != 0 && D_8011511A < 5 && sVar1 == 0) {
-            (*(s16 *)&D_80115128) = 0;
+            (D_80115128[0]) = 0;
             func_8002D4C8(0x466, 0);
             if (D_8011511A != 4) {
-                func_801376E8((s32)((s32 (*)(void))func_80141CA4)(), (s32)&(*(u8 *)&D_8018B788));
+                func_801376E8((s32)((s32 (*)(void))func_80141CA4)(), (s32)&(*(u8 *)D_8018B788));
             }
             (*(unsigned short *)&D_80115112) -= 1;
         } else {
@@ -1980,8 +1980,8 @@ s32 func_8013EE10() {
     extern u8 D_801151C8[];
     extern s32 D_801151D0;
     extern s16 D_8018B784;
-    extern s16 D_8018B786;
-    extern unsigned char D_8018B788;
+    extern s16 D_8018B786[0];
+    extern unsigned char D_8018B788[0];
     extern E4 D_80115188[];
     extern E4 D_80115168[];
     extern unsigned short D_80115118;
@@ -2000,7 +2000,7 @@ s32 func_8013EE10() {
         D_80115188[i].f0 = t;
         D_80115168[i].f0 = D_80115168[i].f0 - t;
     }
-    r = &D_8018B786;
+    r = D_8018B786;
     if (*r < 3) {
         *r = *r + 1;
     }
@@ -2009,7 +2009,7 @@ s32 func_8013EE10() {
     old = *p;
     *p = old + 1;
     if (old >= 5) {
-        ((void (*)(int, unsigned char *))func_801376E8)((int)func_80141CA4(), &D_8018B788);
+        ((void (*)(int, unsigned char *))func_801376E8)((int)func_80141CA4(), D_8018B788);
         for (i = 0; i < 5; i++) {
             s32 *q = (s32 *)((char *)p - 8);
             *(s32 *)((char *)&q[i] + 0x78) = 0;
@@ -2047,7 +2047,7 @@ void func_8013EF88(void)
     extern u16 D_80115124;
     extern u16 D_80115114;
     extern u16 D_80115112;
-    extern s16 D_8018B786;
+    extern s16 D_8018B786[0];
     extern s16 D_8018B784;
     u16 *p = &D_80115118;
     u16 old = *p;
@@ -2065,7 +2065,7 @@ void func_8013EF88(void)
                 D_80115168[i].f0 = D_80115168[i].f0 + t;
             }
             if (D_80115118 < 3) {
-                u16 *s = &(*(u16 *)&D_8018B786);
+                u16 *s = &(D_8018B786[0]);
                 *s -= 1;
             }
             {
@@ -2110,12 +2110,12 @@ void func_8013F138(void) {
     extern unsigned short D_80115118;
     extern unsigned short D_80115112;
     extern u16 D_80115110;
-    extern unsigned char D_8018B788;
+    extern unsigned char D_8018B788[0];
     u16 *p = &D_80115118;
     *p += 0x10;
     if ((u16)*p >= 0x40) {
         if (D_80115110 == 0) {
-            ((void (*)(int, unsigned char *))func_801376E8)((int)func_80141CA4(), &D_8018B788);
+            ((void (*)(int, unsigned char *))func_801376E8)((int)func_80141CA4(), D_8018B788);
         }
         D_80115112 += 1;
     }

src/ov_SC07_006/ov_SC07_006_jr_8014032C.c

@@ -755,7 +755,7 @@ extern void func_80141C0C(s32);
 extern u16 D_8011511C;
 extern u16 D_80115120;
 extern u16 D_80115122;
-extern s16 D_80115128;
+extern s16 D_80115128[];
 extern s16 D_8011512A;
 extern u16 D_8011512E;
 extern u8  D_80115140[];
@@ -787,7 +787,7 @@ extern s32   func_800D27DC(s32, s32 *, void *, s32, s32);
 extern s32  *func_800D29F8(s32, s32, void *, s32, s32);
 extern void func_8013FAF8(s16 arg0, s16 arg1);
 
-extern short D_80115128;
+extern short D_80115128[0];
 extern u8 D_8018B4A8[];
 extern u8 D_8018B4C0[];
 extern s32 func_80029178(s32 arg);
@@ -837,7 +837,7 @@ s32 func_8014032C(s32 param_1, s32 param_2) {
         result = D_8018B52C[((short)param_2)];
         break;
     case 2:
-        switch ((*(s16*)&D_80115128)) {
+        switch ((D_80115128[0])) {
         case 0:
             if (D_8018B7F0[((short)param_2)]() == 0) {
                 ((short)param_2) = 5;

src/ov_SC07_006/ov_SC07_006_jr_80140608.c

@@ -737,7 +737,7 @@ extern s32 func_8013EE10();
 extern void func_8013F138(void);
 extern void func_800D2624(void);
 extern unsigned short D_80115114;
-extern unsigned short D_80115118;
+extern unsigned short D_80115118[];
 extern void func_8013F1BC(void);
 extern void func_80141C0C(s32);
 extern u16 D_8011511C;
@@ -1258,7 +1258,7 @@ void func_80141874(void) {
 
 extern u16 D_80115110;
 extern u16 D_80115112;
-extern unsigned short D_80115118;
+extern unsigned short D_80115118[0];
 extern volatile u16 D_8011511A;
 extern s16 D_80115128;
 extern u16 D_8011512E;   /* §17a-1: canonical width (jr_8013F350 TUs decl u16); byte-neutral here (only use is store-0) */
@@ -1291,7 +1291,7 @@ void func_801418F8(void)
     func_800D24A0(1);
     D_8011511A = 2;
     t = D_8011511A;
-    (*(s16 *)&D_80115118) = 0;
+    (D_80115118[0]) = 0;
     D_80115130 = 0;
     if (t >= 4) {
         D_8011511A = t - 3;

src/ov_SC07_006/ov_SC07_006_jr_801588CC.c

@@ -207,7 +207,7 @@ extern void func_8012A860(void *a0, int a1);
 extern void func_8012A8B0(u8 *a0, s32 a1);
 extern void func_8012A8E8(void);
 extern u8 D_801202A0[];
-extern u16 D_801270C0;
+extern u16 D_801270C0[];
 extern void func_8012A988(u8 *a0);
 extern void func_8012A908(void);
 extern s32 func_8012ACE0(void *a0);
@@ -2250,7 +2250,7 @@ s32 func_801596F0(s32 param_1) {
 
     extern s16 D_800B9AAC[];
     extern s16 D_800B9B00;
-    extern u16 D_801270C0;
+    extern u16 D_801270C0[0];
     extern u8 D_800AF630[];
     extern u32 D_800AFAE8[];
     extern char D_8018C818[];
@@ -2283,7 +2283,7 @@ s32 func_801596F0(s32 param_1) {
             } while (q < (u32 *)(base + 0x65AC));
         }
 
-        (*(s16 *)&D_801270C0) = 3;
+        (D_801270C0[0]) = 3;
         ((void (*)(s32))func_80129248)(0);
         func_8013C938();
         func_8013CB20();

src/ov_SC07_006/ov_SC07_006_jr_8015C32C.c

@@ -4595,7 +4595,7 @@ void func_80161E08(s32 param_1) {
     extern void func_801622C4(void);
     extern u16 D_800AF7BC;
     extern u16 D_800AF7BE;
-    extern s16 D_80078EB0;
+    extern s16 D_80078EB0[];
     extern u16 D_800B5BD8;
     extern s16 D_800B5C04;
     extern u8 D_800B5BFF;
@@ -4658,7 +4658,7 @@ void func_80161E08(s32 param_1) {
         }
 
         func_800242D0((s16)func_801620C4(), &D_801F4F94, 0x84);
-        if ((a2 & 0x7FFF) == (s32)D_80078EB0) {
+        if ((a2 & 0x7FFF) == (s32)D_80078EB0[0]) {
             func_801622C4();
         }
     }
@@ -4704,7 +4704,7 @@ extern s32 func_800291DC(s32);
 s32 func_801621CC(s32 arg0) {
 
     extern u8 D_80078E78[];
-    extern u8 D_80078EB0;
+    extern u8 D_80078EB0[0];
     extern u8 D_80078EB1;
     extern s32 D_8018CF48;
     s32 s0 = arg0;       /* $s0: arg0, crosses the call */
@@ -4720,7 +4720,7 @@ s32 func_801621CC(s32 arg0) {
         return 0;
     }
     a2 &= 0x7FFF;
-    if (((a2 >> 8) == D_80078EB1) && ((a2 & 0xFF) <= (u32)D_80078EB0)) {
+    if (((a2 >> 8) == D_80078EB1) && ((a2 & 0xFF) <= (u32)D_80078EB0[0])) {
         return (s32)&D_8018CF48;
     }
     d = s1[0x39] - 1;
@@ -4807,7 +4807,7 @@ extern s32 func_800291DC(s32);
 
 
 s32 func_80162438(s32 _unused0) {
-    extern s16 D_80078EB0;
+    extern s16 D_80078EB0[0];
     extern u8 D_800AF630[];
     extern void func_80024054(void *, void *);
     extern void func_8001CE28(void *, void *);
@@ -4875,7 +4875,7 @@ s32 func_80162438(s32 _unused0) {
             D_800B5C52 = -D_800AF7BE / 2 + 0x10;
         }
         func_800242D0((s16)func_801626B8(), D_801F4FF0, 0x84);
-        if ((uVar2 & 0x7FFF) == (s32)(*(s16 *)&D_80078EB0)) {
+        if ((uVar2 & 0x7FFF) == (s32)(D_80078EB0[0])) {
             func_80162760();
         }
     }

src/ov_SC07_006/ov_SC07_006_jr_80171B4C.c

@@ -4170,7 +4170,7 @@ void func_80176218(s32 param_1) {
     extern u16 D_80078EB2;
     extern u16 D_8011F82A;
     extern u16 D_8011F82C;
-    extern s16 D_80078EB4;
+    extern s16 D_80078EB4[];
     extern u16 D_8011F8C4;
     extern u8  D_8011F7A8;   /* st base  ($s3) */
     extern u8 D_80078E78[];   /* cur base ($s5) */
@@ -4188,11 +4188,11 @@ void func_80176218(s32 param_1) {
     /* ---- block 1: raw-global pair 0x3A/0x3C ---- */
     sA = D_80078EB2;
     t = (sA != D_8011F82A);
-    if (D_8011F82C == (*(u16 *)&D_80078EB4)) {
+    if (D_8011F82C == (*(u16 *)D_80078EB4)) {
         ne = t;
         if (ne == 0 && D_8011F8C4 == 0) goto L340;
     } else {
-        s32 d = (s16)(D_8011F82C - (*(u16 *)&D_80078EB4));
+        s32 d = (s16)(D_8011F82C - (D_80078EB4[0]));
         u16 nv;
         if (d < 0) {
             if (d < -10) nv = D_8011F82C + 2;

src/ov_SC07_006/ov_SC07_006_jr_801789AC.c

@@ -3263,7 +3263,7 @@ extern void func_8017AE2C(s32 a0);
 extern s32 func_801399F0(s32 a0);
 extern void func_80178CBC(s32 arg0, s32 arg1);
 
-extern short D_801F636C;
+extern short D_801F636C[];
 extern s32 D_801F5FF8;
 extern s32 D_801F6214;
 extern s32 D_801F5BE4;
@@ -3278,7 +3278,7 @@ s32 func_801789AC(s32 arg0)
     func_8017A4AC();
     func_8017AE2C(arg0);
 
-    switch ((s16)(D_801F636C - 1)) {
+    switch ((s16)(D_801F636C[0] - 1)) {
     case 0:
         ret = func_801399F0(D_801F5FF8);
         D_801F6214 = ret;
@@ -3380,7 +3380,7 @@ extern void func_80016714(void *a0, s32 a1);
 void func_80178BF8(s32 _unused0, s32 _unused1)
 {
     extern void func_8017B1D8(void);
-    extern short D_801F636C;
+    extern short D_801F636C[0];
     extern int D_801F5FF8;
     extern short D_801F6008;
     extern short D_801F6004;
@@ -3388,7 +3388,7 @@ void func_80178BF8(s32 _unused0, s32 _unused1)
     extern short D_801F5FFC;
     extern int D_801F6214;
     extern int D_801F6010;
-    extern s16 D_801F5FF0;
+    extern s16 D_801F5FF0[];
     extern short D_801F5FE8;
     extern short D_801F5FEC;
     extern int D_801F62C8;
@@ -3401,7 +3401,7 @@ void func_80178BF8(s32 _unused0, s32 _unused1)
 
     iVar2 = 9;
     puVar3 = &D_801F6060;
-    D_801F636C = 0;
+    D_801F636C[0] = 0;
     D_801F5FF8 = 0;
     D_801F6008 = 0;
     D_801F6004 = 0;
@@ -3409,7 +3409,7 @@ void func_80178BF8(s32 _unused0, s32 _unused1)
     D_801F5FFC = 0;
     D_801F6214 = 1;
     D_801F6010 = 0;
-    (*(short *)&D_801F5FF0) = 0;
+    (D_801F5FF0[0]) = 0;
     do {
         *puVar3 = 0;
         iVar2 = iVar2 + -1;
@@ -3434,11 +3434,11 @@ extern M2C_UNK func_80178D40(s32 arg0, s32 arg1);
 void func_80178CBC(s32 arg0, s32 arg1) {
 
     extern s32 D_801F5BE0;
-    extern short D_801F636C;
+    extern short D_801F636C[0];
     D_801F5BE0 = arg1;
     do {
         func_80178D40(arg0, D_801F5BE0);
-    } while (D_801F636C == 3);
+    } while (D_801F636C[0] == 3);
 }
 
 
@@ -3447,8 +3447,8 @@ extern void func_80174714(void);
 
 void func_80178D18(void) {
 
-    extern short D_801F636C;
-    D_801F636C = 0;
+    extern short D_801F636C[0];
+    D_801F636C[0] = 0;
     func_80174714();
 }
 
@@ -3631,49 +3631,49 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
     case 1:
         func_80179B28(D_801F5FF8);
         D_801F5FF8 = ((s32 (*)(s32, s32, s32))func_80137614)(((Cmd_80178D40 *)arg1)->a.w, D_801F6004, D_801F6008 ? 0x48 : 0x40);
-        (*(s16*)&D_801F636C) = 2;
+        (D_801F636C[0]) = 2;
         break;
     case 0:
         func_80179B28(D_801F5FF8);
         D_801F5FF8 = ((s32 (*)(s32, s32, s32))func_80137614)(((Cmd_80178D40 *)arg1)->a.w, D_801F5FFC, D_801F6000 ? 0x48 : 0x40);
-        (*(s16*)&D_801F636C) = 1;
+        (*(s16*)D_801F636C) = 1;
         break;
     case 0x45:
         ((void (*)(s32))((Cmd_80178D40 *)arg1)->a.w)(((Actor_80178D40 *)arg0));
         if (D_801F6210 != 0) {
             func_80179B28(D_801F5FF8);
             D_801F5FF8 = ((s32 (*)(s32, s32, s32))func_80137614)(((Actor_80178D40 *)arg0)->unkDC[1], D_801F5FFC, D_801F6000 ? 0x48 : 0x40);
-            (*(s16*)&D_801F636C) = 1;
+            (*(s16*)D_801F636C) = 1;
         } else {
-            (*(s16*)&D_801F636C) = 3;
+            (*(s16*)D_801F636C) = 3;
         }
         break;
     case 0x32:
         func_80179B28(D_801F5FF8);
         D_801F5FF8 = ((s32 (*)(s32, s32, s32))func_80137614)(((Actor_80178D40 *)arg0)->unkDC[((Cmd_80178D40 *)arg1)->a.w], D_801F5FFC,
                                    D_801F6000 ? 0x48 : 0x40);
-        (*(s16*)&D_801F636C) = 1;
+        (*(s16*)D_801F636C) = 1;
         break;
     case 2:
         func_80179B28(D_801F5FF8);
         if (D_801F6010 != 0) {
             D_801F5BE0 = D_801F6010;
             D_801F6010 = 0;
-            (*(s16*)&D_801F636C) = 3;
+            (*(s16*)D_801F636C) = 3;
             return;
         }
-        (*(s16*)&D_801F636C) = 6;
+        (*(s16*)D_801F636C) = 6;
         break;
     case 6:
         func_80179DF8();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 3:
         v10.vx = ((Cmd_80178D40 *)arg1)->a.uh[0];
         v10.vy = 0;
         v10.vz = ((Cmd_80178D40 *)arg1)->a.uh[1];
         func_80179D30(&v10);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 4:
         v10.vx = ((Cmd_80178D40 *)arg1)->a.uh[0];
@@ -3681,11 +3681,11 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
         v10.vz = ((Cmd_80178D40 *)arg1)->a.uh[1];
         ((void (*)(void *, void *, void *))func_8012F214)(((Actor_80178D40 *)arg0), &v10, &v18);
         func_80179D30(&v18);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x4C:
         func_80179D78((void *)((Cmd_80178D40 *)arg1)->a.w);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x4D:
         v10.vx = ((Blk_80178D40 *)((Cmd_80178D40 *)arg1)->a.p)->f0;
@@ -3694,7 +3694,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
         ((void (*)(void *, void *, void *))func_8012F214)(((Actor_80178D40 *)arg0), &v10, &v18);
         v18.pad = ((Blk_80178D40 *)((Cmd_80178D40 *)arg1)->a.p)->f6;
         func_80179D78(&v18);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x15:
         v10.vx = ((Cmd_80178D40 *)arg1)->a.uh[0];
@@ -3702,33 +3702,33 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
         v10.vz = ((Cmd_80178D40 *)arg1)->a.uh[1];
         ((void (*)(void *, void *, void *))func_8012F214)(((Actor_80178D40 *)arg0)->unkD4, &v10, &v18);
         func_80179D30(&v18);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 5:
         func_80179DCC(((Cmd_80178D40 *)arg1)->a.h[0]);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 7:
         func_80179E1C(((Cmd_80178D40 *)arg1)->a.h[0]);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 8:
         func_80179E74(((Cmd_80178D40 *)arg1)->a.h[0]);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 9:
         v10.vx = ((Cmd_80178D40 *)arg1)->a.uh[0];
         v10.vy = 0;
         v10.vz = ((Cmd_80178D40 *)arg1)->a.uh[1];
         func_80179EA0(&v10);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0xA:
         v10.vx = ((Actor_80178D40 *)arg0)->unk6;
         v10.vy = ((Actor_80178D40 *)arg0)->unkA;
         v10.vz = ((Actor_80178D40 *)arg0)->unkE;
         func_80179EA0(&v10);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x16: {
         Actor_80178D40 *p = ((Actor_80178D40 *)arg0)->unkD4;
@@ -3736,155 +3736,155 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
         v10.vy = p->unkA;
         v10.vz = p->unkE;
         func_80179EA0(&v10);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     }
     case 0xB:
         func_8017A0F4();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0xC:
         func_8017A11C();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0xD:
         func_8017A180();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0xE:
         func_8017A1A8();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x10:
         func_8017A1D0();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x46:
         func_8017A1F8();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x59:
         func_8017A220();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x5A:
         func_8017A248();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x49:
         func_8017A144(((Cmd_80178D40 *)arg1)->a.w);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x47:
         func_8017A270();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x17:
         func_80179EE8(((Cmd_80178D40 *)arg1)->a.h[0]);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x18:
         func_80179F14(((Cmd_80178D40 *)arg1)->a.h[0], ((Cmd_80178D40 *)arg1)->a.h[1]);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x19:
         func_80179F6C(((Cmd_80178D40 *)arg1)->a.h[0]);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x1A:
         func_80179F98(((Cmd_80178D40 *)arg1)->a.w);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x51:
         func_8017A040(((Cmd_80178D40 *)arg1)->a.w);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x1B:
         D_801F6030 = ((Cmd_80178D40 *)arg1)->a.w;
         func_80179F44();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x1C:
         func_8017A338();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x52:
         func_8017A360();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x1D:
         func_8017A388();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x3B:
         func_8017A094(((Cmd_80178D40 *)arg1)->a.w);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x3C:
         func_8017A0C4(((Cmd_80178D40 *)arg1)->a.w);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0xF:
     case 0x3F:
-        (*(s16*)&D_801F636C) = 4;
+        (*(s16*)D_801F636C) = 4;
         D_801F5BE4 = ((Cmd_80178D40 *)arg1)->a.w;
         break;
     case 0x3E:
-        (*(s16*)&D_801F636C) = 5;
+        (*(s16*)D_801F636C) = 5;
         D_801F6024 = ((Cmd_80178D40 *)arg1)->a.w;
         break;
     case 0x40:
         D_801F6024 = (s32)func_8017A3B0;
-        (*(s16*)&D_801F636C) = 5;
+        (*(s16*)D_801F636C) = 5;
         break;
     case 0x23:
         ((void (*)(void *, s32))func_8012A828)(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x31:
         ((void (*)(void *, s32))func_8012A828)(((Actor_80178D40 *)arg0), ((Actor_80178D40 *)arg0)->unkDC[((Cmd_80178D40 *)arg1)->a.w]);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x24:
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         ((Actor_80178D40 *)arg0)->unk20->unk12 = ((Cmd_80178D40 *)arg1)->a.w;
         break;
     case 0x25:
         g[0] = 1;
         g[2] = ((Actor_80178D40 *)arg0)->unk20->unk12 + ((Cmd_80178D40 *)arg1)->a.uh[0];
         g[1] = 0x1E;
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         g[3] = ((Cmd_80178D40 *)arg1)->a.uh[1];
         break;
     case 0x48:
         g[0] = 1;
         g[2] = ((Cmd_80178D40 *)arg1)->a.uh[0];
         g[1] = 0x1E;
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         g[3] = ((Cmd_80178D40 *)arg1)->a.uh[1];
         break;
     case 0x26:
         g[0] = 1;
         g[2] = ((s32 (*)(void *))func_8012B8A4)(((Actor_80178D40 *)arg0));
         g[1] = 0x1E;
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         g[3] = ((Cmd_80178D40 *)arg1)->a.w;
         break;
     case 0x3D:
         ((void(*)(void *, s32))func_8012E8E0)(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x27:
         g[0] = 2;
         g[4] = ((Cmd_80178D40 *)arg1)->a.uh[0];
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         g[1] = ((Cmd_80178D40 *)arg1)->a.uh[1];
         break;
     case 0x4F:
         g[5] = 1;
         g[0] = 3;
         g[6] = ((Cmd_80178D40 *)arg1)->a.uh[0];
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         g[7] = ((Actor_80178D40 *)arg0)->unkA;
         g[8] = ((Cmd_80178D40 *)arg1)->a.uh[1];
         g[1] = 0x10;
@@ -3894,7 +3894,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
         g[5] = 0;
         g[0] = 3;
         g[6] = ((Cmd_80178D40 *)arg1)->a.uh[0];
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         g[7] = ((Actor_80178D40 *)arg0)->unkA;
         g[8] = ((Cmd_80178D40 *)arg1)->a.uh[1];
         g[1] = 0x10;
@@ -3910,7 +3910,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
         *(SV3_80178D40 *)(g + 6) = v28;
         g[1] = 0x10;
         g[3] = 4;
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x50:
         v30.vx = ((Cmd_80178D40 *)arg1)->a.uh[0];
@@ -3922,129 +3922,129 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
         *(SV3_80178D40 *)(g + 6) = v38;
         g[1] = 0x10;
         g[3] = 4;
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x2A:
         g[0] = 4;
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         g[1] = ((Cmd_80178D40 *)arg1)->a.w;
         break;
     case 0x1E:
         func_8017B238(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x21:
         func_8017BA3C(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
         func_8017B238(((Actor_80178D40 *)arg0), (s32)&D_801F6014);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x54:
         func_8017BB34(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
         func_8017B238(((Actor_80178D40 *)arg0), (s32)&D_801F6014);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x1F:
         func_8017B614(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x22:
         func_8017BA3C(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
         func_8017B614(((Actor_80178D40 *)arg0), (s32)&D_801F6014);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x55:
         func_8017BB34(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
         func_8017B614(((Actor_80178D40 *)arg0), (s32)&D_801F6014);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x20:
         func_8017B7A8(((Actor_80178D40 *)arg0));
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x4E:
         D_801F6038 = ((Cmd_80178D40 *)arg1)->a.w;
         func_8017B940(((Actor_80178D40 *)arg0));
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x57:
         func_8017B824();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x58:
         func_8017B880();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x2B:
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         ((Actor_80178D40 *)arg0)->unk2 = ((Cmd_80178D40 *)arg1)->a.w;
         break;
     case 0x2C:
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         ((Actor_80178D40 *)arg0)->unk34 = ((Cmd_80178D40 *)arg1)->a.w;
         break;
     case 0x2D:
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         ((Actor_80178D40 *)arg0)->unkD8 = ((Cmd_80178D40 *)arg1)->a.w;
         break;
     case 0x2F:
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         ((Actor_80178D40 *)arg0)->unk10A = ((Cmd_80178D40 *)arg1)->a.w;
         break;
     case 0x2E:
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         ((Actor_80178D40 *)arg0)->unkF8 = ((Cmd_80178D40 *)arg1)->a.w;
         break;
     case 0x11:
         func_8017A298();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x12:
         func_8017A2C0();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x13:
         func_8017A2E8();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x14:
         func_8017A310();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x33: {
         void (*f)(Actor_80178D40 *) = (void (*)(Actor_80178D40 *))((Cmd_80178D40 *)arg1)->a.w;
         D_801F62F4 = (s32)&((Cmd_80178D40 *)arg1)[1];
         f(((Actor_80178D40 *)arg0));
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     }
     case 0x30:
         if (((Cmd_80178D40 *)arg1)->a.w == 0) {
             ((void (*)(void *))func_8012E8A8)(((Actor_80178D40 *)arg0));
-            (*(s16*)&D_801F636C) = 3;
+            (*(s16*)D_801F636C) = 3;
         } else {
             ((void (*)(void *))func_8012E88C)(((Actor_80178D40 *)arg0));
-            (*(s16*)&D_801F636C) = 3;
+            (*(s16*)D_801F636C) = 3;
         }
         break;
     case 0x4A:
         ((void(*)())func_80175414)();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x4B:
         func_80175454();
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x34:
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         D_801F5BE0 = ((Cmd_80178D40 *)arg1)->a.w;
         return;
     case 0x35:
         D_801F6010 = (s32)&((Cmd_80178D40 *)arg1)[1];
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         D_801F5BE0 = ((Cmd_80178D40 *)arg1)->a.w;
         return;
     case 0x36:
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         D_801F5BE0 += 8;
         if (((s32 (*)(s32))((Cmd_80178D40 *)arg1)->a.w)(((Actor_80178D40 *)arg0)) == 0) {
             break;
@@ -4052,12 +4052,12 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
         D_801F5BE0 = *(s32 *)(D_801F5BE0 + 4);
         return;
     case 0x37:
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         D_801F5FFC = ((Cmd_80178D40 *)arg1)->a.uh[0];
         D_801F6000 = ((Cmd_80178D40 *)arg1)->a.uh[1];
         break;
     case 0x38:
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         D_801F6004 = ((Cmd_80178D40 *)arg1)->a.uh[0];
         D_801F6008 = ((Cmd_80178D40 *)arg1)->a.uh[1];
         break;
@@ -4073,7 +4073,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
         w1 = out50[0];
         func_8012F40C(out50, &v48);
         w2 = out50[0];
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         D_801F5FFC = w1;
         D_801F6000 = (s16)w1 >= (s16)w2;
         break;
@@ -4090,42 +4090,42 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
         w1 = out50[0];
         func_8012F40C(out50, &v60);
         w2 = out50[0];
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         D_801F6004 = w2;
         D_801F6008 = (s16)w1 < (s16)w2;
         break;
     }
     case 0x41:
         ((void(*)(s32, s32))func_8002D4C8)(((Cmd_80178D40 *)arg1)->a.uh[0], ((Cmd_80178D40 *)arg1)->a.uh[1]);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x42:
         func_8017AD0C(((Cmd_80178D40 *)arg1)->a.w);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x43:
         D_801F6024 = (s32)func_8017A3D8;
         D_801F602C = 0;
-        (*(s16*)&D_801F636C) = 5;
+        (*(s16*)D_801F636C) = 5;
         D_801F6028 = ((Cmd_80178D40 *)arg1)->a.w;
         break;
     case 0x44:
         func_8001AAD0(((Cmd_80178D40 *)arg1)->a.h[0], ((Cmd_80178D40 *)arg1)->a.h[1]);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x53:
         func_80179E48(((Cmd_80178D40 *)arg1)->a.h[0]);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x56:
         func_80179FEC(((Cmd_80178D40 *)arg1)->a.w);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     L5B_found:
         fp5b = ((Cmd_80178D40 *)arg1)->a.w;
         *q5b = fp5b;
         ((void (*)(Actor_80178D40 *))fp5b)(((Actor_80178D40 *)arg0));
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     case 0x5B:
         i5b = 0;
@@ -4137,7 +4137,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
             }
             q5b++;
         } while (i5b < 10);
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     L5C_found1:
         *q5c = 0;
@@ -4156,7 +4156,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
             } while (i5c < 10);
         L5C_join:
             if (i5c != 10) {
-                (*(s16*)&D_801F636C) = 3;
+                (*(s16*)D_801F636C) = 3;
                 break;
             }
             i5c = 0;
@@ -4167,7 +4167,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
                 }
                 i5c++;
             } while (i5c < 10);
-            (*(s16*)&D_801F636C) = 3;
+            (*(s16*)D_801F636C) = 3;
             break;
         L5C_found2:
             *p5c = 0;
@@ -4185,7 +4185,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
         /* fallthrough */
     case 0x5D:
     L5D:
-        (*(s16*)&D_801F636C) = 3;
+        (*(s16*)D_801F636C) = 3;
         break;
     default:
         break;

src/ov_SC07_006/ov_SC07_006_jr_8017AE2C.c

@@ -3706,9 +3706,9 @@ void func_8017B940(void)
     extern s32 D_80114F2C;
     extern u8  D_8012694C;
     extern s16 D_801F5FF4;
-    extern short D_801F607C;
-    extern short D_801F607E;
-    extern short D_801F6080;
+    extern short D_801F607C[];
+    extern short D_801F607E[];
+    extern short D_801F6080[];
     extern s16 D_801F606C;
     extern s16 D_801F606E;
     extern s16 D_801F6070;
@@ -3721,9 +3721,9 @@ void func_8017B940(void)
     buf[0] = (*(s16 *)&D_80126B5E) - (*(s16 *)&D_801F6074);
     buf[1] = (*(s16 *)&D_80126B62) - (*(s16 *)&D_801F6076);
     buf[2] = (*(s16 *)&D_80126B66) - (*(s16 *)&D_801F6078);
-    (*(s16 *)&D_801F607C) = buf[0];
-    (*(s16 *)&D_801F607E) = buf[1];
-    (*(s16 *)&D_801F6080) = buf[2];
+    (D_801F607C[0]) = buf[0];
+    (D_801F607E[0]) = buf[1];
+    (D_801F6080[0]) = buf[2];
     D_801F606C = D_80114F30 + buf[0];
     D_801F5FF4 = 0;
     D_801F606E = D_80114F34 + buf[1];
@@ -3906,9 +3906,9 @@ void func_8017BD50(int param_1)
 
     extern s16 D_801F5FF4;
     extern void (*D_801F6038)(void);
-    extern short D_801F607C;
-    extern short D_801F607E;
-    extern short D_801F6080;
+    extern short D_801F607C[0];
+    extern short D_801F607E[0];
+    extern short D_801F6080[0];
     extern s16 D_801F62F8;
     extern s32 D_80114F24;
     extern s32 D_80114F28;
@@ -3922,12 +3922,12 @@ void func_8017BD50(int param_1)
         if (D_801F6038 != 0) {
             (*D_801F6038)();
         } else {
-            D_80114F30 = D_80114F30 + D_801F607C;
-            D_80114F34 = D_80114F34 + D_801F607E;
-            D_80114F38 = D_80114F38 + D_801F6080;
-            D_80114F24 = D_80114F24 + D_801F607C;
-            D_80114F28 = D_80114F28 + D_801F607E;
-            D_80114F2C = D_80114F2C + D_801F6080;
+            D_80114F30 = D_80114F30 + D_801F607C[0];
+            D_80114F34 = D_80114F34 + D_801F607E[0];
+            D_80114F38 = D_80114F38 + D_801F6080[0];
+            D_80114F24 = D_80114F24 + D_801F607C[0];
+            D_80114F28 = D_80114F28 + D_801F607E[0];
+            D_80114F2C = D_80114F2C + D_801F6080[0];
             func_8012A4BC();
         }
         D_801F62F8 = 0;