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

* versus

* ending

* ending

* header

* vs names

* errant header

1 files changed, 159 insertions, 159 deletions

diff --git a/linker_scripts/us/undefined_syms.ld b/linker_scripts/us/undefined_syms.ld
index c20cd436..ba12589d 100644
--- a/linker_scripts/us/undefined_syms.ld
+++ b/linker_scripts/us/undefined_syms.ld
@@ -90,29 +90,29 @@ D_BG_PLANET_20101A0 = 0x020101A0;
 D_arwing_3001C90 = 0x03001C90;
 D_arwing_3003CE0 = 0x03003CE0;
 D_arwing_3007650 = 0x03007650;
-D_vs_player_3012ED0 = 0x03012ED0;
-D_vs_player_3013580 = 0x03013580;
-D_vs_player_3013780 = 0x03013780;
-D_vs_player_3016B00 = 0x03016B00;
+D_versus_3012ED0 = 0x03012ED0;
+D_versus_3013580 = 0x03013580;
+D_versus_3013780 = 0x03013780;
+D_versus_3016B00 = 0x03016B00;
 D_arwing_3016CC0 = 0x03016CC0;
-D_vs_player_30173C0 = 0x030173C0;
-D_vs_player_30174E0 = 0x030174E0;
-D_vs_player_3017600 = 0x03017600;
-D_vs_player_301B080 = 0x0301B080;
-D_vs_player_302ED4C = 0x0302ED4C;
-D_vs_player_302ED98 = 0x0302ED98;
-D_vs_player_302EDB4 = 0x0302EDB4;
-D_vs_player_302EE00 = 0x0302EE00;
-D_vs_player_302EE64 = 0x0302EE64;
-D_vs_player_302EE80 = 0x0302EE80;
-D_vs_player_302EE9C = 0x0302EE9C;
-D_vs_player_302EEE8 = 0x0302EEE8;
+D_versus_30173C0 = 0x030173C0;
+D_versus_30174E0 = 0x030174E0;
+D_versus_3017600 = 0x03017600;
+D_versus_301B080 = 0x0301B080;
+D_versus_302ED4C = 0x0302ED4C;
+D_versus_302ED98 = 0x0302ED98;
+D_versus_302EDB4 = 0x0302EDB4;
+D_versus_302EE00 = 0x0302EE00;
+D_versus_302EE64 = 0x0302EE64;
+D_versus_302EE80 = 0x0302EE80;
+D_versus_302EE9C = 0x0302EE9C;
+D_versus_302EEE8 = 0x0302EEE8;
 D_arwing_302EF00 = 0x0302EF00;
-D_vs_player_302EF6C = 0x0302EF6C;
+D_versus_302EF6C = 0x0302EF6C;
 D_arwing_302EF84 = 0x0302EF84;
-D_vs_player_302EFF0 = 0x0302EFF0;
+D_versus_302EFF0 = 0x0302EFF0;
 D_arwing_302F008 = 0x0302F008;
-D_vs_player_302F044 = 0x0302F044;
+D_versus_302F044 = 0x0302F044;
 D_arwing_302F098 = 0x0302F098;
 
 D_5000000 = 0x05000000;
@@ -573,20 +573,20 @@ D_FONT3D_9004230 = 0x09004230;
 
 // fox_versus
 
