remove assets.h and fix various symbols

32 files changed, 77 insertions, 148 deletions

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 57d633ee..bbadaec6 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -115,7 +115,17 @@
     "any": "c",
     "memory_resource": "c",
     "ast_andross.h": "c",
-    "sf64object.h": "c"
+    "sf64object.h": "c",
+    "ast_corneria.h": "c",
+    "ast_great_fox.h": "c",
+    "ast_bolse.h": "c",
+    "ast_venom_2.h": "c",
+    "ast_katina.h": "c",
+    "ast_fortuna.h": "c",
+    "ast_zoness.h": "c",
+    "ast_solar.h": "c",
+    "ast_ve1_boss.h": "c",
+    "ast_arwing.h": "c"
   },
   "C_Cpp_Runner.msvcBatchPath": ""
 }
\ No newline at end of file
diff --git a/assets/yaml/us/ast_corneria.yaml b/assets/yaml/us/ast_corneria.yaml
index e55e1381..9d5ae453 100644
--- a/assets/yaml/us/ast_corneria.yaml
+++ b/assets/yaml/us/ast_corneria.yaml
@@ -159,9 +159,8 @@ D_CO_6015F00:
 D_CO_6015700:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06015700, symbol: D_CO_6015700 }
 
-# Seems unused
-D_CO_6016268: 
-  { type: GFX, offset: 0x6016268, symbol: D_CO_6016268 }
+D_CO_6016270: 
+  { type: GFX, offset: 0x6016270, symbol: D_CO_6016270 }
 
 D_CO_60164F0: 
   { type: GFX, offset: 0x60164F0, symbol: D_CO_60164F0 }
diff --git a/assets/yaml/us/ast_fortuna.yaml b/assets/yaml/us/ast_fortuna.yaml
index 65e76252..d95bde1c 100644
--- a/assets/yaml/us/ast_fortuna.yaml
+++ b/assets/yaml/us/ast_fortuna.yaml
@@ -127,7 +127,7 @@ D_FO_600D7E8:
   { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x600D7E8, ctype: u16, symbol: D_FO_600D7E8 }
 
 D_FO_600D9F0:
-  { type: GFX, offset: 0x600D9F0, symbol: D_FO_600D9F8 }
+  { type: GFX, offset: 0x600D9F0, symbol: D_FO_600D9F0 }
 
 D_FO_600DA88:
   { type: TEXTURE, format: RGBA16, width: 64, height: 32, offset: 0x600DA88, ctype: u16, symbol: D_FO_600DA88 }
@@ -139,13 +139,13 @@ D_FO_600EAD4:
   { type: SF64:OBJECT_INIT, offset: 0x600EAD4, symbol: D_FO_600EAD4 }
 
 D_FO_600F1DC:
-  { type: SF64:COLPOLY, offset: 0x600F1DC, count: 22, symbol: D_FO_600F1DC }
+  { type: SF64:COLPOLY, offset: 0x600F1DC, count: 22, symbol: D_FO_600F1DC, mesh_symbol: D_FO_OFFSET }
 
 D_FO_600F3F4:
-  { type: SF64:COLPOLY, offset: 0x600F3F4, count: 22, symbol: D_FO_600F3F4 }
+  { type: SF64:COLPOLY, offset: 0x600F3F4, count: 22, symbol: D_FO_600F3F4, mesh_symbol: D_FO_OFFSET }
 
 D_FO_600F60C:
-  { type: SF64:COLPOLY, offset: 0x600F60C, count: 93, symbol: D_FO_600F60C }
+  { type: SF64:COLPOLY, offset: 0x600F60C, count: 93, symbol: D_FO_600F60C, mesh_symbol: D_FO_OFFSET }
 
 D_FO_600FE9C:
   { type: SF64:HITBOX, offset: 0x600FE9C, symbol: D_FO_600FE9C }
diff --git a/assets/yaml/us/ast_macbeth.yaml b/assets/yaml/us/ast_macbeth.yaml
index 3594e8bb..a520cdf0 100644
--- a/assets/yaml/us/ast_macbeth.yaml
+++ b/assets/yaml/us/ast_macbeth.yaml
@@ -31,6 +31,9 @@ D_MA_6001578:
 D_MA_6001978:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 112, offset: 0x6001978, symbol: D_MA_6001978}
 
