titania boss assets, cleanup pads, update torch, split remaining segments other than 6 (#173)

* splits

* torch

* torch again

* headers

9 files changed, 124 insertions, 170 deletions

diff --git a/include/assets.h b/include/assets.h
index c4acd789..49d94e6a 100644
--- a/include/assets.h
+++ b/include/assets.h
@@ -8,13 +8,7 @@
 #include "sf64player.h"
 
 // ast_enmy_planet
-extern Animation D_40001A4;
-extern Limb* D_4000270[];
-extern Gfx D_40018A0[];
-extern Animation D_40057AC;
-extern Limb* D_40058B8[];
-extern Gfx D_40068F0[];
-extern Gfx D_4007AF0[];
+
 
 /* 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*,
@@ -591,48 +585,6 @@ extern Gfx D_6019670[];
 extern Gfx D_60185E0[];
 extern Gfx D_6017550[];
 
-// ast_versus, ast_ending
-extern u8 D_7000F10[]; // fox_option
-extern u8 D_7001030[]; // fox_option
-extern u8 D_7001270[]; // fox_option
-extern u8 D_7001DF0[]; // fox_option
-extern u8 D_7002110[]; // fox_option
-extern u8 D_7003650[]; // fox_option
-extern Gfx D_7003830[]; // fox_versus
-extern u8 D_7003C70[]; // fox_versus
-extern u8 D_7003E10[]; // fox_versus
-extern u8 D_7003F10[]; // fox_versus
-extern u8 D_7004010[]; // fox_option
-extern u8 D_7004050[]; // fox_versus
-extern u16 D_7004150[]; // fox_versus
-extern u8 D_70041F0[]; // fox_versus
-extern u16 D_70042F0[]; // fox_versus
-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 u16 D_700E9A0[]; // fox_option
-extern u8 D_70118E0[]; // fox_versus, fox_option
-extern u16 D_70123F8[]; // fox_versus, fox_option
-
-// ast_9_ti, ast_ve1_boss
-extern Gfx D_9002CF0[];
-extern u16 D_9003330[];
-extern u16 D_9003890[];
-extern u16 D_9003DF0[];
-extern Gfx D_9003F50[];
-extern Gfx D_9005C80[];
-extern Gfx D_900D180[];
-extern Gfx D_900DD20[];
-extern Gfx D_900F060[];
-extern Gfx D_900F1D0[];
-extern Gfx D_9010FD0[];
-extern Gfx D_9011200[];
-extern Gfx D_901DA50[];
-extern Gfx D_9023290[];
-extern Gfx D_90234D0[];
-extern Gfx D_9023AD0[];
-
 // fox_map, to be ordered later
 
 extern f32 D_603E118[];
diff --git a/include/assets/ast_7_ti_2.h b/include/assets/ast_7_ti_2.h
deleted file mode 100644
index 6445f646..00000000
--- a/include/assets/ast_7_ti_2.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef AST_7_TI_2_H
-#define AST_7_TI_2_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "structs.h"
-
-extern Animation D_TI2_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[];
-extern Gfx D_7009A80[];
-
-#endif
diff --git a/include/assets/ast_8_ti.h b/include/assets/ast_8_ti.h
deleted file mode 100644
index cfdce9df..00000000
--- a/include/assets/ast_8_ti.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef AST_8_TI_H
-#define AST_8_TI_H
-
-#include "gfx.h"
-#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_9_ti.h b/include/assets/ast_9_ti.h
deleted file mode 100644
index 3e51eace..00000000
--- a/include/assets/ast_9_ti.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef AST_9_TI_H
-#define AST_9_TI_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "structs.h"
-
-#endif
diff --git a/include/assets/ast_enmy_planet.h b/include/assets/ast_enmy_planet.h
index be93ccaa..a860ad85 100644
--- a/include/assets/ast_enmy_planet.h
+++ b/include/assets/ast_enmy_planet.h
@@ -5,4 +5,21 @@
 #include "sf64object.h"
 #include "structs.h"
 
+extern Animation D_40001A4;
+extern Limb* D_4000270[];
+extern Gfx D_4000710[];
+extern Gfx D_40018A0[];
+extern Animation D_40057AC;
+extern Limb* D_40058B8[];
+extern Gfx D_40068F0[];
+extern Gfx D_4006E90[];
+extern Gfx D_40073C0[];
+extern Gfx D_4007AF0[];
+extern Gfx D_4008CE0[];
+extern Gfx D_4008CE0[];
+extern Gfx D_4008F70[];
+extern Gfx D_4008F70[];
+extern Gfx D_4009800[];
+extern Gfx D_400AAE0[];
+
 #endif
diff --git a/include/assets/ast_ve1_boss.h b/include/assets/ast_ve1_boss.h
index 4e6c91a5..2b5579f5 100644
--- a/include/assets/ast_ve1_boss.h
+++ b/include/assets/ast_ve1_boss.h
@@ -5,4 +5,54 @@
 #include "sf64object.h"
 #include "structs.h"
 
+extern Gfx D_VE1_9000000[];
+extern Gfx D_VE1_90007F0[];
+extern Gfx D_VE1_9002CF0[];
+extern u16 D_VE1_9003330[];
+extern u16 D_VE1_9003890[];
+extern u16 D_VE1_9003DF0[];
+extern Gfx D_VE1_9003F50[];
+extern Gfx D_VE1_9005C80[];
+extern Animation D_VE1_900D098;
+extern Limb* D_VE1_900D164[];
+extern Gfx D_VE1_900D180[];
+extern Gfx D_VE1_900DD20[];
+extern Gfx D_VE1_900DF20[];
+extern Gfx D_VE1_900EFC0[];
+extern Gfx D_VE1_900F060[];
+extern Gfx D_VE1_900F1D0[];
+extern Animation D_VE1_9010FC4;
+extern Gfx D_VE1_9010FD0[];
+extern Gfx D_VE1_9011200[];
+extern Gfx D_VE1_9012180[];
+extern Gfx D_VE1_9013880[];
+extern Gfx D_VE1_9013C20[];
+extern Gfx D_VE1_9014DF0[];
+extern Gfx D_VE1_90150A0[];
+extern Gfx D_VE1_9015480[];
+extern Gfx D_VE1_9015900[];
+extern Gfx D_VE1_9015BB0[];
+extern Animation D_VE1_9018BD0;
+extern Animation D_VE1_901A4B8;
+extern Animation D_VE1_901BDA8;
+extern Limb* D_VE1_901C0F4[];
+extern Animation D_VE1_901DA38;
+extern Gfx D_VE1_901DA50[];
+extern Gfx D_VE1_901E350[];
+extern Gfx D_VE1_901F6D0[];
+extern Gfx D_VE1_901F990[];
+extern Gfx D_VE1_901FC40[];
+extern Gfx D_VE1_9021630[];
+extern Gfx D_VE1_9021900[];
+extern Gfx D_VE1_9021B80[];
+extern Gfx D_VE1_9022A20[];
+extern Gfx D_VE1_9022D80[];
+extern Gfx D_VE1_9023290[];
+extern Gfx D_VE1_90234D0[];
+extern Gfx D_VE1_9023AD0[];
+extern Animation D_VE1_9024738;
+extern Animation D_VE1_9024738;
+extern Gfx D_VE1_9024750[];
+
+
 #endif
diff --git a/include/assets/ast_versus.h b/include/assets/ast_versus.h
index 3540bf76..b96d7197 100644
--- a/include/assets/ast_versus.h
+++ b/include/assets/ast_versus.h
@@ -5,4 +5,60 @@
 #include "sf64object.h"
 #include "structs.h"
 
+extern u8  D_VS_7000000[];
+extern u8  D_VS_70000D0[];
+extern u8  D_VS_7000210[];
+extern u8  D_VS_7000350[];
+extern u8  D_VS_7000F10[]; // fox_option
+extern u8  D_VS_7001030[]; // fox_option
+extern u8  D_VS_7001270[]; // fox_option
+extern u8  D_VS_70017B0[];
+extern u8  D_VS_70019E0[];
+extern u8  D_VS_7001C10[];
+extern u8  D_VS_7001DF0[]; // fox_option
+extern u8  D_VS_7002110[]; // fox_option
+extern u8  D_VS_70024D0[];
+extern u8  D_VS_7002730[];
+extern u8  D_VS_7002990[];
+extern u8  D_VS_7002BF0[];
+extern u8  D_VS_7002E50[];
+extern u8  D_VS_70030B0[];
+extern u8  D_VS_7003290[];
+extern u8  D_VS_7003470[];
+extern u8  D_VS_7003650[]; // fox_option
+extern Gfx D_VS_7003830[]; // fox_versus
+extern u8  D_VS_7003C70[]; // fox_versus
+extern u8  D_VS_7003E10[]; // fox_versus
+extern u8  D_VS_7003F10[]; // fox_versus
+extern u8  D_VS_7004010[]; // fox_option
+extern u8  D_VS_7004050[]; // fox_versus
+extern u16 D_VS_7004150[]; // fox_versus
+extern u8  D_VS_70041F0[]; // fox_versus
+extern u16 D_VS_70042F0[]; // fox_versus
+extern u8  D_VS_7004360[]; // fox_versus
+extern u16 D_VS_7004460[]; // fox_versus
+extern u8  D_VS_70044D0[]; // fox_versus
+extern u16 D_VS_7004990[]; // fox_versus
+extern u8  D_VS_70049C0[];
+extern u16 D_VS_7004B80[];
+extern u8  D_VS_7004BB0[];
+extern u16 D_VS_7004D90[];
+extern u8  D_VS_7004DC0[];
+extern u16 D_VS_7004FF0[];
+extern u8  D_VS_7005020[];
+extern u16 D_VS_70051A0[];
+extern u8  D_VS_7005600[];
+extern u16 D_VS_7005D20[];
+extern u8  D_VS_7005F10[];
+extern u16 D_VS_7006630[];
+extern u8  D_VS_7006780[];
+extern u16 D_VS_7006EA0[];
+extern u16 D_VS_70070A0[];
+extern u16 D_VS_7008EE0[];
+extern u16 D_VS_700AD20[];
+extern u16 D_VS_700CB60[];
+extern u16 D_VS_700E9A0[]; // fox_option
+extern u8  D_VS_70118E0[]; // fox_versus, fox_option
+extern u16 D_VS_70123F8[]; // fox_versus, fox_option
+
 #endif
diff --git a/include/fox_enmy2_assets.h b/include/fox_enmy2_assets.h
index 87fbb0d8..07c8c542 100644
--- a/include/fox_enmy2_assets.h
+++ b/include/fox_enmy2_assets.h
@@ -5,28 +5,13 @@
 
 // Displaylists
 
-extern Gfx D_40068F0[];
-extern Gfx D_4006E90[];
-extern Gfx D_4000170[];
-extern Gfx D_40084D0[];
-extern Gfx D_400A630[];
-extern Gfx D_4009800[];
-extern Gfx D_40073C0[];
 extern Gfx D_6011F90[];
-extern Gfx D_4000710[];
-extern Gfx D_400BD20[];
-extern Gfx D_4001310[];
 extern Gfx D_601F2A0[];
-extern Gfx D_400AAE0[];
-extern Gfx D_4000650[];
-extern Gfx D_4008FA0[];
 extern Gfx D_60102C0[];
 extern Gfx D_6017B60[];
 extern Gfx D_6004D00[];
 extern Gfx D_601A880[];
 extern Gfx D_6015D60[];
-extern Gfx D_4000EC0[];
-extern Gfx D_4008D50[];
 extern Gfx D_60102C0[];
 extern Gfx D_601F3D0[];
 extern Gfx D_6022B10[];
@@ -43,8 +28,6 @@ extern Gfx D_6005360[];
 extern Gfx D_601B610[];
 extern Gfx D_601C6A0[];
 extern Gfx D_60188D0[];
-extern Gfx D_9012180[];
-extern Gfx D_900EFC0[];
 extern Gfx D_601C520[];
 extern Gfx D_600AF40[];
 extern Gfx D_600AC70[];
diff --git a/include/fox_option_assets.h b/include/fox_option_assets.h
deleted file mode 100644
index 715e6814..00000000
--- a/include/fox_option_assets.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef FOX_OPTION_ASSETS_H
-#define FOX_OPTION_ASSETS_H
-
-#include "global.h"
-
-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 u16 D_7004D90[];
-extern u16 D_7004FF0[];
-extern u16 D_70051A0[];
-extern u16 D_7008EE0[];
-extern u16 D_700AD20[];
-extern u16 D_700CB60[];
-extern u16 D_70070A0[];
-extern u8  D_70017B0[];
-extern u8  D_70019E0[];
-extern u8  D_7005600[];
-extern u8  D_7005F10[];
-extern u16 D_7005D20[];
-extern u16 D_7006630[];
-extern u8  D_7001C10[];
-extern u8  D_7006780[];
-extern u8  D_70019E0[];
-extern u8  D_7005F10[];
-extern u16 D_7006EA0[];
-extern u16 D_7006630[];
-extern u8 D_70024D0[];
-extern u8 D_7002730[];
-extern u8 D_7002990[];
-extern u8 D_7002BF0[];
-extern u8 D_7002E50[];
-
-#endif