-D_vs_player_30087A0 = 0x030087A0;
-D_vs_player_3008DE0 = 0x03008DE0;
-D_vs_player_3008EC0 = 0x03008EC0;
-D_vs_player_30098C0 = 0x030098C0;
-D_vs_player_3009990 = 0x03009990;
-D_vs_player_300A390 = 0x0300A390;
-D_vs_player_3006A68 = 0x03006A68;
-D_vs_player_3008598 = 0x03008598;
-D_vs_player_300C458 = 0x0300C458;
-D_vs_player_3005E38 = 0x03005E38;
-D_vs_player_3006040 = 0x03006040;
-D_vs_player_30076C0 = 0x030076C0;
-D_vs_player_300B3F0 = 0x0300B3F0;
-D_vs_player_3004F60 = 0x03004F60;
+D_versus_30087A0 = 0x030087A0;
+D_versus_3008DE0 = 0x03008DE0;
+D_versus_3008EC0 = 0x03008EC0;
+D_versus_30098C0 = 0x030098C0;
+D_versus_3009990 = 0x03009990;
+D_versus_300A390 = 0x0300A390;
+D_versus_3006A68 = 0x03006A68;
+D_versus_3008598 = 0x03008598;
+D_versus_300C458 = 0x0300C458;
+D_versus_3005E38 = 0x03005E38;
+D_versus_3006040 = 0x03006040;
+D_versus_30076C0 = 0x030076C0;
+D_versus_300B3F0 = 0x0300B3F0;
+D_versus_3004F60 = 0x03004F60;
 
 // fox_hud, to be ordered later
 D_101C170 = 0x0101C170;
@@ -998,26 +998,26 @@ D_OPT_80147B0 = 0x080147B0;
 D_OPT_8003A50 = 0x08003A50;
 D_OPT_8013990 = 0x08013990;
 D_OPT_80141B0 = 0x080141B0;
-D_VS_70030B0 = 0x070030B0;
-D_VS_7003290 = 0x07003290;
-D_VS_7003470 = 0x07003470;
+D_VS_MENU_70030B0 = 0x070030B0;
+D_VS_MENU_7003290 = 0x07003290;
+D_VS_MENU_7003470 = 0x07003470;
 D_TI2_70049C0 = 0x070049C0;
-D_VS_7004BB0 = 0x07004BB0;
-D_VS_7004DC0 = 0x07004DC0;
-D_VS_7005020 = 0x07005020;
-D_VS_7004B80 = 0x07004B80;
-D_VS_7004D90 = 0x07004D90;
-D_VS_7004FF0 = 0x07004FF0;
-D_VS_70051A0 = 0x070051A0;
-D_VS_7008EE0 = 0x07008EE0;
-D_VS_700AD20 = 0x0700AD20;
-D_VS_700CB60 = 0x0700CB60;
-D_VS_70070A0 = 0x070070A0;
-D_VS_7000000 = 0x07000000;
+D_VS_MENU_7004BB0 = 0x07004BB0;
+D_VS_MENU_7004DC0 = 0x07004DC0;
+D_VS_MENU_7005020 = 0x07005020;
+D_VS_MENU_7004B80 = 0x07004B80;
+D_VS_MENU_7004D90 = 0x07004D90;
+D_VS_MENU_7004FF0 = 0x07004FF0;
+D_VS_MENU_70051A0 = 0x070051A0;
+D_VS_MENU_7008EE0 = 0x07008EE0;
+D_VS_MENU_700AD20 = 0x0700AD20;
+D_VS_MENU_700CB60 = 0x0700CB60;
+D_VS_MENU_70070A0 = 0x070070A0;
+D_VS_MENU_7000000 = 0x07000000;
 D_END_7000000 = 0x07000000;
-D_VS_70000D0 = 0x070000D0;
-D_VS_7000210 = 0x07000210;
-D_VS_7000350 = 0x07000350;
+D_VS_MENU_70000D0 = 0x070000D0;
+D_VS_MENU_7000210 = 0x07000210;
+D_VS_MENU_7000350 = 0x07000350;
 D_FONT3D_90086F0 = 0x090086F0;
 D_FONT3D_9007FD0 = 0x09007FD0;
 D_FONT3D_9007BB0 = 0x09007BB0;
@@ -1055,24 +1055,24 @@ D_FONT3D_9009990 = 0x09009990;
 D_FONT3D_9009280 = 0x09009280;
 D_FONT3D_9008C60 = 0x09008C60;
 D_FONT3D_9000000 = 0x09000000;