+D_MA_6001A60:
+  {type: GFX, offset: 0x6001A60, symbol: D_MA_6001A60}
+
 D_MA_6001B38:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x6001B38, symbol: D_MA_6001B38, tlut: 0x6001C38}
 
@@ -303,6 +306,21 @@ D_MA_600F028:
 
 D_MA_600F128:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 24, offset: 0x600F128, symbol: D_MA_600F128}
+  
+D_MA_600F160:
+  {type: GFX, offset: 0x600F160, symbol: D_MA_600F160}
+  
+D_MA_600F2F0:
+  {type: GFX, offset: 0x600F2F0, symbol: D_MA_600F2F0}
+  
+D_MA_600F3D0:
+  {type: GFX, offset: 0x600F3D0, symbol: D_MA_600F3D0}
+  
+D_MA_600F6C0:
+  {type: GFX, offset: 0x600F6C0, symbol: D_MA_600F6C0}
+  
+D_MA_600F9B0:
+  {type: GFX, offset: 0x600F9B0, symbol: D_MA_600F9B0}
 
 D_MA_600FEC4:
   {type: SF64:ANIM, offset: 0x600FEC4, symbol: D_MA_600FEC4}
@@ -478,6 +496,15 @@ D_MA_601F1D0:
 D_MA_601F270:
   {type: GFX, offset: 0x601F270, symbol: D_MA_601F270}
 
+D_MA_6020A30:
+  {type: GFX, offset: 0x6020A30, symbol: D_MA_6020A30}
+
+D_MA_60200E0:
+  {type: GFX, offset: 0x60200E0, symbol: D_MA_60200E0}
+
+D_MA_6020E600:
+  {type: GFX, offset: 0x6020E60, symbol: D_MA_6020E60}
+
 D_MA_6022200:
   {type: GFX, offset: 0x6022200, symbol: D_MA_6022200}
 
diff --git a/assets/yaml/us/ast_venom_1.yaml b/assets/yaml/us/ast_venom_1.yaml
index 46ba936e..87d29851 100644
--- a/assets/yaml/us/ast_venom_1.yaml
+++ b/assets/yaml/us/ast_venom_1.yaml
@@ -59,7 +59,10 @@ D_VE1_60044D0:
   { type: TEXTURE, format: CI8, width: 16, height: 16, offset: 0x60044D0, tlut: 0x60048D0, ctype: u8, symbol: D_VE1_60044D0 }
 
 D_VE1_60045D0:
-  { type: TEXTURE, format: TLUT, colors: 216, offset: 0x60045D0, ctype: u16, symbol: D_VE1_60045D0 }
+  { type: TEXTURE, format: TLUT, colors: 144, offset: 0x60045D0, ctype: u16, symbol: D_VE1_60045D0 }
+
+D_VE1_60046F0:
+  { type: GFX, offset: 0x60046F0, symbol: D_VE1_60046F0 }
 
 D_VE1_6004780:
   { type: TEXTURE, format: RGBA16, width: 64, height: 32, offset: 0x6004780, ctype: u16, symbol: D_VE1_6004780 }
diff --git a/assets/yaml/us/ast_venom_2.yaml b/assets/yaml/us/ast_venom_2.yaml
index f4200825..2d6ff062 100644
--- a/assets/yaml/us/ast_venom_2.yaml
+++ b/assets/yaml/us/ast_venom_2.yaml
@@ -191,7 +191,7 @@ D_VE2_6014D94:
   { type: SF64:OBJECT_INIT, offset: 0x6014D94, symbol: D_VE2_6014D94 }
 
 D_VE2_6014FEC:
-  { type: SF64:COLPOLY, count: 250, offset: 0x6014FEC, symbol: D_VE2_6014FEC }
+  { type: SF64:COLPOLY, count: 250, offset: 0x6014FEC, symbol: D_VE2_6014FEC, mesh_symbol: D_VE2_OFFSET }
 
 D_VE2_601668C:
   { type: SF64:HITBOX, offset: 0x601668C, symbol: D_VE2_601668C }
