export configuration for ast_fortuna, ast_katina, ast_venom_1 & ast_venom_2 (#190)

* Matched ast_fortuna

* Added FO prefix into every asset

* Fully matched PR

* Removed katina from assets.h

* WIP ast_venom_2

* Debinarized ast_venom_2

* Removed venom_2 from assets.h

* Renamed VE1 to VE1B

* Matched ast_venom_1

* Renamed to D_VE1

* Renamed venom_1 boss assets back to D_VE1

* Fixed merge conflicts

7 files changed, 25 insertions, 115 deletions

diff --git a/include/assets.h b/include/assets.h
index c266c1b7..d6b56fa6 100644
--- a/include/assets.h
+++ b/include/assets.h
@@ -16,41 +16,23 @@
  * ast_katina, ast_macbeth, ast_title, ast_map, ast_training
  */
 extern Gfx D_60005B0[]; // fox_bg
-extern Gfx D_6001360[]; // fox_bg, fox_demo, fox_edata_1C. Possible symbol collision
 extern Gfx D_6001530[]; // fox_360, fox_demo, fox_ka
 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_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_60038E0[];
-extern Gfx D_6004170[];
 extern Vtx D_6004500[];
 extern Gfx D_60046F0[];
 extern u16 D_6005710[];
-extern Gfx D_6005780[];
 extern Gfx D_6005880[];
 extern Gfx D_6006140[];
-extern Gfx D_6006310[];
 extern Animation D_600636C;
 extern Limb* D_6006558[];
-extern Gfx D_60066D0[];
-extern u16 D_6006750[];
 extern EnvSettings D_6006A60;
-extern Gfx D_6006BE0[];
 extern u16 D_6006EA0[];
-extern Gfx D_6006F50[];
-extern Gfx D_6007410[];
-extern Gfx D_6007650[];
-extern Gfx D_60079B0[];
-extern Gfx D_6007CF0[];
-extern Gfx D_6007D80[];
-extern Gfx D_6007D90[];
-extern EnvSettings D_VE1_6007E30;
-extern Gfx D_6008370[];
+extern Gfx D_6007C40[];
+extern Gfx D_60084C0[];
+extern Gfx D_6008770[];
 extern Gfx D_6008830[];
 extern Gfx D_6009250[];
 extern u16* D_6009B34[];
@@ -62,62 +44,39 @@ extern Gfx D_6009F90[];
 extern Gfx D_600A420[];
 extern Gfx D_600B0E0[];
 extern Animation D_600B1B4;
-extern Gfx D_600B4B0[];
-extern Gfx D_600BAF0[];
+extern Gfx D_600B8B0[];
 extern u16 D_600BEA0[];
 extern Animation D_600C15C;
-extern Animation D_600C200;
-extern Limb* D_600C2AC[];
 extern u16 D_600C6A0[];
 extern Vtx D_600C780[];
 extern Animation D_600D3DC;
-extern u16 D_600D5C0[];
-extern Gfx D_600D730[];
 extern u16 D_600D990[];
 extern Gfx D_600D9F0[];
-extern Gfx D_600DBC0[];
 extern u8 D_600DDC0[];
-extern Gfx D_600E050[];
+extern Gfx D_600DDF0[];
 extern Animation D_600E2C4;
 extern u8 D_600E360[];
 extern Limb* D_600E470[];
 extern Animation D_600E5EC;
 extern Gfx D_600E820[];
 extern u8 D_600E980[];
-extern EnvSettings D_FO_600EA90;
 extern Gfx D_600EC90[];
-extern Gfx D_600EFF0[];
 extern Gfx D_600F160[];
-extern Gfx D_600F1D0[];
-extern CollisionPoly D_600F1DC[];
 extern Gfx D_600F2F0[];
 extern Vec3s D_600F394[];
 extern Gfx D_600F3D0[];
 extern CollisionPoly D_600F3F4[];
 extern Gfx D_600F560[];
 extern Vec3s D_600F5AC[];
-extern CollisionPoly D_600F60C[];
-extern Gfx D_600F670[];
 extern Animation D_600F744;
 extern u8 D_600F940[];
 extern Gfx D_600F9B0[];
 extern Vec3s D_600FD50[];
-extern f32 D_600FE9C[];
-extern f32 D_600FEB8[];
-extern f32 D_600FF30_Hitbox[];
-extern f32 D_600FF80[];
-extern f32 D_600FFA0[];
-extern f32 D_600FFC0[];
-extern f32 D_600FFE0[];
-extern ObjectInit* D_6010088[];
 extern u8 D_6010090[];
 extern u16 D_6010198[];
 extern u8 D_60106B0[];
-extern Gfx D_6010960[];
 extern u8 D_6010FA0[];
-extern EnvSettings D_KA_6011000;
-extern f32 D_6011058[];
-extern f32 D_601115C[];
+extern Vec3s D_601170C[];
 extern u8 D_6011890[];
 extern u8 D_6012310[];
 extern u8 D_60123F0[];
@@ -127,38 +86,27 @@ extern Gfx D_6013480[];
 extern Animation D_601388C;
 extern u8 D_6014140[];
 extern u16 D_6014510[];
-extern Animation D_6014658;
 extern u16 D_60147C0[];
 extern u8 D_60147E0[];
 extern u8 D_60148B0[];
-extern EnvSettings D_VE2_6014D50;
-extern CollisionPoly D_6014FEC[];
 extern u16 D_6015430[];
 extern Gfx D_6016270[];
 extern Vec3s D_6016374[];
-extern f32 D_601668C[];
-extern f32 D_60166F4[];
-extern f32 D_6016714[];
 extern Gfx D_6016CF0[];
 extern Gfx D_6017090[];
 extern Gfx D_6017370[];
 extern u16* D_VE1_601B1E4[];
-extern f32 D_601B4C4[];
-extern f32 D_601B4E0[];
-extern f32 D_601B4FC[];
-extern f32 D_601B518[];
-extern f32 D_601B584[];
-extern f32 D_601B5F4[];
-extern f32 D_601B644[];
-extern f32 D_601B678[];
-extern f32 D_601B6C4[];
+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 f32 D_601B75C[];
-extern f32 D_601B7F8[];
-extern f32 D_601B830[];
-extern f32 D_601B868[];
-extern f32 D_601B8A0[];
-extern f32 D_601B8D8[];
+extern Gfx D_601B790[];
+extern Gfx D_601B790[];
 extern Gfx D_601C820[];
 extern Gfx D_601E150[];
 extern u16 D_601E1E8[];
@@ -168,17 +116,16 @@ extern Limb* D_601F920[];
 extern Gfx D_601FCB0[];
 extern Gfx D_60200E0[];
 extern Gfx D_6020A30[];
-extern u16* D_SO_600631C[];
 extern Gfx D_6020E60[];
 extern u16 D_6020F60[];
 extern u16 D_6022760[];
 extern u16 D_60229A4[];
 extern f32 D_60231A4[];
+extern u16* D_ZO_602AAC0[];
 extern Gfx D_6024220[];
 extern Gfx D_6024AC0[];
 extern EnvSettings D_ZO_60266D0;
 extern Gfx D_602A720[];
-extern u16* D_ZO_602AAC0[];
 extern u16 D_602AC50[];
 extern f32 D_602B9EC[];
 extern f32 D_602BA20[];
@@ -195,21 +142,16 @@ extern f32 D_602C218[];
 extern f32 D_602C234[];
 extern f32 D_602C250[];
 extern f32 D_602C294[];
+extern u16* D_ME_602F3AC[];
 extern f32 D_602C2B0[];
 extern u16 D_602C2CC[];
 extern Triangle D_602CACC[];
 extern Vec3f D_602CB80[];
 extern CollisionPoly D_602FA9C[];
 extern Vec3s D_6033E08[];
-extern Gfx D_60084C0[];
-extern Gfx D_6008D40[];
-extern Gfx D_6007C40[];
-extern Gfx D_601B790[];
-extern Gfx D_601B790[];
-extern Gfx D_601A700[];
-extern Gfx D_6019670[];
-extern Gfx D_60185E0[];
-extern Gfx D_6017550[];
 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/include/assets/ast_fortuna.h b/include/assets/ast_fortuna.h
deleted file mode 100644
index 793619da..00000000
--- a/include/assets/ast_fortuna.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef AST_FORTUNA_H
-#define AST_FORTUNA_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "structs.h"
-
-#endif
diff --git a/include/assets/ast_katina.h b/include/assets/ast_katina.h
deleted file mode 100644
index 4ccbe831..00000000
--- a/include/assets/ast_katina.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef AST_KATINA_H
-#define AST_KATINA_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "structs.h"
-
-#endif
diff --git a/include/assets/ast_venom_1.h b/include/assets/ast_venom_1.h
deleted file mode 100644
index da493725..00000000
--- a/include/assets/ast_venom_1.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef AST_VENOM_1_H
-#define AST_VENOM_1_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "structs.h"
-
-#endif
diff --git a/include/assets/ast_venom_2.h b/include/assets/ast_venom_2.h
deleted file mode 100644
index b8051371..00000000
--- a/include/assets/ast_venom_2.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef AST_VENOM_2_H
-#define AST_VENOM_2_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "structs.h"
-
-#endif
diff --git a/include/fox_edisplay_assets.h b/include/fox_edisplay_assets.h
index 4eb7811a..0ed76ff6 100644
--- a/include/fox_edisplay_assets.h
+++ b/include/fox_edisplay_assets.h
@@ -136,7 +136,7 @@ extern Gfx D_6023EB0[];
 extern Gfx D_60249C0[];
 extern Gfx D_6023B80[];
 extern Gfx D_601B570[];
-extern Gfx D_601B710[];
+extern Gfx D_VE1_601B710[];
 extern Gfx D_60209B0[];
 extern Gfx D_6020B70[];
 extern Gfx D_6020D50[];
diff --git a/include/fox_enmy2_assets.h b/include/fox_enmy2_assets.h
index 5e598b22..437ec461 100644
--- a/include/fox_enmy2_assets.h
+++ b/include/fox_enmy2_assets.h
@@ -11,8 +11,8 @@ extern Gfx D_60043F0[];
 extern Gfx D_6004310[];
 extern f32 D_602C1A0[];
 extern f32 D_602C294[];
-extern f32 D_601B474[];
-extern f32 D_601B43C[];
-extern f32 D_601B944[];
+extern f32 D_VE1_601B474[];
+extern f32 D_VE1_601B43C[];
+extern f32 D_VE1_601B944[];
 
 #endif