-D_VS_70017B0 = 0x070017B0;
-D_VS_70019E0 = 0x070019E0;
-D_VS_7005600 = 0x07005600;
-D_VS_7005F10 = 0x07005F10;
-D_VS_7005D20 = 0x07005D20;
-D_VS_7006630 = 0x07006630;
-D_VS_7001C10 = 0x07001C10;
-D_VS_7006780 = 0x07006780;
-D_VS_70019E0 = 0x070019E0;
-D_VS_7005F10 = 0x07005F10;
-D_VS_7006EA0 = 0x07006EA0;
-D_VS_7006630 = 0x07006630;
-D_VS_70024D0 = 0x070024D0;
+D_VS_MENU_70017B0 = 0x070017B0;
+D_VS_MENU_70019E0 = 0x070019E0;
+D_VS_MENU_7005600 = 0x07005600;
+D_VS_MENU_7005F10 = 0x07005F10;
+D_VS_MENU_7005D20 = 0x07005D20;
+D_VS_MENU_7006630 = 0x07006630;
+D_VS_MENU_7001C10 = 0x07001C10;
+D_VS_MENU_7006780 = 0x07006780;
+D_VS_MENU_70019E0 = 0x070019E0;
+D_VS_MENU_7005F10 = 0x07005F10;
+D_VS_MENU_7006EA0 = 0x07006EA0;
+D_VS_MENU_7006630 = 0x07006630;
+D_VS_MENU_70024D0 = 0x070024D0;
 D_TI1_7002730 = 0x07002730;
-D_VS_7002730 = 0x07002730;
-D_VS_7002990 = 0x07002990;
-D_VS_7002BF0 = 0x07002BF0;
-D_VS_7002E50 = 0x07002E50;
+D_VS_MENU_7002730 = 0x07002730;
+D_VS_MENU_7002990 = 0x07002990;
+D_VS_MENU_7002BF0 = 0x07002BF0;
+D_VS_MENU_7002E50 = 0x07002E50;
 
 // fox_ti
 D_TI1_700DDF0 = 0x0700DDF0;
@@ -1098,7 +1098,7 @@ D_TI2_7009700 = 0x07009700;
 D_TI2_7004E80 = 0x07004E80;
 D_TI2_70049C0 = 0x070049C0;
 D_TI2_70045D0 = 0x070045D0;
-D_VS_70049C0 = 0x070049C0;
+D_VS_MENU_70049C0 = 0x070049C0;
 D_TI_A001FA0 = 0x0A001FA0;
 D_TI_900FE80 = 0x0900FE80;
 D_TI_80018D0 = 0x080018D0;
@@ -1236,98 +1236,98 @@ D_BG_PLANET_200D750 = 0x200D750;
 D_BG_PLANET_2010A30 = 0x2010A30;
 D_BG_PLANET_20112C0 = 0x20112C0;
 D_arwing_3000090 = 0x3000090;
-D_vs_player_3000120 = 0x3000120;
+D_versus_3000120 = 0x3000120;
 D_blue_marine_3000130 = 0x3000130;
-D_vs_player_30001E0 = 0x30001E0;
-D_vs_player_3000380 = 0x3000380;
-D_vs_player_30003A0 = 0x30003A0;
+D_versus_30001E0 = 0x30001E0;
+D_versus_3000380 = 0x3000380;
+D_versus_30003A0 = 0x30003A0;
 D_blue_marine_3000470 = 0x3000470;
-D_vs_player_30004E0 = 0x30004E0;
-D_vs_player_3000510 = 0x3000510;
+D_versus_30004E0 = 0x30004E0;
+D_versus_3000510 = 0x3000510;
 D_blue_marine_3000660 = 0x3000660;
-D_vs_player_30006A0 = 0x30006A0;
-D_vs_player_30006D0 = 0x30006D0;
-D_vs_player_3000810 = 0x3000810;
+D_versus_30006A0 = 0x30006A0;
+D_versus_30006D0 = 0x30006D0;
+D_versus_3000810 = 0x3000810;
 D_blue_marine_3000AF0 = 0x3000AF0;
