use array count for collision headers (#222)

* lights fix

* names

* remove header

* so many names

* format

* more docs

* makefile

* colheaders

* it's gone too far

* torch

.vscode/settings.json

@@ -45,7 +45,7 @@
     "cstdlib": "c",
     "typeinfo": "c",
     "sym_addrs_funcs": "c",
-    "*.txt": "c",
+    "*.txt": "plaintext",
     "fox_title.h": "c",
     "prevent_bss_reordering.h": "c",
     "fox_map.h": "c",

assets/yaml/us/ast_andross.yaml

@@ -176,7 +176,7 @@ D_ANDROSS_C033D98:
   {type: SF64:ANIM, offset: 0xC033D98, symbol: D_ANDROSS_C033D98}
 
 D_ANDROSS_C035110:
-  {type: SF64:ENV_SETTINGS, offset: 0xC035110, symbol: D_ANDROSS_C035110}
+  {type: SF64:ENVIRONMENT, offset: 0xC035110, symbol: D_ANDROSS_C035110}
 
 D_ANDROSS_C035154:
   {type: SF64:OBJECT_INIT, offset: 0xC035154, symbol: D_ANDROSS_C035154}

assets/yaml/us/ast_aquas.yaml

@@ -645,10 +645,10 @@ D_AQ_602E028:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x602E028, symbol: D_AQ_602E028 }
 
 D_AQ_602E540:
-  { type: SF64:ENV_SETTINGS, offset: 0x602E540, symbol: D_AQ_602E540 }
+  { type: SF64:ENVIRONMENT, offset: 0x602E540, symbol: D_AQ_602E540 }
 
 D_AQ_602E584:
-  { type: SF64:ENV_SETTINGS, offset: 0x602E584, symbol: D_AQ_602E584 }
+  { type: SF64:ENVIRONMENT, offset: 0x602E584, symbol: D_AQ_602E584 }
 
 D_AQ_602E584:
   { type: SF64:OBJECT_INIT, offset: 0x602E5C8, symbol: D_AQ_602E5C8 }

assets/yaml/us/ast_area_6.yaml

@@ -220,7 +220,7 @@ D_A6_6022F20:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06022F20, symbol: D_A6_6022F20 }
 
 D_A6_6023F20:
-  { type: SF64:ENV_SETTINGS, offset: 0x6023F20, symbol: D_A6_6023F20}
+  { type: SF64:ENVIRONMENT, offset: 0x6023F20, symbol: D_A6_6023F20}
 
 D_A6_6023F64:
   { type: SF64:OBJECT_INIT, offset: 0x6023F64, symbol: D_A6_6023F64}
@@ -244,7 +244,7 @@ D_A6_6028578:
   { type: SF64:HITBOX, offset: 0x6028578, symbol: D_A6_6028578 }
 
 D_A6_6028760:
-  { type: SF64:ENV_SETTINGS, offset: 0x6028760, symbol: D_A6_6028760}
+  { type: SF64:ENVIRONMENT, offset: 0x6028760, symbol: D_A6_6028760}
 
 D_A6_60287A4:
   { type: SF64:OBJECT_INIT, offset: 0x60287A4, symbol: D_A6_60287A4}

assets/yaml/us/ast_bolse.yaml

@@ -167,7 +167,7 @@ D_BO_600F728:
   { type: TEXTURE, format: RGBA16, offset: 0x0600F728, width: 32, height: 32, ctype: u16, symbol: D_BO_600F728 }
 
 D_BO_600FF30:
-  { type: SF64:ENV_SETTINGS, offset: 0x600FF30, symbol: D_BO_600FF30 }
+  { type: SF64:ENVIRONMENT, offset: 0x600FF30, symbol: D_BO_600FF30 }
 
 D_BO_600FF74: 
   { type: SF64:OBJECT_INIT, offset: 0x600FF74, symbol: D_BO_600FF74 }

assets/yaml/us/ast_corneria.yaml

@@ -433,7 +433,7 @@ D_CO_6036D58:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x06036D58, symbol: D_CO_6036D58 }
 
 D_CO_6037160:
-  { type: SF64:ENV_SETTINGS, offset: 0x6037160, symbol: D_CO_6037160 }
+  { type: SF64:ENVIRONMENT, offset: 0x6037160, symbol: D_CO_6037160 }
 
 D_CO_60371A4: 
   { type: SF64:OBJECT_INIT, offset: 0x60371A4, symbol: D_CO_60371A4 }

assets/yaml/us/ast_fortuna.yaml

