finish export on segment 7, rename the versus assets (#187)

* versus

* ending

* ending

* header

* vs names

* errant header

3 files changed, 2 insertions, 100 deletions

diff --git a/include/assets/ast_ending.h b/include/assets/ast_ending.h
deleted file mode 100644
index 5ab3bee2..00000000
--- a/include/assets/ast_ending.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef AST_ENDING_H
-#define AST_ENDING_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "structs.h"
-
-extern Gfx D_END_7010970[];
-extern Animation D_END_70111D0;
-extern Animation D_END_70143C0;
-extern Animation D_END_7018708;
-extern Limb* D_END_70187B4[];
-extern Gfx D_END_700C620[];
-extern Gfx D_END_700C8B0[];
-extern Gfx D_END_700F240[];
-extern Gfx D_END_700F320[];
-extern Gfx D_END_7010970[];
-extern u8 D_END_7010E10[];
-extern u16 D_END_7010EE0[];
-extern u8 D_END_7010F00[];
-extern u16 D_END_7010FD0[];
-extern u8 D_END_7010FF0[];
-extern u16 D_END_70110C0[];
-extern u8 D_END_70110E0[];
-extern u16 D_END_70111B0[];
-extern Gfx D_END_7000000[];
-extern Gfx D_END_7002120[];
-extern Gfx D_END_7004240[];
-extern Gfx D_END_700E9E0[];
-extern u16 D_END_700EA38[];
-extern Gfx D_END_7010970[];
-extern Gfx D_END_7016540[];
-
-#endif
diff --git a/include/assets/ast_versus.h b/include/assets/ast_versus.h
deleted file mode 100644
index 03a8fecb..00000000
--- a/include/assets/ast_versus.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef AST_VERSUS_H
-#define AST_VERSUS_H
-
-#include "gfx.h"
-#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 u8  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/sf64dma.h b/include/sf64dma.h
index 201c1ec4..541ab4db 100644
--- a/include/sf64dma.h
+++ b/include/sf64dma.h
@@ -133,7 +133,7 @@ DECLARE_SEGMENT(ast_bg_planet);
 DECLARE_SEGMENT(ast_arwing);
 DECLARE_SEGMENT(ast_landmaster);
 DECLARE_SEGMENT(ast_blue_marine);
-DECLARE_SEGMENT(ast_vs_player);
+DECLARE_SEGMENT(ast_versus);
 DECLARE_SEGMENT(ast_enmy_planet);
 DECLARE_SEGMENT(ast_enmy_space);
 DECLARE_SEGMENT(ast_great_fox);
@@ -165,7 +165,7 @@ DECLARE_SEGMENT(ast_warp_zone);
 DECLARE_SEGMENT(ast_title);
 DECLARE_SEGMENT(ast_map);
 DECLARE_SEGMENT(ast_option);
-DECLARE_SEGMENT(ast_versus);
+DECLARE_SEGMENT(ast_vs_menu);
 DECLARE_SEGMENT(ast_font);
 DECLARE_SEGMENT(ast_font_3d);
 DECLARE_SEGMENT(ast_andross);