Split headers as much as possible. add unique tags to segment 6 addresses (#167)

* split up

* format

* torch

15 files changed, 250 insertions, 581 deletions

diff --git a/include/assets.h b/include/assets.h
index 1d9c8397..770d1a74 100644
--- a/include/assets.h
+++ b/include/assets.h
@@ -7,205 +7,6 @@
 #include "sf64object.h"
 #include "sf64player.h"
 
-// ast_common
-extern u16 D_1002040[];
-extern u16 D_10032A0[];
-extern u16 D_10041C0[];
-extern u16 D_10050E0[];
-extern u16 D_1006000[];
-extern u16 D_1006F20[];
-extern u16 D_1007E40[];
-extern u16 D_1008D60[];
-extern u16 D_1009C80[];
-extern u16 D_100ABA0[];
-extern u16 D_100BAC0[];
-extern u16 D_100C9E0[];
-extern u16 D_100D900[];
-extern u16 D_100E820[];
-extern u8 D_1011A40[];
-extern u16 D_1011AB0[];
-extern u8 D_1011E80[];
-extern u16 D_1011EC0[];
-extern u8 D_1011ED0[];
-extern u16 D_1011F08[];
-extern Gfx D_1011F20[];
-extern u8 D_10127D0[];
-extern u16 D_1012898[];
-extern u8 D_10128C0[];
-extern u16 D_1012988[];
-extern u8 D_10129C0[];
-extern u16 D_1013090[];
-extern u8 D_1013170[];
-extern u16 D_1013570[];
-extern Gfx D_1015510[];
-extern Gfx D_1015980[];
-extern Gfx D_1016580[];
-extern Gfx D_1016870[];
-extern Gfx D_10177C0[];
-extern Gfx D_10182C0[];
-extern u16 D_10190C0[]; // A texture of some sort.
-extern Gfx D_10194C0[];
-extern Gfx D_1019820[];
-extern Gfx D_1019CA0[];
-extern Gfx D_101A570[];
-extern Gfx D_101A8E0[];
-extern Gfx D_101ABD0[];
-extern Gfx D_101AD20[];
-extern Gfx D_101AED0[];
-extern Gfx D_101C2E0[];
-extern Gfx D_101C2E0[];
-extern Gfx D_101CAE0[];
-extern Gfx D_101CD70[];
-extern u16 D_101D070[];
-extern Gfx D_101DC10[];
-extern Gfx D_1021E20[];
-extern Gfx D_1022120[];
-extern Gfx D_1022E80[];
-extern Gfx D_10231A0[];
-extern Gfx D_1023700[];
-extern Gfx D_1023750[];
-extern Gfx D_1023C80[];
-extern Gfx D_1024230[];
-extern Gfx D_1024290[];
-extern Gfx D_1024410[];
-extern Gfx D_1024570[];
-extern Gfx D_10246D0[];
-extern Gfx D_1024830[];
-extern u8 D_1024A58[];
-extern Gfx D_1024AC0[];
-extern Gfx D_1024F60[];
-extern Gfx D_1025800[];
-extern Gfx D_1026090[];
-extern Gfx D_1028230[];
-extern Gfx D_1029780[];
-extern Gfx D_102A010[];
-extern Gfx D_102A8A0[];
-extern Gfx D_102ED50[];
-extern Gfx D_102F5E0[];
-extern Gfx D_102FE80[];
-extern u16 D_102FF08[];
-extern Gfx D_1031630[];
-extern Gfx D_1031EC0[];
-extern Gfx D_1032780[];
-
-// ast_arwing, ast_landmaster, ast_blue_marine, ast_vs_player
-extern u8  D_3000000[];
-extern u16 D_3000080[];
-extern u8  D_30001E0[];
-extern u16 D_3000380[];
-extern u8  D_30003A0[];
-extern u16 D_30004E0[];
-extern u8  D_3000510[];
-extern Gfx D_3000660[];
-extern u8  D_30006D0[];
-extern u16 D_30006A0[];
-extern u16 D_3000810[];
-extern u8  D_30013E0[];
-extern u8  D_3001420[];
-extern u16 D_3000BC0[];
-extern u8  D_3004010[];
-extern u16 D_3003E20[];
-extern u16 D_3004D58[];
-extern Gfx D_301AD60[];
-extern Gfx D_301AEF0[];
-extern Gfx D_302D120[];
-extern u16 D_3007500[];
-extern u8  D_3006C60[];
-extern u16 D_300B218[];
-extern u8  D_300A470[];
-
-
-
-extern Gfx D_3001C90[];
-extern Gfx D_3003CE0[];
-extern Gfx D_3005980[];
-extern Gfx D_3005AB0[];
-extern Gfx D_3007650[];
-extern u8 D_300D350[];
-extern u16 D_300D398[];
-extern u8 D_300D3C0[];
-extern u16 D_300D408[];
-extern u8 D_300D440[];
-extern u16 D_300D500[];
-extern Gfx D_300D550[];
-extern Gfx D_300EE80[];
-extern Gfx D_300FB80[];
-extern Gfx D_3010A90[];
-extern Gfx D_3011470[];
-extern Gfx D_3011720[];
-extern Gfx D_3011E40[];
-extern Gfx D_3012ED0[];
-extern Gfx D_30131F0[];
-extern Gfx D_3013580[];
-extern Gfx D_3013780[];
-extern Gfx D_30146B0[];
-extern Gfx D_3014BF0[];
-extern Gfx D_3015120[];
-extern Gfx D_30155E0[];
-extern Gfx D_3015740[];
-extern Animation D_3015AF4;
-extern Animation D_3015C28;
-extern Gfx D_3015D80[];
-extern Animation D_30163C4;
-extern Limb* D_3016610[];
-extern Gfx D_3016660[];
-extern Gfx D_30160A0[];
-extern Gfx D_3016B00[];
-extern Gfx D_3016B30[];
-extern Gfx D_3016CC0[];
-extern Gfx D_30173C0[];
-extern Gfx D_30174E0[];
-extern Gfx D_3017600[];
-extern Gfx D_3017600[];
-extern Gfx D_30183D0[];
-extern Gfx D_3018800[];
-extern Gfx D_30194E0[];
-extern Gfx D_301B080[];
-extern Gfx D_301B6E0[];
-extern Animation D_301C3A8;
-extern Limb* D_301C614[];
-extern Animation D_301CFEC;
-extern Limb* D_301D258[];
-extern Animation D_301D888;
-extern Limb* D_301DB94[];
-extern Animation D_301E19C;
-extern Limb* D_301E3E8[];
-extern Gfx D_301E570[];
-extern Gfx D_301F140[];
-extern Gfx D_301FD20[];
-extern Gfx D_302D240[];
-extern Gfx D_302D4D0[];
-extern EnvSettings D_302DD70;
-extern EnvSettings D_302DDB4;
-extern EnvSettings D_302DDF8;
-extern ObjectInit D_302DE3C[];
-extern ObjectInit D_302E0E4[];
-extern ObjectInit D_302E170[];
-extern ObjectInit D_302E378[];
-extern Vec3f D_302E56C[];
-extern Vec3f D_302E65C[];
-extern Vec3f D_302E74C[];
-extern Vec3f D_302E830[];
-extern Vec3f D_302E95C[];
-extern Vec3f D_302EA4C[];
-extern Vec3f D_302EB3C[];
-extern Vec3f D_302EC20[];
-extern f32 D_302ED4C[];
-extern f32 D_302ED98[];
-extern f32 D_302EDB4[];
-extern f32 D_302EE00[];
-extern f32 D_302EE64[];
-extern f32 D_302EE80[];
-extern f32 D_302EE9C[];
-extern Triangle D_302EEE8[];
-extern Vec3f D_302EF00[];
-extern Triangle D_302EF6C[];
-extern Vec3f D_302EF84[];
-extern Triangle D_302EFF0[];
-extern Vec3f D_302F008[];
-extern Triangle D_302F044[];
-extern Vec3f D_302F098[];
-
 // ast_enmy_planet, ast_enmy_space
 extern Animation D_4000080;
 extern Limb* D_400014C[];
@@ -222,24 +23,6 @@ extern Animation D_400A30C;
 extern Limb* D_400A398[];
 extern Gfx D_400B390[];
 
-// ast_font
-extern u8 D_50021F0[]; // fox_option
-extern u8 D_50022F0[]; // fox_hud
-extern u8 D_5002DC0[]; // fox_hud
-extern u8 D_5003A00[]; // fox_hud
-extern u16 D_50077B0[]; // fox_title
-extern u8 D_5007F60[]; // fox_std_lib, fox_versus
-extern u8 D_5009F60[]; // fox_std_lib, fox_versus, fox_option
-extern u8 D_500A050[]; // fox_std_lib, fox_versus, fox_option, fox_map
-extern u8 D_500A140[]; // fox_std_lib, fox_versus, fox_option, fox_map, fox_hud
-extern u8 D_500A230[]; // fox_std_lib, fox_versus, fox_option, fox_map, fox_hud
-extern u8 D_500A320[]; // fox_std_lib, fox_versus, fox_option, fox_map, fox_hud
-extern u8 D_500A410[]; // fox_std_lib, fox_versus, fox_option, fox_map, fox_hud
-extern u8 D_500A500[]; // fox_std_lib, fox_versus, fox_option, fox_map, fox_hud
-extern u8 D_500A5F0[]; // fox_std_lib, fox_versus, fox_option, fox_hud
-extern u8 D_500A6E0[]; // fox_std_lib, fox_versus, fox_option, fox_hud
-extern u8 D_500A7D0[]; // fox_std_lib, fox_versus, fox_option, fox_hud
-
 /* 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,
@@ -249,11 +32,9 @@ extern Gfx D_60005B0[]; // fox_bg
 extern Gfx D_6000A80[]; // fox_bg, fox_effect
 extern u16 D_6000B60[]; // fox_radio
 extern Gfx D_6000E00[]; // fox_edata_1C
-extern Gfx D_6000E10[]; // fox_enmy2
 extern Gfx D_6001360[]; // fox_bg, fox_demo, fox_edata_1C
 extern Gfx D_6001530[]; // fox_360, fox_demo, fox_ka
 extern Gfx D_6001840[]; // fox_bg
-extern Gfx D_6001950[]; // fox_enmy2
 extern Gfx D_6001A60[]; // fox_effect
 extern u16 D_6001A80[]; // fox_radio
 extern u8 D_6001B80[]; // fox_hud
@@ -271,7 +52,6 @@ extern Gfx D_6003000[]; // fox_edata_1C
 extern u8 D_60030D0[]; // fox_map
 extern Gfx D_60030F0[]; // fox_edata_1C
 extern Gfx D_60034D0[]; // fox_edata_1C, fox_enmy2
-extern Gfx D_6003610[]; // fox_edata_1C
 extern Gfx D_60036A0[]; // fox_edata_1C, fox_enmy2
 extern Gfx D_6003760[];
 extern u16 D_60038C0[];
@@ -313,7 +93,6 @@ extern f32 D_6006694[];
 extern Gfx D_60066D0[];
 extern f32 D_60066E0_f32[];
 extern Gfx D_60066E0_Gfx[];
-extern Gfx D_60066F0[];
 extern f32 D_600672C[];
 extern u16 D_6006750[];
 extern f32 D_6006778[];
@@ -359,7 +138,6 @@ extern EnvSettings D_6007E30;
 extern Gfx D_6008370[];
 extern Gfx D_6008770[];
 extern Gfx D_6008830[];
-extern Gfx D_6008970[];
 extern u8 D_6008990[];
 extern Gfx D_6008AA0[];
 extern Vec3s D_6008E08[];
@@ -377,11 +155,8 @@ extern Animation D_6009D30;
 extern Gfx D_6009E30[];
 extern Vtx D_6009ED0[];
 extern Gfx D_6009F90[];
-extern Gfx D_600A220[];
 extern Gfx D_600A420[];
 extern Gfx D_600A810[];
-extern Gfx D_600AB10[];
-extern u16 D_600AB68[];
 extern u8 D_600AD30[];
 extern Gfx D_600AF40[];
 extern Gfx D_600B0E0[];
@@ -391,7 +166,6 @@ extern Gfx D_600B8B0[];
 extern u8 D_600B9B0[];
 extern Gfx D_600BAF0[];
 extern u16 D_600BEA0[];
-extern Gfx D_600BF80[];
 extern Gfx D_600C130[];
 extern Animation D_600C15C;
 extern Animation D_600C200;
@@ -409,7 +183,6 @@ extern Gfx D_600D730[];
 extern u16 D_600D990[];
 extern Gfx D_600D9F0[];
 extern Gfx D_600DA10[];
-extern Gfx D_600DB80[];
 extern Gfx D_600DBC0[];
 extern u8 D_600DDC0[];
 extern Gfx D_600DDF0[];
@@ -424,8 +197,6 @@ extern Gfx D_600E820[];
 extern u8 D_600E980[];
 extern EnvSettings D_600EA90;
 extern Gfx D_600EC90[];
-extern Gfx D_600EE10[];
-extern Gfx D_600EEF0[];
 extern Gfx D_600EFF0[];
 extern Gfx D_600F160[];
 extern Gfx D_600F1D0[];
@@ -444,7 +215,6 @@ extern Gfx D_600F670[];
 extern Gfx D_600F6C0[];
 extern Gfx D_600F6C0[];
 extern Animation D_600F744;
-extern Gfx D_600F8A0[];
 extern u8 D_600F940[];
 extern Gfx D_600F9B0[];
 extern Vec3s D_600FD50[];
@@ -477,7 +247,6 @@ extern u8 D_TEX_6011660[];
 extern Vec3s D_601170C[];
 extern u8 D_6011890[];
 extern Gfx D_6011910[];
-extern Gfx D_60119A0[];
 extern f32 D_6011B24[];
 extern u16 D_6011B40[];
 extern f32 D_6011BF4[];
@@ -485,8 +254,6 @@ extern f32 D_6011C10[];
 extern f32 D_6011C48[];
 extern f32 D_6011C80[];
 extern u8 D_6011EA0[];
-extern Gfx D_6011EE0[];
-extern Gfx D_60120F0[];
 extern u8 D_6012310[];
 extern u8 D_60123F0[];
 extern Gfx D_6012C00_Gfx[];
@@ -496,9 +263,7 @@ extern Gfx D_60132B0[];
 extern u8 D_6013470[];
 extern Gfx D_6013480[];
 extern Gfx D_60137B0[];
-extern Animation D_6013820;
 extern Animation D_601388C;
-extern Limb* D_601390C[];
 extern Gfx D_6013960[];
 extern u8 D_60139E0[];
 extern Gfx D_6013B50[];
@@ -511,7 +276,7 @@ extern Animation D_6014658;
 extern Gfx D_6014670[];
 extern u16 D_60147C0[];
 extern u8 D_60147E0[];
-extern Gfx D_60148B0[];
+extern u8 D_60148B0[];
 extern Gfx D_60148D0[];
 extern Gfx D_6014A20[];
 extern Gfx D_6014B50[];
@@ -520,12 +285,9 @@ extern EnvSettings D_6014D50;
 extern CollisionPoly D_6014FEC[];
 extern Gfx D_60153B0[];
 extern u16 D_6015430[];
-extern Gfx D_6015730[];
 extern u8 D_6015CE0[];
-extern Gfx D_6015DD0[];
 extern Gfx D_6015EE0[];
 extern Gfx D_6015F00[];
-extern Gfx D_6015FF0[];
 extern Gfx D_6016270[];
 extern Vec3s D_6016374[];
 extern Gfx D_60164F0[];
@@ -557,7 +319,6 @@ extern Gfx D_601A7A0[];
 extern Gfx D_601A7D0[];
 extern Gfx D_601AD70[];
 extern Gfx D_601AE40[];
-extern Gfx D_601AFF0[];
 extern Gfx D_601B0D0[];
 extern u16* D_601B1E4[];
 extern Gfx D_601B2B0[];
@@ -585,7 +346,6 @@ extern f32 D_601B8A0[];
 extern f32 D_601B8D8[];
 extern Gfx D_601BB40[];
 extern Gfx D_601BEC0[];
-extern Gfx D_601C080[];
 extern Gfx D_601C0D0[];
 extern Gfx D_601C6A0[];
 extern Gfx D_601C7C0[];
@@ -598,7 +358,6 @@ extern Gfx D_601D730[];
 extern u8 D_601D750[];
 extern u16 D_601D800[];
 extern u16 D_601DB50[];
-extern Gfx D_601DE60[];
 extern Gfx D_601DE80[];
 extern Gfx D_601E150[];
 extern u16 D_601E1E8[];
@@ -622,11 +381,6 @@ extern Gfx D_6020B40[];
 extern u16* D_6020DD0[];
 extern Gfx D_6020E60[];
 extern u16 D_6020F60[];
-extern u16 D_6020FB0[];
-extern u16 D_6021ED0[];
-extern Animation D_602201C;
-extern Limb* D_60220E8[];
-extern Gfx D_6022110[];
 extern u16 D_6022340[];
 extern Gfx D_60223C0[];
 extern u8 D_60223E0[];
@@ -636,7 +390,6 @@ extern u16 D_6022760[];
 extern Gfx D_6022920[];
 extern u16 D_60229A4[];
 extern f32 D_60231A4[];
-extern Gfx D_60231C0[];
 extern Gfx D_60238F0[];
 extern Gfx D_6023AC0[];
 extern EnvSettings D_6023F20;
@@ -673,14 +426,10 @@ extern u8 D_6029220[];
 extern Animation D_6029528;
 extern Limb* D_6029674[];
 extern Gfx D_6029890[];
-extern EnvSettings D_602A120;
 extern Gfx D_602A720[];
 extern u16* D_602AAC0[];
-extern Gfx D_602AC40[];
 extern u16 D_602AC50[];
-extern u16 D_602ACC0[];
 extern ObjectInit* D_602B148[];
-extern Gfx D_602B4C0[];
 extern u16 D_602B620[];
 extern u8 D_602B6D0[];
 extern f32 D_602B9EC[];
@@ -692,9 +441,7 @@ extern f32 D_602BC58[];
 extern f32 D_602BE3C[];
 extern f32 D_602BE58[];
 extern f32 D_602BFC4[];
-extern Gfx D_602C030[];
 extern f32 D_602C044[];
-extern Gfx D_602C088[];
 extern f32 D_602C1D4[];
 extern f32 D_602C218[];
 extern f32 D_602C234[];
@@ -716,12 +463,9 @@ extern u16 D_602DCB8[];
 extern Gfx D_602E080[];
 extern Gfx D_602E380[];
 extern EnvSettings D_602E4B0;
-extern EnvSettings D_602E540;
 extern Gfx D_602E570[];
-extern EnvSettings D_602E584[];
 extern Gfx D_602E7A0[];
 extern Gfx D_602E9E0[];
-extern ObjectInit* D_602F18C[];
 extern u16* D_602F3AC[];
 extern f32 D_602F638[];
 extern f32 D_602F684[];
@@ -743,24 +487,8 @@ extern Vec3s D_6030550[];
 extern CollisionPoly D_60305DC[];
 extern Gfx D_6030630[];
 extern Gfx D_60306D0[];
-extern u16* D_60308B8[];
-extern f32 D_6030B10[];
 extern ObjectInit D_6030B14[];
-extern f32 D_6030B14_f32[];
-extern f32 D_6030BE0[];
-extern f32 D_6030BFC[];
-extern f32 D_6030C18[];
-extern f32 D_6030C44[];
-extern f32 D_6030C60[];
-extern f32 D_6030C7C[];
-extern f32 D_6030D20[];
-extern f32 D_6030D74[];
-extern f32 D_6030DF8[];
-extern f32 D_6030E14[];
-extern f32 D_6030E30_Hitbox[];
 extern EnvSettings D_6030E30_Env;
-extern f32 D_6030E4C[];
-extern f32 D_6030E68[];
 extern Triangle D_6030E74[];
 extern Vec3f D_6030E80[];
 extern Triangle D_6030EB0[];
@@ -770,37 +498,16 @@ extern Vec3f D_6030EF8[];
 extern Triangle D_6030F28[];
 extern Vec3f D_6030F34[];
 extern Triangle D_6030F64[];
-extern f32 D_6030F74[];
 extern Vec3f D_6030F7C[];
 extern Triangle D_6030FC4[];
-
-extern f32 D_6031400[];
-extern f32 D_603144C[];
-extern f32 D_6031480[];
-extern f32 D_60314C8[];
-extern f32 D_6031500[];
-extern f32 D_6031538[];
-extern f32 D_6031554[];
-extern f32 D_6031570[];
-extern u16 D_603158C[];
 extern Vec3s D_603184C[];
-extern Triangle D_6031FB0[];
-extern Triangle D_6031FB0[];
 extern Vec3f D_6031FE0[];
 extern Vec3f D_603204C[];
-extern Triangle D_60320B8[];
-extern u16* D_60320D0[];
 extern Gfx D_60320E0[];
 extern Vec3f D_603216C[];
-extern f32 D_6032328[];
-extern Triangle D_6032388[];
 extern u16 D_60323D0[];
-extern f32 D_6032408[];
 extern Vec3f D_6032430[];
 extern u16 D_6032440[];
-extern f32 D_6032488[];
-extern f32 D_60324EC[];
-extern f32 D_6032550[];
 extern Gfx D_6032580[];
 extern u16 D_6032A60[];
 extern Gfx D_6032BC0[];
@@ -876,7 +583,6 @@ extern u16 D_603CC80[];
 extern u16* D_603D9E8[];
 extern f32 D_603DCA4[];
 extern f32 D_603DD40[];
-extern EnvSettings D_C035110;
 extern f32 D_603DDF0[];
 extern f32 D_603DE8C[];
 extern f32 D_603DEF4[];
@@ -886,7 +592,6 @@ extern f32 D_603E014[];
 extern f32 D_603E030[];
 extern f32 D_603E09C[];
 extern f32 D_603E0EC[];
-
 extern Gfx D_60084C0[];
 extern Gfx D_6008D40[];
 extern Gfx D_6007C40[];
@@ -897,11 +602,10 @@ extern Gfx D_6019670[];
 extern Gfx D_60185E0[];
 extern Gfx D_6017550[];
 
-// ast_7_ti_2, ast_7_ti_1, ast_warp_zone, ast_versus, ast_ending
+// ast_versus, ast_ending
 extern u8 D_7000F10[]; // fox_option
 extern u8 D_7001030[]; // fox_option
 extern u8 D_7001270[]; // fox_option
-extern Gfx D_7001540[]; // fox_bg
 extern u8 D_7001DF0[]; // fox_option
 extern u8 D_7002110[]; // fox_option
 extern u8 D_7003650[]; // fox_option
@@ -918,63 +622,11 @@ extern u8 D_7004360[]; // fox_versus
 extern u16 D_7004460[]; // fox_versus
 extern u8 D_70044D0[]; // fox_versus
 extern u16 D_7004990[]; // fox_versus
-extern Gfx D_7007350[]; // fox_edisplay
-extern Gfx D_700AB70[]; // fox_edata_1C
-extern Gfx D_700BB10[]; // fox_edisplay
-extern Gfx D_700BE00[]; // fox_edata_1C
-extern Animation D_700CAF4; // fox_enmy2
 extern u16 D_700E9A0[]; // fox_option
 extern u8 D_70118E0[]; // fox_versus, fox_option
 extern u16 D_70123F8[]; // fox_versus, fox_option
 
-// ast_8_ti, ast_option
-extern u8 D_8000000[]; // option
-extern u16 D_8000680[]; // option
-extern u8 D_80006A0[]; // option
-extern u16 D_80017A0[]; // option
-extern u8 D_80017C0[]; // option
-extern u16 D_80038C0[]; // option
-extern u8 D_80038E0[]; // option
-extern u8 D_8003930[]; // option
-extern u8 D_8003950[]; // option
-extern u8 D_80039A8[]; // option
-extern u8 D_8003A70[]; // option
-extern u8 D_8003AB8[]; // option
-extern u8 D_8003AE0[]; // option
-extern u8 D_8003B28[]; // option
-extern u8 D_8003B50[]; // option
-extern u8 D_80046B0[]; // option
-extern u8 D_8004C50[]; // option
-extern u8 D_8005CD0[]; // option
-extern u8 D_8006280[]; // option
-extern u8 D_80064F0[]; // option
-extern u8 D_80069C0[]; // option
-extern u8 D_8006D10[]; // option
-extern u8 D_8006E50[]; // option
-extern u8 D_8007210[]; // option
-extern u8 D_80076E0[]; // option
-extern u8 D_80079F0[]; // option
-extern u8 D_80080F0[]; // option
-extern u8 D_80084B0[]; // option
-extern u8 D_8008A30[]; // unused?
-extern u8 D_8008DA0[]; // option
-extern u8 D_80098E0[]; // unused?
-extern u8 D_8009980[]; // option
-extern u8 D_8009B00[]; // option
-extern u8 D_8009CE0[]; // option
-extern u8 D_800B5E0[]; // unused?
-extern u8 D_800B680[]; // option
-extern u8 D_800C640[]; // unused?
-extern u8 D_800CD90[]; // option
-extern u8 D_800D070[]; // option
-extern u8 D_800D170[]; // option
-extern u8 D_800D1F0[];
-extern u8 D_800E130[];
-extern u16 D_800E170[];
-extern Gfx D_8015550[];
-extern Gfx D_8015DF0[];
-
-// ast_9_ti, ast_ve1_boss, ast_font_3d
+// ast_9_ti, ast_ve1_boss
 extern Gfx D_9002CF0[];
 extern u16 D_9003330[];
 extern u16 D_9003890[];
@@ -992,62 +644,6 @@ extern Gfx D_9023290[];
 extern Gfx D_90234D0[];
 extern Gfx D_9023AD0[];
 
-// ast_A_ti
-extern Gfx D_A000000[];
-
-// segment B is unused
-
-// ast_andross
-extern Gfx D_C017440[];
-extern ObjectInit* D_C0356A4[];
-extern u16* D_C037E3C[];
-extern f32 D_C038A48[];
-extern f32 D_C038B40[];
-extern f32 D_C038B40[];
-extern f32 D_C038BA4[];
-extern f32 D_C038BD8[];
-extern f32 D_C038DC0[];
-extern f32 D_C038F24[];
-extern Gfx D_C039208[];
-
-// ast_great_fox
-extern Gfx D_E000000[];
-extern Gfx D_E003AB0[];
-extern Gfx D_E00DFB0[];
-extern u16 D_E00E100[];
-extern u16 D_E00F020[];
-extern u16 D_E00FF40[];
-extern u16 D_E010E60[];
-
-// ast_logo
-extern u16 D_F000000[];
-extern u16 D_F000800[];
-extern u16 D_F001000[];
-extern u16 D_F001800[];
-extern u16 D_F002000[];
-
-// ast_star_wolf
-extern u16 D_F000000[];
-extern u16 D_F000F20[];
-extern u16 D_F001E40[];
-extern u16 D_F002D60[];
-extern u16 D_F003C80[];
-extern u16 D_F004BA0[];
-extern u16 D_F005AC0[];
-extern u16 D_F0069E0[];
-extern u16 D_F007900[];
-extern u16 D_F008820[];
-extern u16 D_F009740[];
-extern u16 D_F00A660[];
-extern u16 D_F00B580[];
-extern u16 D_F00C4A0[];
-extern u16 D_F00D3C0[];
-extern u16 D_F00E2E0[];
-extern Gfx D_F00F200[];
-extern Gfx D_F0103D0[];
-extern Gfx D_F014180[];
-extern Gfx D_F014310[];
-
 // fox_map, to be ordered later
 
 extern f32 D_603E118[];
@@ -1102,25 +698,4 @@ extern Gfx D_6055F20[];
 extern Gfx D_605C230[];
 extern Gfx D_6060610[];
 
-extern Gfx D_9006AE0[];
-extern Gfx D_9000570[];
-extern Gfx D_90086F0[];
-extern Gfx D_9002EA0[];
-extern Gfx D_9005380[];
-extern Gfx D_90075A0[];
-extern Gfx D_9004230[];
-
-extern Gfx D_C001880[];
-extern f32 D_C037FCC[];
-extern f32 D_C0380C0[];
-extern f32 D_C0381B4[];
-extern f32 D_C0382A8[];
-extern f32 D_C03839C[];
-extern f32 D_C038490[];
-extern f32 D_C038584[];
-extern f32 D_C038678[];
-extern f32 D_C03876C[];
-extern f32 D_C038860[];
-extern f32 D_C038954[];
-
 #endif // ASSETS_H
diff --git a/include/assets/ast_7_ti_2.h b/include/assets/ast_7_ti_2.h
index 8d721892..81294984 100644
--- a/include/assets/ast_7_ti_2.h
+++ b/include/assets/ast_7_ti_2.h
@@ -5,4 +5,18 @@
 #include "sf64object.h"
 #include "structs.h"
 
+extern Animation D_7003EE8;
+extern Animation D_70084CC;
+extern Animation D_70096EC;
+extern Animation D_700E244;
+extern Gfx D_7003F00[];
+extern Gfx D_7004270[];
+extern Gfx D_7004400[];
+extern Gfx D_70045D0[];
+extern Gfx D_70049C0[];
+extern Gfx D_7004E80[];
+extern Gfx D_7005300[];
+extern Gfx D_7009700[];
+extern Gfx D_7009890[];
+
 #endif
diff --git a/include/assets/ast_8_ti.h b/include/assets/ast_8_ti.h
index c1c0bd49..cfdce9df 100644
--- a/include/assets/ast_8_ti.h
+++ b/include/assets/ast_8_ti.h
@@ -5,4 +5,26 @@
 #include "sf64object.h"
 #include "structs.h"
 
+extern Animation D_8000708;
+extern Animation D_8000D80;
+extern Animation D_8008FE8;
+extern UNK_TYPE D_8000FC0[];
+extern Gfx D_8000D90[];
+extern Gfx D_80011C0[];
+extern Gfx D_80014A0[];
+extern Gfx D_8001630[];
+extern Gfx D_80018D0[];
+extern Gfx D_8001A80[];
+extern Gfx D_8001D20[];
+extern Gfx D_8001E20[];
+extern Gfx D_8001FB0[];
+extern Gfx D_80020D0[];
+extern Gfx D_8002360[];
+extern Gfx D_8003640[];
+extern Gfx D_8009000[];
+extern UNK_TYPE D_8008A30[]; // unused?
+extern UNK_TYPE D_80098E0[]; // unused?
+extern UNK_TYPE D_800B5E0[]; // unused?
+extern UNK_TYPE D_800C640[]; // unused?
+
 #endif
diff --git a/include/assets/ast_andross.h b/include/assets/ast_andross.h
index 414e9b18..0c4ce383 100644
--- a/include/assets/ast_andross.h
+++ b/include/assets/ast_andross.h
@@ -5,24 +5,34 @@
 #include "sf64object.h"
 #include "structs.h"
 
+
+extern u8 D_C000A80[];
 extern Gfx D_C001880[];
 extern Animation D_C00208C;
 extern Animation D_C002654;
 extern Animation D_C002B08;
 extern Gfx D_C002B20[];
+extern Gfx D_C002B20[];
 extern Gfx D_C002F00[];
+extern Gfx D_C002F00[];
+extern Gfx D_C0043D0[];
 extern Gfx D_C0043D0[];
 extern Gfx D_C004860[];
+extern Gfx D_C004860[];
 extern Animation D_C006F08;
 extern Animation D_C00DE48;
 extern Animation D_C00E598;
 extern Gfx D_C015740[];
+extern Gfx D_C015740[];
 extern Animation D_C017050;
 extern Animation D_C017430;
 extern Gfx D_C017440[];
 extern Vtx D_C017598[];
+extern Vtx D_C017598[];
 extern Animation D_C018BC4;
 extern Limb* D_C01CC3C[];
+extern Limb* D_C01CC3C[];
+extern Gfx D_C022520[];
 extern Gfx D_C022520[];
 extern Animation D_C023B54;
 extern Animation D_C0240D0;
@@ -33,9 +43,14 @@ extern Animation D_C02EDA0;
 extern Animation D_C030244;
 extern Animation D_C033780;
 extern Animation D_C033D98;
+extern EnvSettings D_C035110;
 extern ObjectInit D_C0356A4[];
+extern ObjectInit D_C0356CC[];
+extern ObjectInit D_C036310[];
 extern ObjectInit D_C036310[];
 extern ObjectInit D_C036B6C[];
+extern ObjectInit D_C036B6C[];
+extern ObjectInit D_C03733C[];
 extern ObjectInit D_C03733C[];
 extern u16* D_C037E3C[];
 extern f32 D_C037FCC[];
@@ -51,15 +66,20 @@ extern f32 D_C038860[];
 extern f32 D_C038954[];
 extern f32 D_C038A48[];
 extern Gfx D_C038AC4[];
+extern Gfx D_C038AC4[];
 extern f32 D_C038B40[];
 extern f32 D_C038B40[];
 extern f32 D_C038BA4[];
 extern f32 D_C038BD8[];
+extern f32 D_C038CCC[];
 extern f32 D_C038DC0[];
 extern f32 D_C038F24[];
 extern Vtx D_C038FE8[];
+extern Vtx D_C038FE8[];
 extern Gfx D_C039208[];
 extern u32 D_C039290[];
+extern u32 D_C039290[];
+extern u32 D_C03A290[];
 extern u32 D_C03A290[];
 
 #endif
diff --git a/include/assets/ast_common.h b/include/assets/ast_common.h
index b52390cf..2d2bddd1 100644
--- a/include/assets/ast_common.h
+++ b/include/assets/ast_common.h
@@ -5,7 +5,14 @@
 #include "sf64object.h"
 #include "structs.h"
 
+extern  u8 D_1000000[];
+extern  u8 D_1000280[];
+extern  u8 D_1000640[];
+extern u16 D_1000E80[];
 extern u16 D_1002040[];
+extern u16 D_1002280[];
+extern u16 D_10030D0[];
+extern Gfx D_1003130[];
 extern u16 D_10032A0[];
 extern u16 D_10041C0[];
 extern u16 D_10050E0[];
@@ -19,23 +26,48 @@ extern u16 D_100BAC0[];
 extern u16 D_100C9E0[];
 extern u16 D_100D900[];
 extern u16 D_100E820[];
-extern u8 D_1011A40[];
+extern s32 D_1011280[];
+extern s32 D_10116A0[];
+extern s32 D_10116B0[];
+extern s32 D_1011730[];
+extern u8  D_1011A40[];
 extern u16 D_1011AB0[];
-extern u8 D_1011E80[];
+extern s32 D_1011AC0[];
+extern s32 D_1011B90[];
+extern s32 D_1011BB0[];
+extern s32 D_1011C80[];
+extern s32 D_1011CA0[];
+extern s32 D_1011D70[];
+extern s32 D_1011D90[];
+extern s32 D_1011E60[];
+extern u8  D_1011E80[];
 extern u16 D_1011EC0[];
-extern u8 D_1011ED0[];
+extern u8  D_1011ED0[];
 extern u16 D_1011F08[];
 extern Gfx D_1011F20[];
-extern u8 D_10127D0[];
+extern Gfx D_1012110[];
+extern u8  D_10127D0[];
 extern u16 D_1012898[];
-extern u8 D_10128C0[];
+extern u8  D_10128C0[];
 extern u16 D_1012988[];
-extern u8 D_10129C0[];
+extern u8  D_10129C0[];
 extern u16 D_1013090[];
-extern u8 D_1013170[];
+extern u8  D_1013170[];
 extern u16 D_1013570[];
+extern s32 D_1013580[];
+extern s32 D_1013700[];
+extern Gfx D_1015320[];
 extern Gfx D_1015510[];
+extern Gfx D_10156A0[];
+extern Gfx D_1015810[];
 extern Gfx D_1015980[];
+extern Gfx D_1015B70[];
+extern Gfx D_1015CE0[];
+extern Gfx D_1015E50[];
+extern Gfx D_1015FC0[];
+extern Gfx D_1016130[];
+extern Gfx D_10162A0[];
+extern Gfx D_1016410[];
 extern Gfx D_1016580[];
 extern Gfx D_1016870[];
 extern Gfx D_10177C0[];
@@ -49,7 +81,18 @@ extern Gfx D_101A8E0[];
 extern Gfx D_101ABD0[];
 extern Gfx D_101AD20[];
 extern Gfx D_101AED0[];
-extern Gfx D_101C2E0[];
+extern Gfx D_101B1A0[];
+extern Gfx D_101B310[];
+extern Gfx D_101B480[];
+extern Gfx D_101B5F0[];
+extern Gfx D_101B760[];
+extern Gfx D_101B8D0[];
+extern Gfx D_101BA40[];
+extern Gfx D_101BBB0[];
+extern Gfx D_101BD20[];
+extern Gfx D_101BE90[];
+extern Gfx D_101C000[];
+extern Gfx D_101C170[];
 extern Gfx D_101C2E0[];
 extern Gfx D_101CAE0[];
 extern Gfx D_101CD70[];
@@ -68,7 +111,8 @@ extern Gfx D_1024410[];
 extern Gfx D_1024570[];
 extern Gfx D_10246D0[];
 extern Gfx D_1024830[];
-extern u8 D_1024A58[];
+extern Gfx D_1024990[];
+extern u8  D_1024A58[];
 extern Gfx D_1024AC0[];
 extern Gfx D_1024F60[];
 extern Gfx D_1025800[];
@@ -84,5 +128,25 @@ extern u16 D_102FF08[];
 extern Gfx D_1031630[];
 extern Gfx D_1031EC0[];
 extern Gfx D_1032780[];
+extern u8 D_1010660[];
+extern u8 D_10106B0[];
+extern u8 D_1010700[];
+extern u8 D_1010750[];
+extern u8 D_10107A0[];
+extern u8 D_10107F0[];
+extern u8 D_1010840[];
+extern u8 D_1010890[];
+extern u8 D_10108E0[];
+extern u8 D_1010930[];
+extern u16 D_10106A0[];
+extern u16 D_10106F0[];
+extern u16 D_1010740[];
+extern u16 D_1010790[];
+extern u16 D_10107E0[];
+extern u16 D_1010830[];
+extern u16 D_1010880[];
+extern u16 D_10108D0[];
+extern u16 D_1010920[];
+extern u16 D_1010970[];
 
 #endif
diff --git a/include/assets/ast_vs_player.h b/include/assets/ast_vs_player.h
index dab26a2f..32f60659 100644
--- a/include/assets/ast_vs_player.h
+++ b/include/assets/ast_vs_player.h
@@ -3,6 +3,117 @@
 
 #include "gfx.h"
 #include "sf64object.h"
+#include "sf64level.h"
 #include "structs.h"
 
+extern u8  D_3000000[];
+extern u16 D_3000080[];
+extern u8  D_30001E0[];
+extern u16 D_3000380[];
+extern u8  D_30003A0[];
+extern u16 D_30004E0[];
+extern u8  D_3000510[];
+extern u16 D_30006A0[];
+extern u8  D_30006D0[];
+extern u16 D_3000810[];
+extern u16 D_3000B20[];
+extern u16 D_3000BC0[];
+extern u8  D_30013E0[];
+extern u8  D_3001420[];
+extern u16 D_3003E20[];
+extern u8  D_3004010[];
+extern u16 D_3004D58[];
+extern u8 D_3004F60[];
+extern u16 D_3005E38[];
+extern u8 D_3006040[];
+extern u16 D_3006A68[];
+extern u8  D_3006C60[];
+extern u16 D_3007500[];
+extern u8 D_30076C0[];
+extern u16 D_3008598[];
+extern u8 D_30087A0[];
+extern u16 D_3008DE0[];
+extern u8 D_3008EC0[];
+extern u16 D_30098C0[];
+extern u8 D_3009990[];
+extern u16 D_300A390[];
+extern u8  D_300A470[];
+extern u16 D_300B218[];
+extern u8 D_300B3F0[];
+extern u16 D_300C458[];
+extern u8 D_300D350[];
+extern u16 D_300D398[];
+extern u8 D_300D3C0[];
+extern u16 D_300D408[];
+extern u8 D_300D440[];
+extern u16 D_300D500[];
+extern Gfx D_300D550[];
+extern Gfx D_300EE80[];
+extern Gfx D_300FB80[];
+extern Gfx D_3010A90[];
+extern Gfx D_3011470[];
+extern Gfx D_3011E40[];
+extern Gfx D_3012ED0[];
+extern Gfx D_3013580[];
+extern Gfx D_3013780[];
+extern Gfx D_30146B0[];
+extern Gfx D_30155E0[];
+extern Gfx D_3015740[];
+extern Gfx D_30160A0[];
+extern Gfx D_3016660[];
+extern Gfx D_3016B00[];
+extern Gfx D_30173C0[];
+extern Gfx D_30174E0[];
+extern Gfx D_3017600[];
+extern Gfx D_3017600[];
+extern Gfx D_3018800[];
+extern Gfx D_301AD60[];
+extern Gfx D_301AEF0[];
+extern Gfx D_301B080[];
+extern Gfx D_301B6E0[];
+extern Animation D_301C3A8;
+extern Limb* D_301C614[];
+extern Animation D_301CFEC;
+extern Limb* D_301D258[];
+extern Animation D_301D888;
+extern Limb* D_301DB94[];
+extern Animation D_301E19C;
+extern Limb* D_301E3E8[];
+extern Gfx D_301E570[];
+extern Gfx D_301F140[];
+extern Gfx D_301FD20[];
+extern Gfx D_302D120[];
+extern Gfx D_302D240[];
+extern Gfx D_302D4D0[];
+extern EnvSettings D_302DD70;
+extern EnvSettings D_302DDB4;
+extern EnvSettings D_302DDF8;
+extern ObjectInit D_302DE3C[];
+extern ObjectInit D_302E0E4[];
+extern ObjectInit D_302E170[];
+extern ObjectInit D_302E378[];
+extern Vec3f D_302E56C[];
+extern Vec3f D_302E65C[];
+extern Vec3f D_302E74C[];
+extern Vec3f D_302E830[];
+extern Vec3f D_302E95C[];
+extern Vec3f D_302EA4C[];
+extern Vec3f D_302EB3C[];
+extern Vec3f D_302EC20[];
+extern f32 D_302ED4C[];
+extern f32 D_302ED98[];
+extern f32 D_302EDB4[];
+extern f32 D_302EE00[];
+extern f32 D_302EE64[];
+extern f32 D_302EE80[];
+extern f32 D_302EE9C[];
+extern Triangle D_302EEE8[];
+extern Vec3f D_302EF00[];
+extern Triangle D_302EF6C[];
+extern Vec3f D_302EF84[];
+extern Triangle D_302EFF0[];
+extern Vec3f D_302F008[];
+extern Triangle D_302F044[];
+extern Vec3f D_302F098[];
+
 #endif
diff --git a/include/fox_edisplay_assets.h b/include/fox_edisplay_assets.h
index 81652ef9..efb42d4c 100644
--- a/include/fox_edisplay_assets.h
+++ b/include/fox_edisplay_assets.h
@@ -126,7 +126,6 @@ extern Gfx D_6029530[];
 extern Gfx D_60296A0[];
 extern Gfx D_6028A80[];
 extern Gfx D_6028910[];
-extern Gfx D_6014FD0[];
 extern Gfx D_601EDE0[];
 extern Gfx D_601F2F0[];
 extern Gfx D_601F830[];
diff --git a/include/fox_enmy2_assets.h b/include/fox_enmy2_assets.h
index af51086c..43c8f38a 100644
--- a/include/fox_enmy2_assets.h
+++ b/include/fox_enmy2_assets.h
@@ -3,8 +3,6 @@
 
 #include "global.h"
 
-extern Limb* D_700CB60[];
-
 // Displaylists
 
 extern Gfx D_40068F0[];
@@ -22,26 +20,13 @@ extern Gfx D_601F2A0[];
 extern Gfx D_400AAE0[];
 extern Gfx D_4000650[];
 extern Gfx D_6016190[];
-extern Gfx D_6023500[];
-extern Gfx D_6022DF0[];
 extern Gfx D_4008FA0[];
-extern Gfx D_60285F0[];
-extern Gfx D_600AF70[];
-extern Gfx D_6023E30[];
-extern Gfx D_6001CE0[];
-extern Gfx D_6000840[];
 extern Gfx D_6012A40[];
-extern Gfx D_6009950[];
-extern Gfx D_600B2B0[];
-extern Gfx D_600A2E0[];
-extern Gfx D_600B830[];
-extern Gfx D_6020D20[];
 extern Gfx D_60102C0[];
 extern Gfx D_6017B60[];
 extern Gfx D_6004D00[];
 extern Gfx D_601A880[];
 extern Gfx D_6015D60[];
-extern Gfx D_600B540[];
 extern Gfx D_4000EC0[];
 extern Gfx D_4008D50[];
 extern Gfx D_60102C0[];
@@ -55,7 +40,6 @@ extern Gfx D_600C2A0[];
 extern Gfx D_600BD40[];
 extern Gfx D_60205D0[];
 extern Gfx D_60036A0[];
-extern Gfx D_3007650[];
 extern Gfx D_60034D0[];
 extern Gfx D_6005360[];
 extern Gfx D_601B610[];
@@ -73,25 +57,13 @@ extern Gfx D_6004310[];
 extern Gfx D_6002890[];
 
 extern f32 D_60282A0[];
-extern f32 D_603298C[];
-extern f32 D_6032904[];
-extern f32 D_6032970[];
-extern f32 D_603285C[];
-extern f32 D_6032938[];
-extern f32 D_6032954[];
 extern f32 D_6028254[];
 extern f32 D_60280E0[];
-extern f32 D_6032878[];
-extern f32 D_6032894[];
-extern f32 D_60328B0[];
-extern f32 D_603238C[];
-extern f32 D_60328CC[];
 extern f32 D_6034478[];
 extern f32 D_603450C[];
 extern f32 D_6034588[];
 extern f32 D_6034124[];
 extern f32 D_602C1A0[];
-extern f32 D_60328E8[];
 extern f32 D_602F604[];
 extern f32 D_603445C[];
 extern f32 D_6034664[];
@@ -101,9 +73,7 @@ extern f32 D_60347F0[];
 extern f32 D_603486C[];
 extern f32 D_602C294[];
 extern f32 D_601B474[];
-extern f32 D_6030B4C[];
 extern f32 D_601B43C[];
-extern f32 D_6030B30[];
 extern f32 D_60368FC[];
 extern f32 D_60368E0[];
 extern f32 D_60364C0[];
diff --git a/include/fox_enmy_assets.h b/include/fox_enmy_assets.h
index a80c3142..94d948e5 100644
--- a/include/fox_enmy_assets.h
+++ b/include/fox_enmy_assets.h
@@ -5,7 +5,7 @@
 
 extern ObjectInit D_60371A4[];
 extern ObjectInit D_6026CC4[];
-extern ObjectInit D_602A164[];
+extern ObjectInit D_SX_602A164[];
 extern ObjectInit D_6023F64[];
 extern ObjectInit D_60287A4[];
 extern ObjectInit D_602E4F4[];
@@ -13,7 +13,7 @@ extern ObjectInit D_6007E74[];
 extern ObjectInit D_601F234[];
 extern ObjectInit D_6026714[];
 extern ObjectInit D_0C035154[];
-extern ObjectInit D_6006AA4[];
+extern ObjectInit D_TR_6006AA4[];
 extern ObjectInit D_6031000[];
 extern ObjectInit D_6006C60[];
 extern ObjectInit D_602E5C8[];
diff --git a/include/fox_option_assets.h b/include/fox_option_assets.h
index 3343c86b..715e6814 100644
--- a/include/fox_option_assets.h
+++ b/include/fox_option_assets.h
@@ -3,39 +3,18 @@
 
 #include "global.h"
 
-extern u8 D_80039D0[];
-extern u16 D_8003A50[];
-extern u8 D_8003B50[];
-extern u8 D_8003EB0[];
-extern u8 D_8004270[];
-extern u8 D_80043B0[];
-extern u8 D_80046B0[];
-extern u8 D_8004930[];
-extern u8 D_8005010[];
-extern u8 D_80054F0[];
-extern u8 D_8005910[];
-extern u16 D_8013990[];
-extern u16 D_80141B0[];
-extern u8 D_80143B0[];
-extern u16 D_80147B0[];
-
 extern u8 D_70030B0[];
 extern u8 D_7003290[];
 extern u8 D_7003470[];
-
 extern u8 D_70049C0[];
 extern u8 D_7004BB0[];
 extern u8 D_7004DC0[];
 extern u8 D_7005020[];
-
 extern u8  D_7000000[];
 extern u8  D_70000D0[];
 extern u8  D_7000210[];
 extern u8  D_7000350[];
-
 extern u16 D_7004B80[];
-
-extern u8 D_8000000[];
 extern u16 D_7004D90[];
 extern u16 D_7004FF0[];
 extern u16 D_70051A0[];
@@ -43,44 +22,6 @@ extern u16 D_7008EE0[];
 extern u16 D_700AD20[];
 extern u16 D_700CB60[];
 extern u16 D_70070A0[];
-extern Gfx D_90086F0[];
-extern Gfx D_9007FD0[];
-extern Gfx D_9007BB0[];
-extern Gfx D_9000980[];
-extern Gfx D_90075A0[];
-extern Gfx D_90070C0[];
-extern Gfx D_9006AE0[];
-extern Gfx D_9006500[];
-extern Gfx D_90062D0[];
-extern Gfx D_9001120[];
-extern Gfx D_9005CA0[];
-extern Gfx D_9005980[];
-extern Gfx D_9005380[];
-extern Gfx D_9004E10[];
-extern Gfx D_9000570[];
-extern Gfx D_90014E0[];
-extern Gfx D_9004920[];
-extern Gfx D_9004230[];
-extern Gfx D_9003A30[];
-extern Gfx D_9003620[];
-extern Gfx D_9003230[];
-extern Gfx D_9002EA0[];
-extern Gfx D_9002890[];
-extern Gfx D_90022A0[];
-extern Gfx D_9001E90[];
-extern Gfx D_9001A10[];
-extern Gfx D_900BB90[];
-extern Gfx D_90001F0[];
-extern Gfx D_900B580[];
-extern Gfx D_900AF60[];
-extern Gfx D_900A870[];
-extern Gfx D_900A290[];
-extern Gfx D_9009CB0[];
-extern Gfx D_9009990[];
-extern Gfx D_9009280[];
-extern Gfx D_9008C60[];
-extern Gfx D_9000000[];
-
 extern u8  D_70017B0[];
 extern u8  D_70019E0[];
 extern u8  D_7005600[];
diff --git a/include/fox_std_lib_assets.h b/include/fox_std_lib_assets.h
deleted file mode 100644
index 13cb0718..00000000
--- a/include/fox_std_lib_assets.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef FOX_STD_LIB_ASSETS_H
-#define FOX_STD_LIB_ASSETS_H
-
-#include "global.h"
-
-extern u8 D_1010660[];
-extern u8 D_10106B0[];
-extern u8 D_1010700[];
-extern u8 D_1010750[];
-extern u8 D_10107A0[];
-extern u8 D_10107F0[];
-extern u8 D_1010840[];
-extern u8 D_1010890[];
-extern u8 D_10108E0[];
-extern u8 D_1010930[];
-
-extern u16 D_10106A0[];
-extern u16 D_10106F0[];
-extern u16 D_1010740[];
-extern u16 D_1010790[];
-extern u16 D_10107E0[];
-extern u16 D_1010830[];
-extern u16 D_1010880[];
-extern u16 D_10108D0[];
-extern u16 D_1010920[];
-extern u16 D_1010970[];
-
-#endif
diff --git a/include/fox_versus_assets.h b/include/fox_versus_assets.h
deleted file mode 100644
index a00033b0..00000000
--- a/include/fox_versus_assets.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef FOX_VERSUS_ASSETS_H
-#define FOX_VERSUS_ASSETS_H
-
-#include "global.h"
-
-extern u8 D_30087A0[];
-extern u8 D_3008EC0[];
-extern u8 D_3009990[];
-extern u8 D_3006040[];
-extern u8 D_30076C0[];
-extern u8 D_300B3F0[];
-extern u8 D_3004F60[];
-
-extern u16 D_3008DE0[];
-extern u16 D_30098C0[];
-extern u16 D_300A390[];
-extern u16 D_3006A68[];
-extern u16 D_3008598[];
-extern u16 D_300C458[];
-extern u16 D_3005E38[];
-
-#endif
diff --git a/include/global.h b/include/global.h
index 908b5b98..1a4923ba 100644
--- a/include/global.h
+++ b/include/global.h
@@ -19,6 +19,7 @@
 #include "i4.h"
 #include "i5.h"
 #include "i6.h"
+#include "assets/ast_common.h"
 #include "assets.h"
 
 #endif // GLOBAL_H
diff --git a/include/i6.h b/include/i6.h
index cf8b1b5b..6364d40c 100644
--- a/include/i6.h
+++ b/include/i6.h
@@ -24,6 +24,8 @@ extern f32 D_i6_801A7F70;
 extern f32 D_i6_801A7F74;
 extern f32 D_i6_801A7F78;
 extern f32 D_i6_801A7F7C;
+extern Vec3f D_i6_801A7F80[100];
+extern f32 D_i6_801A8430;
 
 void func_i6_80187530(Actor*);
 void func_i6_80193C4C(Player*);
diff --git a/include/sf64mesg.h b/include/sf64mesg.h
index cd733547..23fdf80d 100644
--- a/include/sf64mesg.h
+++ b/include/sf64mesg.h
@@ -93,8 +93,8 @@ typedef enum {
     RCID_ROB64_TITLE_OPEN,
     RCID_GEN_PEPPER_TITLE = 310,
     RCID_GEN_PEPPER_TITLE_OPEN,
-    RCID_TRAINING = 350,
-    RCID_TRAINING_OPEN,
+    RCID_TR = 350,
+    RCID_TR_OPEN,
     RCID_FOX_EXPERT = 400,
     RCID_FOX_EXPERT_OPEN,
 } RadioCharacterId;