mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-08-22 07:04:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

torch update, ast_area_6 and ast_vs_player, new names (#169)

Browse Source 
* split up

* format

* torch

* headers

* just keep going

* torch

* names and such

* format

* remove headers
This commit is contained in:
petrie911
2024-03-16 23:06:28 -05:00
committed by GitHub
parent 60a64d402f
commit a7aac0753d
68 changed files with 2395 additions and 1407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
linker_scripts/us/symbol_addrs.txt
+1
View File
@@ -31,6 +31,7 @@ D_800D0000 = 0x800D0000;//ignore:true
D_7FFFFFFE = 0x7FFFFFFE;//ignore:true
D_1000000 = 0x01000000;//ignore:true
D_A000000 = 0x0A000000;//ignore:true
D_4000000 = 0x04000000;//ignore:true
// constant for K1 access
D_A0000000 = 0xA0000000;//ignore:true
linker_scripts/us/symbol_addrs_assets.txt
+14 -6
View File
@@ -59,9 +59,17 @@ D_AQ_6000AE4 = 0x06000AE4;
D_AQ_6002628 = 0x06002628;
D_AQ_60260EC = 0x060260EC;
D_AQ_60314AC = 0x060314AC;
D_TI1_70067C4 = 0x70067C4;
D_TI1_7006990 = 0x7006990;
D_TI1_7006F74 = 0x7006F74;
D_TI1_7007130 = 0x7007130;
D_TI1_7007234 = 0x7007234;
D_TI1_700733C = 0x700733C;
D_TI1_70067C4 = 0x070067C4;
D_TI1_7006990 = 0x07006990;
D_TI1_7006F74 = 0x07006F74;
D_TI1_7007130 = 0x07007130;
D_TI1_7007234 = 0x07007234;
D_TI1_700733C = 0x0700733C;
D_TI2_7003EE8 = 0x07003EE8;
D_A6_6018994 = 0x06018994;
D_A6_6011910 = 0x06011910;
D_A6_601B2B0 = 0x0601B2B0;
D_A6_6018BA0 = 0x06018BA0;
D_A6_6028578 = 0x06028578;
D_A6_6028454 = 0x06028454;
linker_scripts/us/symbol_addrs_engine.txt
+7 -7
View File
@@ -227,7 +227,7 @@ Object_DrawAll = 0x8005FB70;
func_8006046C = 0x8006046C;
func_80060714 = 0x80060714;
func_8006089C = 0x8006089C;
func_80060968 = 0x80060968;
TexturedLine_Draw = 0x80060968;
func_80060D94 = 0x80060D94;
// fox_effect
@@ -325,8 +325,8 @@ Object_80_Update = 0x80069DF4;
Object_4C_Update = 0x80069E88;
Item_Update = 0x80069F30;
Effect_Update = 0x80069FD4;
func_8006A06C = 0x8006A06C;
func_8006A38C = 0x8006A38C;
TexturedLine_Update = 0x8006A06C;
TexturedLine_UpdateAll = 0x8006A38C;
Object_UpdateAll = 0x8006A3E8;
// fox_enmy2
@@ -410,8 +410,8 @@ gBosses = 0x8016F110; //size:0x1020
gEffects = 0x80170130; //size:0x36B0
gItems = 0x801737E0; //size:0x870
gPlayerShots = 0x80174050; //size:0x700
gUnkEntities30 = 0x80174750; //size:0x12C0
gUnkEntities28 = 0x80175A10; //size:0xA28
gTexturedLines = 0x80174750; //size:0x12C0
gRadarMarks = 0x80175A10; //size:0xA28
gBonusText = 0x80176438; //size:0x118
D_80176550 = 0x80176550;
D_80176558 = 0x80176558;
@@ -670,8 +670,8 @@ func_800A5FA0 = 0x800A5FA0;
func_800A6028 = 0x800A6028;
func_800A6070 = 0x800A6070;
BonusText_Initialize = 0x800A60B8;
func_800A60E8 = 0x800A60E8;
func_800A6118 = 0x800A6118;
TexturedLine_Initialize = 0x800A60E8;
RadarMark_Initialize = 0x800A6118;
func_800A6148 = 0x800A6148;
func_800A6590 = 0x800A6590;
func_800A668C = 0x800A668C;
linker_scripts/us/undefined_syms.ld
+205 -210
View File
@@ -58,62 +58,62 @@ D_1015B70 = 0x01015B70;
D_1015320 = 0x01015320;
D_2000000 = 0x02000000;
D_2000890 = 0x02000890;
D_2001090 = 0x02001090;
D_2001120 = 0x02001120;
D_20019B0 = 0x020019B0;
D_2002120 = 0x02002120;
D_2002240 = 0x02002240;
D_2002AD0 = 0x02002AD0;
D_2003360 = 0x02003360;
D_2003BF0 = 0x02003BF0;
D_2004240 = 0x02004240;
D_2004480 = 0x02004480;
D_2004D10 = 0x02004D10;
D_20052D0 = 0x020052D0;
D_20055A0 = 0x020055A0;
D_2005E30 = 0x02005E30;
D_2006360 = 0x02006360;
D_20066C0 = 0x020066C0;
D_20073F0 = 0x020073F0;
D_2008480 = 0x02008480;
D_2009510 = 0x02009510;
D_200A5A0 = 0x0200A5A0;
D_200B630 = 0x0200B630;
D_200C6C0 = 0x0200C6C0;
D_200E7F0 = 0x0200E7F0;
D_200F080 = 0x0200F080;
D_200F910 = 0x0200F910;
D_20101A0 = 0x020101A0;
D_BG_SPACE_2000000 = 0x02000000;
D_BG_SPACE_2000890 = 0x02000890;
D_BG_PLANET_2001090 = 0x02001090;
D_BG_SPACE_2001120 = 0x02001120;
D_BG_SPACE_20019B0 = 0x020019B0;
D_BG_PLANET_2002120 = 0x02002120;
D_BG_SPACE_2002240 = 0x02002240;
D_BG_SPACE_2002AD0 = 0x02002AD0;
D_BG_SPACE_2003360 = 0x02003360;
D_BG_SPACE_2003BF0 = 0x02003BF0;
D_BG_PLANET_2004240 = 0x02004240;
D_BG_SPACE_2004480 = 0x02004480;
D_BG_SPACE_2004D10 = 0x02004D10;
D_BG_PLANET_20052D0 = 0x020052D0;
D_BG_SPACE_20055A0 = 0x020055A0;
D_BG_SPACE_2005E30 = 0x02005E30;
D_BG_PLANET_2006360 = 0x02006360;
D_BG_SPACE_20066C0 = 0x020066C0;
D_BG_PLANET_20073F0 = 0x020073F0;
D_BG_PLANET_2008480 = 0x02008480;
D_BG_PLANET_2009510 = 0x02009510;
D_BG_PLANET_200A5A0 = 0x0200A5A0;
D_BG_PLANET_200B630 = 0x0200B630;
D_BG_PLANET_200C6C0 = 0x0200C6C0;
D_BG_PLANET_200E7F0 = 0x0200E7F0;
D_BG_PLANET_200F080 = 0x0200F080;
D_BG_PLANET_200F910 = 0x0200F910;
D_BG_PLANET_20101A0 = 0x020101A0;
D_3001C90 = 0x03001C90;
D_3003CE0 = 0x03003CE0;
D_3007650 = 0x03007650;
D_3012ED0 = 0x03012ED0;
D_3013580 = 0x03013580;
D_3013780 = 0x03013780;
D_3016B00 = 0x03016B00;
D_3016CC0 = 0x03016CC0;
D_30173C0 = 0x030173C0;
D_30174E0 = 0x030174E0;
D_3017600 = 0x03017600;
D_301B080 = 0x0301B080;
D_302ED4C = 0x0302ED4C;
D_302ED98 = 0x0302ED98;
D_302EDB4 = 0x0302EDB4;
D_302EE00 = 0x0302EE00;
D_302EE64 = 0x0302EE64;
D_302EE80 = 0x0302EE80;
D_302EE9C = 0x0302EE9C;
D_302EEE8 = 0x0302EEE8;
D_302EF00 = 0x0302EF00;
D_302EF6C = 0x0302EF6C;
D_302EF84 = 0x0302EF84;
D_302EFF0 = 0x0302EFF0;
D_302F008 = 0x0302F008;
D_302F044 = 0x0302F044;
D_302F098 = 0x0302F098;
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_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_arwing_302EF00 = 0x0302EF00;
D_vs_player_302EF6C = 0x0302EF6C;
D_arwing_302EF84 = 0x0302EF84;
D_vs_player_302EFF0 = 0x0302EFF0;
D_arwing_302F008 = 0x0302F008;
D_vs_player_302F044 = 0x0302F044;
D_arwing_302F098 = 0x0302F098;
D_5000000 = 0x05000000;
D_5000080 = 0x05000080;
@@ -297,7 +297,7 @@ D_6026C90 = 0x06026C90;
D_60270E0 = 0x060270E0;
D_6027180 = 0x06027180;
D_6027900 = 0x06027900;
D_6028454 = 0x06028454;
D_A6_6028454 = 0x06028454;
D_6029170 = 0x06029170;
D_6029220 = 0x06029220;
D_AQ_602B4C0 = 0x0602B4C0;
@@ -510,8 +510,8 @@ D_6029BE4 = 0x06029BE4;
D_SX_602A120 = 0x0602A120;
D_602A710 = 0x0602A710;
D_6020058 = 0x06020058;
D_6023F20 = 0x06023F20;
D_6028760 = 0x06028760;
D_A6_6023F20 = 0x06023F20;
D_A6_6028760 = 0x06028760;
D_602E4B0 = 0x0602E4B0;
D_6007E30 = 0x06007E30;
D_601F1F0 = 0x0601F1F0;
@@ -676,20 +676,20 @@ D_9004230 = 0x09004230;
// fox_versus
D_30087A0 = 0x030087A0;
D_3008DE0 = 0x03008DE0;
D_3008EC0 = 0x03008EC0;
D_30098C0 = 0x030098C0;
D_3009990 = 0x03009990;
D_300A390 = 0x0300A390;
D_3006A68 = 0x03006A68;
D_3008598 = 0x03008598;
D_300C458 = 0x0300C458;
D_3005E38 = 0x03005E38;
D_3006040 = 0x03006040;
D_30076C0 = 0x030076C0;
D_300B3F0 = 0x0300B3F0;
D_3004F60 = 0x03004F60;
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;
// fox_hud, to be ordered later
D_101C170 = 0x0101C170;
@@ -704,8 +704,6 @@ D_101B5F0 = 0x0101B5F0;
D_101B480 = 0x0101B480;
D_101B310 = 0x0101B310;
D_101B1A0 = 0x0101B1A0;
D_03000000 = 0x03000000;
D_3000080 = 0x03000080;
D_5000D50 = 0x05000D50;
D_5006CB0 = 0x05006CB0;
D_5006E90 = 0x05006E90;
@@ -728,7 +726,7 @@ D_C038860 = 0x0C038860;
D_C038954 = 0x0C038954;
// fox_end2
D_3016CC0 = 0x03016CC0;
D_arwing_3016CC0 = 0x03016CC0;
D_50054B0 = 0x050054B0;
D_7016540 = 0x07016540;
@@ -1013,13 +1011,13 @@ D_601F3B8 = 0x0601F3B8;
D_60371A4 = 0x0060371A4;
D_6026CC4 = 0x006026CC4;
D_SX_602A164 = 0x00602A164;
D_6023F64 = 0x006023F64;
D_60287A4 = 0x0060287A4;
D_A6_6023F64 = 0x006023F64;
D_A6_60287A4 = 0x0060287A4;
D_602E4F4 = 0x00602E4F4;
D_6007E74 = 0x006007E74;
D_601F234 = 0x00601F234;
D_6026714 = 0x006026714;
D_0C035154 = 0x00C035154;
D_C035154 = 0x00C035154;
D_TR_6006AA4 = 0x006006AA4;
D_6031000 = 0x006031000;
D_6006C60 = 0x006006C60;
@@ -1029,20 +1027,19 @@ D_6011044 = 0x006011044;
D_600FF74 = 0x00600FF74;
D_6006EB4 = 0x006006EB4;
D_6014D94 = 0x006014D94;
D_0302DE3C = 0x00302DE3C;
// fox_enmy2
D_6011F90 = 0x06011F90;
D_4000710 = 0x04000710;
D_601F2A0 = 0x0601F2A0;
D_6016190 = 0x06016190;
D_A6_6016190 = 0x06016190;
D_SX_6023500 = 0x06023500;
D_SX_6022DF0 = 0x06022DF0;
D_SX_60285F0 = 0x060285F0;
D_SX_600AF70 = 0x0600AF70;
D_SX_6023E30 = 0x06023E30;
D_SX_6001CE0 = 0x06001CE0;
D_6012A40 = 0x06012A40;
D_A6_6012A40 = 0x06012A40;
D_SX_6009950 = 0x06009950;
D_SX_600B2B0 = 0x0600B2B0;
D_SX_600A2E0 = 0x0600A2E0;
@@ -1071,15 +1068,15 @@ D_4006E90 = 0x04006E90;
D_4009800 = 0x04009800;
D_40073C0 = 0x040073C0;
D_60282A0 = 0x060282A0;
D_A6_60282A0 = 0x060282A0;
D_SX_603298C = 0x0603298C;
D_SX_6032904 = 0x06032904;
D_SX_6032970 = 0x06032970;
D_SX_603285C = 0x0603285C;
D_SX_6032938 = 0x06032938;
D_SX_6032954 = 0x06032954;
D_6028254 = 0x06028254;
D_60280E0 = 0x060280E0;
D_A6_6028254 = 0x06028254;
D_A6_60280E0 = 0x060280E0;
D_SX_6032878 = 0x06032878;
D_SX_6032894 = 0x06032894;
D_SX_60328B0 = 0x060328B0;
@@ -1259,7 +1256,7 @@ D_A001EC0 = 0x0A001EC0;
D_A001BE0 = 0x0A001BE0;
D_7004270 = 0x07004270;
D_3005AB0 = 0x3005AB0;
D_arwing_3005AB0 = 0x3005AB0;
D_1000000 = 0x1000000;
D_1000280 = 0x1000280;
D_1000640 = 0x1000640;
@@ -1356,105 +1353,105 @@ D_102FF08 = 0x102FF08;
D_1031630 = 0x1031630;
D_1031EC0 = 0x1031EC0;
D_1032780 = 0x1032780;
D_20031B0 = 0x20031B0;
D_2006F50 = 0x2006F50;
D_200D750 = 0x200D750;
D_2010A30 = 0x2010A30;
D_20112C0 = 0x20112C0;
D_3000090 = 0x3000090;
D_3000120 = 0x3000120;
D_3000130 = 0x3000130;
D_30001E0 = 0x30001E0;
D_3000380 = 0x3000380;
D_30003A0 = 0x30003A0;
D_3000470 = 0x3000470;
D_30004E0 = 0x30004E0;
D_3000510 = 0x3000510;
D_3000660 = 0x3000660;
D_30006A0 = 0x30006A0;
D_30006D0 = 0x30006D0;
D_3000810 = 0x3000810;
D_3000AF0 = 0x3000AF0;
D_3000B20 = 0x3000B20;
D_3000BC0 = 0x3000BC0;
D_3000C70 = 0x3000C70;
D_30013E0 = 0x30013E0;
D_3001420 = 0x3001420;
D_3003E20 = 0x3003E20;
D_3004010 = 0x3004010;
D_3004D58 = 0x3004D58;
D_3005980 = 0x3005980;
D_3005AB0 = 0x3005AB0;
D_3006AF0 = 0x3006AF0;
D_3006C60 = 0x3006C60;
D_3006C70 = 0x3006C70;
D_3007500 = 0x3007500;
D_300A470 = 0x300A470;
D_300B218 = 0x300B218;
D_300D350 = 0x300D350;
D_300D398 = 0x300D398;
D_300D3C0 = 0x300D3C0;
D_300D408 = 0x300D408;
D_300D440 = 0x300D440;
D_300D500 = 0x300D500;
D_300D550 = 0x300D550;
D_300EE80 = 0x300EE80;
D_300FB80 = 0x300FB80;
D_3010A90 = 0x3010A90;
D_3011470 = 0x3011470;
D_3011720 = 0x3011720;
D_3011E40 = 0x3011E40;
D_30131F0 = 0x30131F0;
D_30146B0 = 0x30146B0;
D_3014BF0 = 0x3014BF0;
D_3015120 = 0x3015120;
D_30155E0 = 0x30155E0;
D_3015740 = 0x3015740;
D_3015AF4 = 0x3015AF4;
D_3015C28 = 0x3015C28;
D_3015D80 = 0x3015D80;
D_30160A0 = 0x30160A0;
D_30163C4 = 0x30163C4;
D_3016610 = 0x3016610;
D_3016660 = 0x3016660;
D_3016B30 = 0x3016B30;
D_30183D0 = 0x30183D0;
D_30184D8 = 0x30184D8;
D_3018800 = 0x3018800;
D_30194E0 = 0x30194E0;
D_301AD60 = 0x301AD60;
D_301AEF0 = 0x301AEF0;
D_301B6E0 = 0x301B6E0;
D_301C3A8 = 0x301C3A8;
D_301C614 = 0x301C614;
D_301CFEC = 0x301CFEC;
D_301D258 = 0x301D258;
D_301D888 = 0x301D888;
D_301DB94 = 0x301DB94;
D_301E19C = 0x301E19C;
D_301E3E8 = 0x301E3E8;
D_301E570 = 0x301E570;
D_301F140 = 0x301F140;
D_301FD20 = 0x301FD20;
D_302D120 = 0x302D120;
D_302D240 = 0x302D240;
D_302D4D0 = 0x302D4D0;
D_302DD70 = 0x302DD70;
D_302DDB4 = 0x302DDB4;
D_302DDF8 = 0x302DDF8;
D_302DE3C = 0x302DE3C;
D_302E0E4 = 0x302E0E4;
D_302E170 = 0x302E170;
D_302E378 = 0x302E378;
D_302E56C = 0x302E56C;
D_302E65C = 0x302E65C;
D_302E74C = 0x302E74C;
D_302E830 = 0x302E830;
D_302E95C = 0x302E95C;
D_302EA4C = 0x302EA4C;
D_302EB3C = 0x302EB3C;
D_302EC20 = 0x302EC20;
D_04000000 = 0x04000000;
D_BG_PLANET_20031B0 = 0x20031B0;
D_BG_SPACE_2006F50 = 0x2006F50;
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_blue_marine_3000130 = 0x3000130;
D_vs_player_30001E0 = 0x30001E0;
D_vs_player_3000380 = 0x3000380;
D_vs_player_30003A0 = 0x30003A0;
D_blue_marine_3000470 = 0x3000470;
D_vs_player_30004E0 = 0x30004E0;
D_vs_player_3000510 = 0x3000510;
D_blue_marine_3000660 = 0x3000660;
D_vs_player_30006A0 = 0x30006A0;
D_vs_player_30006D0 = 0x30006D0;
D_vs_player_3000810 = 0x3000810;
D_blue_marine_3000AF0 = 0x3000AF0;
D_vs_player_3000B20 = 0x3000B20;
D_vs_player_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_blue_marine_3005980 = 0x3005980;
D_arwing_3005AB0 = 0x3005AB0;
D_blue_marine_3006AF0 = 0x3006AF0;
D_vs_player_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_arwing_3011720 = 0x3011720;
D_vs_player_3011E40 = 0x3011E40;
D_arwing_30131F0 = 0x30131F0;
D_vs_player_30146B0 = 0x30146B0;
D_arwing_3014BF0 = 0x3014BF0;
D_arwing_3015120 = 0x3015120;
D_arwing_30155E0 = 0x30155E0;
D_vs_player_3015740 = 0x3015740;
D_arwing_3015AF4 = 0x3015AF4;
D_arwing_3015C28 = 0x3015C28;
D_arwing_3015D80 = 0x3015D80;
D_vs_player_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_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_4000080 = 0x4000080;
D_400014C = 0x400014C;
D_40001A4 = 0x40001A4;
D_4000270 = 0x4000270;
@@ -1498,7 +1495,7 @@ D_SX_6000840 = 0x6000840;
D_6000840 = 0x6000840;
D_6000A80 = 0x6000A80;
D_AQ_6000AE4 = 0x6000AE4;
D_6000B60 = 0x6000B60;
D_A6_6000B60 = 0x6000B60;
D_6000C80 = 0x6000C80;
D_6000D80 = 0x6000D80;
D_AQ_6000DB0 = 0x6000DB0;
@@ -1518,7 +1515,7 @@ D_60018C0 = 0x60018C0;
D_SX_6001950 = 0x6001950;
D_6001A10 = 0x6001A10;
D_6001A60 = 0x6001A60;
D_6001A80 = 0x6001A80;
D_A6_6001A80 = 0x6001A80;
D_6001BA8 = 0x6001BA8;
D_6001C50 = 0x6001C50;
D_6001C64 = 0x6001C64;
@@ -1528,7 +1525,7 @@ D_6002020 = 0x6002020;
D_AQ_6002628 = 0x6002628;
D_AQ_6002874 = 0x6002874;
D_6002890 = 0x6002890;
D_60029A0 = 0x60029A0;
D_A6_60029A0 = 0x60029A0;
D_AQ_6002C10 = 0x6002C10;
D_6002E10 = 0x6002E10;
D_6002E60 = 0x6002E60;
@@ -1538,7 +1535,7 @@ D_6003090 = 0x6003090;
D_6003348 = 0x6003348;
D_6003370 = 0x6003370;
D_60034C4 = 0x60034C4;
D_60038C0 = 0x60038C0;
D_A6_60038C0 = 0x60038C0;
D_60038E0 = 0x60038E0;
D_60038F8 = 0x60038F8;
D_6004330 = 0x6004330;
@@ -1548,10 +1545,10 @@ D_6004500 = 0x6004500;
D_6004570 = 0x6004570;
D_60045E0 = 0x60045E0;
D_60046F0 = 0x60046F0;
D_60047E0 = 0x60047E0;
D_A6_60047E0 = 0x60047E0;
D_6004900 = 0x6004900;
D_6004FE0 = 0x6004FE0;
D_6005700 = 0x6005700;
D_A6_6005700 = 0x6005700;
D_6005710 = 0x6005710;
D_AQ_6005954 = 0x6005954;
D_60059F0 = 0x60059F0;
@@ -1678,7 +1675,7 @@ D_600DDC0 = 0x600DDC0;
D_600DDF0 = 0x600DDF0;
D_600E010 = 0x600E010;
D_600E050 = 0x600E050;
D_600E0C0 = 0x600E0C0;
D_A6_600E0C0 = 0x600E0C0;
D_600E2C4 = 0x600E2C4;
D_600E360 = 0x600E360;
D_600E470 = 0x600E470;
@@ -1690,7 +1687,7 @@ D_AQ_600EEF0 = 0x600EEF0;
D_600EFF0 = 0x600EFF0;
D_600F160 = 0x600F160;
D_600F1D0 = 0x600F1D0;
D_600F1F0 = 0x600F1F0;
D_A6_600F1F0 = 0x600F1F0;
D_600F2E0 = 0x600F2E0;
D_600F2F0 = 0x600F2F0;
D_600F36C = 0x600F36C;
@@ -1722,7 +1719,7 @@ D_6010EF0 = 0x6010EF0;
D_6010FA0 = 0x6010FA0;
D_60117E0 = 0x60117E0;
D_6011890 = 0x6011890;
D_6011910 = 0x6011910;
D_A6_6011910 = 0x6011910;
D_AQ_60119A0 = 0x60119A0;
D_AQ_6011A78 = 0x6011A78;
D_6011B40 = 0x6011B40;
@@ -1731,8 +1728,8 @@ D_6011E28 = 0x6011E28;
D_6012310 = 0x6012310;
D_SX_60123BC = 0x60123BC;
D_60123F0 = 0x60123F0;
D_6012550 = 0x6012550;
D_6012840 = 0x6012840;
D_A6_6012550 = 0x6012550;
D_A6_6012840 = 0x6012840;
D_6012A60 = 0x6012A60;
D_6012C00 = 0x6012C00;
D_AQ_6012C98 = 0x6012C98;
@@ -1774,7 +1771,7 @@ D_6015430 = 0x6015430;
D_6015510 = 0x6015510;
D_SX_60158C4 = 0x60158C4;
D_6015C24 = 0x6015C24;
D_6015EE0 = 0x6015EE0;
D_A6_6015EE0 = 0x6015EE0;
D_6016040 = 0x6016040;
D_6016240 = 0x6016240;
D_60163F0 = 0x60163F0;
@@ -1793,10 +1790,10 @@ D_6018550 = 0x6018550;
D_601863C = 0x601863C;
D_6018660 = 0x6018660;
D_AQ_6018878 = 0x6018878;
D_6018994 = 0x6018994;
D_A6_6018994 = 0x6018994;
D_6018AF0 = 0x6018AF0;
D_6018BA0 = 0x6018BA0;
D_6018BF0 = 0x6018BF0;
D_A6_6018BA0 = 0x6018BA0;
D_A6_6018BF0 = 0x6018BF0;
D_6018C00 = 0x6018C00;
D_AQ_6018C78 = 0x6018C78;
D_6018D40 = 0x6018D40;
@@ -1808,7 +1805,7 @@ D_AQ_6019238 = 0x6019238;
D_AQ_6019338 = 0x6019338;
D_AQ_60194D0 = 0x60194D0;
D_60195EC = 0x60195EC;
D_6019730 = 0x6019730;
D_A6_6019730 = 0x6019730;
D_6019738 = 0x6019738;
D_AQ_6019880 = 0x6019880;
D_601996C = 0x601996C;
@@ -1817,7 +1814,7 @@ D_6019E18 = 0x6019E18;
D_6019E50 = 0x6019E50;
D_AQ_6019E80 = 0x6019E80;
D_6019EB0 = 0x6019EB0;
D_601A120 = 0x601A120;
D_A6_601A120 = 0x601A120;
D_601A2B0 = 0x601A2B0;
D_601A340 = 0x601A340;
D_601A7A0 = 0x601A7A0;
@@ -1831,13 +1828,13 @@ D_601AFB8 = 0x601AFB8;
D_AQ_601AFF0 = 0x601AFF0;
D_601B184 = 0x601B184;
D_601B1E4 = 0x601B1E4;
D_601B2B0 = 0x601B2B0;
D_A6_601B2B0 = 0x601B2B0;
D_601B4B0 = 0x601B4B0;
D_601B4C4 = 0x601B4C4;
D_601B640 = 0x601B640;
D_601B6C0 = 0x601B6C0;
D_601BAD0 = 0x601BAD0;
D_601BB40 = 0x601BB40;
D_A6_601BB40 = 0x601BB40;
D_601BCC0 = 0x601BCC0;
D_601BE90 = 0x601BE90;
D_601C000 = 0x601C000;
@@ -1956,12 +1953,12 @@ D_6027AF0 = 0x6027AF0;
D_6027BF0 = 0x6027BF0;
D_6027D40 = 0x6027D40;
D_6027EB0 = 0x6027EB0;
D_6027F50 = 0x6027F50;
D_A6_6027F50 = 0x6027F50;
D_6028260 = 0x6028260;
D_6028454 = 0x6028454;
D_6028578 = 0x6028578;
D_A6_6028454 = 0x6028454;
D_A6_6028578 = 0x6028578;
D_60288A0 = 0x60288A0;
D_60289FC = 0x60289FC;
D_A6_60289FC = 0x60289FC;
D_6028A60 = 0x6028A60;
D_6029528 = 0x6029528;
D_6029674 = 0x6029674;
@@ -2099,7 +2096,6 @@ D_604CDE0 = 0x604CDE0;
D_604D680 = 0x604D680;
D_605A120 = 0x605A120;
D_605C230 = 0x605C230;
D_07000000 = 0x7000000;
D_TI1_7000A80 = 0x7000A80;
D_7000F10 = 0x7000F10;
D_7001030 = 0x7001030;
@@ -2114,8 +2110,7 @@ D_7003650 = 0x7003650;
D_7003830 = 0x7003830;
D_7003C70 = 0x7003C70;
D_7003E10 = 0x7003E10;
D_7003EE8 = 0x7003EE8;
D_07003EE8 = 0x07003EE8;
D_TI2_7003EE8 = 0x7003EE8;
D_7003F10 = 0x7003F10;
D_7004010 = 0x7004010;
D_7004050 = 0x7004050;