Merge branch 'master' into pokenav-decomp-again

1 files changed, 414 insertions, 0 deletions

diff --git a/src/data/contest_text_tables.h b/src/data/contest_text_tables.h
new file mode 100644
index 000000000..8375520d1
--- /dev/null
+++ b/src/data/contest_text_tables.h
@@ -0,0 +1,414 @@
+
+#include "global.h"
+
+extern const u8 gContestEffect00hDescription[];
+extern const u8 gContestEffect01hDescription[];
+extern const u8 gContestEffect02hDescription[];
+extern const u8 gContestEffect03hDescription[];
+extern const u8 gContestEffect04hDescription[];
+extern const u8 gContestEffect05hDescription[];
+extern const u8 gContestEffect06hDescription[];
+extern const u8 gContestEffect07hDescription[];
+extern const u8 gContestEffect08hDescription[];
+extern const u8 gContestEffect09hDescription[];
+extern const u8 gContestEffect0AhDescription[];
+extern const u8 gContestEffect0BhDescription[];
+extern const u8 gContestEffect0ChDescription[];
+extern const u8 gContestEffect0DhDescription[];
+extern const u8 gContestEffect0EhDescription[];
+extern const u8 gContestEffect0FhDescription[];
+extern const u8 gContestEffect10hDescription[];
+extern const u8 gContestEffect11hDescription[];
+extern const u8 gContestEffect12hDescription[];
+extern const u8 gContestEffect13hDescription[];
+extern const u8 gContestEffect14hDescription[];
+extern const u8 gContestEffect15hDescription[];
+extern const u8 gContestEffect16hDescription[];
+extern const u8 gContestEffect17hDescription[];
+extern const u8 gContestEffect18hDescription[];
+extern const u8 gContestEffect19hDescription[];
+extern const u8 gContestEffect1AhDescription[];
+extern const u8 gContestEffect1BhDescription[];
+extern const u8 gContestEffect1ChDescription[];
+extern const u8 gContestEffect1DhDescription[];
+extern const u8 gContestEffect1EhDescription[];
+extern const u8 gContestEffect1FhDescription[];
+extern const u8 gContestEffect20hDescription[];
+extern const u8 gContestEffect21hDescription[];
+extern const u8 gContestEffect22hDescription[];
+extern const u8 gContestEffect23hDescription[];
+extern const u8 gContestEffect24hDescription[];
+extern const u8 gContestEffect25hDescription[];
+extern const u8 gContestEffect26hDescription[];
+extern const u8 gContestEffect27hDescription[];
+extern const u8 gContestEffect28hDescription[];
+extern const u8 gContestEffect29hDescription[];
+extern const u8 gContestEffect2AhDescription[];
+extern const u8 gContestEffect2BhDescription[];
+extern const u8 gContestEffect2ChDescription[];
+extern const u8 gContestEffect2DhDescription[];
+extern const u8 gContestEffect2EhDescription[];
+extern const u8 gContestEffect2FhDescription[];
+
+extern const u8 gUnusedContestMoveName0[];
+extern const u8 gUnusedContestMoveName1[];
+extern const u8 gUnusedContestMoveName2[];
+extern const u8 gUnusedContestMoveName3[];
+extern const u8 gUnusedContestMoveName4[];
+extern const u8 gUnusedContestMoveName5[];
+extern const u8 gUnusedContestMoveName6[];
+extern const u8 gUnusedContestMoveName7[];
+extern const u8 gUnusedContestMoveName8[];
+extern const u8 gUnusedContestMoveName9[];
+extern const u8 gUnusedContestMoveName10[];
+extern const u8 gUnusedContestMoveName11[];
+extern const u8 gUnusedContestMoveName12[];
+
+extern const u8 gContestMoveTypeCoolText[];
+extern const u8 gContestMoveTypeBeautyText[];
+extern const u8 gContestMoveTypeCuteText[];
+extern const u8 gContestMoveTypeSmartText[];
+extern const u8 gContestMoveTypeToughText[];
+
+extern const u8 gText_0827D5C1[];
+extern const u8 gText_0827D5DC[];
+extern const u8 gText_0827D600[];
+extern const u8 gText_0827D612[];
+extern const u8 gText_0827D612[];
+extern const u8 gText_0827D62D[];
+extern const u8 gText_0827D654[];
+extern const u8 gText_0827D67E[];
+extern const u8 gText_0827D69C[];
+extern const u8 gText_0827D6BA[];
+extern const u8 gText_0827D6E5[];
+extern const u8 gText_0827D706[];
+extern const u8 gText_0827D71D[];
+
+extern const u8 gText_0827D743[];
+extern const u8 gText_0827D764[];
+extern const u8 gText_0827D785[];
+extern const u8 gText_0827D7A5[];
+extern const u8 gText_0827D7C8[];
+extern const u8 gText_0827D7E8[];
+extern const u8 gText_0827D831[];
+extern const u8 gText_0827D855[];
+extern const u8 gText_0827D830[];
+extern const u8 gText_0827D872[];
+extern const u8 gText_0827D88F[];
+extern const u8 gText_0827D8B5[];
+extern const u8 gText_0827D8E4[];
+extern const u8 gText_0827D8FE[];
+extern const u8 gText_0827D926[];
+extern const u8 gText_0827D947[];
+extern const u8 gText_0827D961[];
+extern const u8 gText_0827D986[];
+extern const u8 gText_0827D9B1[];
+extern const u8 gText_0827D9D9[];
+extern const u8 gText_0827DA03[];
+extern const u8 gText_0827DA31[];
+extern const u8 gText_0827DA5B[];
+extern const u8 gText_0827DA85[];
+extern const u8 gText_0827DAB2[];
+extern const u8 gText_0827DADA[];
+extern const u8 gText_0827DB03[];
+extern const u8 gText_0827D830[];
+extern const u8 gText_0827D830[];
+extern const u8 gText_0827D830[];
+extern const u8 gText_0827DB1F[];
+extern const u8 gText_0827DB4E[];
+
+extern const u8 gText_827DB75[];
+extern const u8 gText_827DBB0[];
+extern const u8 gText_827DBE0[];
+extern const u8 gText_827DC0F[];
+extern const u8 gText_827DC45[];
+extern const u8 gText_827DC7C[];
+extern const u8 gText_827DCB4[];
+extern const u8 gText_827DCE7[];
+extern const u8 gText_827DD12[];
+extern const u8 gText_827DD3D[];
+extern const u8 gText_827DD6F[];
+extern const u8 gText_827DD8E[];
+extern const u8 gText_827DDC7[];
+extern const u8 gText_827DDF2[];
+extern const u8 gText_827DE14[];
+extern const u8 gText_827DE44[];
+extern const u8 gText_827DE73[];
+extern const u8 gText_827DEA5[];
+extern const u8 gText_827DED9[];
+extern const u8 gText_827DF02[];
+extern const u8 gText_827DF3A[];
+extern const u8 gText_827DF63[];
+extern const u8 gText_827DF8C[];
+extern const u8 gText_827DFB8[];
+extern const u8 gText_827DFE2[];
+extern const u8 gText_827E00C[];
+extern const u8 gText_827E02F[];
+extern const u8 gText_827E05F[];
+extern const u8 gText_827E08B[];
+extern const u8 gText_827E0B5[];
+extern const u8 gText_827E0DD[];
+extern const u8 gText_827E107[];
+extern const u8 gText_827E143[];
+extern const u8 gText_827E17F[];
+extern const u8 gText_827E1BB[];
+extern const u8 gText_827E1F3[];
+extern const u8 gText_827E220[];
+extern const u8 gText_827E254[];
+extern const u8 gText_827E289[];
+extern const u8 gText_827E2C5[];
+extern const u8 gText_0827E2FE[];
+extern const u8 gText_0827E32E[];
+extern const u8 gText_0827E35B[];
+extern const u8 gText_0827E38D[];
+extern const u8 gText_0827E3C1[];
+extern const u8 gText_0827E3EB[];
+extern const u8 gText_0827E416[];
+extern const u8 gText_0827E448[];
+extern const u8 gText_0827E473[];
+extern const u8 gText_0827E4A6[];
+extern const u8 gText_0827E4D5[];
+extern const u8 gText_0827E504[];
+extern const u8 gText_0827E531[];
+extern const u8 gText_0827E55A[];
+extern const u8 gText_0827E5B2[];
+extern const u8 gText_0827E5D0[];
+extern const u8 gText_0827E606[];
+extern const u8 gText_0827E638[];
+extern const u8 gText_0827E658[];
+extern const u8 gText_0827E68B[];
+extern const u8 gText_0827E6C4[];
+extern const u8 gText_0827E7BA[];
+
+extern const u8 gText_0827E85F[];
+extern const u8 gText_0827E868[];
+extern const u8 gText_0827E86F[];
+extern const u8 gText_0827E878[];
+extern const u8 gText_0827E882[];
+
+extern const u8 gText_0827E894[];
+extern const u8 gText_0827E89E[];
+extern const u8 gText_0827E8AA[];
+extern const u8 gText_0827E8B4[];
+extern const u8 gText_0827E8BF[];
+extern const u8 gText_0827E8CA[];
+
+const u8 *const gContestEffectDescriptionPointers[] =
+{
+    gContestEffect00hDescription,
+    gContestEffect01hDescription,
+    gContestEffect02hDescription,
+    gContestEffect03hDescription,
+    gContestEffect04hDescription,
+    gContestEffect05hDescription,
+    gContestEffect06hDescription,
+    gContestEffect07hDescription,
+    gContestEffect08hDescription,
+    gContestEffect09hDescription,
+    gContestEffect0AhDescription,
+    gContestEffect0BhDescription,
+    gContestEffect0ChDescription,
+    gContestEffect0DhDescription,
+    gContestEffect0EhDescription,
+    gContestEffect0FhDescription,
+    gContestEffect10hDescription,
+    gContestEffect11hDescription,
+    gContestEffect12hDescription,
+    gContestEffect13hDescription,
+    gContestEffect14hDescription,
+    gContestEffect15hDescription,
+    gContestEffect16hDescription,
+    gContestEffect17hDescription,
+    gContestEffect18hDescription,
+    gContestEffect19hDescription,
+    gContestEffect1AhDescription,
+    gContestEffect1BhDescription,
+    gContestEffect1ChDescription,
+    gContestEffect1DhDescription,
+    gContestEffect1EhDescription,
+    gContestEffect1FhDescription,
+    gContestEffect20hDescription,
+    gContestEffect21hDescription,
+    gContestEffect22hDescription,
+    gContestEffect23hDescription,
+    gContestEffect24hDescription,
+    gContestEffect25hDescription,
+    gContestEffect26hDescription,
+    gContestEffect27hDescription,
+    gContestEffect28hDescription,
+    gContestEffect29hDescription,
+    gContestEffect2AhDescription,
+    gContestEffect2BhDescription,
+    gContestEffect2ChDescription,
+    gContestEffect2DhDescription,
+    gContestEffect2EhDescription,
+    gContestEffect2FhDescription
+};
+
+// Unreferenced array of pointers to move names.
+// All of the moves except Conversion are combo starters, so this may have
+// been an early list of combo starters.
+const u8 *const gUnknown_8587D10[] =
+{
+    gUnusedContestMoveName0,
+    gUnusedContestMoveName0,
+    gUnusedContestMoveName1,
+    gUnusedContestMoveName2,
+    gUnusedContestMoveName3,
+    gUnusedContestMoveName4,
+    gUnusedContestMoveName5,
+    gUnusedContestMoveName6,
+    gUnusedContestMoveName7,
+    gUnusedContestMoveName8,
+    gUnusedContestMoveName9,
+    gUnusedContestMoveName10,
+    gUnusedContestMoveName11,
+    gUnusedContestMoveName12
+};
+
+const u8 *const gContestMoveTypeTextPointers[] =
+{
+    gContestMoveTypeCoolText,
+    gContestMoveTypeBeautyText,
+    gContestMoveTypeCuteText,
+    gContestMoveTypeSmartText,
+    gContestMoveTypeToughText
+};
+
+const u8 *const gUnknown_08587D5C[] =
+{
+    gText_0827D5C1,
+    gText_0827D5DC,
+    gText_0827D600,
+    gText_0827D612,
+    gText_0827D612,
+    gText_0827D62D,
+    gText_0827D654,
+    gText_0827D67E,
+    gText_0827D69C,
+    gText_0827D6BA,
+    gText_0827D6E5,
+    gText_0827D706,
+    gText_0827D71D
+};
+
+const u8 *const gUnknown_08587D90[] =
+{
+    gText_0827D743,
+    gText_0827D764,
+    gText_0827D785,
+    gText_0827D7A5,
+    gText_0827D7C8,
+    gText_0827D7E8,
+    gText_0827D831,
+    gText_0827D855,
+    gText_0827D830,
+    gText_0827D872,
+    gText_0827D88F,
+    gText_0827D8B5,
+    gText_0827D8E4,
+    gText_0827D8FE,
+    gText_0827D926,
+    gText_0827D947,
+    gText_0827D961,
+    gText_0827D986,
+    gText_0827D9B1,
+    gText_0827D9D9,
+    gText_0827DA03,
+    gText_0827DA31,
+    gText_0827DA5B,
+    gText_0827DA85,
+    gText_0827DAB2,
+    gText_0827DADA,
+    gText_0827DB03,
+    gText_0827D830,
+    gText_0827D830,
+    gText_0827D830,
+    gText_0827DB1F,
+    gText_0827DB4E
+};
+
+const u8 *const gUnknown_08587E10[] =
+{
+    gText_827DB75,
+    gText_827DBB0,
+    gText_827DBE0,
+    gText_827DC0F,
+    gText_827DC45,
+    gText_827DC7C,
+    gText_827DCB4,
+    gText_827DCE7,
+    gText_827DD12,
+    gText_827DD3D,
+    gText_827DD6F,
+    gText_827DD8E,
+    gText_827DDC7,
+    gText_827DDF2,
+    gText_827DE14,
+    gText_827DE44,
+    gText_827DE73,
+    gText_827DEA5,
+    gText_827DED9,
+    gText_827DF02,
+    gText_827DF3A,
+    gText_827DF63,
+    gText_827DF8C,
+    gText_827DFB8,
+    gText_827DFE2,
+    gText_827E00C,
+    gText_827E02F,
+    gText_827E05F,
+    gText_827E08B,
+    gText_827E0B5,
+    gText_827E0DD,
+    gText_827E107,
+    gText_827E143,
+    gText_827E17F,
+    gText_827E1BB,
+    gText_827E1F3,
+    gText_827E220,
+    gText_827E254,
+    gText_827E289,
+    gText_827E2C5,
+    gText_0827E2FE,
+    gText_0827E32E,
+    gText_0827E35B,
+    gText_0827E38D,
+    gText_0827E3C1,
+    gText_0827E3EB,
+    gText_0827E416,
+    gText_0827E448,
+    gText_0827E473,
+    gText_0827E4A6,
+    gText_0827E4D5,
+    gText_0827E504,
+    gText_0827E531,
+    gText_0827E55A,
+    gText_0827E5B2,
+    gText_0827E5D0,
+    gText_0827E606,
+    gText_0827E638,
+    gText_0827E658,
+    gText_0827E68B,
+    gText_0827E6C4,
+    gText_0827E7BA
+};
+
+const u8 *const gUnknown_08587F08[] =
+{
+    gText_0827E85F,
+    gText_0827E868,
+    gText_0827E86F,
+    gText_0827E878,
+    gText_0827E882
+};
+
+const u8 *const gUnknown_08587F1C[] =
+{
+    gText_0827E894,
+    gText_0827E89E,
+    gText_0827E8AA,
+    gText_0827E8B4,
+    gText_0827E8BF,
+    gText_0827E8CA
+};