diff --git a/include/assets.h b/include/assets.h
deleted file mode 100644
index db303978..00000000
--- a/include/assets.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-#ifndef ASSETS_H
-#define ASSETS_H
-
-#include "sys.h"
-#include "sf64level.h"
-#include "sf64object.h"
-#include "sf64player.h"
-
-// ast_enmy_planet
-
-
-/* ast_corneria, ast_meteo, ast_titania, ast_sector_x, ast_sector_z,
- * ast_aquas, ast_area_6, ast_venom_1, ast_venom_2, ast_ve1_boss*,
- * ast_bolse, ast_fortuna, ast_sector_y, ast_solar, ast_zoness,
- * ast_katina, ast_macbeth, ast_title, ast_map, ast_training
- */
-extern Gfx D_6001530[]; // fox_360, fox_demo, fox_ka
-extern Gfx D_6001A60[]; // fox_effect
-extern Gfx D_6002E60[]; // fox_bg
-extern Gfx D_60030F0[]; // fox_edata_1C
-extern Gfx D_60046F0[];
-extern Gfx D_6005880[];
-extern Gfx D_6006140[];
-extern EnvSettings D_6006A60;
-extern u16 D_6006EA0[];
-extern Gfx D_6009250[];
-extern u16* D_6009B34[];
-extern f32 D_6009CC4[];
-extern f32 D_6009CFC[];
-extern Gfx D_6009F90[];
-extern Gfx D_600A420[];
-extern u16 D_600BEA0[];
-extern u16 D_600C6A0[];
-extern Gfx D_600D9F0[];
-extern u8 D_600DDC0[];
-extern u8 D_600E360[];
-extern u8 D_600E980[];
-extern Gfx D_600F160[];
-extern Gfx D_600F2F0[];
-extern Vec3s D_600F394[];
-extern Gfx D_600F3D0[];
-extern CollisionPoly D_600F3F4[];
-extern Vec3s D_600F5AC[];
-extern u8 D_600F940[];
-extern Gfx D_600F9B0[];
-extern Vec3s D_600FD50[];
-extern u8 D_6010090[];
-extern u8 D_60106B0[];
-extern u8 D_6010FA0[];
-extern Vec3s D_601170C[];
-extern u8 D_6011890[];
-extern u8 D_6012310[];
-extern u8 D_60123F0[];
-extern u8 D_6013470[];
-extern u8 D_6014140[];
-extern u16 D_60147C0[];
-extern u8 D_60147E0[];
-extern u8 D_60148B0[];
-extern Gfx D_6016270[];
-extern Vec3s D_6016374[];
-extern u16* D_VE1_601B1E4[];
-extern Gfx D_6018C00[]; // possible collision
-extern Gfx D_6019670[];
-extern Gfx D_6008D40[];
-extern Gfx D_60185E0[];
-extern Gfx D_6017550[];
-extern Gfx D_601A700[];
-extern u16* D_SO_600631C[];
-extern Gfx D_601AE40[];
-extern f32 D_F32_601B710[];
-extern EnvSettings D_SO_601F1F0;
-extern Gfx D_60200E0[];
-extern Gfx D_6020A30[];
-extern Gfx D_6020E60[];
-extern Vec3f D_602CB80[];
-extern CollisionPoly D_602FA9C[];
-extern Vec3s D_6033E08[];
-extern Gfx D_6041070[];
-extern EnvSettings D_BO_600FF30;
-extern EnvSettings D_ME_6026C80;
-extern EnvSettings D_ZO_60266D0;
-
-#endif // ASSETS_H
diff --git a/linker_scripts/us/undefined_syms.ld b/linker_scripts/us/undefined_syms.ld
index 7690e31b..21584db5 100644
--- a/linker_scripts/us/undefined_syms.ld
+++ b/linker_scripts/us/undefined_syms.ld
@@ -1253,7 +1253,6 @@ D_6001260 = 0x6001260;
 D_60012D0 = 0x60012D0;
 D_6001360 = 0x6001360;
 D_MA_60014A0 = 0x60014A0;
-D_6001530 = 0x6001530;
 D_60018C0 = 0x60018C0;
 D_SX_6001950 = 0x6001950;
 D_6001A60 = 0x6001A60;
diff --git a/src/main/fox_360.c b/src/main/fox_360.c
index c1106e84..e4d951ff 100644
--- a/src/main/fox_360.c
+++ b/src/main/fox_360.c
@@ -1,6 +1,5 @@
 #include "prevent_bss_reordering.h"
 #include "global.h"