-D_vs_player_3000B20 = 0x3000B20;
-D_vs_player_3000BC0 = 0x3000BC0;
+D_versus_3000B20 = 0x3000B20;
+D_versus_3000BC0 = 0x3000BC0;
 D_blue_marine_3000C70 = 0x3000C70;
-D_vs_player_30013E0 = 0x30013E0;
-D_vs_player_3001420 = 0x3001420;
-D_vs_player_3003E20 = 0x3003E20;
-D_vs_player_3004010 = 0x3004010;
-D_vs_player_3004D58 = 0x3004D58;
+D_versus_30013E0 = 0x30013E0;
+D_versus_3001420 = 0x3001420;
+D_versus_3003E20 = 0x3003E20;
+D_versus_3004010 = 0x3004010;
+D_versus_3004D58 = 0x3004D58;
 D_blue_marine_3005980 = 0x3005980;
 D_arwing_3005AB0 = 0x3005AB0;
 D_blue_marine_3006AF0 = 0x3006AF0;
-D_vs_player_3006C60 = 0x3006C60;
+D_versus_3006C60 = 0x3006C60;
 D_blue_marine_3006C70 = 0x3006C70;
-D_vs_player_3007500 = 0x3007500;
-D_vs_player_300A470 = 0x300A470;
-D_vs_player_300B218 = 0x300B218;
-D_vs_player_300D350 = 0x300D350;
-D_vs_player_300D398 = 0x300D398;
-D_vs_player_300D3C0 = 0x300D3C0;
-D_vs_player_300D408 = 0x300D408;
-D_vs_player_300D440 = 0x300D440;
-D_vs_player_300D500 = 0x300D500;
-D_vs_player_300D550 = 0x300D550;
-D_vs_player_300EE80 = 0x300EE80;
-D_vs_player_300FB80 = 0x300FB80;
-D_vs_player_3010A90 = 0x3010A90;
-D_vs_player_3011470 = 0x3011470;
+D_versus_3007500 = 0x3007500;
+D_versus_300A470 = 0x300A470;
+D_versus_300B218 = 0x300B218;
+D_versus_300D350 = 0x300D350;
+D_versus_300D398 = 0x300D398;
+D_versus_300D3C0 = 0x300D3C0;
+D_versus_300D408 = 0x300D408;
+D_versus_300D440 = 0x300D440;
+D_versus_300D500 = 0x300D500;
+D_versus_300D550 = 0x300D550;
+D_versus_300EE80 = 0x300EE80;
+D_versus_300FB80 = 0x300FB80;
+D_versus_3010A90 = 0x3010A90;
+D_versus_3011470 = 0x3011470;
 D_arwing_3011720 = 0x3011720;
-D_vs_player_3011E40 = 0x3011E40;
+D_versus_3011E40 = 0x3011E40;
 D_arwing_30131F0 = 0x30131F0;
-D_vs_player_30146B0 = 0x30146B0;
+D_versus_30146B0 = 0x30146B0;
 D_arwing_3014BF0 = 0x3014BF0;
 D_arwing_3015120 = 0x3015120;
 D_arwing_30155E0 = 0x30155E0;
-D_vs_player_3015740 = 0x3015740;
+D_versus_3015740 = 0x3015740;
 D_arwing_3015AF4 = 0x3015AF4;
 D_arwing_3015C28 = 0x3015C28;
 D_arwing_3015D80 = 0x3015D80;
-D_vs_player_30160A0 = 0x30160A0;
+D_versus_30160A0 = 0x30160A0;
 D_arwing_30163C4 = 0x30163C4;
 D_arwing_3016610 = 0x3016610;
 D_arwing_3016660 = 0x3016660;
 D_arwing_3016B30 = 0x3016B30;
 D_arwing_30183D0 = 0x30183D0;
 D_arwing_30184D8 = 0x30184D8;