@@ -144,7 +144,7 @@ D_FO_600DA88:
   { type: TEXTURE, format: RGBA16, width: 64, height: 32, offset: 0x600DA88, ctype: u16, symbol: D_FO_600DA88 }
 
 D_FO_600EA90:
-  { type: SF64:ENV_SETTINGS, offset: 0x600EA90, symbol: D_FO_600EA90 }
+  { type: SF64:ENVIRONMENT, offset: 0x600EA90, symbol: D_FO_600EA90 }
 
 D_FO_600EAD4:
   { type: SF64:OBJECT_INIT, offset: 0x600EAD4, symbol: D_FO_600EAD4 }

assets/yaml/us/ast_katina.yaml

@@ -162,7 +162,7 @@ D_KA_6010780:
   { type: GFX, offset: 0x6010780, symbol: D_KA_6010780 }
 
 D_KA_6011000:
-  { type: SF64:ENV_SETTINGS, offset: 0x6011000, symbol: D_KA_6011000 }
+  { type: SF64:ENVIRONMENT, offset: 0x6011000, symbol: D_KA_6011000 }
 
 D_KA_6011044:
   { type: SF64:OBJECT_INIT, offset: 0x6011044, symbol: D_KA_6011044 }

assets/yaml/us/ast_macbeth.yaml

@@ -722,7 +722,7 @@ D_MA_6030C50:
   {type: GFX, offset: 0x6030C50, symbol: D_MA_6030C50}
 
 D_MA_6030E30:
-  {type: SF64:ENV_SETTINGS, offset: 0x6030E30, symbol: D_MA_6030E30}
+  {type: SF64:ENVIRONMENT, offset: 0x6030E30, symbol: D_MA_6030E30}
 
 D_MA_6030E74:
   {type: SF64:TRIANGLE, count: 2, offset: 0x6030E74, symbol: D_MA_6030E74, mesh_symbol: D_MA_OFFSET}

assets/yaml/us/ast_meteo.yaml

@@ -272,7 +272,7 @@ D_ME_6026CC4:
   { type: SF64:OBJECT_INIT, offset: 0x6026CC4, symbol: D_ME_6026CC4 }
 
 D_ME_6026C80:
-  { type: SF64:ENV_SETTINGS, offset: 0x6026C80, symbol: D_ME_6026C80 }
+  { type: SF64:ENVIRONMENT, offset: 0x6026C80, symbol: D_ME_6026C80 }
 
 D_ME_602B148: 
   { type: SF64:OBJECT_INIT, offset: 0x602B148, symbol: D_ME_602B148 }

assets/yaml/us/ast_sector_x.yaml

@@ -227,7 +227,7 @@ D_SX_6029918:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x029918, symbol: D_SX_6029918 }
 
 D_SX_602A120:
-  { type: SF64:ENV_SETTINGS, offset: 0x602A120, symbol: D_SX_602A120 }
+  { type: SF64:ENVIRONMENT, offset: 0x602A120, symbol: D_SX_602A120 }
 
 D_SX_602A164:
   { type: SF64:OBJECT_INIT, count: 1026, offset: 0x602A164, symbol: D_SX_602A164 }

assets/yaml/us/ast_sector_y.yaml

@@ -294,7 +294,7 @@ D_SY_602D238:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 16, offset: 0x0602D238, symbol: D_SY_602D238 }
 
 D_SY_602E4B0:
-  { type: SF64:ENV_SETTINGS, offset: 0x602E4B0, symbol: D_SY_602E4B0 }
+  { type: SF64:ENVIRONMENT, offset: 0x602E4B0, symbol: D_SY_602E4B0 }
 
 D_SY_602E4F4:
   { type: SF64:OBJECT_INIT, offset: 0x602E4F4, symbol: D_SY_602E4F4 }

assets/yaml/us/ast_sector_z.yaml

@@ -149,7 +149,7 @@ D_SZ_6006E50:
   { type: SF64:SKELETON, offset: 0x6006E50, symbol: D_SZ_6006E50 }
 
 D_SZ_6006E70:
-  { type: SF64:ENV_SETTINGS, offset: 0x6006E70, symbol: D_SZ_6006E70 }
+  { type: SF64:ENVIRONMENT, offset: 0x6006E70, symbol: D_SZ_6006E70 }
 
 D_SZ_6006EB4:
   { type: SF64:OBJECT_INIT, offset: 0x6006EB4, symbol: D_SZ_6006EB4 }

assets/yaml/us/ast_solar.yaml

@@ -203,7 +203,7 @@ D_SO_601E1E8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x601E1E8, symbol: D_SO_601E1E8}
 
 D_SO_601F1F0:
-  { type: SF64:ENV_SETTINGS, offset: 0x601F1F0, symbol: D_SO_601F1F0}
+  { type: SF64:ENVIRONMENT, offset: 0x601F1F0, symbol: D_SO_601F1F0}
 
 D_SO_601F234:
   { type: SF64:OBJECT_INIT, offset: 0x601F234, symbol: D_SO_601F234}

assets/yaml/us/ast_titania.yaml

@@ -71,7 +71,7 @@ D_TI_6004C00:
   {type: TEXTURE, format: IA8, ctype: u8, width: 32, height: 32, offset: 0x6004C00, symbol: D_TI_6004C00}
 
 D_TI_6005000:
-  {type: SF64:ENV_SETTINGS, offset: 0x6005000, symbol: D_TI_6005000}
+  {type: SF64:ENVIRONMENT, offset: 0x6005000, symbol: D_TI_6005000}
 
 D_TI_600631C:
   {type: SF64:SCRIPT, offset: 0x600631C, symbol: D_TI_600631C}

assets/yaml/us/ast_training.yaml

@@ -65,7 +65,7 @@ D_TR_60069D8:
   { type: TEXTURE, format: RGBA16, offset: 0x060069D8, width: 8, height: 8, ctype: u16, symbol: D_TR_60069D8 }
 
 D_TR_6006A60:
-  { type: SF64:ENV_SETTINGS, offset: 0x6006A60, symbol: D_TR_6006A60 }
+  { type: SF64:ENVIRONMENT, offset: 0x6006A60, symbol: D_TR_6006A60 }
 
 D_TR_6006AA4:
   { type: SF64:OBJECT_INIT, offset: 0x6006AA4, symbol: D_TR_6006AA4 }

assets/yaml/us/ast_venom_1.yaml

@@ -113,7 +113,7 @@ D_VE1_6007D90:
   { type: GFX, offset: 0x6007D90, symbol: D_VE1_6007D90 }
 
 D_VE1_6007E30:
-  { type: SF64:ENV_SETTINGS, offset: 0x6007E30, symbol: D_VE1_6007E30 }
+  { type: SF64:ENVIRONMENT, offset: 0x6007E30, symbol: D_VE1_6007E30 }
 
 D_VE1_6007E74:
   { type: SF64:OBJECT_INIT, offset: 0x6007E74, symbol: D_VE1_6007E74 }

assets/yaml/us/ast_venom_2.yaml

@@ -187,7 +187,7 @@ D_VE2_60149D0:
   { type: SF64:SKELETON, offset: 0x60149D0, symbol: D_VE2_60149D0 }
 
 D_VE2_6014D50:
-  { type: SF64:ENV_SETTINGS, offset: 0x6014D50, symbol: D_VE2_6014D50 }
+  { type: SF64:ENVIRONMENT, offset: 0x6014D50, symbol: D_VE2_6014D50 }
 
 D_VE2_6014D94:
   { type: SF64:OBJECT_INIT, offset: 0x6014D94, symbol: D_VE2_6014D94 }

assets/yaml/us/ast_versus.yaml

@@ -684,13 +684,13 @@ D_versus_302D568:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x302D568, symbol: D_versus_302D568 }
 
 D_versus_302DD70:
-  { type: SF64:ENV_SETTINGS, offset: 0x302DD70, symbol: D_versus_302DD70}
+  { type: SF64:ENVIRONMENT, offset: 0x302DD70, symbol: D_versus_302DD70}
 
 D_versus_302DDB4:
-  { type: SF64:ENV_SETTINGS, offset: 0x302DDB4, symbol: D_versus_302DDB4}
+  { type: SF64:ENVIRONMENT, offset: 0x302DDB4, symbol: D_versus_302DDB4}
 
 D_versus_302DDF8:
-  { type: SF64:ENV_SETTINGS, offset: 0x302DDF8, symbol: D_versus_302DDF8}
+  { type: SF64:ENVIRONMENT, offset: 0x302DDF8, symbol: D_versus_302DDF8}
 
 D_versus_302DE3C:
   { type: SF64:OBJECT_INIT, offset: 0x302DE3C, symbol: D_versus_302DE3C}

assets/yaml/us/ast_zoness.yaml

@@ -487,7 +487,7 @@ D_ZO_6025F98:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6025F98, symbol: D_ZO_6025F98}
 
 D_ZO_60266D0:
-  { type: SF64:ENV_SETTINGS, offset: 0x60266D0, symbol: D_ZO_60266D0}
+  { type: SF64:ENVIRONMENT, offset: 0x60266D0, symbol: D_ZO_60266D0}
 
 D_ZO_6026714:
   { type: SF64:OBJECT_INIT, offset: 0x6026714, symbol: D_ZO_6026714}