-#include "assets.h"
 #include "assets/ast_katina.h"
 #include "assets/ast_venom_2.h"
 #include "assets/ast_fortuna.h"
@@ -2259,7 +2258,7 @@ void func_80035448(Actor* actor) {
                             func_8005B1E8(actor, 0);
                             break;
                         case 3:
-                            gSPDisplayList(gMasterDisp++, D_6001530);
+                            gSPDisplayList(gMasterDisp++, D_KA_6001530);
                             Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 30.0f, 1);
                             func_80034E64(actor);
                             break;
diff --git a/src/main/fox_A4290_colheaders.c b/src/main/fox_A4290_colheaders.c
index d695414f..f3fe3eaa 100644
--- a/src/main/fox_A4290_colheaders.c
+++ b/src/main/fox_A4290_colheaders.c
@@ -1,7 +1,6 @@
 #include "structs.h"
 #include "macros.h"
 #include "variables.h"
-#include "assets.h"
 #include "assets/ast_aquas.h"
 #include "assets/ast_bolse.h"
 #include "assets/ast_meteo.h"
@@ -63,28 +62,28 @@ CollisionHeader D_800D2B38[10] = {
         { 1704.0f, 1030.0f, 4842.0f },
         174,
         D_SY_6033070,
-        D_6033E08,
+        D_SY_6033E08,
     },
     {
         { -1308.0f, 0.0f, -1460.0f },
         { 1310.0f, 666.0f, 807.0f },
         93,
         D_FO_600F60C,
-        D_600FD50,
+        D_FO_600FD50,
     },
     {
         { -951.0f, 0.0f, -1075.0f },
         { 1075.0f, 1014.0f, 1075.0f },
         22,
         D_FO_600F3F4,
-        D_600F5AC,
+        D_FO_600F5AC,
     },
     {
         { -951.0f, 0.0f, -1075.0f },
         { 1075.0f, 384.0f, 1075.0f },
         22,
         D_FO_600F1DC,
-        D_600F394,
+        D_FO_600F394,
     },
     {
         { -1554.0f, -2.0f, -1401.0f },
@@ -105,7 +104,7 @@ CollisionHeader D_800D2B38[10] = {
         { 671.0f, 648.0f, 671.0f },
         250,
         D_VE2_6014FEC,
-        D_6016374,
+        D_VE2_6016374,
     },
 };
 
