Implement common data in EU and JP and clean up US data (#258)

* data fixes

* format

* alignment

* include

3 files changed, 63 insertions, 73 deletions

diff --git a/linker_scripts/eu/rev0/symbol_addrs.txt b/linker_scripts/eu/rev0/symbol_addrs.txt
index c1c99525..0a546268 100644
--- a/linker_scripts/eu/rev0/symbol_addrs.txt
+++ b/linker_scripts/eu/rev0/symbol_addrs.txt
@@ -2399,53 +2399,48 @@ D_800D60AC = 0x800D60AC;
 D_800D60BC = 0x800D60BC;
 D_800D60D0 = 0x800D60D0;
 D_800DA910 = 0x800DA910;
-D_800DA940 = 0x800DA940;
+D_Gfx_800D94D0 = 0x800DA940;
 D_800DA958 = 0x800DA958;
 D_800DAAC8 = 0x800DAAC8;
-D_800DAAF8 = 0x800DAAF8;
+D_Gfx_800D9688 = 0x800DAAF8;
 D_800DAB10 = 0x800DAB10;
 D_800DABD0 = 0x800DABD0;
 D_800DAD80 = 0x800DAD80;
 D_800DADC0 = 0x800DADC0;
-D_800DAE68 = 0x800DAE68;
+D_Tex_800D99F8 = 0x800DAE68;
 D_800DB668 = 0x800DB668;
 D_800DBEC8 = 0x800DBEC8;
 D_800DBF68 = 0x800DBF68;
 D_800DBFB0 = 0x800DBFB0;
 D_800DC050 = 0x800DC050;
-D_800DC090 = 0x800DC090;
+D_Gfx_800DAC20 = 0x800DC090;
 D_800DC0F0 = 0x800DC0F0;
-D_800DC128 = 0x800DC128;
-D_800DC928 = 0x800DC928;
-D_800DCE90 = 0x800DCE90;
+D_Tex_800DACB8 = 0x800DC128;
+D_Tex_800DB4B8 = 0x800DC928;
+gTextCharPalettes = 0x800DCE90;
 D_800DCF10 = 0x800DCF10;
-D_800DDC10 = 0x800DDC10;
-D_800DDC80 = 0x800DDC80;
-D_800DDE80 = 0x800DDE80;
-D_800DE080 = 0x800DE080;
-D_800DE280 = 0x800DE280;
-D_800DE480 = 0x800DE480;
-D_800DE680 = 0x800DE680;
-D_800DE888 = 0x800DE888;
-D_800DE8A0 = 0x800DE8A0;
-D_800DEAA0 = 0x800DEAA0;
-D_800DECA0 = 0x800DECA0;
-D_800DF0A0 = 0x800DF0A0;
-D_800DF2A0 = 0x800DF2A0;
-D_800DF2B0 = 0x800DF2B0;
-D_800DF2C0 = 0x800DF2C0;
-D_800DF2D0 = 0x800DF2D0;
-D_800DF2E0 = 0x800DF2E0;
-D_800DF2F0 = 0x800DF2F0;
-D_800DF36E = 0x800DF36E;
-D_800DF372 = 0x800DF372;
-D_800DF374 = 0x800DF374;
-D_800DF3F0 = 0x800DF3F0;
-D_800DF5EC = 0x800DF5EC;
-D_800DF5F0 = 0x800DF5F0;
-D_800DF7EC = 0x800DF7EC;
-D_800DF7F0 = 0x800DF7F0;
-D_800DF9EC = 0x800DF9EC;
+gRcpInitDL = 0x800DDC10;
+gSawtoothWaveSample = 0x800DDC80;
+gTriangleWaveSample = 0x800DDE80;
+gSineWaveSample = 0x800DE080;
+gSquareWaveSample = 0x800DE280;
+gWhiteNoiseSample = 0x800DE480;
+gUnkSample = 0x800DE680;
+gWaveSamples = 0x800DE880; //size:0x18
+gBendPitchOneOctaveFrequencies = 0x800DE8A0; //size:0x400
+gBendPitchTwoSemitonesFrequencies = 0x800DECA0; //size:0x400
+gPitchFrequencies = 0x800DF0A0;
+gDefaultShortNoteVelocityTable = 0x800DF2A0;
+gDefaultShortNoteGateTimeTable = 0x800DF2B0;
+gDefaultEnvelope = 0x800DF2C0;
+gZeroNoteSub = 0x800DF2D0;
+gDefaultNoteSub = 0x800DF2E0;
+gHaasEffectDelaySizes = 0x800DF2F0; //size:0x80
+gD_800DD200 = 0x800DF370; //size:0x80
+gHeadsetPanVolume = 0x800DF3F0; //size:0x200
+gStereoPanVolume = 0x800DF5F0; //size:0x200
+gDefaultPanVolume = 0x800DF7F0; //size:0x200
+
 D_800DF9F0 = 0x800DF9F0;
 D_800DFA02 = 0x800DFA02;
 D_800DFA08 = 0x800DFA08;
@@ -7596,7 +7591,7 @@ D_fr_80187D64 = 0x80187D64; //segment:ast_radio_fr type:u16
 D_fr_80187D9C = 0x80187D9C; //segment:ast_radio_fr type:u16
 D_fr_80187E0C = 0x80187E0C; //segment:ast_radio_fr type:u16
 D_fr_80187E74 = 0x80187E74; //segment:ast_radio_fr type:u16
-D_fr_80187ED8 = 0x80187ED8; //segment:ast_radio_fr
+gMsgLookupFr = 0x80187ED8; //segment:ast_radio_fr
 
 D_en_8017B230 = 0x8017B230; //segment:ast_radio_en type:u16
 D_en_8017B954 = 0x8017B954; //segment:ast_radio_en type:u16
@@ -8377,7 +8372,7 @@ D_en_801873A8 = 0x801873A8; //segment:ast_radio_en type:u16
 D_en_80187400 = 0x80187400; //segment:ast_radio_en type:u16
 D_en_80187460 = 0x80187460; //segment:ast_radio_en type:u16
 D_en_801874C8 = 0x801874C8; //segment:ast_radio_en type:u16
-D_en_8018751C = 0x8018751C; //segment:ast_radio_en
+gMsgLookupEn = 0x8018751C; //segment:ast_radio_en
 
 D_de_8017B230 = 0x8017B230; //segment:ast_radio_de type:u16
 D_de_8017BA38 = 0x8017BA38; //segment:ast_radio_de type:u16
@@ -9158,4 +9153,4 @@ D_de_80189610 = 0x80189610; //segment:ast_radio_de type:u16
 D_de_80189678 = 0x80189678; //segment:ast_radio_de type:u16
 D_de_801896E8 = 0x801896E8; //segment:ast_radio_de type:u16
 D_de_8018974C = 0x8018974C; //segment:ast_radio_de type:u16
-D_de_801897B4 = 0x801897B4; //segment:ast_radio_de
+gMsgLookupDe = 0x801897B4; //segment:ast_radio_de
diff --git a/linker_scripts/jp/rev0/symbol_addrs.txt b/linker_scripts/jp/rev0/symbol_addrs.txt
index 1cfe2ab6..0812be15 100644
--- a/linker_scripts/jp/rev0/symbol_addrs.txt
+++ b/linker_scripts/jp/rev0/symbol_addrs.txt
@@ -3037,56 +3037,51 @@ D_800D9400 = 0x800D9400;
 D_800D9428 = 0x800D9428;
 D_800D9458 = 0x800D9458;
 D_800D9488 = 0x800D9488;
-D_800D94B4 = 0x800D94B4;
+gMsgLookup = 0x800D94B4;
 D_800DAD00 = 0x800DAD00;
 D_800DF360 = 0x800DF360;
 D_800E43E0 = 0x800E43E0;
-D_800E4410 = 0x800E4410;
+D_Gfx_800D94D0 = 0x800E4410;
 D_800E4428 = 0x800E4428;
 D_800E4598 = 0x800E4598;
-D_800E45C8 = 0x800E45C8;
+D_Gfx_800D9688 = 0x800E45C8;
 D_800E45E0 = 0x800E45E0;
 D_800E46A0 = 0x800E46A0;
 D_800E4850 = 0x800E4850;
 D_800E4890 = 0x800E4890;
-D_800E4938 = 0x800E4938;
+D_Tex_800D99F8 = 0x800E4938;
 D_800E5138 = 0x800E5138;
 D_800E5998 = 0x800E5998;
 D_800E5A38 = 0x800E5A38;
 D_800E5A80 = 0x800E5A80;
 D_800E5B20 = 0x800E5B20;
-D_800E5B60 = 0x800E5B60;
+D_Gfx_800DAC20 = 0x800E5B60;
 D_800E5BC0 = 0x800E5BC0;
-D_800E5BF8 = 0x800E5BF8;
-D_800E63F8 = 0x800E63F8;
-D_800E6960 = 0x800E6960;
-D_800E69E0 = 0x800E69E0;
-D_800E6A50 = 0x800E6A50;
-D_800E6C50 = 0x800E6C50;
-D_800E6E50 = 0x800E6E50;
-D_800E7050 = 0x800E7050;
-D_800E7250 = 0x800E7250;
-D_800E7450 = 0x800E7450;
-D_800E7658 = 0x800E7658;
-D_800E7670 = 0x800E7670;
-D_800E7870 = 0x800E7870;
-D_800E7A70 = 0x800E7A70;
-D_800E7E70 = 0x800E7E70;
-D_800E8070 = 0x800E8070;
-D_800E8080 = 0x800E8080;
-D_800E8090 = 0x800E8090;
-D_800E80A0 = 0x800E80A0;
-D_800E80B0 = 0x800E80B0;
-D_800E80C0 = 0x800E80C0;
-D_800E813E = 0x800E813E;
-D_800E8142 = 0x800E8142;
-D_800E8144 = 0x800E8144;
-D_800E81C0 = 0x800E81C0;
-D_800E83BC = 0x800E83BC;
-D_800E83C0 = 0x800E83C0;
-D_800E85BC = 0x800E85BC;
-D_800E85C0 = 0x800E85C0;
-D_800E87BC = 0x800E87BC;
+D_Tex_800DACB8 = 0x800E5BF8;
+D_Tex_800DB4B8 = 0x800E63F8;
+gTextCharPalettes = 0x800E6960;
+gRcpInitDL = 0x800E69E0;
+gSawtoothWaveSample =0x800E6A50;
+gTriangleWaveSample =0x800E6C50;
+gSineWaveSample =0x800E6E50;
+gSquareWaveSample =0x800E7050;
+gWhiteNoiseSample =0x800E7250;
+gUnkSample =0x800E7450;
+gWaveSamples =0x800E7650; //size:0x18
+gBendPitchOneOctaveFrequencies = 0x800E7670; //size:0x400
+gBendPitchTwoSemitonesFrequencies = 0x800E7A70; //size:0x400
+gPitchFrequencies = 0x800E7E70;
+gDefaultShortNoteVelocityTable = 0x800E8070;
+gDefaultShortNoteGateTimeTable = 0x800E8080;
+gDefaultEnvelope = 0x800E8090;
+gZeroNoteSub = 0x800E80A0;
+gDefaultNoteSub = 0x800E80B0;
+gHaasEffectDelaySizes = 0x800E80C0; //size:0x80
+gD_800DD200 = 0x800E8140; //size:0x80
+gHeadsetPanVolume = 0x800E81C0; //size:0x200
+gStereoPanVolume = 0x800E83C0; //size:0x200
+gDefaultPanVolume = 0x800E85C0; //size:0x200
+
 D_800E87C0 = 0x800E87C0;
 D_800E87D2 = 0x800E87D2;
 D_800E87D8 = 0x800E87D8;
diff --git a/linker_scripts/us/rev1/symbol_addrs_assets.txt b/linker_scripts/us/rev1/symbol_addrs_assets.txt
index 9ae8fb9b..f396714e 100644
--- a/linker_scripts/us/rev1/symbol_addrs_assets.txt
+++ b/linker_scripts/us/rev1/symbol_addrs_assets.txt
@@ -50,7 +50,7 @@ gDefaultEnvelope = 0x800DD150;
 gZeroNoteSub = 0x800DD160;
 gDefaultNoteSub = 0x800DD170;
 gHaasEffectDelaySizes = 0x800DD180; // size:0x80 type:u16
-D_800DD200 = 0x800DD200; // size:0x80 type:s16
+gD_800DD200 = 0x800DD200; // size:0x80 type:s16
 gHeadsetPanVolume = 0x800DD280; // size:0x200 type:f32
 gStereoPanVolume = 0x800DD480; // size:0x200 type:f32
 gDefaultPanVolume = 0x800DD680; // size:0x200 type:f32