-D_vs_player_3018800 = 0x3018800;
+D_versus_3018800 = 0x3018800;
 D_arwing_30194E0 = 0x30194E0;
-D_vs_player_301AD60 = 0x301AD60;
-D_vs_player_301AEF0 = 0x301AEF0;
-D_vs_player_301B6E0 = 0x301B6E0;
-D_vs_player_301C3A8 = 0x301C3A8;
-D_vs_player_301C614 = 0x301C614;
-D_vs_player_301CFEC = 0x301CFEC;
-D_vs_player_301D258 = 0x301D258;
-D_vs_player_301D888 = 0x301D888;
-D_vs_player_301DB94 = 0x301DB94;
-D_vs_player_301E19C = 0x301E19C;
-D_vs_player_301E3E8 = 0x301E3E8;
-D_vs_player_301E570 = 0x301E570;
-D_vs_player_301F140 = 0x301F140;
-D_vs_player_301FD20 = 0x301FD20;
-D_vs_player_302D120 = 0x302D120;
-D_vs_player_302D240 = 0x302D240;
-D_vs_player_302D4D0 = 0x302D4D0;
-D_vs_player_302DD70 = 0x302DD70;
-D_vs_player_302DDB4 = 0x302DDB4;
-D_vs_player_302DDF8 = 0x302DDF8;
-D_vs_player_302DE3C = 0x302DE3C;
-D_vs_player_302E0E4 = 0x302E0E4;
-D_vs_player_302E170 = 0x302E170;
-D_vs_player_302E378 = 0x302E378;
-D_vs_player_302E56C = 0x302E56C;
-D_vs_player_302E65C = 0x302E65C;
-D_vs_player_302E74C = 0x302E74C;
-D_vs_player_302E830 = 0x302E830;
-D_vs_player_302E95C = 0x302E95C;
-D_vs_player_302EA4C = 0x302EA4C;
-D_vs_player_302EB3C = 0x302EB3C;
-D_vs_player_302EC20 = 0x302EC20;
+D_versus_301AD60 = 0x301AD60;
+D_versus_301AEF0 = 0x301AEF0;
+D_versus_301B6E0 = 0x301B6E0;
+D_versus_301C3A8 = 0x301C3A8;
+D_versus_301C614 = 0x301C614;
+D_versus_301CFEC = 0x301CFEC;
+D_versus_301D258 = 0x301D258;
+D_versus_301D888 = 0x301D888;
+D_versus_301DB94 = 0x301DB94;
+D_versus_301E19C = 0x301E19C;
+D_versus_301E3E8 = 0x301E3E8;
+D_versus_301E570 = 0x301E570;
+D_versus_301F140 = 0x301F140;
+D_versus_301FD20 = 0x301FD20;
+D_versus_302D120 = 0x302D120;
+D_versus_302D240 = 0x302D240;
+D_versus_302D4D0 = 0x302D4D0;
+D_versus_302DD70 = 0x302DD70;
+D_versus_302DDB4 = 0x302DDB4;
+D_versus_302DDF8 = 0x302DDF8;
+D_versus_302DE3C = 0x302DE3C;
+D_versus_302E0E4 = 0x302E0E4;
+D_versus_302E170 = 0x302E170;
+D_versus_302E378 = 0x302E378;
+D_versus_302E56C = 0x302E56C;
+D_versus_302E65C = 0x302E65C;
+D_versus_302E74C = 0x302E74C;
+D_versus_302E830 = 0x302E830;
+D_versus_302E95C = 0x302E95C;
+D_versus_302EA4C = 0x302EA4C;
+D_versus_302EB3C = 0x302EB3C;
+D_versus_302EC20 = 0x302EC20;
 D_ENMY_PLANET_4000080 = 0x4000080;
 D_ENMY_PLANET_400014C = 0x400014C;
 D_5000200 = 0x5000200;
