Last Titania asset, fix to hibox exporter, more cleanup (#180)

* yaml

* ti

* hud

* a

* torch

* forgot header

* fix?

* format

3 files changed, 10 insertions, 59 deletions

diff --git a/include/assets.h b/include/assets.h
index 319fe631..a6d4129c 100644
--- a/include/assets.h
+++ b/include/assets.h
@@ -16,7 +16,6 @@
  * ast_katina, ast_macbeth, ast_title, ast_map, ast_training
  */
 extern Gfx D_60005B0[]; // fox_bg
-extern Gfx D_6000A80[]; // fox_bg, fox_effect
 extern Gfx D_6000E00[]; // fox_edata_1C
 extern Gfx D_6001360[]; // fox_bg, fox_demo, fox_edata_1C. Possible symbol collision
 extern Gfx D_6001530[]; // fox_360, fox_demo, fox_ka
@@ -24,66 +23,29 @@ extern Gfx D_6001A60[]; // fox_effect
 extern u8 D_6001B80[]; // fox_hud
 extern Vtx D_6001C50[]; // fox_play
 extern u8 D_60020D0[]; // fox_hud
-extern Gfx D_60023B0[]; // fox_edata_1C
 extern Gfx D_6002990[]; // fox_edata_1C
 extern Gfx D_6002E60[]; // fox_bg
 extern Gfx D_6003000[]; // fox_edata_1C
 extern Gfx D_60030F0[]; // fox_edata_1C
-extern Gfx D_6003760[];
 extern Gfx D_60038E0[];
 extern u16 D_60038F8[];
 extern Gfx D_6004170[];
 extern Vtx D_6004500[];
 extern Gfx D_60046F0[];
 extern Gfx D_6004900[];
-extern EnvSettings D_TI_6005000;
 extern u16 D_6005710[];
 extern Gfx D_6005780[];
 extern Gfx D_6005880[];
 extern Gfx D_60059F0[];
 extern Gfx D_6006140[];
 extern Gfx D_6006310[];
-extern u16* D_TI_600631C[];
 extern Animation D_600636C;
-extern f32 D_60064AC[];
-extern f32 D_60064C8[];
-extern f32 D_60064FC[];
-extern f32 D_6006518[];
 extern Limb* D_6006558[];
-extern f32 D_6006564[];
-extern f32 D_60065B0[];
-extern f32 D_60065FC[];
-extern f32 D_6006648[];
-extern f32 D_6006694[];
 extern Gfx D_60066D0[];
-extern f32 D_60066E0_f32[];
-extern Gfx D_60066E0_Gfx[];
-extern f32 D_600672C[];
 extern u16 D_6006750[];
-extern f32 D_6006778[];
-extern f32 D_60067C4[];
-extern f32 D_6006808[];
-extern f32 D_600683C[];
-extern f32 D_6006858[];
-extern f32 D_6006890_f32[];
-extern Gfx D_6006890_Gfx[];
-extern f32 D_60068BC[];
-extern f32 D_60068F0[];
-extern f32 D_6006940[];
-extern f32 D_600695C[];
-extern f32 D_6006978[];
-extern f32 D_6006994[];
-extern f32 D_60069B0[];
-extern f32 D_60069CC[];
-extern f32 D_60069E8[];
-extern f32 D_6006A04[];
-extern f32 D_6006A20[];
-extern f32 D_6006A3C[];
 extern EnvSettings D_6006A60;
 extern Gfx D_6006A80[];
 extern Gfx D_6006BE0[];
-extern f32 D_6006BF0[];
-extern f32 D_6006C44[];
 extern u16 D_6006EA0[];
 extern Gfx D_6006F50[];
 extern Gfx D_6007410[];
@@ -100,7 +62,6 @@ extern Gfx D_6008830[];
 extern Gfx D_6008AA0[];
 extern Gfx D_6009250[];
 extern u16* D_6009B34[];
-extern u16 D_6009BB8[];
 extern f32 D_6009CC4[];
 extern f32 D_6009CFC[];
 extern Animation D_6009D30;
diff --git a/include/assets/ast_titania.h b/include/assets/ast_titania.h
deleted file mode 100644
index 52a650ad..00000000
--- a/include/assets/ast_titania.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef AST_TITANIA_H
-#define AST_TITANIA_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "structs.h"
-
-#endif
diff --git a/include/fox_enmy_assets.h b/include/fox_enmy_assets.h
index 854bbc3a..5a35b8f0 100644
--- a/include/fox_enmy_assets.h
+++ b/include/fox_enmy_assets.h
@@ -3,17 +3,15 @@
 
 #include "sf64object.h"
 
-extern ObjectInit D_60371A4[];
-extern ObjectInit D_6026CC4[];
-extern ObjectInit D_6007E74[];
-extern ObjectInit D_601F234[];
-extern ObjectInit D_6026714[];
-extern ObjectInit D_6031000[];
-extern ObjectInit D_6006C60[];
-extern ObjectInit D_602E5C8[];
-extern ObjectInit D_600EAD4[];
-extern ObjectInit D_6011044[];
-extern ObjectInit D_600FF74[];
-extern ObjectInit D_6014D94[];
+extern ObjectInit D_CO_60371A4[];
+extern ObjectInit D_ME_6026CC4[];
+extern ObjectInit D_VE1_6007E74[];
+extern ObjectInit D_SO_601F234[];
+extern ObjectInit D_ZO_6026714[];
+extern ObjectInit D_MA_6031000[];
+extern ObjectInit D_FO_600EAD4[];
+extern ObjectInit D_KA_6011044[];
+extern ObjectInit D_BO_600FF74[];
+extern ObjectInit D_VE2_600FF74[];
 
 #endif