Match call data, 2

1 files changed, 329 insertions, 8 deletions

diff --git a/src/match_call.c b/src/match_call.c
index b13e7e949..510192781 100644
--- a/src/match_call.c
+++ b/src/match_call.c
@@ -93,13 +93,13 @@ const struct MatchCallStruct##type_ name = { \
 };
 
 typedef union {
-    struct MatchCallStructCommon *common;
-    struct MatchCallStruct0 *type0;
-    struct MatchCallStruct1 *type1;
-    struct MatchCallStruct2 *type2;
-    struct MatchCallStruct3 *type3;
-    struct MatchCallStruct4 *type4;
-    struct MatchCallStruct5 *type5;
+    const struct MatchCallStructCommon *common;
+    const struct MatchCallStruct0 *type0;
+    const struct MatchCallStruct1 *type1;
+    const struct MatchCallStruct2 *type2;
+    const struct MatchCallStruct3 *type3;
+    const struct MatchCallStruct4 *type4;
+    const struct MatchCallStruct5 *type5;
 } match_call_t;
 
 struct UnkStruct_08625388 {
@@ -156,6 +156,110 @@ extern const u8 gText_Mom_Pokenav_2B23F3[];
 extern const u8 gUnknown_085EFB32[];
 extern const u8 gUnknown_085EFB4B[];
 
+extern const u8 gText_Steven_Pokenav_2B5B95[];
+extern const u8 gText_Steven_Pokenav_2B5C53[];
+extern const u8 gText_Steven_Pokenav_2B5CC9[];
+extern const u8 gText_Steven_Pokenav_2B5DB4[];
+extern const u8 gText_Steven_Pokenav_2B5E26[];
+extern const u8 gText_Steven_Pokenav_2B5EA2[];
+extern const u8 gText_Steven_Pokenav_2B5ED9[];
+
+extern const u8 gUnknown_085EFB04[];
+extern const u8 gUnknown_085EFB11[];
+
+extern const u8 gText_May_Pokenav_2B3AB3[];
+extern const u8 gText_May_Pokenav_2B3B3F[];
+extern const u8 gText_May_Pokenav_2B3C13[];
+extern const u8 gText_May_Pokenav_2B3CF3[];
+extern const u8 gText_May_Pokenav_2B3D4B[];
+extern const u8 gText_May_Pokenav_2B3DD1[];
+extern const u8 gText_May_Pokenav_2B3E69[];
+extern const u8 gText_May_Pokenav_2B3ECD[];
+extern const u8 gText_May_Pokenav_2B3F2B[];
+extern const u8 gText_May_Pokenav_2B3FFB[];
+extern const u8 gText_May_Pokenav_2B402B[];
+extern const u8 gText_May_Pokenav_2B414B[];
+extern const u8 gText_May_Pokenav_2B4228[];
+extern const u8 gText_May_Pokenav_2B42E0[];
+extern const u8 gText_May_Pokenav_2B4350[];
+extern const u8 gUnknown_085EFB18[];
+extern const u8 gExpandedPlaceholder_May[];
+extern const u8 gText_Brendan_Pokenav_2B43EF[];
+extern const u8 gText_Brendan_Pokenav_2B4486[];
+extern const u8 gText_Brendan_Pokenav_2B4560[];
+extern const u8 gText_Brendan_Pokenav_2B463F[];
+extern const u8 gText_Brendan_Pokenav_2B46B7[];
+extern const u8 gText_Brendan_Pokenav_2B4761[];
+extern const u8 gText_Brendan_Pokenav_2B47F4[];
+extern const u8 gText_Brendan_Pokenav_2B4882[];
+extern const u8 gText_Brendan_Pokenav_2B4909[];
+extern const u8 gText_Brendan_Pokenav_2B49C4[];
+extern const u8 gText_Brendan_Pokenav_2B4A44[];
+extern const u8 gText_Brendan_Pokenav_2B4B28[];
+extern const u8 gText_Brendan_Pokenav_2B4C15[];
+extern const u8 gText_Brendan_Pokenav_2B4CD8[];
+extern const u8 gText_Brendan_Pokenav_2B4D46[];
+extern const u8 gExpandedPlaceholder_Brendan[];
+extern const u8 gText_Wally_Pokenav_2B4DE2[];
+extern const u8 gText_Wally_Pokenav_2B4E57[];
+extern const u8 gText_Wally_Pokenav_2B4EA5[];
+extern const u8 gText_Wally_Pokenav_2B4F41[];
+extern const u8 gText_Wally_Pokenav_2B4FF3[];
+extern const u8 gText_Wally_Pokenav_2B50B1[];
+extern const u8 gText_Wally_Pokenav_2B5100[];
+extern const u8 gUnknown_085EFB3E[];
+extern const u8 gText_Scott_Pokenav_2B5184[];
+extern const u8 gText_Scott_Pokenav_2B5275[];
+extern const u8 gText_Scott_Pokenav_2B5323[];
+extern const u8 gText_Scott_Pokenav_2B53DB[];
+extern const u8 gText_Scott_Pokenav_2B54A5[];
+extern const u8 gText_Scott_Pokenav_2B5541[];
+extern const u8 gText_Scott_Pokenav_2B56CA[];
+extern const u8 gUnknown_085EFB4F[];
+extern const u8 gUnknown_085EFB5C[];
+extern const u8 gText_Roxanne_Pokenav_2B2456[];
+extern const u8 gText_Roxanne_Pokenav_2B250E[];
+extern const u8 gText_Roxanne_Pokenav_2B25C1[];
+extern const u8 gText_Roxanne_Pokenav_2B2607[];
+extern const u8 gUnknown_085EFB62[];
+extern const u8 gText_Brawly_Pokenav_2B2659[];
+extern const u8 gText_Brawly_Pokenav_2B275D[];
+extern const u8 gText_Brawly_Pokenav_2B286F[];
+extern const u8 gText_Brawly_Pokenav_2B28D1[];
+extern const u8 gUnknown_085EFB6F[];
+extern const u8 gText_Wattson_Pokenav_2B2912[];
+extern const u8 gText_Wattson_Pokenav_2B29CA[];
+extern const u8 gText_Wattson_Pokenav_2B2AB6[];
+extern const u8 gText_Wattson_Pokenav_2B2B01[];
+extern const u8 gUnknown_085EFB7B[];
+extern const u8 gText_Flannery_Pokenav_2B2B4D[];
+extern const u8 gText_Flannery_Pokenav_2B2C0E[];
+extern const u8 gText_Flannery_Pokenav_2B2CF1[];
+extern const u8 gText_Flannery_Pokenav_2B2D54[];
+extern const u8 gUnknown_085EFB87[];
+extern const u8 gText_Winona_Pokenav_2B2DA4[];
+extern const u8 gText_Winona_Pokenav_2B2E2B[];
+extern const u8 gText_Winona_Pokenav_2B2EC2[];
+extern const u8 gText_Winona_Pokenav_2B2F16[];
+extern const u8 gUnknown_085EFB94[];
+extern const u8 gText_TateLiza_Pokenav_2B2F97[];
+extern const u8 gText_TateLiza_Pokenav_2B306E[];
+extern const u8 gText_TateLiza_Pokenav_2B3158[];
+extern const u8 gText_TateLiza_Pokenav_2B31CD[];
+extern const u8 gUnknown_085EFB9E[];
+extern const u8 gText_Juan_Pokenav_2B3249[];
+extern const u8 gText_Juan_Pokenav_2B32EC[];
+extern const u8 gText_Juan_Pokenav_2B33AA[];
+extern const u8 gText_Juan_Pokenav_2B341E[];
+extern const u8 gUnknown_085EFBA9[];
+extern const u8 gText_Sidney_Pokenav_2B34CC[];
+extern const u8 gUnknown_085EFBB5[];
+extern const u8 gText_Phoebe_Pokenav_2B3561[];
+extern const u8 gText_Glacia_Pokenav_2B35E4[];
+extern const u8 gText_Drake_Pokenav_2B368B[];
+extern const u8 gText_Wallace_Pokenav_2B3790[];
+extern const u8 gUnknown_085EFBC0[];
+
 // .rodata
 
 const match_call_sub0_t gUnknown_08624D1C[] = {
@@ -201,7 +305,224 @@ const match_call_sub0_t gUnknown_08624DFC[] = {
 
 MATCHCALLDEF(gUnknown_08624E1C, 0, 0, FLAG_0x0D8, gUnknown_085EFB32, gUnknown_085EFB4B, gUnknown_08624DFC);
 
-extern const match_call_t gUnknown_086252A8[];
+const match_call_sub0_t gUnknown_08624E2C[] = {
+    { gText_Steven_Pokenav_2B5B95, 0xffff,              0xffff },
+    { gText_Steven_Pokenav_2B5C53, FLAG_0x0C7,          0xffff },
+    { gText_Steven_Pokenav_2B5CC9, FLAG_0x0D4,          0xffff },
+    { gText_Steven_Pokenav_2B5DB4, FLAG_0x070,          0xffff },
+    { gText_Steven_Pokenav_2B5E26, FLAG_0x4F6,          0xffff },
+    { gText_Steven_Pokenav_2B5EA2, FLAG_0x081,          0xffff },
+    { gText_Steven_Pokenav_2B5ED9, FLAG_SYS_GAME_CLEAR, 0xffff },
+    { NULL,                        0xffff,              0xffff },
+};
+
+MATCHCALLDEF(gUnknown_08624E6C, 0, 0xd5, FLAG_0x131, gUnknown_085EFB04, gUnknown_085EFB11, gUnknown_08624E2C);
+
+const match_call_sub0_t gUnknown_08624E7C[] = {
+    { gText_May_Pokenav_2B3AB3, 0xFFFF, 0xFFFF },
+    { gText_May_Pokenav_2B3B3F, 0x4F1, 0xFFFF },
+    { gText_May_Pokenav_2B3C13, 0x095, 0xFFFF },
+    { gText_May_Pokenav_2B3CF3, 0x324, 0xFFFF },
+    { gText_May_Pokenav_2B3D4B, 0x06A, 0xFFFF },
+    { gText_May_Pokenav_2B3DD1, 0x4F3, 0xFFFF },
+    { gText_May_Pokenav_2B3E69, 0x4F4, 0xFFFF },
+    { gText_May_Pokenav_2B3ECD, 0x097, 0xFFFF },
+    { gText_May_Pokenav_2B3F2B, 0x0D4, 0xFFFF },
+    { gText_May_Pokenav_2B3FFB, 0x06F, 0xFFFF },
+    { gText_May_Pokenav_2B402B, 0x061, 0xFFFF },
+    { gText_May_Pokenav_2B414B, 0x070, 0xFFFF },
+    { gText_May_Pokenav_2B4228, 0x081, 0xFFFF },
+    { gText_May_Pokenav_2B42E0, 0x4F7, 0xFFFF },
+    { gText_May_Pokenav_2B4350, 0x864, 0xFFFF },
+    { NULL, 0xFFFF, 0xFFFF }
+};
+
+MATCHCALLDEF(gUnknown_08624EFC, 4, 0, 0x0FD, gUnknown_085EFB18, gExpandedPlaceholder_May, gUnknown_08624E7C);
+
+const match_call_sub0_t gUnknown_08624F0C[] = {
+    { gText_Brendan_Pokenav_2B43EF, 0xFFFF, 0xFFFF },
+    { gText_Brendan_Pokenav_2B4486, 0x4F1, 0xFFFF },
+    { gText_Brendan_Pokenav_2B4560, 0x095, 0xFFFF },
+    { gText_Brendan_Pokenav_2B463F, 0x324, 0xFFFF },
+    { gText_Brendan_Pokenav_2B46B7, 0x06A, 0xFFFF },
+    { gText_Brendan_Pokenav_2B4761, 0x4F3, 0xFFFF },
+    { gText_Brendan_Pokenav_2B47F4, 0x4F4, 0xFFFF },
+    { gText_Brendan_Pokenav_2B4882, 0x097, 0xFFFF },
+    { gText_Brendan_Pokenav_2B4909, 0x0D4, 0xFFFF },
+    { gText_Brendan_Pokenav_2B49C4, 0x06F, 0xFFFF },
+    { gText_Brendan_Pokenav_2B4A44, 0x061, 0xFFFF },
+    { gText_Brendan_Pokenav_2B4B28, 0x070, 0xFFFF },
+    { gText_Brendan_Pokenav_2B4C15, 0x081, 0xFFFF },
+    { gText_Brendan_Pokenav_2B4CD8, 0x4F7, 0xFFFF },
+    { gText_Brendan_Pokenav_2B4D46, 0x864, 0xFFFF },
+    { NULL, 0xFFFF, 0xFFFF }
+};
+
+MATCHCALLDEF(gUnknown_08624F8C, 4, 1, 0x0FD, gUnknown_085EFB18, gExpandedPlaceholder_Brendan, gUnknown_08624F0C);
+
+const match_call_sub0_t gUnknown_08624F9C[] = {
+    { gText_Wally_Pokenav_2B4DE2, 0xFFFF, 0xFFFF },
+    { gText_Wally_Pokenav_2B4E57, 0x0C7, 0xFFFF },
+    { gText_Wally_Pokenav_2B4EA5, 0x4F3, 0xFFFF },
+    { gText_Wally_Pokenav_2B4F41, 0x097, 0xFFFF },
+    { gText_Wally_Pokenav_2B4FF3, 0x06F, 0xFFFF },
+    { gText_Wally_Pokenav_2B50B1, 0x081, 0xFFFF },
+    { gText_Wally_Pokenav_2B5100, 0x07E, 0xFFFF },
+    { NULL, 0xFFFF, 0xFFFF }
+};
+
+const struct MatchCallSubstruct2 gUnknown_08624FDC[] = {
+    { 0x0324, 0x05 },
+    { 0x006F, 0xD5 },
+    { 0x035A, 0x46 },
+    { 0xFFFF, 0xD5 }
+};
+
+MATCHCALLDEF(gUnknown_08624FEC, 2, 0, 0x0D6, 0x40, gUnknown_085EFB3E, gUnknown_08624F9C, gUnknown_08624FDC);
+
+const match_call_sub0_t gUnknown_08624500[] = {
+    { gText_Scott_Pokenav_2B5184, 0xFFFF, 0xFFFF },
+    { gText_Scott_Pokenav_2B5275, 0x08B, 0xFFFF },
+    { gText_Scott_Pokenav_2B5323, 0x097, 0xFFFF },
+    { gText_Scott_Pokenav_2B53DB, 0x0D4, 0xFFFF },
+    { gText_Scott_Pokenav_2B54A5, 0x070, 0xFFFF },
+    { gText_Scott_Pokenav_2B5541, 0x4F7, 0xFFFF },
+    { gText_Scott_Pokenav_2B56CA, 0x864, 0xFFFF },
+    { NULL, 0xFFFF, 0xFFFF }
+};
+
+
+MATCHCALLDEF(gUnknown_08625040, 0, 0xD5, 0x0D7, gUnknown_085EFB4F, gUnknown_085EFB5C, gUnknown_08624500);
+
+const match_call_sub0_t gUnknown_08625050[] = {
+    { gText_Roxanne_Pokenav_2B2456, 0xFFFE, 0xFFFF },
+    { gText_Roxanne_Pokenav_2B250E, 0xFFFF, 0xFFFF },
+    { gText_Roxanne_Pokenav_2B25C1, 0xFFFF, 0xFFFF },
+    { gText_Roxanne_Pokenav_2B2607, 0x864, 0xFFFF },
+    { NULL, 0xFFFF, 0xFFFF }
+};
+
+MATCHCALLDEF(gUnknown_08625078, 5, 10, 0x1D3, 0x41, gUnknown_085EFB62, NULL, gUnknown_08625050);
+
+const match_call_sub0_t gUnknown_0862508C[] = {
+    { gText_Brawly_Pokenav_2B2659, 0xFFFE, 0xFFFF },
+    { gText_Brawly_Pokenav_2B275D, 0xFFFF, 0xFFFF },
+    { gText_Brawly_Pokenav_2B286F, 0xFFFF, 0xFFFF },
+    { gText_Brawly_Pokenav_2B28D1, 0x864, 0xFFFF },
+    { NULL, 0xFFFF, 0xFFFF }
+};
+
+MATCHCALLDEF(gUnknown_086250B4, 5, 2, 0x1D4, 0x42, gUnknown_085EFB6F, NULL, gUnknown_0862508C);
+
+const match_call_sub0_t gUnknown_086250C8[] = {
+    { gText_Wattson_Pokenav_2B2912, 0xFFFE, 0xFFFF },
+    { gText_Wattson_Pokenav_2B29CA, 0xFFFF, 0xFFFF },
+    { gText_Wattson_Pokenav_2B2AB6, 0xFFFF, 0xFFFF },
+    { gText_Wattson_Pokenav_2B2B01, 0x864, 0xFFFF },
+    { NULL, 0xFFFF, 0xFFFF }
+};
+
+MATCHCALLDEF(gUnknown_086250F0, 5, 9, 0x1D5, 0x43, gUnknown_085EFB7B, NULL, gUnknown_086250C8);
+
+const match_call_sub0_t gUnknown_08625104[] = {
+    { gText_Flannery_Pokenav_2B2B4D, 0xFFFE, 0xFFFF },
+    { gText_Flannery_Pokenav_2B2C0E, 0xFFFF, 0xFFFF },
+    { gText_Flannery_Pokenav_2B2CF1, 0xFFFF, 0xFFFF },
+    { gText_Flannery_Pokenav_2B2D54, 0x864, 0xFFFF },
+    { NULL, 0xFFFF, 0xFFFF }
+};
+
+MATCHCALLDEF(gUnknown_0862512C, 5, 3, 0x1D6, 0x44, gUnknown_085EFB87, NULL, gUnknown_08625104);
+
+const match_call_sub0_t gUnknown_08625140[] = {
+    { gText_Winona_Pokenav_2B2DA4, 0xFFFE, 0xFFFF },
+    { gText_Winona_Pokenav_2B2E2B, 0xFFFF, 0xFFFF },
+    { gText_Winona_Pokenav_2B2EC2, 0xFFFF, 0xFFFF },
+    { gText_Winona_Pokenav_2B2F16, 0x864, 0xFFFF },
+    { NULL, 0xFFFF, 0xFFFF }
+};
+
+MATCHCALLDEF(gUnknown_08625168, 5, 11, 0x1D7, 0x46, gUnknown_085EFB94, NULL, gUnknown_08625140);
+
+const match_call_sub0_t gUnknown_0862517C[] = {
+    { gText_TateLiza_Pokenav_2B2F97, 0xFFFE, 0xFFFF },
+    { gText_TateLiza_Pokenav_2B306E, 0xFFFF, 0xFFFF },
+    { gText_TateLiza_Pokenav_2B3158, 0xFFFF, 0xFFFF },
+    { gText_TateLiza_Pokenav_2B31CD, 0x864, 0xFFFF },
+    { NULL, 0xFFFF, 0xFFFF }
+};
+
+MATCHCALLDEF(gUnknown_086251A4, 5, 13, 0x1D8, 0x47, gUnknown_085EFB9E, NULL, gUnknown_0862517C);
+
+const match_call_sub0_t gUnknown_086251B8[] = {
+    { gText_Juan_Pokenav_2B3249, 0xFFFE, 0xFFFF },
+    { gText_Juan_Pokenav_2B32EC, 0xFFFF, 0xFFFF },
+    { gText_Juan_Pokenav_2B33AA, 0xFFFF, 0xFFFF },
+    { gText_Juan_Pokenav_2B341E, 0x864, 0xFFFF },
+    { NULL, 0xFFFF, 0xFFFF }
+};
+
+MATCHCALLDEF(gUnknown_086251E0, 5, 14, 0x1D9, 0x48, gUnknown_085EFBA9, NULL, gUnknown_086251B8);
+
+const match_call_sub0_t gUnknown_086251F4[] = {
+    { gText_Sidney_Pokenav_2B34CC, 0xFFFF, 0xFFFF },
+    { NULL, 0xFFFF, 0xFFFF }
+};
+
+MATCHCALLDEF(gUnknown_08625204, 5, 15, 0x1A5, 0x49, gUnknown_085EFBB5, NULL, gUnknown_086251F4);
+
+const match_call_sub0_t gUnknown_08625218[] = {
+    { gText_Phoebe_Pokenav_2B3561, 0xFFFF, 0xFFFF },
+    { NULL, 0xFFFF, 0xFFFF }
+};
+
+MATCHCALLDEF(gUnknown_08625228, 5, 15, 0x1A6, 0x4A, gUnknown_085EFBB5, NULL, gUnknown_08625218);
+
+const match_call_sub0_t gUnknown_0862523C[] = {
+    { gText_Glacia_Pokenav_2B35E4, 0xFFFF, 0xFFFF },
+    { NULL, 0xFFFF, 0xFFFF }
+};
+
+MATCHCALLDEF(gUnknown_0862524C, 5, 15, 0x1A7, 0x4B, gUnknown_085EFBB5, NULL, gUnknown_0862523C);
+
+const match_call_sub0_t gUnknown_08625260[] = {
+    { gText_Drake_Pokenav_2B368B, 0xFFFF, 0xFFFF },
+    { NULL, 0xFFFF, 0xFFFF }
+};
+
+MATCHCALLDEF(gUnknown_08625270, 5, 15, 0x1A8, 0x4C, gUnknown_085EFBB5, NULL, gUnknown_08625260);
+
+const match_call_sub0_t gUnknown_08625284[] = {
+    { gText_Wallace_Pokenav_2B3790, 0xFFFF, 0xFFFF },
+    { NULL, 0xFFFF, 0xFFFF }
+};
+
+MATCHCALLDEF(gUnknown_08625294, 5, 15, 0x1A9, 0x4D, gUnknown_085EFBC0, NULL, gUnknown_08625284);
+
+const match_call_t gUnknown_086252A8[] = {
+    {.type0 = &gUnknown_08624D7C},
+    {.type3 = &gUnknown_08624DF0},
+    {.type4 = &gUnknown_08624F8C},
+    {.type4 = &gUnknown_08624EFC},
+    {.type2 = &gUnknown_08624FEC},
+    {.type5 = &gUnknown_08624DDC},
+    {.type0 = &gUnknown_08624E1C},
+    {.type0 = &gUnknown_08624E6C},
+    {.type0 = &gUnknown_08625040},
+    {.type5 = &gUnknown_08625078},
+    {.type5 = &gUnknown_086250B4},
+    {.type5 = &gUnknown_086250F0},
+    {.type5 = &gUnknown_0862512C},
+    {.type5 = &gUnknown_08625168},
+    {.type5 = &gUnknown_086251A4},
+    {.type5 = &gUnknown_086251E0},
+    {.type5 = &gUnknown_08625204},
+    {.type5 = &gUnknown_08625228},
+    {.type5 = &gUnknown_0862524C},
+    {.type5 = &gUnknown_08625270},
+    {.type5 = &gUnknown_08625294}
+};
+
 extern bool32 (*const gUnknown_086252FC[])(const match_call_t);
 extern u8 (*const gUnknown_08625310[])(const match_call_t);
 extern bool32 (*const gUnknown_08625324[])(const match_call_t);