@@ -1869,31 +1869,31 @@ D_604D680 = 0x604D680;
 D_605A120 = 0x605A120;
 D_605C230 = 0x605C230;
 D_TI1_7000A80 = 0x7000A80;
-D_VS_7000F10 = 0x7000F10;
-D_VS_7001030 = 0x7001030;
-D_VS_7001270 = 0x7001270;
+D_VS_MENU_7000F10 = 0x7000F10;
+D_VS_MENU_7001030 = 0x7001030;
+D_VS_MENU_7001270 = 0x7001270;
 D_WZ_7001540 = 0x7001540;
-D_VS_7001DF0 = 0x7001DF0;
-D_VS_7002110 = 0x7002110;
+D_VS_MENU_7001DF0 = 0x7001DF0;
+D_VS_MENU_7002110 = 0x7002110;
 D_END_7002120 = 0x7002120;
 D_TI1_7002270 = 0x7002270;
 D_TI1_7002490 = 0x7002490;
-D_VS_7003650 = 0x7003650;
-D_VS_7003830 = 0x7003830;
-D_VS_7003C70 = 0x7003C70;
-D_VS_7003E10 = 0x7003E10;
+D_VS_MENU_7003650 = 0x7003650;
+D_VS_MENU_7003830 = 0x7003830;
+D_VS_MENU_7003C70 = 0x7003C70;
+D_VS_MENU_7003E10 = 0x7003E10;
 D_TI2_7003EE8 = 0x7003EE8;
-D_VS_7003F10 = 0x7003F10;
-D_VS_7004010 = 0x7004010;
-D_VS_7004050 = 0x7004050;
-D_VS_7004150 = 0x7004150;
-D_VS_70041F0 = 0x70041F0;
+D_VS_MENU_7003F10 = 0x7003F10;
+D_VS_MENU_7004010 = 0x7004010;
+D_VS_MENU_7004050 = 0x7004050;
+D_VS_MENU_7004150 = 0x7004150;
+D_VS_MENU_70041F0 = 0x70041F0;
 D_END_7004240 = 0x7004240;
-D_VS_70042F0 = 0x70042F0;
-D_VS_7004360 = 0x7004360;
-D_VS_7004460 = 0x7004460;
-D_VS_70044D0 = 0x70044D0;
-D_VS_7004990 = 0x7004990;
+D_VS_MENU_70042F0 = 0x70042F0;
+D_VS_MENU_7004360 = 0x7004360;
+D_VS_MENU_7004460 = 0x7004460;
+D_VS_MENU_70044D0 = 0x70044D0;
+D_VS_MENU_7004990 = 0x7004990;
 D_TI2_7005300 = 0x7005300;
 D_TI1_70067C4 = 0x70067C4;
 D_TI1_7006990 = 0x7006990;
@@ -1924,7 +1924,7 @@ D_TI1_700D534 = 0x700D534;
 D_TI1_700D700 = 0x700D700;
 D_TI2_700E244 = 0x700E244;
 D_TI1_700E3F0 = 0x700E3F0;
-D_VS_700E9A0 = 0x700E9A0;
+D_VS_MENU_700E9A0 = 0x700E9A0;
 D_END_700E9E0 = 0x700E9E0;
 D_END_700EA38 = 0x700EA38;
 D_END_700F240 = 0x700F240;
@@ -1938,9 +1938,9 @@ D_END_7010FF0 = 0x7010FF0;
 D_END_70110C0 = 0x70110C0;
 D_END_70110E0 = 0x70110E0;
 D_END_70111B0 = 0x70111B0;
-D_VS_70118E0 = 0x70118E0;
+D_VS_MENU_70118E0 = 0x70118E0;
 D_END_70122E0 = 0x70122E0;
-D_VS_70123F8 = 0x70123F8;
+D_VS_MENU_70123F8 = 0x70123F8;
 D_OPT_8000000 = 0x8000000;
 D_OPT_8000400 = 0x8000400;
 D_OPT_8000680 = 0x8000680;