@@ -164,7 +163,7 @@ CollisionHeader2 D_800D2CA0[19] = {
         { 488.0f, 148.0f, 567.0f },
         30,
         D_ZO_602CACC,
-        D_602CB80,
+        D_ZO_602CB80,
     },
     {
         { -900.0f, -110.0f, -1900.0f },
diff --git a/src/main/fox_bg.c b/src/main/fox_bg.c
index 162d4eff..b685aa15 100644
--- a/src/main/fox_bg.c
+++ b/src/main/fox_bg.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "assets.h"
 #include "prevent_bss_reordering.h"
 
 extern f32 D_i3_801C4188;
@@ -294,7 +293,7 @@ void func_8003E1E8(void) {
                             }
                             break;
                         case LEVEL_FORTUNA:
-                            gSPDisplayList(gMasterDisp++, D_600D9F0);
+                            gSPDisplayList(gMasterDisp++, D_FO_600D9F0);
                             break;
                         case LEVEL_KATINA:
                             gSPDisplayList(gMasterDisp++, D_KA_600F1D0);
@@ -316,7 +315,7 @@ void func_8003E1E8(void) {
                             }
                             break;
                         case LEVEL_FORTUNA:
-                            gSPDisplayList(gMasterDisp++, D_600D9F0);
+                            gSPDisplayList(gMasterDisp++, D_FO_600D9F0);
                             break;
                         case LEVEL_KATINA:
                             gSPDisplayList(gMasterDisp++, D_KA_600F1D0);
@@ -338,7 +337,7 @@ void func_8003E1E8(void) {
                             gSPDisplayList(gMasterDisp++, D_CO_60059F0);
                             break;
                         case LEVEL_VENOM_1:
-                            gSPDisplayList(gMasterDisp++, D_60046F0);
+                            gSPDisplayList(gMasterDisp++, D_VE1_60046F0);
                             break;
                     }
                     Matrix_Translate(gGfxMatrix, 7280.0f, 0.0f, 0.0f, 1);
@@ -348,7 +347,7 @@ void func_8003E1E8(void) {
                             gSPDisplayList(gMasterDisp++, D_CO_60059F0);
                             break;
                         case LEVEL_VENOM_1:
-                            gSPDisplayList(gMasterDisp++, D_60046F0);
+                            gSPDisplayList(gMasterDisp++, D_VE1_60046F0);
                             break;
                     }
                     break;
@@ -1069,7 +1068,7 @@ void func_80040CE4(void) {
                 if (gCurrentLevel == LEVEL_FORTUNA) {
                     gSPDisplayList(gMasterDisp++, D_FO_6001360);
                 } else if (gCurrentLevel == LEVEL_KATINA) {
-                    gSPDisplayList(gMasterDisp++, D_6009250);
+                    gSPDisplayList(gMasterDisp++, D_KA_6009250);
                 } else if (gCurrentLevel == LEVEL_BOLSE) {
                     gSPDisplayList(gMasterDisp++, D_BO_600A810);
                 } else if (gCurrentLevel == LEVEL_VENOM_2) {
diff --git a/src/main/fox_demo.c b/src/main/fox_demo.c
index 9226a477..3c72408d 100644
--- a/src/main/fox_demo.c
+++ b/src/main/fox_demo.c
@@ -5,7 +5,6 @@
  */
 
 #include "global.h"
-#include "assets.h"
 #include "assets/ast_aquas.h"
 #include "assets/ast_great_fox.h"
 #include "assets/ast_enmy_space.h"
@@ -2757,7 +2756,7 @@ void func_8004FEC0(Actor* actor) {
             break;
 
         case 34:
-            gSPDisplayList(gMasterDisp++, D_6001530);
+            gSPDisplayList(gMasterDisp++, D_KA_6001530);
             break;
 
         case 35:
diff --git a/src/main/fox_display.c b/src/main/fox_display.c
index 86f3bba2..a2e7eb24 100644
--- a/src/main/fox_display.c
+++ b/src/main/fox_display.c
@@ -1,6 +1,5 @@
 #include "prevent_bss_reordering.h"
 #include "global.h"
-#include "assets.h"
 
 s16 D_80161410;
 Vec3f D_801613B0[4];
diff --git a/src/main/fox_edata.c b/src/main/fox_edata.c
index e4447a5a..7b450f17 100644
--- a/src/main/fox_edata.c
+++ b/src/main/fox_edata.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "assets.h"
 
 #include "fox_edata_1C.c"
 
diff --git a/src/main/fox_edata_1C.c b/src/main/fox_edata_1C.c
index f0fedf54..f83133b1 100644
--- a/src/main/fox_edata_1C.c
+++ b/src/main/fox_edata_1C.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "assets.h"
 
 #include "assets/ast_versus.h"
 #include "assets/ast_arwing.h"
@@ -116,7 +115,7 @@ ObjectInfo D_800CC124[0x190] = {
   /* OBJ_80_20,  */  {(void*)     D_CO_601F5A0, 0, (ObjectFunc)          NULL,        D_CO_603E14C,   500.0f,  0, 0, 39, 0,   0.0f,  0 },
   /* OBJ_80_21,  */  {(void*)     D_CO_60137B0, 0, (ObjectFunc)          NULL,        D_CO_603E1B4,   400.0f,  0, 0, 39, 0,   0.0f,  0 },
   /* OBJ_80_22,  */  {(void*)     D_CO_6006A80, 0, (ObjectFunc)          NULL,        D_CO_603E21C,   400.0f,  0, 0, 39, 0,   0.0f,  0 },
-  /* OBJ_80_23,  */  {(void*)     D_6016270, 0,    (ObjectFunc)          NULL,        D_CO_603E4A0,   200.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_80_23,  */  {(void*)     D_CO_6016270, 0,    (ObjectFunc)          NULL,        D_CO_603E4A0,   200.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_80_24,  */  {(void*)     D_CO_6010E00, 0, (ObjectFunc)          NULL,        D_CO_603E9EC,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_80_25,  */  {(void*)     D_CO_6014670, 0, (ObjectFunc)          NULL,        D_CO_603EA08,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_80_26,  */  {(void*)     D_CO_6010A50, 0, (ObjectFunc)          NULL,        D_CO_603EA74,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
@@ -222,7 +221,7 @@ ObjectInfo D_800CC124[0x190] = {
   /* OBJ_80_126  */  {(void*) func_i3_801BE1FC, 1, (ObjectFunc)          NULL,       D_800CBF34,  2000.0f,  0, 0, 41, 0,   0.0f,  0 },
   /* OBJ_80_127  */  {(void*)     D_VE1_9005C80, 0, (ObjectFunc) func_i1_801924A8,        D_VE1_601B678,  1000.0f,  0, 0, 42, 0,   0.0f,  0 },
   /* OBJ_80_128  */  {(void*)     D_VE1_9003F50, 0, (ObjectFunc)          NULL,        D_VE1_601B6C4,  3200.0f,  0, 0, 42, 0,   0.0f,  0 },
-  /* OBJ_80_129  */  {(void*)     D_VE1_900F060, 0, (ObjectFunc)          NULL,        D_F32_601B710,  3200.0f,  0, 0, 42, 0,   0.0f,  0 },
+  /* OBJ_80_129  */  {(void*)     D_VE1_900F060, 0, (ObjectFunc)          NULL,        D_VE1_601B710,  3200.0f,  0, 0, 42, 0,   0.0f,  0 },
   /* OBJ_80_130  */  {(void*)     D_VE1_900F1D0, 0, (ObjectFunc)          NULL,        D_VE1_601B75C,  3200.0f,  0, 0, 42, 0,   0.0f,  0 },
   /* OBJ_80_131  */  {(void*) func_i6_801935D4, 1, (ObjectFunc) func_i6_8019356C,        D_ANDROSS_C038BD8,   500.0f,  0, 0, 41, 0,   0.0f,  0 },
   /* OBJ_80_132  */  {(void*) func_i6_8019350C, 1, (ObjectFunc) func_i6_80193380,        D_ANDROSS_C038A48,   500.0f,  0, 0, 41, 0,   0.0f,  0 },
diff --git a/src/main/fox_edisplay.c b/src/main/fox_edisplay.c
index 83a44f64..84b9c2a1 100644
--- a/src/main/fox_edisplay.c
+++ b/src/main/fox_edisplay.c
@@ -1,6 +1,5 @@
 
 #include "global.h"
-#include "assets.h"
 #include "prevent_bss_reordering.h"
 Vec3f D_801615D0;
 Vec3f D_801615E0;
diff --git a/src/main/fox_effect.c b/src/main/fox_effect.c
index ea7b8078..4ddb583e 100644
--- a/src/main/fox_effect.c
+++ b/src/main/fox_effect.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "assets.h"
 
 // rodata
 const char D_800D7230[] = "Enm->wrk3=<%d>\n";
@@ -757,13 +756,13 @@ void func_800798F0(Effect* effect) {
 
                 case 8:
                     gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-                    gSPDisplayList(gMasterDisp++, D_6020E60);
+                    gSPDisplayList(gMasterDisp++, D_MA_6020E60);
                     gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
                     break;
 
                 case 9:
                     gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-                    gSPDisplayList(gMasterDisp++, D_6020A30);
+                    gSPDisplayList(gMasterDisp++, D_MA_6020A30);
                     gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
                     break;
 
@@ -777,31 +776,31 @@ void func_800798F0(Effect* effect) {
 
                 case 11:
                     gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-                    gSPDisplayList(gMasterDisp++, D_60200E0);
+                    gSPDisplayList(gMasterDisp++, D_MA_60200E0);
                     gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
                     break;
 
                 case 12:
                     gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-                    gSPDisplayList(gMasterDisp++, D_600F2F0);
+                    gSPDisplayList(gMasterDisp++, D_MA_600F2F0);
                     gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
                     break;
 
                 case 13:
                     gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-                    gSPDisplayList(gMasterDisp++, D_6001A60);
+                    gSPDisplayList(gMasterDisp++, D_MA_6001A60);
                     gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
                     break;
 
                 case 14:
                     gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-                    gSPDisplayList(gMasterDisp++, D_600F160);
+                    gSPDisplayList(gMasterDisp++, D_MA_600F160);
                     gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
                     break;
 
                 case 15:
                     gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-                    gSPDisplayList(gMasterDisp++, D_600F3D0);
+                    gSPDisplayList(gMasterDisp++, D_MA_600F3D0);
                     gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
                     break;
 
@@ -813,7 +812,7 @@ void func_800798F0(Effect* effect) {
 
                 case 17:
                     gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-                    gSPDisplayList(gMasterDisp++, D_600F9B0);
+                    gSPDisplayList(gMasterDisp++, D_MA_600F9B0);
                     gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
                     break;
 
diff --git a/src/main/fox_enmy.c b/src/main/fox_enmy.c
index bbbf2fea..a8dbcc03 100644
--- a/src/main/fox_enmy.c
+++ b/src/main/fox_enmy.c
@@ -1,6 +1,5 @@
 #include "prevent_bss_reordering.h"
 #include "global.h"
-#include "assets.h"
 #include "assets/ast_corneria.h"
 #include "assets/ast_sector_x.h"
 #include "assets/ast_sector_y.h"
diff --git a/src/main/fox_enmy2.c b/src/main/fox_enmy2.c
index 06185202..aadca886 100644
--- a/src/main/fox_enmy2.c
+++ b/src/main/fox_enmy2.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "assets.h"
 
 s32 D_800CFF80[4] = { 0, 0, 0, 0 };
 s32 D_800CFF90 = 0;
diff --git a/src/main/fox_hud.c b/src/main/fox_hud.c
index f6ab684e..cadea344 100644
--- a/src/main/fox_hud.c
+++ b/src/main/fox_hud.c
@@ -70,7 +70,6 @@ s32 D_80161900[20];
 // BSS SECTION END
 
 #include "global.h"
-#include "assets.h"
 
 #include "assets/ast_bg_space.h"
 #include "assets/ast_bg_planet.h"
diff --git a/src/main/fox_play.c b/src/main/fox_play.c
index ee433c34..92460d8b 100644
--- a/src/main/fox_play.c
+++ b/src/main/fox_play.c
@@ -1,6 +1,5 @@
 // #include "prevent_bss_reordering2.h"
 #include "global.h"
-#include "assets.h"
 #include "fox_map.h"
 #include "assets/ast_corneria.h"
 #include "assets/ast_training.h"
diff --git a/src/main/fox_radio.c b/src/main/fox_radio.c
index 83c7a38f..6632aa43 100644
--- a/src/main/fox_radio.c
+++ b/src/main/fox_radio.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "assets.h"
 
 u16** D_80178720;
 s32 D_80178724;
@@ -400,7 +399,7 @@ void func_800BAAE8(void) {
                     break;
                 case GSTATE_TITLE:
                 case GSTATE_CREDITS:
-                    sp44 = D_600C6A0;
+                    sp44 = gTitleRadioStatic;
                     break;
             }
             if (((s32) D_80177D68 == RCID_ANDROSS) || ((s32) D_80177D68 == RCID_ANDROSS_RED)) {
diff --git a/src/overlays/ovl_i1/fox_co.c b/src/overlays/ovl_i1/fox_co.c
index 3df763eb..6e154045 100644
--- a/src/overlays/ovl_i1/fox_co.c
+++ b/src/overlays/ovl_i1/fox_co.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "assets.h"
 #include "assets/ast_arwing.h"
 #include "assets/ast_corneria.h"
 
diff --git a/src/overlays/ovl_i1/fox_ve1.c b/src/overlays/ovl_i1/fox_ve1.c
index ced369f3..b39401db 100644
--- a/src/overlays/ovl_i1/fox_ve1.c
+++ b/src/overlays/ovl_i1/fox_ve1.c
@@ -1,5 +1,5 @@
+#include "prevent_bss_reordering.h"
 #include "global.h"
-#include "assets.h"
 #include "assets/ast_ve1_boss.h"
 
 typedef struct {
diff --git a/src/overlays/ovl_i2/fox_me.c b/src/overlays/ovl_i2/fox_me.c
index 64c8a13d..4c215349 100644
--- a/src/overlays/ovl_i2/fox_me.c
+++ b/src/overlays/ovl_i2/fox_me.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "assets.h"
 #include "assets/ast_meteo.h"
 
 extern s32 D_800C9E90[];
diff --git a/src/overlays/ovl_i3/fox_so.c b/src/overlays/ovl_i3/fox_so.c
index 741a9fbf..a68d9ec4 100644
--- a/src/overlays/ovl_i3/fox_so.c
+++ b/src/overlays/ovl_i3/fox_so.c
@@ -1,6 +1,5 @@
 #include "prevent_bss_reordering.h"
 #include "global.h"
-#include "assets.h"
 #include "assets/ast_bg_planet.h"
 #include "assets/ast_solar.h"
 
diff --git a/src/overlays/ovl_i3/fox_zo.c b/src/overlays/ovl_i3/fox_zo.c
index 2c6d0226..3295e22d 100644
--- a/src/overlays/ovl_i3/fox_zo.c
+++ b/src/overlays/ovl_i3/fox_zo.c
@@ -1,6 +1,5 @@
 #include "prevent_bss_reordering.h"
 #include "global.h"
-#include "assets.h"
 #include "assets/ast_enmy_planet.h"
 #include "assets/ast_zoness.h"
 
diff --git a/src/overlays/ovl_i4/fox_bo.c b/src/overlays/ovl_i4/fox_bo.c
index fff0b2ba..3e6a9f1c 100644
--- a/src/overlays/ovl_i4/fox_bo.c
+++ b/src/overlays/ovl_i4/fox_bo.c
@@ -1,7 +1,6 @@
-#include "prevent_bss_reordering.h"
+//#include "prevent_bss_reordering.h"
 // #include "prevent_bss_reordering2.h"
 #include "global.h"
-#include "assets.h"
 #include "assets/ast_bolse.h"
 
 typedef struct UnkStruct_D_i4_801A03E0 {
diff --git a/src/overlays/ovl_i4/fox_fo.c b/src/overlays/ovl_i4/fox_fo.c
index 6fd5fb4d..96437398 100644
--- a/src/overlays/ovl_i4/fox_fo.c
+++ b/src/overlays/ovl_i4/fox_fo.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "assets.h"
 #include "assets/ast_fortuna.h"
 
 void func_i4_801875F0(Actor* actor) {
diff --git a/src/overlays/ovl_i4/fox_ka.c b/src/overlays/ovl_i4/fox_ka.c
index a34114b0..c261e1bf 100644
--- a/src/overlays/ovl_i4/fox_ka.c
+++ b/src/overlays/ovl_i4/fox_ka.c
@@ -1,7 +1,5 @@
-#include "prevent_bss_reordering.h"
+// #include "prevent_bss_reordering.h"
 #include "global.h"
-#include "assets.h"
-
 #include "assets/ast_katina.h"
 
 Vec3f D_i4_8019F0F0[] = { { 7000.0f, 500.0f, -50 }, { 7700.0f, 550.0f, -50.0f }, { 6000.0f, 300.0f, 1950.0f } };
@@ -2155,7 +2153,7 @@ void func_i4_801995B4(Actor* actor) {
             if (actor->iwork[23] != 0) {
                 gSPDisplayList(gMasterDisp++, D_KA_600EFF0);
             } else {
-                gSPDisplayList(gMasterDisp++, D_6001530);
+                gSPDisplayList(gMasterDisp++, D_KA_6001530);
             }
             break;
 
diff --git a/src/overlays/ovl_i6/fox_andross.c b/src/overlays/ovl_i6/fox_andross.c
index fededa4e..98348b9b 100644
--- a/src/overlays/ovl_i6/fox_andross.c
+++ b/src/overlays/ovl_i6/fox_andross.c
@@ -1,7 +1,6 @@
 #include "prevent_bss_reordering2.h"
 #include "prevent_bss_reordering.h"
 #include "global.h"
-#include "assets.h"
 #include "assets/ast_venom_2.h"
 #include "assets/ast_andross.h"
 #include "assets/ast_arwing.h"
diff --git a/src/overlays/ovl_i6/fox_ve2.c b/src/overlays/ovl_i6/fox_ve2.c
index f7cdee2c..2f7732e3 100644
--- a/src/overlays/ovl_i6/fox_ve2.c
+++ b/src/overlays/ovl_i6/fox_ve2.c
@@ -1,6 +1,4 @@
 #include "global.h"
-#include "assets.h"
-
 #include "assets/ast_venom_2.h"
 
 void func_i6_80196210(Boss* boss) {