From 7f7b182ca4430b488e6f6b502a53697154df6b86 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 27 Feb 2018 08:47:47 -0500 Subject: sub_81D1574 --- src/match_call.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/match_call.c (limited to 'src') diff --git a/src/match_call.c b/src/match_call.c new file mode 100644 index 000000000..d435ea8a6 --- /dev/null +++ b/src/match_call.c @@ -0,0 +1,32 @@ + +// Includes +#include "global.h" + +// Static type declarations + +// Static RAM declarations + +// Static ROM declarations + +// .rodata + +// .text + +u32 sub_81D1574(u8 *a) +{ + switch (*a) + { + case 0: + default: + return 0; + case 1: + case 5: + return 1; + case 2: + return 2; + case 4: + return 3; + case 3: + return 4; + } +} -- cgit v1.2.3 From 9abc121fa278e7b71ffbfbfa6f151874a5d3f4d9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Feb 2018 22:09:28 -0500 Subject: through sub_81D16DC --- src/match_call.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 95 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/match_call.c b/src/match_call.c index d435ea8a6..8267d08be 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -1,20 +1,37 @@ // Includes #include "global.h" +#include "battle_setup.h" +#include "event_data.h" + +#define NELEMS(a) (s32)( sizeof (a) / sizeof (*(a)) ) // Static type declarations +typedef struct { + u8 v0; + u8 v1; + u16 v2; + void *v4; + void *v8; + void *vC; +} match_call_t; + // Static RAM declarations // Static ROM declarations // .rodata +extern const void *const gUnknown_086252A8[]; +extern bool32 (*const gUnknown_086252FC[])(const match_call_t *); +extern bool8 (*const gUnknown_08625310[])(const match_call_t *); + // .text -u32 sub_81D1574(u8 *a) +s32 sub_81D1574(const match_call_t *matchCall) { - switch (*a) + switch (matchCall->v0) { case 0: default: @@ -30,3 +47,79 @@ u32 sub_81D1574(u8 *a) return 4; } } + +s32 sub_81D15BC(s32 rematchIdx) +{ + return gRematchTable[rematchIdx].trainerIds[0]; +} + +s32 sub_81D15CC(s32 trainerIdx) +{ + s32 rematchIdx; + + for (rematchIdx = 0; rematchIdx < NELEMS(gRematchTable); rematchIdx++) + { + if (gRematchTable[rematchIdx].trainerIds[0] == trainerIdx) + return rematchIdx; + } + return -1; +} + +bool32 sub_81D15F4(u32 idx) +{ + const match_call_t *matchCall; + s32 v0; + + if (idx > 20) + return FALSE; + matchCall = gUnknown_086252A8[idx]; + v0 = sub_81D1574(matchCall); + return gUnknown_086252FC[v0](matchCall); +} + +bool32 sub_81D1628(const match_call_t *matchCall) +{ + if (matchCall->v2 == 0xffff) + return TRUE; + return FlagGet(matchCall->v2); +} + +bool32 sub_81D164C(const match_call_t *matchCall) +{ + if (matchCall->v2 == 0xffff) + return TRUE; + return FlagGet(matchCall->v2); +} + +bool32 sub_81D1670(const match_call_t *matchCall) +{ + if (matchCall->v2 == 0xffff) + return TRUE; + return FlagGet(matchCall->v2); +} + +bool32 sub_81D1694(const match_call_t *matchCall) +{ + if (matchCall->v1 != gSaveBlock2Ptr->playerGender) + return FALSE; + if (matchCall->v2 == 0xffff) + return TRUE; + return FlagGet(matchCall->v2); +} + +bool32 sub_81D16CC(const match_call_t *matchCall) +{ + return FlagGet(matchCall->v2); +} + +bool8 sub_81D16DC(u32 idx) +{ + const match_call_t *matchCall; + s32 v0; + + if (idx > 20) + return FALSE; + matchCall = gUnknown_086252A8[idx]; + v0 = sub_81D1574(matchCall); + return gUnknown_08625310[v0](matchCall); +} -- cgit v1.2.3 From 988be1ab86453db2647c8b79391700fb0a72a436 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Feb 2018 22:47:50 -0500 Subject: Carve out Match Call functions --- src/match_call.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/match_call.c b/src/match_call.c index 8267d08be..58278bfbe 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -8,13 +8,19 @@ // Static type declarations +typedef struct { + const u8 *text; + u16 v4; + u16 v6; +} match_call_script_t; + typedef struct { u8 v0; - u8 v1; - u16 v2; - void *v4; - void *v8; - void *vC; + u8 gender; + u16 flag; + const u8 *name; + const u8 *desc; + match_call_script_t *script; } match_call_t; // Static RAM declarations @@ -79,40 +85,40 @@ bool32 sub_81D15F4(u32 idx) bool32 sub_81D1628(const match_call_t *matchCall) { - if (matchCall->v2 == 0xffff) + if (matchCall->flag == 0xffff) return TRUE; - return FlagGet(matchCall->v2); + return FlagGet(matchCall->flag); } bool32 sub_81D164C(const match_call_t *matchCall) { - if (matchCall->v2 == 0xffff) + if (matchCall->flag == 0xffff) return TRUE; - return FlagGet(matchCall->v2); + return FlagGet(matchCall->flag); } bool32 sub_81D1670(const match_call_t *matchCall) { - if (matchCall->v2 == 0xffff) + if (matchCall->flag == 0xffff) return TRUE; - return FlagGet(matchCall->v2); + return FlagGet(matchCall->flag); } bool32 sub_81D1694(const match_call_t *matchCall) { - if (matchCall->v1 != gSaveBlock2Ptr->playerGender) + if (matchCall->gender != gSaveBlock2Ptr->playerGender) return FALSE; - if (matchCall->v2 == 0xffff) + if (matchCall->flag == 0xffff) return TRUE; - return FlagGet(matchCall->v2); + return FlagGet(matchCall->flag); } bool32 sub_81D16CC(const match_call_t *matchCall) { - return FlagGet(matchCall->v2); + return FlagGet(matchCall->flag); } -bool8 sub_81D16DC(u32 idx) +u8 sub_81D16DC(u32 idx) { const match_call_t *matchCall; s32 v0; -- cgit v1.2.3 From 89847427e48b434bbc403066673f89b688b4d9c7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 2 Mar 2018 08:44:33 -0500 Subject: match_call_t; through sub_81D17E4 --- src/match_call.c | 187 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 157 insertions(+), 30 deletions(-) (limited to 'src') diff --git a/src/match_call.c b/src/match_call.c index 58278bfbe..557710ea6 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -8,19 +8,73 @@ // Static type declarations -typedef struct { +struct MatchCallSusbtruct0 { const u8 *text; u16 v4; u16 v6; -} match_call_script_t; +}; -typedef struct { - u8 v0; - u8 gender; +struct MatchCallStructCommon { + u8 type; + u8 v1; u16 flag; - const u8 *name; - const u8 *desc; - match_call_script_t *script; +}; + +struct MatchCallStruct0 { + u8 type; + u8 v1; + u16 flag; + const u8 *v4; + const u8 *v8; + const struct MatchCallSusbtruct0 *vC; +}; + +struct MatchCallStruct1 { + u8 type; + u8 v1; + u16 flag; + u16 v4; +}; + +struct MatchCallSubstruct2 { + u16 v0; + u8 v2; +}; + +struct MatchCallStruct2 { + u8 type; + u8 v1; + u16 flag; + u16 v4; + const u8 *v8; + const u8 *vC; + const struct MatchCallSubstruct2 *v10; +}; + +struct MatchCallStruct3 { + u8 type; + u8 v1; + u16 flag; + const u8 *v4; + const u8 *v8; +}; + +struct MatchCallStruct4 { + u8 type; + u8 v1; + u16 flag; + const u8 *v4; + const u8 *v8; + const struct MatchCallSusbtruct0 *vC; +}; + +typedef union { + struct MatchCallStructCommon *common; + struct MatchCallStruct0 *type0; + struct MatchCallStruct1 *type1; + struct MatchCallStruct2 *type2; + struct MatchCallStruct3 *type3; + struct MatchCallStruct4 *type4; } match_call_t; // Static RAM declarations @@ -29,15 +83,16 @@ typedef struct { // .rodata -extern const void *const gUnknown_086252A8[]; -extern bool32 (*const gUnknown_086252FC[])(const match_call_t *); -extern bool8 (*const gUnknown_08625310[])(const match_call_t *); +extern const match_call_t gUnknown_086252A8[]; +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); // .text -s32 sub_81D1574(const match_call_t *matchCall) +s32 sub_81D1574(const match_call_t matchCall) { - switch (matchCall->v0) + switch (matchCall.common->type) { case 0: default: @@ -73,7 +128,7 @@ s32 sub_81D15CC(s32 trainerIdx) bool32 sub_81D15F4(u32 idx) { - const match_call_t *matchCall; + match_call_t matchCall; s32 v0; if (idx > 20) @@ -83,44 +138,44 @@ bool32 sub_81D15F4(u32 idx) return gUnknown_086252FC[v0](matchCall); } -bool32 sub_81D1628(const match_call_t *matchCall) +bool32 sub_81D1628(match_call_t matchCall) { - if (matchCall->flag == 0xffff) + if (matchCall.type0->flag == 0xffff) return TRUE; - return FlagGet(matchCall->flag); + return FlagGet(matchCall.type0->flag); } -bool32 sub_81D164C(const match_call_t *matchCall) +bool32 sub_81D164C(match_call_t matchCall) { - if (matchCall->flag == 0xffff) + if (matchCall.type1->flag == 0xffff) return TRUE; - return FlagGet(matchCall->flag); + return FlagGet(matchCall.type1->flag); } -bool32 sub_81D1670(const match_call_t *matchCall) +bool32 sub_81D1670(match_call_t matchCall) { - if (matchCall->flag == 0xffff) + if (matchCall.type2->flag == 0xffff) return TRUE; - return FlagGet(matchCall->flag); + return FlagGet(matchCall.type2->flag); } -bool32 sub_81D1694(const match_call_t *matchCall) +bool32 sub_81D1694(match_call_t matchCall) { - if (matchCall->gender != gSaveBlock2Ptr->playerGender) + if (matchCall.type4->v1 != gSaveBlock2Ptr->playerGender) return FALSE; - if (matchCall->flag == 0xffff) + if (matchCall.type4->flag == 0xffff) return TRUE; - return FlagGet(matchCall->flag); + return FlagGet(matchCall.type4->flag); } -bool32 sub_81D16CC(const match_call_t *matchCall) +bool32 sub_81D16CC(match_call_t matchCall) { - return FlagGet(matchCall->flag); + return FlagGet(matchCall.type3->flag); } u8 sub_81D16DC(u32 idx) { - const match_call_t *matchCall; + match_call_t matchCall; s32 v0; if (idx > 20) @@ -129,3 +184,75 @@ u8 sub_81D16DC(u32 idx) v0 = sub_81D1574(matchCall); return gUnknown_08625310[v0](matchCall); } + +u8 sub_81D1714(match_call_t matchCall) +{ + return matchCall.type0->v1; +} + +u8 sub_81D1718(match_call_t matchCall) +{ + return matchCall.type1->v1; +} + +u8 sub_81D171C(match_call_t matchCall) +{ + s32 i; + + for (i = 0; matchCall.type2->v10[i].v0 != 0xffff; i++) + { + if (!FlagGet(matchCall.type2->v10[i].v0)) + break; + } + return matchCall.type2->v10[i].v2; +} + +u8 sub_81D1750(match_call_t matchCall) +{ + return 0xd5; +} + +u8 sub_81D1754(match_call_t matchCall) +{ + return 0xd5; +} + +bool32 sub_81D1758(u32 idx) +{ + match_call_t matchCall; + s32 v0; + + if (idx > 20) + return 0; + matchCall = gUnknown_086252A8[idx]; + v0 = sub_81D1574(matchCall); + return gUnknown_08625324[v0](matchCall); +} + +bool32 sub_81D178C(match_call_t matchCall) +{ + return FALSE; +} + +bool32 sub_81D1790(match_call_t matchCall) +{ + if (matchCall.type1->v4 > 0x48) + return FALSE; + return gSaveBlock1Ptr->trainerRematches[matchCall.type1->v4] ? TRUE : FALSE; +} + +bool32 sub_81D17C0(match_call_t matchCall) +{ + return gSaveBlock1Ptr->trainerRematches[matchCall.type2->v4] ? TRUE : FALSE; +} + +bool32 sub_81D17E0(match_call_t matchCall) +{ + return FALSE; +} + +bool32 sub_81D17E4(match_call_t matchCall) +{ + return FALSE; +} + -- cgit v1.2.3 From d25a9ffe169059715878c0c01bf8f8913b3eeb76 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 2 Mar 2018 18:12:23 -0500 Subject: through sub_81D1898 --- src/match_call.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 103 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/match_call.c b/src/match_call.c index 557710ea6..b754b1180 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -77,6 +77,16 @@ typedef union { struct MatchCallStruct4 *type4; } match_call_t; +struct UnkStruct_08625388 { + u16 idx; + u16 v2; + u16 v4; + const u8 *v8; + const u8 *vC; + const u8 *v10; + const u8 *v14; +}; + // Static RAM declarations // Static ROM declarations @@ -87,10 +97,13 @@ extern const match_call_t gUnknown_086252A8[]; 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); +extern bool32 (*const gUnknown_08625338[])(const match_call_t); +extern const struct UnkStruct_08625388 gUnknown_08625388[]; +extern u32 (*const gUnknown_0862534C[])(const match_call_t); // .text -s32 sub_81D1574(const match_call_t matchCall) +u32 sub_81D1574(const match_call_t matchCall) { switch (matchCall.common->type) { @@ -129,13 +142,13 @@ s32 sub_81D15CC(s32 trainerIdx) bool32 sub_81D15F4(u32 idx) { match_call_t matchCall; - s32 v0; + u32 i; if (idx > 20) return FALSE; matchCall = gUnknown_086252A8[idx]; - v0 = sub_81D1574(matchCall); - return gUnknown_086252FC[v0](matchCall); + i = sub_81D1574(matchCall); + return gUnknown_086252FC[i](matchCall); } bool32 sub_81D1628(match_call_t matchCall) @@ -176,13 +189,13 @@ bool32 sub_81D16CC(match_call_t matchCall) u8 sub_81D16DC(u32 idx) { match_call_t matchCall; - s32 v0; + u32 i; if (idx > 20) return FALSE; matchCall = gUnknown_086252A8[idx]; - v0 = sub_81D1574(matchCall); - return gUnknown_08625310[v0](matchCall); + i = sub_81D1574(matchCall); + return gUnknown_08625310[i](matchCall); } u8 sub_81D1714(match_call_t matchCall) @@ -220,13 +233,13 @@ u8 sub_81D1754(match_call_t matchCall) bool32 sub_81D1758(u32 idx) { match_call_t matchCall; - s32 v0; + u32 i; if (idx > 20) return 0; matchCall = gUnknown_086252A8[idx]; - v0 = sub_81D1574(matchCall); - return gUnknown_08625324[v0](matchCall); + i = sub_81D1574(matchCall); + return gUnknown_08625324[i](matchCall); } bool32 sub_81D178C(match_call_t matchCall) @@ -256,3 +269,83 @@ bool32 sub_81D17E4(match_call_t matchCall) return FALSE; } +bool32 sub_81D17E8(u32 idx) +{ + match_call_t matchCall; + u32 i; + + if (idx > 20) + return FALSE; + matchCall = gUnknown_086252A8[idx]; + i = sub_81D1574(matchCall); + if (gUnknown_08625338[i](matchCall)) + return TRUE; + for (i = 0; i < 4; i++) + { + if (gUnknown_08625388[i].idx == idx) + return TRUE; + } + return FALSE; +} + +bool32 sub_81D1840(match_call_t matchCall) +{ + return FALSE; +} + +bool32 sub_81D1844(match_call_t matchCall) +{ + return TRUE; +} + +bool32 sub_81D1848(match_call_t matchCall) +{ + return TRUE; +} + +bool32 sub_81D184C(match_call_t matchCall) +{ + return FALSE; +} + +bool32 sub_81D1850(match_call_t matchCall) +{ + return FALSE; +} + +u32 sub_81D1854(u32 idx) +{ + match_call_t matchCall; + u32 i; + + if (idx > 20) + return ARRAY_COUNT(gRematchTable); + matchCall = gUnknown_086252A8[idx]; + i = sub_81D1574(matchCall); + return gUnknown_0862534C[i](matchCall); +} + +u32 sub_81D1888(match_call_t matchCall) +{ + return ARRAY_COUNT(gRematchTable); +} + +u32 sub_81D188C(match_call_t matchCall) +{ + return matchCall.type1->v4; +} + +u32 sub_81D1890(match_call_t matchCall) +{ + return matchCall.type2->v4; +} + +u32 sub_81D1894(match_call_t matchCall) +{ + return ARRAY_COUNT(gRematchTable); +} + +u32 sub_81D1898(match_call_t matchCall) +{ + return ARRAY_COUNT(gRematchTable); +} -- cgit v1.2.3 From e3b078d08fb7208065cb6bda96879fbb6e97c5db Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 2 Mar 2018 21:43:18 -0500 Subject: through sub_81D1914 --- src/match_call.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/match_call.c b/src/match_call.c index b754b1180..8712cbf3a 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -8,11 +8,11 @@ // Static type declarations -struct MatchCallSusbtruct0 { +typedef struct MatchCallSusbtruct0 { const u8 *text; u16 v4; u16 v6; -}; +} match_call_sub0_t; struct MatchCallStructCommon { u8 type; @@ -26,7 +26,7 @@ struct MatchCallStruct0 { u16 flag; const u8 *v4; const u8 *v8; - const struct MatchCallSusbtruct0 *vC; + const match_call_sub0_t *vC; }; struct MatchCallStruct1 { @@ -34,6 +34,8 @@ struct MatchCallStruct1 { u8 v1; u16 flag; u16 v4; + u8 fill6[10]; + const match_call_sub0_t *v10; }; struct MatchCallSubstruct2 { @@ -47,7 +49,7 @@ struct MatchCallStruct2 { u16 flag; u16 v4; const u8 *v8; - const u8 *vC; + const match_call_sub0_t *vC; const struct MatchCallSubstruct2 *v10; }; @@ -65,7 +67,15 @@ struct MatchCallStruct4 { u16 flag; const u8 *v4; const u8 *v8; - const struct MatchCallSusbtruct0 *vC; + const match_call_sub0_t *vC; +}; + +struct MatchCallStruct5 { + u8 type; + u8 v1; + u16 flag; + u8 fill4[12]; + const match_call_sub0_t *v10; }; typedef union { @@ -75,6 +85,7 @@ typedef union { struct MatchCallStruct2 *type2; struct MatchCallStruct3 *type3; struct MatchCallStruct4 *type4; + struct MatchCallStruct5 *type5; } match_call_t; struct UnkStruct_08625388 { @@ -91,6 +102,10 @@ struct UnkStruct_08625388 { // Static ROM declarations +void sub_81D1920(const match_call_sub0_t *, u8 *); +void sub_81D199C(const match_call_sub0_t *, u16, u8 *); +void sub_8197080(u8 *); + // .rodata extern const match_call_t gUnknown_086252A8[]; @@ -100,6 +115,7 @@ extern bool32 (*const gUnknown_08625324[])(const match_call_t); extern bool32 (*const gUnknown_08625338[])(const match_call_t); extern const struct UnkStruct_08625388 gUnknown_08625388[]; extern u32 (*const gUnknown_0862534C[])(const match_call_t); +extern void (*const gUnknown_08625360[])(const match_call_t, u8 *); // .text @@ -349,3 +365,43 @@ u32 sub_81D1898(match_call_t matchCall) { return ARRAY_COUNT(gRematchTable); } + +void sub_81D189C(u32 idx, u8 *dest) +{ + match_call_t matchCall; + u32 i; + + if (idx > 20) + return; + matchCall = gUnknown_086252A8[idx]; + i = sub_81D1574(matchCall); + gUnknown_08625360[i](matchCall, dest); +} + +void sub_81D18D0(match_call_t matchCall, u8 *dest) +{ + sub_81D1920(matchCall.type0->vC, dest); +} + +void sub_81D18DC(match_call_t matchCall, u8 *dest) +{ + if (matchCall.common->type != 5) + sub_81D1920(matchCall.type5->v10, dest); + else + sub_81D199C(matchCall.type1->v10, matchCall.type1->v4, dest); +} + +void sub_81D18FC(match_call_t matchCall, u8 *dest) +{ + sub_81D1920(matchCall.type2->vC, dest); +} + +void sub_81D1908(match_call_t matchCall, u8 *dest) +{ + sub_81D1920(matchCall.type4->vC, dest); +} + +void sub_81D1914(match_call_t matchCall, u8 *dest) +{ + sub_8197080(dest); +} -- cgit v1.2.3 From 19a89f2362f06130e765805e4564d6c8ddcfc688 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 3 Mar 2018 13:22:38 -0500 Subject: nonmatching sub_81D199C --- src/match_call.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 171 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/match_call.c b/src/match_call.c index 8712cbf3a..fd92d8a9a 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -3,6 +3,8 @@ #include "global.h" #include "battle_setup.h" #include "event_data.h" +#include "string_util.h" +#include "gym_leader_rematch.h" #define NELEMS(a) (s32)( sizeof (a) / sizeof (*(a)) ) @@ -10,8 +12,8 @@ typedef struct MatchCallSusbtruct0 { const u8 *text; - u16 v4; - u16 v6; + u16 flag; + u16 flag2; } match_call_sub0_t; struct MatchCallStructCommon { @@ -265,7 +267,7 @@ bool32 sub_81D178C(match_call_t matchCall) bool32 sub_81D1790(match_call_t matchCall) { - if (matchCall.type1->v4 > 0x48) + if (matchCall.type1->v4 >= REMATCH_ELITE_FOUR_ENTRIES) return FALSE; return gSaveBlock1Ptr->trainerRematches[matchCall.type1->v4] ? TRUE : FALSE; } @@ -335,7 +337,7 @@ u32 sub_81D1854(u32 idx) u32 i; if (idx > 20) - return ARRAY_COUNT(gRematchTable); + return REMATCH_TABLE_ENTRIES; matchCall = gUnknown_086252A8[idx]; i = sub_81D1574(matchCall); return gUnknown_0862534C[i](matchCall); @@ -343,7 +345,7 @@ u32 sub_81D1854(u32 idx) u32 sub_81D1888(match_call_t matchCall) { - return ARRAY_COUNT(gRematchTable); + return REMATCH_TABLE_ENTRIES; } u32 sub_81D188C(match_call_t matchCall) @@ -358,12 +360,12 @@ u32 sub_81D1890(match_call_t matchCall) u32 sub_81D1894(match_call_t matchCall) { - return ARRAY_COUNT(gRematchTable); + return REMATCH_TABLE_ENTRIES; } u32 sub_81D1898(match_call_t matchCall) { - return ARRAY_COUNT(gRematchTable); + return REMATCH_TABLE_ENTRIES; } void sub_81D189C(u32 idx, u8 *dest) @@ -405,3 +407,165 @@ void sub_81D1914(match_call_t matchCall, u8 *dest) { sub_8197080(dest); } + +void sub_81D1920(const match_call_sub0_t *sub0, u8 *dest) +{ + u32 i; + for (i = 0; sub0[i].text != NULL; i++) + ; + if (i) + i--; + while (i) + { + if (sub0[i].flag != 0xffff && FlagGet(sub0[i].flag) == TRUE) + break; + i--; + } + if (sub0[i].flag2 != 0xffff) + FlagSet(sub0[i].flag2); + StringExpandPlaceholders(dest, sub0[i].text); +} + +#ifdef NONMATCHING +// There's some weird upmerge going on that I cannot replicate at this time. +void sub_81D199C(const match_call_sub0_t *sub0, u16 idx, u8 *dest) +{ + u32 i; + for (i = 0; sub0[i].text != NULL; i++) + { + if (sub0[i].flag == 0xfffe) + break; + if (sub0[i].flag == 0xffff && !FlagGet(sub0[i].flag)) + break; + } + if (sub0[i].flag != 0xfffe) + { + if (i) + i--; + if (sub0[i].flag2 != 0xffff) + FlagSet(sub0[i].flag2); + StringExpandPlaceholders(dest, sub0[i].text); + } + else + { + if (!FlagGet(FLAG_SYS_GAME_CLEAR)) + ; + else if (gSaveBlock1Ptr->trainerRematches[idx]) + i += 2; + else if (CountBattledRematchTeams(idx) >= 2) + i += 3; + else + i++; + StringExpandPlaceholders(dest, sub0[i].text); + } +} +#else +ASM_DIRECT void sub_81D199C(const match_call_sub0_t *sub0, u16 idx, u8 *dest) +{ + asm_unified("\tpush {r4-r7,lr}\n" + "\tmov r7, r10\n" + "\tmov r6, r9\n" + "\tmov r5, r8\n" + "\tpush {r5-r7}\n" + "\tadds r6, r0, 0\n" + "\tmov r10, r2\n" + "\tlsls r1, 16\n" + "\tlsrs r7, r1, 16\n" + "\tmovs r5, 0\n" + "\tldr r0, [r6]\n" + "\tcmp r0, 0\n" + "\tbeq _081D19E6\n" + "\tldrh r0, [r6, 0x4]\n" + "\tldr r1, =0x0000fffe\n" + "\tcmp r0, r1\n" + "\tbeq _081D1A24\n" + "\tldr r0, =0x0000ffff\n" + "\tmov r9, r0\n" + "\tmov r8, r1\n" + "\tadds r4, r6, 0\n" + "_081D19C6:\n" + "\tldrh r0, [r4, 0x4]\n" + "\tcmp r0, r9\n" + "\tbeq _081D19D6\n" + "\tbl FlagGet\n" + "\tlsls r0, 24\n" + "\tcmp r0, 0\n" + "\tbeq _081D19E6\n" + "_081D19D6:\n" + "\tadds r4, 0x8\n" + "\tadds r5, 0x1\n" + "\tldr r0, [r4]\n" + "\tcmp r0, 0\n" + "\tbeq _081D19E6\n" + "\tldrh r0, [r4, 0x4]\n" + "\tcmp r0, r8\n" + "\tbne _081D19C6\n" + "_081D19E6:\n" + "\tlsls r0, r5, 3\n" + "\tadds r0, r6\n" + "\tldrh r1, [r0, 0x4]\n" + "\tldr r0, =0x0000fffe\n" + "\tcmp r1, r0\n" + "\tbeq _081D1A24\n" + "\tcmp r5, 0\n" + "\tbeq _081D19F8\n" + "\tsubs r5, 0x1\n" + "_081D19F8:\n" + "\tlsls r0, r5, 3\n" + "\tadds r4, r0, r6\n" + "\tldrh r1, [r4, 0x6]\n" + "\tldr r0, =0x0000ffff\n" + "\tcmp r1, r0\n" + "\tbeq _081D1A0A\n" + "\tadds r0, r1, 0\n" + "\tbl FlagSet\n" + "_081D1A0A:\n" + "\tldr r1, [r4]\n" + "\tmov r0, r10\n" + "\tbl StringExpandPlaceholders\n" + "\tb _081D1A5C\n" + "\t.pool\n" + "_081D1A1C:\n" + "\tadds r5, 0x2\n" + "\tb _081D1A50\n" + "_081D1A20:\n" + "\tadds r5, 0x3\n" + "\tb _081D1A50\n" + "_081D1A24:\n" + "\tldr r0, =0x00000864\n" + "\tbl FlagGet\n" + "\tlsls r0, 24\n" + "\tcmp r0, 0\n" + "\tbeq _081D1A50\n" + "\tldr r0, =gSaveBlock1Ptr\n" + "\tldr r0, [r0]\n" + "\tldr r1, =0x000009ca\n" + "\tadds r0, r1\n" + "\tadds r0, r7\n" + "\tldrb r0, [r0]\n" + "\tcmp r0, 0\n" + "\tbne _081D1A1C\n" + "\tadds r0, r7, 0\n" + "\tbl CountBattledRematchTeams\n" + "\tlsls r0, 16\n" + "\tlsrs r0, 16\n" + "\tcmp r0, 0x1\n" + "\tbhi _081D1A20\n" + "\tadds r5, 0x1\n" + "_081D1A50:\n" + "\tlsls r0, r5, 3\n" + "\tadds r0, r6\n" + "\tldr r1, [r0]\n" + "\tmov r0, r10\n" + "\tbl StringExpandPlaceholders\n" + "_081D1A5C:\n" + "\tpop {r3-r5}\n" + "\tmov r8, r3\n" + "\tmov r9, r4\n" + "\tmov r10, r5\n" + "\tpop {r4-r7}\n" + "\tpop {r0}\n" + "\tbx r0\n" + "\t.pool"); +} +#endif -- cgit v1.2.3 From 30c20bbab63f4d78e4500bcc9a0e056a491faaff Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 3 Mar 2018 13:41:28 -0500 Subject: through sub_81D1B00 --- src/match_call.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/match_call.c b/src/match_call.c index fd92d8a9a..85cc34307 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -36,7 +36,8 @@ struct MatchCallStruct1 { u8 v1; u16 flag; u16 v4; - u8 fill6[10]; + const u8 *v8; + const u8 *vC; const match_call_sub0_t *v10; }; @@ -76,7 +77,9 @@ struct MatchCallStruct5 { u8 type; u8 v1; u16 flag; - u8 fill4[12]; + u16 v4; + const u8 *v8; + const u8 *vC; const match_call_sub0_t *v10; }; @@ -107,6 +110,7 @@ struct UnkStruct_08625388 { void sub_81D1920(const match_call_sub0_t *, u8 *); void sub_81D199C(const match_call_sub0_t *, u16, u8 *); void sub_8197080(u8 *); +void sub_81D1B0C(u32, const u8 **, const u8 **); // .rodata @@ -118,6 +122,7 @@ extern bool32 (*const gUnknown_08625338[])(const match_call_t); extern const struct UnkStruct_08625388 gUnknown_08625388[]; extern u32 (*const gUnknown_0862534C[])(const match_call_t); extern void (*const gUnknown_08625360[])(const match_call_t, u8 *); +extern void (*const gUnknown_08625374[])(const match_call_t, const u8 **, const u8 **); // .text @@ -569,3 +574,49 @@ ASM_DIRECT void sub_81D199C(const match_call_sub0_t *sub0, u16 idx, u8 *dest) "\t.pool"); } #endif + +void sub_81D1A78(u32 idx, const u8 **a1, const u8 **a2) +{ + match_call_t matchCall; + u32 i; + + if (idx > 20) + return; + matchCall = gUnknown_086252A8[idx]; + i = sub_81D1574(matchCall); + gUnknown_08625374[i](matchCall, a1, a2); +} + +void sub_81D1AB0(match_call_t matchCall, const u8 **a1, const u8 **a2) +{ + *a1 = matchCall.type0->v4; + *a2 = matchCall.type0->v8; +} + +void sub_81D1ABC(match_call_t matchCall, const u8 **a1, const u8 **a2) +{ + match_call_t _matchCall = matchCall; + if (_matchCall.type1->vC == NULL) + sub_81D1B0C(_matchCall.type1->v4, a1, a2); + else + *a2 = _matchCall.type1->vC; + *a1 = _matchCall.type1->v8; +} + +void sub_81D1ADC(match_call_t matchCall, const u8 **a1, const u8 **a2) +{ + sub_81D1B0C(matchCall.type2->v4, a1, a2); + *a1 = matchCall.type2->v8; +} + +void sub_81D1AF4(match_call_t matchCall, const u8 **a1, const u8 **a2) +{ + *a1 = matchCall.type0->v4; + *a2 = matchCall.type0->v8; +} + +void sub_81D1B00(match_call_t matchCall, const u8 **a1, const u8 **a2) +{ + *a1 = matchCall.type0->v4; + *a2 = matchCall.type0->v8; +} -- cgit v1.2.3 From 44fedd861de0ea64728c93af29755c29906365ac Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 4 Mar 2018 15:36:01 -0500 Subject: nonmatching sub_81D1B40 --- src/match_call.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 111 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/match_call.c b/src/match_call.c index 85cc34307..f0bc920ee 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -4,10 +4,13 @@ #include "battle_setup.h" #include "event_data.h" #include "string_util.h" +#include "battle.h" #include "gym_leader_rematch.h" #define NELEMS(a) (s32)( sizeof (a) / sizeof (*(a)) ) +extern const u8 gTrainerClassNames[][13]; + // Static type declarations typedef struct MatchCallSusbtruct0 { @@ -97,10 +100,7 @@ struct UnkStruct_08625388 { u16 idx; u16 v2; u16 v4; - const u8 *v8; - const u8 *vC; - const u8 *v10; - const u8 *v14; + const u8 *v8[4]; }; // Static RAM declarations @@ -145,7 +145,7 @@ u32 sub_81D1574(const match_call_t matchCall) } } -s32 sub_81D15BC(s32 rematchIdx) +u32 sub_81D15BC(u32 rematchIdx) { return gRematchTable[rematchIdx].trainerIds[0]; } @@ -620,3 +620,109 @@ void sub_81D1B00(match_call_t matchCall, const u8 **a1, const u8 **a2) *a1 = matchCall.type0->v4; *a2 = matchCall.type0->v8; } + +void sub_81D1B0C(u32 idx, const u8 **a1, const u8 **a2) +{ + const struct Trainer *trainer = gTrainers + sub_81D15BC(idx); + *a1 = gTrainerClassNames[trainer->trainerClass]; + *a2 = trainer->trainerName; +} + +#ifdef NONMATCHING +const u8 *sub_81D1B40(u32 idx, u32 offset) +{ + u32 i; + + for (i = 0; i < 4; i++) + { + if (gUnknown_08625388[i].idx == idx) + { + for (; i + 1 < 4 && gUnknown_08625388[i + 1].idx == idx; i++) + { + if (!FlagGet(gUnknown_08625388[i + 1].v4)) + break; + } + return gUnknown_08625388[i].v8[offset]; + } + } + return NULL; +} +#else +ASM_DIRECT const u8 *sub_81D1B40(u32 idx, u32 offset) +{ + asm_unified("\tpush {r4-r7,lr}\n" + "\tmov r7, r9\n" + "\tmov r6, r8\n" + "\tpush {r6,r7}\n" + "\tadds r6, r0, 0\n" + "\tmovs r5, 0\n" + "\tldr r2, =gUnknown_08625388\n" + "\tmovs r0, 0x8\n" + "\tadds r0, r2\n" + "\tmov r9, r0\n" + "_081D1B54:\n" + "\tlsls r0, r5, 1\n" + "\tadds r0, r5\n" + "\tlsls r0, 3\n" + "\tadds r0, r2\n" + "\tldrh r0, [r0]\n" + "\tcmp r0, r6\n" + "\tbne _081D1BBC\n" + "\tadds r4, r5, 0x1\n" + "\tlsls r1, 2\n" + "\tmov r8, r1\n" + "\tcmp r4, 0x3\n" + "\tbhi _081D1BA8\n" + "\tlsls r0, r4, 1\n" + "\tadds r0, r4\n" + "\tlsls r0, 3\n" + "\tadds r0, r2\n" + "\tldrh r0, [r0]\n" + "\tcmp r0, r6\n" + "\tbne _081D1BA8\n" + "\tldr r7, =gUnknown_08625388\n" + "_081D1B7C:\n" + "\tlsls r0, r4, 1\n" + "\tadds r0, r4\n" + "\tlsls r0, 3\n" + "\tadds r1, r7, 0x4\n" + "\tadds r0, r1\n" + "\tldrh r0, [r0]\n" + "\tbl FlagGet\n" + "\tlsls r0, 24\n" + "\tcmp r0, 0\n" + "\tbeq _081D1BA8\n" + "\tadds r5, r4, 0\n" + "\tadds r4, r5, 0x1\n" + "\tcmp r4, 0x3\n" + "\tbhi _081D1BA8\n" + "\tlsls r0, r4, 1\n" + "\tadds r0, r4\n" + "\tlsls r0, 3\n" + "\tadds r0, r7\n" + "\tldrh r0, [r0]\n" + "\tcmp r0, r6\n" + "\tbeq _081D1B7C\n" + "_081D1BA8:\n" + "\tlsls r0, r5, 1\n" + "\tadds r0, r5\n" + "\tlsls r0, 3\n" + "\tadd r0, r8\n" + "\tadd r0, r9\n" + "\tldr r0, [r0]\n" + "\tb _081D1BC4\n" + "\t.pool\n" + "_081D1BBC:\n" + "\tadds r5, 0x1\n" + "\tcmp r5, 0x3\n" + "\tbls _081D1B54\n" + "\tmovs r0, 0\n" + "_081D1BC4:\n" + "\tpop {r3,r4}\n" + "\tmov r8, r3\n" + "\tmov r9, r4\n" + "\tpop {r4-r7}\n" + "\tpop {r1}\n" + "\tbx r1"); +} +#endif -- cgit v1.2.3 From 734375f10176f74470db85e71d1a2e839865e0bf Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 4 Mar 2018 15:47:54 -0500 Subject: Remaining functions in match_call --- src/match_call.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'src') diff --git a/src/match_call.c b/src/match_call.c index f0bc920ee..431379017 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -726,3 +726,35 @@ ASM_DIRECT const u8 *sub_81D1B40(u32 idx, u32 offset) "\tbx r1"); } #endif + +s32 sub_81D1BD0(u32 idx) +{ + u32 i; + + for (i = 0; i < 4; i++) + { + if (gUnknown_08625388[i].idx == idx) + return gUnknown_08625388[i].v2; + } + return -1; +} + +bool32 sub_81D1BF8(u32 idx) +{ + s32 i; + + for (i = 0; i < 21; i++) + { + u32 r0 = sub_81D1854(i); + if (r0 != REMATCH_TABLE_ENTRIES && r0 == idx) + return TRUE; + } + return FALSE; +} + +void SetMatchCallRegisteredFlag(void) +{ + s32 r0 = sub_81D15CC(gSpecialVar_0x8004); + if (r0 >= 0) + FlagSet(FLAG_MATCH_CALL_REGISTERED + r0); +} -- cgit v1.2.3 From 9b25d02369bca189ac81761e4f14919f11947f7f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 4 Mar 2018 16:14:56 -0500 Subject: Match call data, 1 --- src/match_call.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) (limited to 'src') diff --git a/src/match_call.c b/src/match_call.c index 431379017..b13e7e949 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -86,6 +86,12 @@ struct MatchCallStruct5 { const match_call_sub0_t *v10; }; +#define MATCHCALLDEF(name, type_, ...) \ +const struct MatchCallStruct##type_ name = { \ + .type = type_, \ + __VA_ARGS__ \ +}; + typedef union { struct MatchCallStructCommon *common; struct MatchCallStruct0 *type0; @@ -112,8 +118,89 @@ void sub_81D199C(const match_call_sub0_t *, u16, u8 *); void sub_8197080(u8 *); void sub_81D1B0C(u32, const u8 **, const u8 **); +extern const u8 gText_MrStone_Pokenav_2B60C0[]; +extern const u8 gText_MrStone_Pokenav_2B61E6[]; +extern const u8 gText_MrStone_Pokenav_2B6302[]; +extern const u8 gText_MrStone_Pokenav_2B63A0[]; +extern const u8 gText_MrStone_Pokenav_2B64A2[]; +extern const u8 gText_MrStone_Pokenav_2B6526[]; +extern const u8 gText_MrStone_Pokenav_2B65BB[]; +extern const u8 gText_MrStone_Pokenav_2B6664[]; +extern const u8 gText_MrStone_Pokenav_2B66B1[]; +extern const u8 gText_MrStone_Pokenav_2B6703[]; +extern const u8 gText_MrStone_Pokenav_2B67ED[]; + +extern const u8 gUnknown_085EFAEF[]; +extern const u8 gUnknown_085EFAFA[]; + +extern const u8 gText_Norman_Pokenav_2B5719[]; +extern const u8 gText_Norman_Pokenav_2B5795[]; +extern const u8 gText_Norman_Pokenav_2B584D[]; +extern const u8 gText_Norman_Pokenav_2B58E3[]; +extern const u8 gText_Norman_Pokenav_2B5979[]; +extern const u8 gText_Norman_Pokenav_2B5A07[]; +extern const u8 gText_Norman_Pokenav_2B5A69[]; +extern const u8 gText_Norman_Pokenav_2B5ACF[]; +extern const u8 gText_Norman_Pokenav_2B5B5E[]; + +extern const u8 gUnknown_085EFB25[]; +extern const u8 gUnknown_085EFB47[]; + +extern const u8 gUnknown_085EFBC9[]; +extern const u8 gUnknown_085E8270[]; + +extern const u8 gText_Mom_Pokenav_2B227B[]; +extern const u8 gText_Mom_Pokenav_2B2310[]; +extern const u8 gText_Mom_Pokenav_2B23F3[]; + +extern const u8 gUnknown_085EFB32[]; +extern const u8 gUnknown_085EFB4B[]; + // .rodata +const match_call_sub0_t gUnknown_08624D1C[] = { + { gText_MrStone_Pokenav_2B60C0, 0xFFFF, FLAG_0x158 }, + { gText_MrStone_Pokenav_2B61E6, FLAG_0x158, 0xFFFF }, + { gText_MrStone_Pokenav_2B6302, FLAG_0x0BD, 0xFFFF }, + { gText_MrStone_Pokenav_2B63A0, FLAG_0x110, 0xFFFF }, + { gText_MrStone_Pokenav_2B64A2, FLAG_0x06A, 0xFFFF }, + { gText_MrStone_Pokenav_2B6526, FLAG_0x4F4, 0xFFFF }, + { gText_MrStone_Pokenav_2B65BB, FLAG_0x097, 0xFFFF }, + { gText_MrStone_Pokenav_2B6664, FLAG_0x06F, 0xFFFF }, + { gText_MrStone_Pokenav_2B66B1, FLAG_0x070, 0xFFFF }, + { gText_MrStone_Pokenav_2B6703, FLAG_0x4F7, 0xFFFF }, + { gText_MrStone_Pokenav_2B67ED, FLAG_SYS_GAME_CLEAR, 0xFFFF }, + { NULL, 0xFFFF, 0xFFFF } +}; + +MATCHCALLDEF(gUnknown_08624D7C, 0, 10, 0xffff, gUnknown_085EFAEF, gUnknown_085EFAFA, gUnknown_08624D1C); + +const match_call_sub0_t gUnknown_08624D8C[] = { + { gText_Norman_Pokenav_2B5719, FLAG_0x132, 0xFFFF }, + { gText_Norman_Pokenav_2B5795, FLAG_0x4F1, 0xFFFF }, + { gText_Norman_Pokenav_2B584D, FLAG_0x4F3, 0xFFFF }, + { gText_Norman_Pokenav_2B58E3, FLAG_0x4F4, 0xFFFF }, + { gText_Norman_Pokenav_2B5979, FLAG_0x0D4, 0xFFFF }, + { gText_Norman_Pokenav_2B5A07, 0xFFFE, 0xFFFF }, + { gText_Norman_Pokenav_2B5A69, FLAG_SYS_GAME_CLEAR, 0xFFFF }, + { gText_Norman_Pokenav_2B5ACF, FLAG_SYS_GAME_CLEAR, 0xFFFF }, + { gText_Norman_Pokenav_2B5B5E, FLAG_SYS_GAME_CLEAR, 0xFFFF }, + { NULL, 0xFFFF, 0xFFFF } +}; + +MATCHCALLDEF(gUnknown_08624DDC, 5, 7, FLAG_0x132, 0x45, gUnknown_085EFB25, gUnknown_085EFB47, gUnknown_08624D8C); + +MATCHCALLDEF(gUnknown_08624DF0, 3, 0, FLAG_0x119, gUnknown_085EFBC9, gUnknown_085E8270) + +const match_call_sub0_t gUnknown_08624DFC[] = { + { gText_Mom_Pokenav_2B227B, 0xffff, 0xffff }, + { gText_Mom_Pokenav_2B2310, FLAG_0x4F4, 0xffff }, + { gText_Mom_Pokenav_2B23F3, FLAG_SYS_GAME_CLEAR, 0xffff }, + { NULL, 0xffff, 0xffff } +}; + +MATCHCALLDEF(gUnknown_08624E1C, 0, 0, FLAG_0x0D8, gUnknown_085EFB32, gUnknown_085EFB4B, gUnknown_08624DFC); + extern const match_call_t gUnknown_086252A8[]; extern bool32 (*const gUnknown_086252FC[])(const match_call_t); extern u8 (*const gUnknown_08625310[])(const match_call_t); -- cgit v1.2.3 From 1c67840652f33d034686e5b76a800917b12ec86f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 4 Mar 2018 16:44:50 -0500 Subject: Match call data, 2 --- src/match_call.c | 337 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 329 insertions(+), 8 deletions(-) (limited to 'src') 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); -- cgit v1.2.3 From 7b9930a0a2fa040420e6b6f26b85694e9c1abe5a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 4 Mar 2018 16:58:51 -0500 Subject: Remaining data in match_call --- src/match_call.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 119 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/match_call.c b/src/match_call.c index 510192781..4620a21d8 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -113,6 +113,48 @@ struct UnkStruct_08625388 { // Static ROM declarations +bool32 sub_81D1628(match_call_t); +bool32 sub_81D164C(match_call_t); +bool32 sub_81D1670(match_call_t); +bool32 sub_81D1694(match_call_t); +bool32 sub_81D16CC(match_call_t); + +u8 sub_81D1714(match_call_t); +u8 sub_81D1718(match_call_t); +u8 sub_81D171C(match_call_t); +u8 sub_81D1750(match_call_t); +u8 sub_81D1754(match_call_t); + +bool32 sub_81D178C(match_call_t); +bool32 sub_81D1790(match_call_t); +bool32 sub_81D17C0(match_call_t); +bool32 sub_81D17E0(match_call_t); +bool32 sub_81D17E4(match_call_t); + +bool32 sub_81D1840(match_call_t); +bool32 sub_81D1844(match_call_t); +bool32 sub_81D1848(match_call_t); +bool32 sub_81D184C(match_call_t); +bool32 sub_81D1850(match_call_t); + +u32 sub_81D1888(match_call_t); +u32 sub_81D188C(match_call_t); +u32 sub_81D1890(match_call_t); +u32 sub_81D1894(match_call_t); +u32 sub_81D1898(match_call_t); + +void sub_81D18D0(match_call_t, u8 *); +void sub_81D18DC(match_call_t, u8 *); +void sub_81D18FC(match_call_t, u8 *); +void sub_81D1908(match_call_t, u8 *); +void sub_81D1914(match_call_t, u8 *); + +void sub_81D1AB0(match_call_t, const u8 **, const u8 **); +void sub_81D1ABC(match_call_t, const u8 **, const u8 **); +void sub_81D1ADC(match_call_t, const u8 **, const u8 **); +void sub_81D1AF4(match_call_t, const u8 **, const u8 **); +void sub_81D1B00(match_call_t, const u8 **, const u8 **); + void sub_81D1920(const match_call_sub0_t *, u8 *); void sub_81D199C(const match_call_sub0_t *, u16, u8 *); void sub_8197080(u8 *); @@ -259,7 +301,20 @@ 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[]; - +extern const u8 gUnknown_085ED453[]; +extern const u8 gUnknown_085ED46B[]; +extern const u8 gUnknown_085ED483[]; +extern const u8 gUnknown_085ED49D[]; +extern const u8 gUnknown_085ED4B3[]; +extern const u8 gUnknown_085ED4CE[]; +extern const u8 gUnknown_085ED4E3[]; +extern const u8 gUnknown_085ED4FA[]; +extern const u8 gUnknown_085ED516[]; +extern const u8 gUnknown_085ED52F[]; +extern const u8 gUnknown_085ED547[]; +extern const u8 gUnknown_085ED563[]; +extern const u8 gUnknown_085ED579[]; +extern const u8 gUnknown_085ED58F[]; // .rodata const match_call_sub0_t gUnknown_08624D1C[] = { @@ -523,18 +578,72 @@ const match_call_t gUnknown_086252A8[] = { {.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); -extern bool32 (*const gUnknown_08625338[])(const match_call_t); -extern const struct UnkStruct_08625388 gUnknown_08625388[]; -extern u32 (*const gUnknown_0862534C[])(const match_call_t); -extern void (*const gUnknown_08625360[])(const match_call_t, u8 *); -extern void (*const gUnknown_08625374[])(const match_call_t, const u8 **, const u8 **); +bool32 (*const gUnknown_086252FC[])(match_call_t) = { + sub_81D1628, + sub_81D164C, + sub_81D1670, + sub_81D1694, + sub_81D16CC +}; + +u8 (*const gUnknown_08625310[])(match_call_t) = { + sub_81D1714, + sub_81D1718, + sub_81D171C, + sub_81D1750, + sub_81D1754 +}; + +bool32 (*const gUnknown_08625324[])(match_call_t) = { + sub_81D178C, + sub_81D1790, + sub_81D17C0, + sub_81D17E0, + sub_81D17E4 +}; + +bool32 (*const gUnknown_08625338[])(match_call_t) = { + sub_81D1840, + sub_81D1844, + sub_81D1848, + sub_81D184C, + sub_81D1850 +}; + +u32 (*const gUnknown_0862534C[])(match_call_t) = { + sub_81D1888, + sub_81D188C, + sub_81D1890, + sub_81D1894, + sub_81D1898 +}; + +void (*const gUnknown_08625360[])(match_call_t, u8 *) = { + sub_81D18D0, + sub_81D18DC, + sub_81D18FC, + sub_81D1908, + sub_81D1914 +}; + +void (*const gUnknown_08625374[])(match_call_t, const u8 **, const u8 **) = { + sub_81D1AB0, + sub_81D1ABC, + sub_81D1ADC, + sub_81D1AF4, + sub_81D1B00 +}; + +const struct UnkStruct_08625388 gUnknown_08625388[] = { + { 7, 0x4B, 0xffff, { gUnknown_085ED453, gUnknown_085ED46B, gUnknown_085ED483, gUnknown_085ED49D } }, + { 7, 0x4B, 0x4F6, { gUnknown_085ED453, gUnknown_085ED46B, gUnknown_085ED4B3, gUnknown_085ED4CE } }, + { 2, 0x3c, 0xffff, { gUnknown_085ED4E3, gUnknown_085ED4FA, gUnknown_085ED516, gUnknown_085ED52F } }, + { 3, 0x3f, 0xffff, { gUnknown_085ED547, gUnknown_085ED563, gUnknown_085ED579, gUnknown_085ED58F } } +}; // .text -u32 sub_81D1574(const match_call_t matchCall) +u32 sub_81D1574(match_call_t matchCall) { switch (matchCall.common->type) { -- cgit v1.2.3 From 565b05854575258a1a0834c16470d2f5a5d9399b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 4 Mar 2018 17:08:10 -0500 Subject: Make visual alignment of structs more consistent --- src/match_call.c | 210 +++++++++++++++++++++++++++---------------------------- 1 file changed, 105 insertions(+), 105 deletions(-) (limited to 'src') diff --git a/src/match_call.c b/src/match_call.c index 4620a21d8..d336df3dc 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -374,56 +374,56 @@ const match_call_sub0_t gUnknown_08624E2C[] = { 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 } + { gText_May_Pokenav_2B3AB3, 0xFFFF, 0xFFFF }, + { gText_May_Pokenav_2B3B3F, FLAG_0x4F1, 0xFFFF }, + { gText_May_Pokenav_2B3C13, FLAG_0x095, 0xFFFF }, + { gText_May_Pokenav_2B3CF3, FLAG_0x324, 0xFFFF }, + { gText_May_Pokenav_2B3D4B, FLAG_0x06A, 0xFFFF }, + { gText_May_Pokenav_2B3DD1, FLAG_0x4F3, 0xFFFF }, + { gText_May_Pokenav_2B3E69, FLAG_0x4F4, 0xFFFF }, + { gText_May_Pokenav_2B3ECD, FLAG_0x097, 0xFFFF }, + { gText_May_Pokenav_2B3F2B, FLAG_0x0D4, 0xFFFF }, + { gText_May_Pokenav_2B3FFB, FLAG_0x06F, 0xFFFF }, + { gText_May_Pokenav_2B402B, FLAG_0x061, 0xFFFF }, + { gText_May_Pokenav_2B414B, FLAG_0x070, 0xFFFF }, + { gText_May_Pokenav_2B4228, FLAG_0x081, 0xFFFF }, + { gText_May_Pokenav_2B42E0, FLAG_0x4F7, 0xFFFF }, + { gText_May_Pokenav_2B4350, FLAG_SYS_GAME_CLEAR, 0xFFFF }, + { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_08624EFC, 4, 0, 0x0FD, gUnknown_085EFB18, gExpandedPlaceholder_May, gUnknown_08624E7C); +MATCHCALLDEF(gUnknown_08624EFC, 4, 0, FLAG_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 } + { gText_Brendan_Pokenav_2B43EF, 0xFFFF, 0xFFFF }, + { gText_Brendan_Pokenav_2B4486, FLAG_0x4F1, 0xFFFF }, + { gText_Brendan_Pokenav_2B4560, FLAG_0x095, 0xFFFF }, + { gText_Brendan_Pokenav_2B463F, FLAG_0x324, 0xFFFF }, + { gText_Brendan_Pokenav_2B46B7, FLAG_0x06A, 0xFFFF }, + { gText_Brendan_Pokenav_2B4761, FLAG_0x4F3, 0xFFFF }, + { gText_Brendan_Pokenav_2B47F4, FLAG_0x4F4, 0xFFFF }, + { gText_Brendan_Pokenav_2B4882, FLAG_0x097, 0xFFFF }, + { gText_Brendan_Pokenav_2B4909, FLAG_0x0D4, 0xFFFF }, + { gText_Brendan_Pokenav_2B49C4, FLAG_0x06F, 0xFFFF }, + { gText_Brendan_Pokenav_2B4A44, FLAG_0x061, 0xFFFF }, + { gText_Brendan_Pokenav_2B4B28, FLAG_0x070, 0xFFFF }, + { gText_Brendan_Pokenav_2B4C15, FLAG_0x081, 0xFFFF }, + { gText_Brendan_Pokenav_2B4CD8, FLAG_0x4F7, 0xFFFF }, + { gText_Brendan_Pokenav_2B4D46, FLAG_SYS_GAME_CLEAR, 0xFFFF }, + { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_08624F8C, 4, 1, 0x0FD, gUnknown_085EFB18, gExpandedPlaceholder_Brendan, gUnknown_08624F0C); +MATCHCALLDEF(gUnknown_08624F8C, 4, 1, FLAG_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 } + { gText_Wally_Pokenav_2B4DE2, 0xFFFF, 0xFFFF }, + { gText_Wally_Pokenav_2B4E57, FLAG_0x0C7, 0xFFFF }, + { gText_Wally_Pokenav_2B4EA5, FLAG_0x4F3, 0xFFFF }, + { gText_Wally_Pokenav_2B4F41, FLAG_0x097, 0xFFFF }, + { gText_Wally_Pokenav_2B4FF3, FLAG_0x06F, 0xFFFF }, + { gText_Wally_Pokenav_2B50B1, FLAG_0x081, 0xFFFF }, + { gText_Wally_Pokenav_2B5100, FLAG_0x07E, 0xFFFF }, + { NULL, 0xFFFF, 0xFFFF } }; const struct MatchCallSubstruct2 gUnknown_08624FDC[] = { @@ -433,126 +433,126 @@ const struct MatchCallSubstruct2 gUnknown_08624FDC[] = { { 0xFFFF, 0xD5 } }; -MATCHCALLDEF(gUnknown_08624FEC, 2, 0, 0x0D6, 0x40, gUnknown_085EFB3E, gUnknown_08624F9C, gUnknown_08624FDC); +MATCHCALLDEF(gUnknown_08624FEC, 2, 0, FLAG_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 } + { gText_Scott_Pokenav_2B5184, 0xFFFF, 0xFFFF }, + { gText_Scott_Pokenav_2B5275, FLAG_0x08B, 0xFFFF }, + { gText_Scott_Pokenav_2B5323, FLAG_0x097, 0xFFFF }, + { gText_Scott_Pokenav_2B53DB, FLAG_0x0D4, 0xFFFF }, + { gText_Scott_Pokenav_2B54A5, FLAG_0x070, 0xFFFF }, + { gText_Scott_Pokenav_2B5541, FLAG_0x4F7, 0xFFFF }, + { gText_Scott_Pokenav_2B56CA, FLAG_SYS_GAME_CLEAR, 0xFFFF }, + { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_08625040, 0, 0xD5, 0x0D7, gUnknown_085EFB4F, gUnknown_085EFB5C, gUnknown_08624500); +MATCHCALLDEF(gUnknown_08625040, 0, 0xD5, FLAG_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 } + { gText_Roxanne_Pokenav_2B2456, 0xFFFE, 0xFFFF }, + { gText_Roxanne_Pokenav_2B250E, 0xFFFF, 0xFFFF }, + { gText_Roxanne_Pokenav_2B25C1, 0xFFFF, 0xFFFF }, + { gText_Roxanne_Pokenav_2B2607, FLAG_SYS_GAME_CLEAR, 0xFFFF }, + { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_08625078, 5, 10, 0x1D3, 0x41, gUnknown_085EFB62, NULL, gUnknown_08625050); +MATCHCALLDEF(gUnknown_08625078, 5, 10, FLAG_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 } + { gText_Brawly_Pokenav_2B2659, 0xFFFE, 0xFFFF }, + { gText_Brawly_Pokenav_2B275D, 0xFFFF, 0xFFFF }, + { gText_Brawly_Pokenav_2B286F, 0xFFFF, 0xFFFF }, + { gText_Brawly_Pokenav_2B28D1, FLAG_SYS_GAME_CLEAR, 0xFFFF }, + { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_086250B4, 5, 2, 0x1D4, 0x42, gUnknown_085EFB6F, NULL, gUnknown_0862508C); +MATCHCALLDEF(gUnknown_086250B4, 5, 2, FLAG_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 } + { gText_Wattson_Pokenav_2B2912, 0xFFFE, 0xFFFF }, + { gText_Wattson_Pokenav_2B29CA, 0xFFFF, 0xFFFF }, + { gText_Wattson_Pokenav_2B2AB6, 0xFFFF, 0xFFFF }, + { gText_Wattson_Pokenav_2B2B01, FLAG_SYS_GAME_CLEAR, 0xFFFF }, + { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_086250F0, 5, 9, 0x1D5, 0x43, gUnknown_085EFB7B, NULL, gUnknown_086250C8); +MATCHCALLDEF(gUnknown_086250F0, 5, 9, FLAG_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 } + { gText_Flannery_Pokenav_2B2B4D, 0xFFFE, 0xFFFF }, + { gText_Flannery_Pokenav_2B2C0E, 0xFFFF, 0xFFFF }, + { gText_Flannery_Pokenav_2B2CF1, 0xFFFF, 0xFFFF }, + { gText_Flannery_Pokenav_2B2D54, FLAG_SYS_GAME_CLEAR, 0xFFFF }, + { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_0862512C, 5, 3, 0x1D6, 0x44, gUnknown_085EFB87, NULL, gUnknown_08625104); +MATCHCALLDEF(gUnknown_0862512C, 5, 3, FLAG_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 } + { gText_Winona_Pokenav_2B2DA4, 0xFFFE, 0xFFFF }, + { gText_Winona_Pokenav_2B2E2B, 0xFFFF, 0xFFFF }, + { gText_Winona_Pokenav_2B2EC2, 0xFFFF, 0xFFFF }, + { gText_Winona_Pokenav_2B2F16, FLAG_SYS_GAME_CLEAR, 0xFFFF }, + { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_08625168, 5, 11, 0x1D7, 0x46, gUnknown_085EFB94, NULL, gUnknown_08625140); +MATCHCALLDEF(gUnknown_08625168, 5, 11, FLAG_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 } + { gText_TateLiza_Pokenav_2B2F97, 0xFFFE, 0xFFFF }, + { gText_TateLiza_Pokenav_2B306E, 0xFFFF, 0xFFFF }, + { gText_TateLiza_Pokenav_2B3158, 0xFFFF, 0xFFFF }, + { gText_TateLiza_Pokenav_2B31CD, FLAG_SYS_GAME_CLEAR, 0xFFFF }, + { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_086251A4, 5, 13, 0x1D8, 0x47, gUnknown_085EFB9E, NULL, gUnknown_0862517C); +MATCHCALLDEF(gUnknown_086251A4, 5, 13, FLAG_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 } + { gText_Juan_Pokenav_2B3249, 0xFFFE, 0xFFFF }, + { gText_Juan_Pokenav_2B32EC, 0xFFFF, 0xFFFF }, + { gText_Juan_Pokenav_2B33AA, 0xFFFF, 0xFFFF }, + { gText_Juan_Pokenav_2B341E, FLAG_SYS_GAME_CLEAR, 0xFFFF }, + { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_086251E0, 5, 14, 0x1D9, 0x48, gUnknown_085EFBA9, NULL, gUnknown_086251B8); +MATCHCALLDEF(gUnknown_086251E0, 5, 14, FLAG_0x1D9, 0x48, gUnknown_085EFBA9, NULL, gUnknown_086251B8); const match_call_sub0_t gUnknown_086251F4[] = { { gText_Sidney_Pokenav_2B34CC, 0xFFFF, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_08625204, 5, 15, 0x1A5, 0x49, gUnknown_085EFBB5, NULL, gUnknown_086251F4); +MATCHCALLDEF(gUnknown_08625204, 5, 15, FLAG_0x1A5, 0x49, gUnknown_085EFBB5, NULL, gUnknown_086251F4); const match_call_sub0_t gUnknown_08625218[] = { { gText_Phoebe_Pokenav_2B3561, 0xFFFF, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_08625228, 5, 15, 0x1A6, 0x4A, gUnknown_085EFBB5, NULL, gUnknown_08625218); +MATCHCALLDEF(gUnknown_08625228, 5, 15, FLAG_0x1A6, 0x4A, gUnknown_085EFBB5, NULL, gUnknown_08625218); const match_call_sub0_t gUnknown_0862523C[] = { { gText_Glacia_Pokenav_2B35E4, 0xFFFF, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_0862524C, 5, 15, 0x1A7, 0x4B, gUnknown_085EFBB5, NULL, gUnknown_0862523C); +MATCHCALLDEF(gUnknown_0862524C, 5, 15, FLAG_0x1A7, 0x4B, gUnknown_085EFBB5, NULL, gUnknown_0862523C); const match_call_sub0_t gUnknown_08625260[] = { { gText_Drake_Pokenav_2B368B, 0xFFFF, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_08625270, 5, 15, 0x1A8, 0x4C, gUnknown_085EFBB5, NULL, gUnknown_08625260); +MATCHCALLDEF(gUnknown_08625270, 5, 15, FLAG_0x1A8, 0x4C, gUnknown_085EFBB5, NULL, gUnknown_08625260); const match_call_sub0_t gUnknown_08625284[] = { { gText_Wallace_Pokenav_2B3790, 0xFFFF, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_08625294, 5, 15, 0x1A9, 0x4D, gUnknown_085EFBC0, NULL, gUnknown_08625284); +MATCHCALLDEF(gUnknown_08625294, 5, 15, FLAG_0x1A9, 0x4D, gUnknown_085EFBC0, NULL, gUnknown_08625284); const match_call_t gUnknown_086252A8[] = { {.type0 = &gUnknown_08624D7C}, @@ -636,7 +636,7 @@ void (*const gUnknown_08625374[])(match_call_t, const u8 **, const u8 **) = { const struct UnkStruct_08625388 gUnknown_08625388[] = { { 7, 0x4B, 0xffff, { gUnknown_085ED453, gUnknown_085ED46B, gUnknown_085ED483, gUnknown_085ED49D } }, - { 7, 0x4B, 0x4F6, { gUnknown_085ED453, gUnknown_085ED46B, gUnknown_085ED4B3, gUnknown_085ED4CE } }, + { 7, 0x4B, FLAG_0x4F6, { gUnknown_085ED453, gUnknown_085ED46B, gUnknown_085ED4B3, gUnknown_085ED4CE } }, { 2, 0x3c, 0xffff, { gUnknown_085ED4E3, gUnknown_085ED4FA, gUnknown_085ED516, gUnknown_085ED52F } }, { 3, 0x3f, 0xffff, { gUnknown_085ED547, gUnknown_085ED563, gUnknown_085ED579, gUnknown_085ED58F } } }; -- cgit v1.2.3 From b3fb7cfca57a4cb5cb1cef9ec8f2016f49c64af9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 4 Mar 2018 17:30:59 -0500 Subject: Rename some struct fields --- src/match_call.c | 132 +++++++++++++++++++++++++++---------------------------- 1 file changed, 66 insertions(+), 66 deletions(-) (limited to 'src') diff --git a/src/match_call.c b/src/match_call.c index d336df3dc..e1f9bffd9 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -29,19 +29,19 @@ struct MatchCallStruct0 { u8 type; u8 v1; u16 flag; - const u8 *v4; - const u8 *v8; - const match_call_sub0_t *vC; + const u8 *desc; + const u8 *name; + const match_call_sub0_t *textData; }; struct MatchCallStruct1 { u8 type; u8 v1; u16 flag; - u16 v4; - const u8 *v8; - const u8 *vC; - const match_call_sub0_t *v10; + u16 rematchTableIdx; + const u8 *desc; + const u8 *name; + const match_call_sub0_t *textData; }; struct MatchCallSubstruct2 { @@ -53,9 +53,9 @@ struct MatchCallStruct2 { u8 type; u8 v1; u16 flag; - u16 v4; - const u8 *v8; - const match_call_sub0_t *vC; + u16 rematchTableIdx; + const u8 *desc; + const match_call_sub0_t *textData; const struct MatchCallSubstruct2 *v10; }; @@ -63,17 +63,17 @@ struct MatchCallStruct3 { u8 type; u8 v1; u16 flag; - const u8 *v4; - const u8 *v8; + const u8 *desc; + const u8 *name; }; struct MatchCallStruct4 { u8 type; u8 v1; u16 flag; - const u8 *v4; - const u8 *v8; - const match_call_sub0_t *vC; + const u8 *desc; + const u8 *name; + const match_call_sub0_t *textData; }; struct MatchCallStruct5 { @@ -81,13 +81,13 @@ struct MatchCallStruct5 { u8 v1; u16 flag; u16 v4; - const u8 *v8; - const u8 *vC; - const match_call_sub0_t *v10; + const u8 *desc; + const u8 *name; + const match_call_sub0_t *textData; }; #define MATCHCALLDEF(name, type_, ...) \ -const struct MatchCallStruct##type_ name = { \ +static const struct MatchCallStruct##type_ name = { \ .type = type_, \ __VA_ARGS__ \ }; @@ -317,7 +317,7 @@ extern const u8 gUnknown_085ED579[]; extern const u8 gUnknown_085ED58F[]; // .rodata -const match_call_sub0_t gUnknown_08624D1C[] = { +static const match_call_sub0_t MrStoneTextScripts[] = { { gText_MrStone_Pokenav_2B60C0, 0xFFFF, FLAG_0x158 }, { gText_MrStone_Pokenav_2B61E6, FLAG_0x158, 0xFFFF }, { gText_MrStone_Pokenav_2B6302, FLAG_0x0BD, 0xFFFF }, @@ -332,9 +332,9 @@ const match_call_sub0_t gUnknown_08624D1C[] = { { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_08624D7C, 0, 10, 0xffff, gUnknown_085EFAEF, gUnknown_085EFAFA, gUnknown_08624D1C); +MATCHCALLDEF(MrStoneMatchCallHeader, 0, 10, 0xffff, gUnknown_085EFAEF, gUnknown_085EFAFA, MrStoneTextScripts); -const match_call_sub0_t gUnknown_08624D8C[] = { +static const match_call_sub0_t NormanTextScripts[] = { { gText_Norman_Pokenav_2B5719, FLAG_0x132, 0xFFFF }, { gText_Norman_Pokenav_2B5795, FLAG_0x4F1, 0xFFFF }, { gText_Norman_Pokenav_2B584D, FLAG_0x4F3, 0xFFFF }, @@ -347,11 +347,11 @@ const match_call_sub0_t gUnknown_08624D8C[] = { { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_08624DDC, 5, 7, FLAG_0x132, 0x45, gUnknown_085EFB25, gUnknown_085EFB47, gUnknown_08624D8C); +MATCHCALLDEF(NormanMatchCallHeader, 5, 7, FLAG_0x132, 0x45, gUnknown_085EFB25, gUnknown_085EFB47, NormanTextScripts); -MATCHCALLDEF(gUnknown_08624DF0, 3, 0, FLAG_0x119, gUnknown_085EFBC9, gUnknown_085E8270) +MATCHCALLDEF(ProfBirchMatchCallHeader, 3, 0, FLAG_0x119, gUnknown_085EFBC9, gUnknown_085E8270) -const match_call_sub0_t gUnknown_08624DFC[] = { +static const match_call_sub0_t gUnknown_08624DFC[] = { { gText_Mom_Pokenav_2B227B, 0xffff, 0xffff }, { gText_Mom_Pokenav_2B2310, FLAG_0x4F4, 0xffff }, { gText_Mom_Pokenav_2B23F3, FLAG_SYS_GAME_CLEAR, 0xffff }, @@ -427,13 +427,13 @@ const match_call_sub0_t gUnknown_08624F9C[] = { }; const struct MatchCallSubstruct2 gUnknown_08624FDC[] = { - { 0x0324, 0x05 }, - { 0x006F, 0xD5 }, - { 0x035A, 0x46 }, - { 0xFFFF, 0xD5 } + { FLAG_0x324, 0x05 }, + { FLAG_0x06F, 0xD5 }, + { FLAG_0x35A, 0x46 }, + { 0xFFFF, 0xD5 } }; -MATCHCALLDEF(gUnknown_08624FEC, 2, 0, FLAG_0x0D6, 0x40, gUnknown_085EFB3E, gUnknown_08624F9C, gUnknown_08624FDC); +MATCHCALLDEF(gUnknown_08624FEC, 2, 0, FLAG_0x0D6, REMATCH_WALLY_3, gUnknown_085EFB3E, gUnknown_08624F9C, gUnknown_08624FDC); const match_call_sub0_t gUnknown_08624500[] = { { gText_Scott_Pokenav_2B5184, 0xFFFF, 0xFFFF }, @@ -555,12 +555,12 @@ const match_call_sub0_t gUnknown_08625284[] = { MATCHCALLDEF(gUnknown_08625294, 5, 15, FLAG_0x1A9, 0x4D, gUnknown_085EFBC0, NULL, gUnknown_08625284); const match_call_t gUnknown_086252A8[] = { - {.type0 = &gUnknown_08624D7C}, - {.type3 = &gUnknown_08624DF0}, + {.type0 = &MrStoneMatchCallHeader}, + {.type3 = &ProfBirchMatchCallHeader}, {.type4 = &gUnknown_08624F8C}, {.type4 = &gUnknown_08624EFC}, {.type2 = &gUnknown_08624FEC}, - {.type5 = &gUnknown_08624DDC}, + {.type5 = &NormanMatchCallHeader}, {.type0 = &gUnknown_08624E1C}, {.type0 = &gUnknown_08624E6C}, {.type0 = &gUnknown_08625040}, @@ -789,14 +789,14 @@ bool32 sub_81D178C(match_call_t matchCall) bool32 sub_81D1790(match_call_t matchCall) { - if (matchCall.type1->v4 >= REMATCH_ELITE_FOUR_ENTRIES) + if (matchCall.type1->rematchTableIdx >= REMATCH_ELITE_FOUR_ENTRIES) return FALSE; - return gSaveBlock1Ptr->trainerRematches[matchCall.type1->v4] ? TRUE : FALSE; + return gSaveBlock1Ptr->trainerRematches[matchCall.type1->rematchTableIdx] ? TRUE : FALSE; } bool32 sub_81D17C0(match_call_t matchCall) { - return gSaveBlock1Ptr->trainerRematches[matchCall.type2->v4] ? TRUE : FALSE; + return gSaveBlock1Ptr->trainerRematches[matchCall.type2->rematchTableIdx] ? TRUE : FALSE; } bool32 sub_81D17E0(match_call_t matchCall) @@ -872,12 +872,12 @@ u32 sub_81D1888(match_call_t matchCall) u32 sub_81D188C(match_call_t matchCall) { - return matchCall.type1->v4; + return matchCall.type1->rematchTableIdx; } u32 sub_81D1890(match_call_t matchCall) { - return matchCall.type2->v4; + return matchCall.type2->rematchTableIdx; } u32 sub_81D1894(match_call_t matchCall) @@ -890,7 +890,7 @@ u32 sub_81D1898(match_call_t matchCall) return REMATCH_TABLE_ENTRIES; } -void sub_81D189C(u32 idx, u8 *dest) +void MatchCall_GetMessage(u32 idx, u8 *dest) { match_call_t matchCall; u32 i; @@ -904,25 +904,25 @@ void sub_81D189C(u32 idx, u8 *dest) void sub_81D18D0(match_call_t matchCall, u8 *dest) { - sub_81D1920(matchCall.type0->vC, dest); + sub_81D1920(matchCall.type0->textData, dest); } void sub_81D18DC(match_call_t matchCall, u8 *dest) { if (matchCall.common->type != 5) - sub_81D1920(matchCall.type5->v10, dest); + sub_81D1920(matchCall.type5->textData, dest); else - sub_81D199C(matchCall.type1->v10, matchCall.type1->v4, dest); + sub_81D199C(matchCall.type1->textData, matchCall.type1->rematchTableIdx, dest); } void sub_81D18FC(match_call_t matchCall, u8 *dest) { - sub_81D1920(matchCall.type2->vC, dest); + sub_81D1920(matchCall.type2->textData, dest); } void sub_81D1908(match_call_t matchCall, u8 *dest) { - sub_81D1920(matchCall.type4->vC, dest); + sub_81D1920(matchCall.type4->textData, dest); } void sub_81D1914(match_call_t matchCall, u8 *dest) @@ -1092,7 +1092,7 @@ ASM_DIRECT void sub_81D199C(const match_call_sub0_t *sub0, u16 idx, u8 *dest) } #endif -void sub_81D1A78(u32 idx, const u8 **a1, const u8 **a2) +void sub_81D1A78(u32 idx, const u8 **desc, const u8 **name) { match_call_t matchCall; u32 i; @@ -1101,48 +1101,48 @@ void sub_81D1A78(u32 idx, const u8 **a1, const u8 **a2) return; matchCall = gUnknown_086252A8[idx]; i = sub_81D1574(matchCall); - gUnknown_08625374[i](matchCall, a1, a2); + gUnknown_08625374[i](matchCall, desc, name); } -void sub_81D1AB0(match_call_t matchCall, const u8 **a1, const u8 **a2) +void sub_81D1AB0(match_call_t matchCall, const u8 **desc, const u8 **name) { - *a1 = matchCall.type0->v4; - *a2 = matchCall.type0->v8; + *desc = matchCall.type0->desc; + *name = matchCall.type0->name; } -void sub_81D1ABC(match_call_t matchCall, const u8 **a1, const u8 **a2) +void sub_81D1ABC(match_call_t matchCall, const u8 **desc, const u8 **name) { match_call_t _matchCall = matchCall; - if (_matchCall.type1->vC == NULL) - sub_81D1B0C(_matchCall.type1->v4, a1, a2); + if (_matchCall.type1->name == NULL) + sub_81D1B0C(_matchCall.type1->rematchTableIdx, desc, name); else - *a2 = _matchCall.type1->vC; - *a1 = _matchCall.type1->v8; + *name = _matchCall.type1->name; + *desc = _matchCall.type1->desc; } -void sub_81D1ADC(match_call_t matchCall, const u8 **a1, const u8 **a2) +void sub_81D1ADC(match_call_t matchCall, const u8 **desc, const u8 **name) { - sub_81D1B0C(matchCall.type2->v4, a1, a2); - *a1 = matchCall.type2->v8; + sub_81D1B0C(matchCall.type2->rematchTableIdx, desc, name); + *desc = matchCall.type2->desc; } -void sub_81D1AF4(match_call_t matchCall, const u8 **a1, const u8 **a2) +void sub_81D1AF4(match_call_t matchCall, const u8 **desc, const u8 **name) { - *a1 = matchCall.type0->v4; - *a2 = matchCall.type0->v8; + *desc = matchCall.type4->desc; + *name = matchCall.type4->name; } -void sub_81D1B00(match_call_t matchCall, const u8 **a1, const u8 **a2) +void sub_81D1B00(match_call_t matchCall, const u8 **desc, const u8 **name) { - *a1 = matchCall.type0->v4; - *a2 = matchCall.type0->v8; + *desc = matchCall.type3->desc; + *name = matchCall.type3->name; } -void sub_81D1B0C(u32 idx, const u8 **a1, const u8 **a2) +void sub_81D1B0C(u32 idx, const u8 **desc, const u8 **name) { const struct Trainer *trainer = gTrainers + sub_81D15BC(idx); - *a1 = gTrainerClassNames[trainer->trainerClass]; - *a2 = trainer->trainerName; + *desc = gTrainerClassNames[trainer->trainerClass]; + *name = trainer->trainerName; } #ifdef NONMATCHING -- cgit v1.2.3 From aa2cb6a974fd293f313e66db5939e9ce3e09babf Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 6 Mar 2018 08:52:29 -0500 Subject: Rename match call assets --- src/match_call.c | 332 +++++++++++++++++++++++++++---------------------------- 1 file changed, 166 insertions(+), 166 deletions(-) (limited to 'src') diff --git a/src/match_call.c b/src/match_call.c index e1f9bffd9..5c46a16d1 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -5,6 +5,7 @@ #include "event_data.h" #include "string_util.h" #include "battle.h" +#include "battle_frontier_1.h" #include "gym_leader_rematch.h" #define NELEMS(a) (s32)( sizeof (a) / sizeof (*(a)) ) @@ -69,7 +70,7 @@ struct MatchCallStruct3 { struct MatchCallStruct4 { u8 type; - u8 v1; + u8 gender; u16 flag; const u8 *desc; const u8 *name; @@ -113,11 +114,11 @@ struct UnkStruct_08625388 { // Static ROM declarations -bool32 sub_81D1628(match_call_t); -bool32 sub_81D164C(match_call_t); -bool32 sub_81D1670(match_call_t); -bool32 sub_81D1694(match_call_t); -bool32 sub_81D16CC(match_call_t); +static bool32 sub_81D1628(match_call_t); +static bool32 sub_81D164C(match_call_t); +static bool32 sub_81D1670(match_call_t); +static bool32 sub_81D1694(match_call_t); +static bool32 sub_81D16CC(match_call_t); u8 sub_81D1714(match_call_t); u8 sub_81D1718(match_call_t); @@ -137,17 +138,17 @@ bool32 sub_81D1848(match_call_t); bool32 sub_81D184C(match_call_t); bool32 sub_81D1850(match_call_t); -u32 sub_81D1888(match_call_t); -u32 sub_81D188C(match_call_t); -u32 sub_81D1890(match_call_t); -u32 sub_81D1894(match_call_t); -u32 sub_81D1898(match_call_t); +static u32 MatchCall_GetRematchTableIdx_Type0(match_call_t); +static u32 MatchCall_GetRematchTableIdx_Type1(match_call_t); +static u32 MatchCall_GetRematchTableIdx_Type2(match_call_t); +static u32 MatchCall_GetRematchTableIdx_Type3(match_call_t); +static u32 MatchCall_GetRematchTableIdx_Type4(match_call_t); -void sub_81D18D0(match_call_t, u8 *); -void sub_81D18DC(match_call_t, u8 *); -void sub_81D18FC(match_call_t, u8 *); -void sub_81D1908(match_call_t, u8 *); -void sub_81D1914(match_call_t, u8 *); +static void MatchCall_GetMessage_Type0(match_call_t, u8 *); +static void MatchCall_GetMessage_Type1(match_call_t, u8 *); +static void MatchCall_GetMessage_Type2(match_call_t, u8 *); +static void MatchCall_GetMessage_Type3(match_call_t, u8 *); +static void MatchCall_GetMessage_Type4(match_call_t, u8 *); void sub_81D1AB0(match_call_t, const u8 **, const u8 **); void sub_81D1ABC(match_call_t, const u8 **, const u8 **); @@ -157,7 +158,6 @@ void sub_81D1B00(match_call_t, const u8 **, const u8 **); void sub_81D1920(const match_call_sub0_t *, u8 *); void sub_81D199C(const match_call_sub0_t *, u16, u8 *); -void sub_8197080(u8 *); void sub_81D1B0C(u32, const u8 **, const u8 **); extern const u8 gText_MrStone_Pokenav_2B60C0[]; @@ -172,8 +172,8 @@ extern const u8 gText_MrStone_Pokenav_2B66B1[]; extern const u8 gText_MrStone_Pokenav_2B6703[]; extern const u8 gText_MrStone_Pokenav_2B67ED[]; -extern const u8 gUnknown_085EFAEF[]; -extern const u8 gUnknown_085EFAFA[]; +extern const u8 gMrStoneMatchCallDesc[]; +extern const u8 gMrStoneMatchCallName[]; extern const u8 gText_Norman_Pokenav_2B5719[]; extern const u8 gText_Norman_Pokenav_2B5795[]; @@ -185,18 +185,18 @@ extern const u8 gText_Norman_Pokenav_2B5A69[]; extern const u8 gText_Norman_Pokenav_2B5ACF[]; extern const u8 gText_Norman_Pokenav_2B5B5E[]; -extern const u8 gUnknown_085EFB25[]; -extern const u8 gUnknown_085EFB47[]; +extern const u8 gNormanMatchCallDesc[]; +extern const u8 gNormanMatchCallName[]; -extern const u8 gUnknown_085EFBC9[]; -extern const u8 gUnknown_085E8270[]; +extern const u8 gProfBirchMatchCallDesc[]; +extern const u8 gProfBirchMatchCallName[]; extern const u8 gText_Mom_Pokenav_2B227B[]; extern const u8 gText_Mom_Pokenav_2B2310[]; extern const u8 gText_Mom_Pokenav_2B23F3[]; -extern const u8 gUnknown_085EFB32[]; -extern const u8 gUnknown_085EFB4B[]; +extern const u8 gMomMatchCallDesc[]; +extern const u8 gMomMatchCallName[]; extern const u8 gText_Steven_Pokenav_2B5B95[]; extern const u8 gText_Steven_Pokenav_2B5C53[]; @@ -206,8 +206,8 @@ 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 gStevenMatchCallDesc[]; +extern const u8 gStevenMatchCallName[]; extern const u8 gText_May_Pokenav_2B3AB3[]; extern const u8 gText_May_Pokenav_2B3B3F[]; @@ -224,7 +224,7 @@ 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 gMayBrendanMatchCallDesc[]; extern const u8 gExpandedPlaceholder_May[]; extern const u8 gText_Brendan_Pokenav_2B43EF[]; extern const u8 gText_Brendan_Pokenav_2B4486[]; @@ -249,7 +249,7 @@ 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 gWallyMatchCallDesc[]; extern const u8 gText_Scott_Pokenav_2B5184[]; extern const u8 gText_Scott_Pokenav_2B5275[]; extern const u8 gText_Scott_Pokenav_2B5323[]; @@ -257,67 +257,67 @@ 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 gScottMatchCallDesc[]; +extern const u8 gScottMatchCallName[]; 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 gRoxanneMatchCallDesc[]; 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 gBrawlyMatchCallDesc[]; 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 gWattsonMatchCallDesc[]; 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 gFlanneryMatchCallDesc[]; 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 gWinonaMatchCallDesc[]; 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 gTateLizaMatchCallDesc[]; 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 gJuanMatchCallDesc[]; extern const u8 gText_Sidney_Pokenav_2B34CC[]; -extern const u8 gUnknown_085EFBB5[]; +extern const u8 gEliteFourMatchCallDesc[]; 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[]; -extern const u8 gUnknown_085ED453[]; -extern const u8 gUnknown_085ED46B[]; -extern const u8 gUnknown_085ED483[]; -extern const u8 gUnknown_085ED49D[]; -extern const u8 gUnknown_085ED4B3[]; -extern const u8 gUnknown_085ED4CE[]; -extern const u8 gUnknown_085ED4E3[]; -extern const u8 gUnknown_085ED4FA[]; -extern const u8 gUnknown_085ED516[]; -extern const u8 gUnknown_085ED52F[]; -extern const u8 gUnknown_085ED547[]; -extern const u8 gUnknown_085ED563[]; -extern const u8 gUnknown_085ED579[]; -extern const u8 gUnknown_085ED58F[]; +extern const u8 gChampionMatchCallDesc[]; +extern const u8 gMatchCallStevenStrategyText[]; +extern const u8 gMatchCall_StevenTrainersPokemonText[]; +extern const u8 gMatchCall_StevenSelfIntroductionText_Line1_BeforeMeteorFallsBattle[]; +extern const u8 gMatchCall_StevenSelfIntroductionText_Line2_BeforeMeteorFallsBattle[]; +extern const u8 gMatchCall_StevenSelfIntroductionText_Line1_AfterMeteorFallsBattle[]; +extern const u8 gMatchCall_StevenSelfIntroductionText_Line2_AfterMeteorFallsBattle[]; +extern const u8 gMatchCall_BrendanStrategyText[]; +extern const u8 gMatchCall_BrendanTrainersPokemonText[]; +extern const u8 gMatchCall_BrendanSelfIntroductionText_Line1[]; +extern const u8 gMatchCall_BrendanSelfIntroductionText_Line2[]; +extern const u8 gMatchCall_MayStrategyText[]; +extern const u8 gMatchCall_MayTrainersPokemonText[]; +extern const u8 gMatchCall_MaySelfIntroductionText_Line1[]; +extern const u8 gMatchCall_MaySelfIntroductionText_Line2[]; // .rodata -static const match_call_sub0_t MrStoneTextScripts[] = { +static const match_call_sub0_t sMrStoneTextScripts[] = { { gText_MrStone_Pokenav_2B60C0, 0xFFFF, FLAG_0x158 }, { gText_MrStone_Pokenav_2B61E6, FLAG_0x158, 0xFFFF }, { gText_MrStone_Pokenav_2B6302, FLAG_0x0BD, 0xFFFF }, @@ -332,9 +332,9 @@ static const match_call_sub0_t MrStoneTextScripts[] = { { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(MrStoneMatchCallHeader, 0, 10, 0xffff, gUnknown_085EFAEF, gUnknown_085EFAFA, MrStoneTextScripts); +MATCHCALLDEF(sMrStoneMatchCallHeader, 0, 10, 0xffff, gMrStoneMatchCallDesc, gMrStoneMatchCallName, sMrStoneTextScripts); -static const match_call_sub0_t NormanTextScripts[] = { +static const match_call_sub0_t sNormanTextScripts[] = { { gText_Norman_Pokenav_2B5719, FLAG_0x132, 0xFFFF }, { gText_Norman_Pokenav_2B5795, FLAG_0x4F1, 0xFFFF }, { gText_Norman_Pokenav_2B584D, FLAG_0x4F3, 0xFFFF }, @@ -347,20 +347,20 @@ static const match_call_sub0_t NormanTextScripts[] = { { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(NormanMatchCallHeader, 5, 7, FLAG_0x132, 0x45, gUnknown_085EFB25, gUnknown_085EFB47, NormanTextScripts); +MATCHCALLDEF(sNormanMatchCallHeader, 5, 7, FLAG_0x132, 0x45, gNormanMatchCallDesc, gNormanMatchCallName, sNormanTextScripts); -MATCHCALLDEF(ProfBirchMatchCallHeader, 3, 0, FLAG_0x119, gUnknown_085EFBC9, gUnknown_085E8270) +MATCHCALLDEF(sProfBirchMatchCallHeader, 3, 0, FLAG_0x119, gProfBirchMatchCallDesc, gProfBirchMatchCallName) -static const match_call_sub0_t gUnknown_08624DFC[] = { +static const match_call_sub0_t sMomTextScripts[] = { { gText_Mom_Pokenav_2B227B, 0xffff, 0xffff }, { gText_Mom_Pokenav_2B2310, FLAG_0x4F4, 0xffff }, { gText_Mom_Pokenav_2B23F3, FLAG_SYS_GAME_CLEAR, 0xffff }, { NULL, 0xffff, 0xffff } }; -MATCHCALLDEF(gUnknown_08624E1C, 0, 0, FLAG_0x0D8, gUnknown_085EFB32, gUnknown_085EFB4B, gUnknown_08624DFC); +MATCHCALLDEF(sMomMatchCallHeader, 0, 0, FLAG_0x0D8, gMomMatchCallDesc, gMomMatchCallName, sMomTextScripts); -const match_call_sub0_t gUnknown_08624E2C[] = { +static const match_call_sub0_t sStevenTextScripts[] = { { gText_Steven_Pokenav_2B5B95, 0xffff, 0xffff }, { gText_Steven_Pokenav_2B5C53, FLAG_0x0C7, 0xffff }, { gText_Steven_Pokenav_2B5CC9, FLAG_0x0D4, 0xffff }, @@ -371,9 +371,9 @@ const match_call_sub0_t gUnknown_08624E2C[] = { { NULL, 0xffff, 0xffff }, }; -MATCHCALLDEF(gUnknown_08624E6C, 0, 0xd5, FLAG_0x131, gUnknown_085EFB04, gUnknown_085EFB11, gUnknown_08624E2C); +MATCHCALLDEF(sStevenMatchCallHeader, 0, 0xd5, FLAG_0x131, gStevenMatchCallDesc, gStevenMatchCallName, sStevenTextScripts); -const match_call_sub0_t gUnknown_08624E7C[] = { +static const match_call_sub0_t sMayTextScripts[] = { { gText_May_Pokenav_2B3AB3, 0xFFFF, 0xFFFF }, { gText_May_Pokenav_2B3B3F, FLAG_0x4F1, 0xFFFF }, { gText_May_Pokenav_2B3C13, FLAG_0x095, 0xFFFF }, @@ -392,9 +392,9 @@ const match_call_sub0_t gUnknown_08624E7C[] = { { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_08624EFC, 4, 0, FLAG_0x0FD, gUnknown_085EFB18, gExpandedPlaceholder_May, gUnknown_08624E7C); +MATCHCALLDEF(sMayMatchCallHeader, 4, MALE, FLAG_0x0FD, gMayBrendanMatchCallDesc, gExpandedPlaceholder_May, sMayTextScripts); -const match_call_sub0_t gUnknown_08624F0C[] = { +static const match_call_sub0_t sBrendanTextScripts[] = { { gText_Brendan_Pokenav_2B43EF, 0xFFFF, 0xFFFF }, { gText_Brendan_Pokenav_2B4486, FLAG_0x4F1, 0xFFFF }, { gText_Brendan_Pokenav_2B4560, FLAG_0x095, 0xFFFF }, @@ -413,9 +413,9 @@ const match_call_sub0_t gUnknown_08624F0C[] = { { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_08624F8C, 4, 1, FLAG_0x0FD, gUnknown_085EFB18, gExpandedPlaceholder_Brendan, gUnknown_08624F0C); +MATCHCALLDEF(sBrendanMatchCallHeader, 4, FEMALE, FLAG_0x0FD, gMayBrendanMatchCallDesc, gExpandedPlaceholder_Brendan, sBrendanTextScripts); -const match_call_sub0_t gUnknown_08624F9C[] = { +static const match_call_sub0_t sWallyTextScripts[] = { { gText_Wally_Pokenav_2B4DE2, 0xFFFF, 0xFFFF }, { gText_Wally_Pokenav_2B4E57, FLAG_0x0C7, 0xFFFF }, { gText_Wally_Pokenav_2B4EA5, FLAG_0x4F3, 0xFFFF }, @@ -426,16 +426,16 @@ const match_call_sub0_t gUnknown_08624F9C[] = { { NULL, 0xFFFF, 0xFFFF } }; -const struct MatchCallSubstruct2 gUnknown_08624FDC[] = { +const struct MatchCallSubstruct2 sWallyAdditionalData[] = { { FLAG_0x324, 0x05 }, { FLAG_0x06F, 0xD5 }, { FLAG_0x35A, 0x46 }, { 0xFFFF, 0xD5 } }; -MATCHCALLDEF(gUnknown_08624FEC, 2, 0, FLAG_0x0D6, REMATCH_WALLY_3, gUnknown_085EFB3E, gUnknown_08624F9C, gUnknown_08624FDC); +MATCHCALLDEF(sWallyMatchCallHeader, 2, 0, FLAG_0x0D6, REMATCH_WALLY_3, gWallyMatchCallDesc, sWallyTextScripts, sWallyAdditionalData); -const match_call_sub0_t gUnknown_08624500[] = { +static const match_call_sub0_t sScottTextScripts[] = { { gText_Scott_Pokenav_2B5184, 0xFFFF, 0xFFFF }, { gText_Scott_Pokenav_2B5275, FLAG_0x08B, 0xFFFF }, { gText_Scott_Pokenav_2B5323, FLAG_0x097, 0xFFFF }, @@ -447,9 +447,9 @@ const match_call_sub0_t gUnknown_08624500[] = { }; -MATCHCALLDEF(gUnknown_08625040, 0, 0xD5, FLAG_0x0D7, gUnknown_085EFB4F, gUnknown_085EFB5C, gUnknown_08624500); +MATCHCALLDEF(sScottMatchCallHeader, 0, 0xD5, FLAG_0x0D7, gScottMatchCallDesc, gScottMatchCallName, sScottTextScripts); -const match_call_sub0_t gUnknown_08625050[] = { +static const match_call_sub0_t sRoxanneTextScripts[] = { { gText_Roxanne_Pokenav_2B2456, 0xFFFE, 0xFFFF }, { gText_Roxanne_Pokenav_2B250E, 0xFFFF, 0xFFFF }, { gText_Roxanne_Pokenav_2B25C1, 0xFFFF, 0xFFFF }, @@ -457,9 +457,9 @@ const match_call_sub0_t gUnknown_08625050[] = { { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_08625078, 5, 10, FLAG_0x1D3, 0x41, gUnknown_085EFB62, NULL, gUnknown_08625050); +MATCHCALLDEF(sRoxanneMatchCallHeader, 5, 10, FLAG_0x1D3, 0x41, gRoxanneMatchCallDesc, NULL, sRoxanneTextScripts); -const match_call_sub0_t gUnknown_0862508C[] = { +static const match_call_sub0_t sBrawlyTextScripts[] = { { gText_Brawly_Pokenav_2B2659, 0xFFFE, 0xFFFF }, { gText_Brawly_Pokenav_2B275D, 0xFFFF, 0xFFFF }, { gText_Brawly_Pokenav_2B286F, 0xFFFF, 0xFFFF }, @@ -467,9 +467,9 @@ const match_call_sub0_t gUnknown_0862508C[] = { { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_086250B4, 5, 2, FLAG_0x1D4, 0x42, gUnknown_085EFB6F, NULL, gUnknown_0862508C); +MATCHCALLDEF(sBrawlyMatchCallHeader, 5, 2, FLAG_0x1D4, 0x42, gBrawlyMatchCallDesc, NULL, sBrawlyTextScripts); -const match_call_sub0_t gUnknown_086250C8[] = { +static const match_call_sub0_t sWattsonTextScripts[] = { { gText_Wattson_Pokenav_2B2912, 0xFFFE, 0xFFFF }, { gText_Wattson_Pokenav_2B29CA, 0xFFFF, 0xFFFF }, { gText_Wattson_Pokenav_2B2AB6, 0xFFFF, 0xFFFF }, @@ -477,9 +477,9 @@ const match_call_sub0_t gUnknown_086250C8[] = { { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_086250F0, 5, 9, FLAG_0x1D5, 0x43, gUnknown_085EFB7B, NULL, gUnknown_086250C8); +MATCHCALLDEF(sWattsonMatchCallHeader, 5, 9, FLAG_0x1D5, 0x43, gWattsonMatchCallDesc, NULL, sWattsonTextScripts); -const match_call_sub0_t gUnknown_08625104[] = { +static const match_call_sub0_t sFlanneryTextScripts[] = { { gText_Flannery_Pokenav_2B2B4D, 0xFFFE, 0xFFFF }, { gText_Flannery_Pokenav_2B2C0E, 0xFFFF, 0xFFFF }, { gText_Flannery_Pokenav_2B2CF1, 0xFFFF, 0xFFFF }, @@ -487,9 +487,9 @@ const match_call_sub0_t gUnknown_08625104[] = { { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_0862512C, 5, 3, FLAG_0x1D6, 0x44, gUnknown_085EFB87, NULL, gUnknown_08625104); +MATCHCALLDEF(sFlanneryMatchCallHeader, 5, 3, FLAG_0x1D6, 0x44, gFlanneryMatchCallDesc, NULL, sFlanneryTextScripts); -const match_call_sub0_t gUnknown_08625140[] = { +static const match_call_sub0_t sWinonaTextScripts[] = { { gText_Winona_Pokenav_2B2DA4, 0xFFFE, 0xFFFF }, { gText_Winona_Pokenav_2B2E2B, 0xFFFF, 0xFFFF }, { gText_Winona_Pokenav_2B2EC2, 0xFFFF, 0xFFFF }, @@ -497,9 +497,9 @@ const match_call_sub0_t gUnknown_08625140[] = { { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_08625168, 5, 11, FLAG_0x1D7, 0x46, gUnknown_085EFB94, NULL, gUnknown_08625140); +MATCHCALLDEF(sWinonaMatchCallHeader, 5, 11, FLAG_0x1D7, 0x46, gWinonaMatchCallDesc, NULL, sWinonaTextScripts); -const match_call_sub0_t gUnknown_0862517C[] = { +static const match_call_sub0_t sTateLizaTextScripts[] = { { gText_TateLiza_Pokenav_2B2F97, 0xFFFE, 0xFFFF }, { gText_TateLiza_Pokenav_2B306E, 0xFFFF, 0xFFFF }, { gText_TateLiza_Pokenav_2B3158, 0xFFFF, 0xFFFF }, @@ -507,9 +507,9 @@ const match_call_sub0_t gUnknown_0862517C[] = { { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_086251A4, 5, 13, FLAG_0x1D8, 0x47, gUnknown_085EFB9E, NULL, gUnknown_0862517C); +MATCHCALLDEF(sTateLizaMatchCallHeader, 5, 13, FLAG_0x1D8, 0x47, gTateLizaMatchCallDesc, NULL, sTateLizaTextScripts); -const match_call_sub0_t gUnknown_086251B8[] = { +static const match_call_sub0_t sJuanTextScripts[] = { { gText_Juan_Pokenav_2B3249, 0xFFFE, 0xFFFF }, { gText_Juan_Pokenav_2B32EC, 0xFFFF, 0xFFFF }, { gText_Juan_Pokenav_2B33AA, 0xFFFF, 0xFFFF }, @@ -517,65 +517,65 @@ const match_call_sub0_t gUnknown_086251B8[] = { { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_086251E0, 5, 14, FLAG_0x1D9, 0x48, gUnknown_085EFBA9, NULL, gUnknown_086251B8); +MATCHCALLDEF(sJuanMatchCallHeader, 5, 14, FLAG_0x1D9, 0x48, gJuanMatchCallDesc, NULL, sJuanTextScripts); -const match_call_sub0_t gUnknown_086251F4[] = { +static const match_call_sub0_t sSidneyTextScripts[] = { { gText_Sidney_Pokenav_2B34CC, 0xFFFF, 0xFFFF }, { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_08625204, 5, 15, FLAG_0x1A5, 0x49, gUnknown_085EFBB5, NULL, gUnknown_086251F4); +MATCHCALLDEF(sSidneyMatchCallHeader, 5, 15, FLAG_0x1A5, 0x49, gEliteFourMatchCallDesc, NULL, sSidneyTextScripts); -const match_call_sub0_t gUnknown_08625218[] = { +static const match_call_sub0_t sPhoebeTextScripts[] = { { gText_Phoebe_Pokenav_2B3561, 0xFFFF, 0xFFFF }, { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_08625228, 5, 15, FLAG_0x1A6, 0x4A, gUnknown_085EFBB5, NULL, gUnknown_08625218); +MATCHCALLDEF(sPhoebeMatchCallHeader, 5, 15, FLAG_0x1A6, 0x4A, gEliteFourMatchCallDesc, NULL, sPhoebeTextScripts); -const match_call_sub0_t gUnknown_0862523C[] = { +static const match_call_sub0_t sGlaciaTextScripts[] = { { gText_Glacia_Pokenav_2B35E4, 0xFFFF, 0xFFFF }, { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_0862524C, 5, 15, FLAG_0x1A7, 0x4B, gUnknown_085EFBB5, NULL, gUnknown_0862523C); +MATCHCALLDEF(sGlaciaMatchCallHeader, 5, 15, FLAG_0x1A7, 0x4B, gEliteFourMatchCallDesc, NULL, sGlaciaTextScripts); -const match_call_sub0_t gUnknown_08625260[] = { +static const match_call_sub0_t sDrakeTextScripts[] = { { gText_Drake_Pokenav_2B368B, 0xFFFF, 0xFFFF }, { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_08625270, 5, 15, FLAG_0x1A8, 0x4C, gUnknown_085EFBB5, NULL, gUnknown_08625260); +MATCHCALLDEF(sDrakeMatchCallHeader, 5, 15, FLAG_0x1A8, 0x4C, gEliteFourMatchCallDesc, NULL, sDrakeTextScripts); -const match_call_sub0_t gUnknown_08625284[] = { +static const match_call_sub0_t sWallaceTextScripts[] = { { gText_Wallace_Pokenav_2B3790, 0xFFFF, 0xFFFF }, { NULL, 0xFFFF, 0xFFFF } }; -MATCHCALLDEF(gUnknown_08625294, 5, 15, FLAG_0x1A9, 0x4D, gUnknown_085EFBC0, NULL, gUnknown_08625284); - -const match_call_t gUnknown_086252A8[] = { - {.type0 = &MrStoneMatchCallHeader}, - {.type3 = &ProfBirchMatchCallHeader}, - {.type4 = &gUnknown_08624F8C}, - {.type4 = &gUnknown_08624EFC}, - {.type2 = &gUnknown_08624FEC}, - {.type5 = &NormanMatchCallHeader}, - {.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} +MATCHCALLDEF(sWallaceMatchCallHeader, 5, 15, FLAG_0x1A9, 0x4D, gChampionMatchCallDesc, NULL, sWallaceTextScripts); + +static const match_call_t gUnknown_086252A8[] = { + {.type0 = &sMrStoneMatchCallHeader}, + {.type3 = &sProfBirchMatchCallHeader}, + {.type4 = &sBrendanMatchCallHeader}, + {.type4 = &sMayMatchCallHeader}, + {.type2 = &sWallyMatchCallHeader}, + {.type5 = &sNormanMatchCallHeader}, + {.type0 = &sMomMatchCallHeader}, + {.type0 = &sStevenMatchCallHeader}, + {.type0 = &sScottMatchCallHeader}, + {.type5 = &sRoxanneMatchCallHeader}, + {.type5 = &sBrawlyMatchCallHeader}, + {.type5 = &sWattsonMatchCallHeader}, + {.type5 = &sFlanneryMatchCallHeader}, + {.type5 = &sWinonaMatchCallHeader}, + {.type5 = &sTateLizaMatchCallHeader}, + {.type5 = &sJuanMatchCallHeader}, + {.type5 = &sSidneyMatchCallHeader}, + {.type5 = &sPhoebeMatchCallHeader}, + {.type5 = &sGlaciaMatchCallHeader}, + {.type5 = &sDrakeMatchCallHeader}, + {.type5 = &sWallaceMatchCallHeader} }; bool32 (*const gUnknown_086252FC[])(match_call_t) = { @@ -610,20 +610,20 @@ bool32 (*const gUnknown_08625338[])(match_call_t) = { sub_81D1850 }; -u32 (*const gUnknown_0862534C[])(match_call_t) = { - sub_81D1888, - sub_81D188C, - sub_81D1890, - sub_81D1894, - sub_81D1898 +static u32 (*const sMatchCall_GetRematchTableIdxFunctions[])(match_call_t) = { + MatchCall_GetRematchTableIdx_Type0, + MatchCall_GetRematchTableIdx_Type1, + MatchCall_GetRematchTableIdx_Type2, + MatchCall_GetRematchTableIdx_Type3, + MatchCall_GetRematchTableIdx_Type4 }; -void (*const gUnknown_08625360[])(match_call_t, u8 *) = { - sub_81D18D0, - sub_81D18DC, - sub_81D18FC, - sub_81D1908, - sub_81D1914 +static void (*const sMatchCall_GetMessageFunctions[])(match_call_t, u8 *) = { + MatchCall_GetMessage_Type0, + MatchCall_GetMessage_Type1, + MatchCall_GetMessage_Type2, + MatchCall_GetMessage_Type3, + MatchCall_GetMessage_Type4 }; void (*const gUnknown_08625374[])(match_call_t, const u8 **, const u8 **) = { @@ -634,11 +634,11 @@ void (*const gUnknown_08625374[])(match_call_t, const u8 **, const u8 **) = { sub_81D1B00 }; -const struct UnkStruct_08625388 gUnknown_08625388[] = { - { 7, 0x4B, 0xffff, { gUnknown_085ED453, gUnknown_085ED46B, gUnknown_085ED483, gUnknown_085ED49D } }, - { 7, 0x4B, FLAG_0x4F6, { gUnknown_085ED453, gUnknown_085ED46B, gUnknown_085ED4B3, gUnknown_085ED4CE } }, - { 2, 0x3c, 0xffff, { gUnknown_085ED4E3, gUnknown_085ED4FA, gUnknown_085ED516, gUnknown_085ED52F } }, - { 3, 0x3f, 0xffff, { gUnknown_085ED547, gUnknown_085ED563, gUnknown_085ED579, gUnknown_085ED58F } } +static const struct UnkStruct_08625388 sMatchCallCheckPageOverrides[] = { + { 7, 0x4B, 0xffff, { gMatchCallStevenStrategyText, gMatchCall_StevenTrainersPokemonText, gMatchCall_StevenSelfIntroductionText_Line1_BeforeMeteorFallsBattle, gMatchCall_StevenSelfIntroductionText_Line2_BeforeMeteorFallsBattle } }, // STEVEN + { 7, 0x4B, FLAG_0x4F6, { gMatchCallStevenStrategyText, gMatchCall_StevenTrainersPokemonText, gMatchCall_StevenSelfIntroductionText_Line1_AfterMeteorFallsBattle, gMatchCall_StevenSelfIntroductionText_Line2_AfterMeteorFallsBattle } }, // STEVEN + { 2, 0x3c, 0xffff, { gMatchCall_BrendanStrategyText, gMatchCall_BrendanTrainersPokemonText, gMatchCall_BrendanSelfIntroductionText_Line1, gMatchCall_BrendanSelfIntroductionText_Line2 } }, // Brendan + { 3, 0x3f, 0xffff, { gMatchCall_MayStrategyText, gMatchCall_MayTrainersPokemonText, gMatchCall_MaySelfIntroductionText_Line1, gMatchCall_MaySelfIntroductionText_Line2 } } // May }; // .text @@ -679,7 +679,7 @@ s32 sub_81D15CC(s32 trainerIdx) return -1; } -bool32 sub_81D15F4(u32 idx) +bool32 MatchCallFlagGetByIndex(u32 idx) { match_call_t matchCall; u32 i; @@ -691,37 +691,37 @@ bool32 sub_81D15F4(u32 idx) return gUnknown_086252FC[i](matchCall); } -bool32 sub_81D1628(match_call_t matchCall) +static bool32 sub_81D1628(match_call_t matchCall) { if (matchCall.type0->flag == 0xffff) return TRUE; return FlagGet(matchCall.type0->flag); } -bool32 sub_81D164C(match_call_t matchCall) +static bool32 sub_81D164C(match_call_t matchCall) { if (matchCall.type1->flag == 0xffff) return TRUE; return FlagGet(matchCall.type1->flag); } -bool32 sub_81D1670(match_call_t matchCall) +static bool32 sub_81D1670(match_call_t matchCall) { if (matchCall.type2->flag == 0xffff) return TRUE; return FlagGet(matchCall.type2->flag); } -bool32 sub_81D1694(match_call_t matchCall) +static bool32 sub_81D1694(match_call_t matchCall) { - if (matchCall.type4->v1 != gSaveBlock2Ptr->playerGender) + if (matchCall.type4->gender != gSaveBlock2Ptr->playerGender) return FALSE; if (matchCall.type4->flag == 0xffff) return TRUE; return FlagGet(matchCall.type4->flag); } -bool32 sub_81D16CC(match_call_t matchCall) +static bool32 sub_81D16CC(match_call_t matchCall) { return FlagGet(matchCall.type3->flag); } @@ -822,7 +822,7 @@ bool32 sub_81D17E8(u32 idx) return TRUE; for (i = 0; i < 4; i++) { - if (gUnknown_08625388[i].idx == idx) + if (sMatchCallCheckPageOverrides[i].idx == idx) return TRUE; } return FALSE; @@ -853,7 +853,7 @@ bool32 sub_81D1850(match_call_t matchCall) return FALSE; } -u32 sub_81D1854(u32 idx) +u32 MatchCall_GetRematchTableIdx(u32 idx) { match_call_t matchCall; u32 i; @@ -862,30 +862,30 @@ u32 sub_81D1854(u32 idx) return REMATCH_TABLE_ENTRIES; matchCall = gUnknown_086252A8[idx]; i = sub_81D1574(matchCall); - return gUnknown_0862534C[i](matchCall); + return sMatchCall_GetRematchTableIdxFunctions[i](matchCall); } -u32 sub_81D1888(match_call_t matchCall) +static static u32 MatchCall_GetRematchTableIdx_Type0(match_call_t matchCall) { return REMATCH_TABLE_ENTRIES; } -u32 sub_81D188C(match_call_t matchCall) +static static u32 MatchCall_GetRematchTableIdx_Type1(match_call_t matchCall) { return matchCall.type1->rematchTableIdx; } -u32 sub_81D1890(match_call_t matchCall) +static static u32 MatchCall_GetRematchTableIdx_Type2(match_call_t matchCall) { return matchCall.type2->rematchTableIdx; } -u32 sub_81D1894(match_call_t matchCall) +static static u32 MatchCall_GetRematchTableIdx_Type3(match_call_t matchCall) { return REMATCH_TABLE_ENTRIES; } -u32 sub_81D1898(match_call_t matchCall) +static u32 MatchCall_GetRematchTableIdx_Type4(match_call_t matchCall) { return REMATCH_TABLE_ENTRIES; } @@ -899,15 +899,15 @@ void MatchCall_GetMessage(u32 idx, u8 *dest) return; matchCall = gUnknown_086252A8[idx]; i = sub_81D1574(matchCall); - gUnknown_08625360[i](matchCall, dest); + sMatchCall_GetMessageFunctions[i](matchCall, dest); } -void sub_81D18D0(match_call_t matchCall, u8 *dest) +static void MatchCall_GetMessage_Type0(match_call_t matchCall, u8 *dest) { sub_81D1920(matchCall.type0->textData, dest); } -void sub_81D18DC(match_call_t matchCall, u8 *dest) +static void MatchCall_GetMessage_Type1(match_call_t matchCall, u8 *dest) { if (matchCall.common->type != 5) sub_81D1920(matchCall.type5->textData, dest); @@ -915,17 +915,17 @@ void sub_81D18DC(match_call_t matchCall, u8 *dest) sub_81D199C(matchCall.type1->textData, matchCall.type1->rematchTableIdx, dest); } -void sub_81D18FC(match_call_t matchCall, u8 *dest) +static void MatchCall_GetMessage_Type2(match_call_t matchCall, u8 *dest) { sub_81D1920(matchCall.type2->textData, dest); } -void sub_81D1908(match_call_t matchCall, u8 *dest) +static void MatchCall_GetMessage_Type3(match_call_t matchCall, u8 *dest) { sub_81D1920(matchCall.type4->textData, dest); } -void sub_81D1914(match_call_t matchCall, u8 *dest) +static void MatchCall_GetMessage_Type4(match_call_t matchCall, u8 *dest) { sub_8197080(dest); } @@ -1152,14 +1152,14 @@ const u8 *sub_81D1B40(u32 idx, u32 offset) for (i = 0; i < 4; i++) { - if (gUnknown_08625388[i].idx == idx) + if (sMatchCallCheckPageOverrides[i].idx == idx) { - for (; i + 1 < 4 && gUnknown_08625388[i + 1].idx == idx; i++) + for (; i + 1 < 4 && sMatchCallCheckPageOverrides[i + 1].idx == idx; i++) { - if (!FlagGet(gUnknown_08625388[i + 1].v4)) + if (!FlagGet(sMatchCallCheckPageOverrides[i + 1].v4)) break; } - return gUnknown_08625388[i].v8[offset]; + return sMatchCallCheckPageOverrides[i].v8[offset]; } } return NULL; @@ -1173,7 +1173,7 @@ ASM_DIRECT const u8 *sub_81D1B40(u32 idx, u32 offset) "\tpush {r6,r7}\n" "\tadds r6, r0, 0\n" "\tmovs r5, 0\n" - "\tldr r2, =gUnknown_08625388\n" + "\tldr r2, =sMatchCallCheckPageOverrides\n" "\tmovs r0, 0x8\n" "\tadds r0, r2\n" "\tmov r9, r0\n" @@ -1197,7 +1197,7 @@ ASM_DIRECT const u8 *sub_81D1B40(u32 idx, u32 offset) "\tldrh r0, [r0]\n" "\tcmp r0, r6\n" "\tbne _081D1BA8\n" - "\tldr r7, =gUnknown_08625388\n" + "\tldr r7, =sMatchCallCheckPageOverrides\n" "_081D1B7C:\n" "\tlsls r0, r4, 1\n" "\tadds r0, r4\n" @@ -1250,8 +1250,8 @@ s32 sub_81D1BD0(u32 idx) for (i = 0; i < 4; i++) { - if (gUnknown_08625388[i].idx == idx) - return gUnknown_08625388[i].v2; + if (sMatchCallCheckPageOverrides[i].idx == idx) + return sMatchCallCheckPageOverrides[i].v2; } return -1; } @@ -1262,7 +1262,7 @@ bool32 sub_81D1BF8(u32 idx) for (i = 0; i < 21; i++) { - u32 r0 = sub_81D1854(i); + u32 r0 = MatchCall_GetRematchTableIdx(i); if (r0 != REMATCH_TABLE_ENTRIES && r0 == idx) return TRUE; } -- cgit v1.2.3 From b2d8ce10ceb9063ae44daf4b6f8cb8a956cbde26 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 6 Mar 2018 21:51:25 -0500 Subject: Fix build crash --- src/match_call.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/match_call.c b/src/match_call.c index 5c46a16d1..bedea65ec 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -865,22 +865,22 @@ u32 MatchCall_GetRematchTableIdx(u32 idx) return sMatchCall_GetRematchTableIdxFunctions[i](matchCall); } -static static u32 MatchCall_GetRematchTableIdx_Type0(match_call_t matchCall) +static u32 MatchCall_GetRematchTableIdx_Type0(match_call_t matchCall) { return REMATCH_TABLE_ENTRIES; } -static static u32 MatchCall_GetRematchTableIdx_Type1(match_call_t matchCall) +static u32 MatchCall_GetRematchTableIdx_Type1(match_call_t matchCall) { return matchCall.type1->rematchTableIdx; } -static static u32 MatchCall_GetRematchTableIdx_Type2(match_call_t matchCall) +static u32 MatchCall_GetRematchTableIdx_Type2(match_call_t matchCall) { return matchCall.type2->rematchTableIdx; } -static static u32 MatchCall_GetRematchTableIdx_Type3(match_call_t matchCall) +static u32 MatchCall_GetRematchTableIdx_Type3(match_call_t matchCall) { return REMATCH_TABLE_ENTRIES; } -- cgit v1.2.3 From 9b920bfec363bbcda40354079500062bc992dfed Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 7 Mar 2018 18:03:13 -0500 Subject: More renaming --- src/match_call.c | 278 +++++++++++++++++++++++++++---------------------------- 1 file changed, 138 insertions(+), 140 deletions(-) (limited to 'src') diff --git a/src/match_call.c b/src/match_call.c index bedea65ec..a7ac3c579 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -8,17 +8,15 @@ #include "battle_frontier_1.h" #include "gym_leader_rematch.h" -#define NELEMS(a) (s32)( sizeof (a) / sizeof (*(a)) ) - extern const u8 gTrainerClassNames[][13]; // Static type declarations -typedef struct MatchCallSusbtruct0 { +typedef struct MatchCallTextDataStruct { const u8 *text; u16 flag; u16 flag2; -} match_call_sub0_t; +} match_call_text_data_t; struct MatchCallStructCommon { u8 type; @@ -32,7 +30,7 @@ struct MatchCallStruct0 { u16 flag; const u8 *desc; const u8 *name; - const match_call_sub0_t *textData; + const match_call_text_data_t *textData; }; struct MatchCallStruct1 { @@ -42,11 +40,11 @@ struct MatchCallStruct1 { u16 rematchTableIdx; const u8 *desc; const u8 *name; - const match_call_sub0_t *textData; + const match_call_text_data_t *textData; }; struct MatchCallSubstruct2 { - u16 v0; + u16 flag; u8 v2; }; @@ -56,7 +54,7 @@ struct MatchCallStruct2 { u16 flag; u16 rematchTableIdx; const u8 *desc; - const match_call_sub0_t *textData; + const match_call_text_data_t *textData; const struct MatchCallSubstruct2 *v10; }; @@ -74,7 +72,7 @@ struct MatchCallStruct4 { u16 flag; const u8 *desc; const u8 *name; - const match_call_sub0_t *textData; + const match_call_text_data_t *textData; }; struct MatchCallStruct5 { @@ -84,7 +82,7 @@ struct MatchCallStruct5 { u16 v4; const u8 *desc; const u8 *name; - const match_call_sub0_t *textData; + const match_call_text_data_t *textData; }; #define MATCHCALLDEF(name, type_, ...) \ @@ -114,29 +112,29 @@ struct UnkStruct_08625388 { // Static ROM declarations -static bool32 sub_81D1628(match_call_t); -static bool32 sub_81D164C(match_call_t); -static bool32 sub_81D1670(match_call_t); -static bool32 sub_81D1694(match_call_t); -static bool32 sub_81D16CC(match_call_t); - -u8 sub_81D1714(match_call_t); -u8 sub_81D1718(match_call_t); -u8 sub_81D171C(match_call_t); -u8 sub_81D1750(match_call_t); -u8 sub_81D1754(match_call_t); - -bool32 sub_81D178C(match_call_t); -bool32 sub_81D1790(match_call_t); -bool32 sub_81D17C0(match_call_t); -bool32 sub_81D17E0(match_call_t); -bool32 sub_81D17E4(match_call_t); - -bool32 sub_81D1840(match_call_t); -bool32 sub_81D1844(match_call_t); -bool32 sub_81D1848(match_call_t); -bool32 sub_81D184C(match_call_t); -bool32 sub_81D1850(match_call_t); +static bool32 sMatchCallGetFlag_Type0(match_call_t); +static bool32 sMatchCallGetFlag_Type1(match_call_t); +static bool32 sMatchCallGetFlag_Type2(match_call_t); +static bool32 sMatchCallGetFlag_Type3(match_call_t); +static bool32 sMatchCallGetFlag_Type4(match_call_t); + +static u8 sub_81D1714(match_call_t); +static u8 sub_81D1718(match_call_t); +static u8 sub_81D171C(match_call_t); +static u8 sub_81D1750(match_call_t); +static u8 sub_81D1754(match_call_t); + +static bool32 MatchCall_IsRematchable_Type0(match_call_t); +static bool32 MatchCall_IsRematchable_Type1(match_call_t); +static bool32 MatchCall_IsRematchable_Type2(match_call_t); +static bool32 MatchCall_IsRematchable_Type3(match_call_t); +static bool32 MatchCall_IsRematchable_Type4(match_call_t); + +static bool32 sub_81D1840(match_call_t); +static bool32 sub_81D1844(match_call_t); +static bool32 sub_81D1848(match_call_t); +static bool32 sub_81D184C(match_call_t); +static bool32 sub_81D1850(match_call_t); static u32 MatchCall_GetRematchTableIdx_Type0(match_call_t); static u32 MatchCall_GetRematchTableIdx_Type1(match_call_t); @@ -150,15 +148,15 @@ static void MatchCall_GetMessage_Type2(match_call_t, u8 *); static void MatchCall_GetMessage_Type3(match_call_t, u8 *); static void MatchCall_GetMessage_Type4(match_call_t, u8 *); -void sub_81D1AB0(match_call_t, const u8 **, const u8 **); -void sub_81D1ABC(match_call_t, const u8 **, const u8 **); -void sub_81D1ADC(match_call_t, const u8 **, const u8 **); -void sub_81D1AF4(match_call_t, const u8 **, const u8 **); -void sub_81D1B00(match_call_t, const u8 **, const u8 **); +static void MatchCall_GetNameAndDesc_Type0(match_call_t, const u8 **, const u8 **); +static void MatchCall_GetNameAndDesc_Type1(match_call_t, const u8 **, const u8 **); +static void MatchCall_GetNameAndDesc_Type2(match_call_t, const u8 **, const u8 **); +static void MatchCall_GetNameAndDesc_Type3(match_call_t, const u8 **, const u8 **); +static void MatchCall_GetNameAndDesc_Type4(match_call_t, const u8 **, const u8 **); -void sub_81D1920(const match_call_sub0_t *, u8 *); -void sub_81D199C(const match_call_sub0_t *, u16, u8 *); -void sub_81D1B0C(u32, const u8 **, const u8 **); +static void sub_81D1920(const match_call_text_data_t *, u8 *); +static void sub_81D199C(const match_call_text_data_t *, u16, u8 *); +static void MatchCall_GetNameAndDescByRematchIdx(u32, const u8 **, const u8 **); extern const u8 gText_MrStone_Pokenav_2B60C0[]; extern const u8 gText_MrStone_Pokenav_2B61E6[]; @@ -317,7 +315,7 @@ extern const u8 gMatchCall_MaySelfIntroductionText_Line1[]; extern const u8 gMatchCall_MaySelfIntroductionText_Line2[]; // .rodata -static const match_call_sub0_t sMrStoneTextScripts[] = { +static const match_call_text_data_t sMrStoneTextScripts[] = { { gText_MrStone_Pokenav_2B60C0, 0xFFFF, FLAG_0x158 }, { gText_MrStone_Pokenav_2B61E6, FLAG_0x158, 0xFFFF }, { gText_MrStone_Pokenav_2B6302, FLAG_0x0BD, 0xFFFF }, @@ -334,7 +332,7 @@ static const match_call_sub0_t sMrStoneTextScripts[] = { MATCHCALLDEF(sMrStoneMatchCallHeader, 0, 10, 0xffff, gMrStoneMatchCallDesc, gMrStoneMatchCallName, sMrStoneTextScripts); -static const match_call_sub0_t sNormanTextScripts[] = { +static const match_call_text_data_t sNormanTextScripts[] = { { gText_Norman_Pokenav_2B5719, FLAG_0x132, 0xFFFF }, { gText_Norman_Pokenav_2B5795, FLAG_0x4F1, 0xFFFF }, { gText_Norman_Pokenav_2B584D, FLAG_0x4F3, 0xFFFF }, @@ -351,7 +349,7 @@ MATCHCALLDEF(sNormanMatchCallHeader, 5, 7, FLAG_0x132, 0x45, gNormanMatchCallDes MATCHCALLDEF(sProfBirchMatchCallHeader, 3, 0, FLAG_0x119, gProfBirchMatchCallDesc, gProfBirchMatchCallName) -static const match_call_sub0_t sMomTextScripts[] = { +static const match_call_text_data_t sMomTextScripts[] = { { gText_Mom_Pokenav_2B227B, 0xffff, 0xffff }, { gText_Mom_Pokenav_2B2310, FLAG_0x4F4, 0xffff }, { gText_Mom_Pokenav_2B23F3, FLAG_SYS_GAME_CLEAR, 0xffff }, @@ -360,7 +358,7 @@ static const match_call_sub0_t sMomTextScripts[] = { MATCHCALLDEF(sMomMatchCallHeader, 0, 0, FLAG_0x0D8, gMomMatchCallDesc, gMomMatchCallName, sMomTextScripts); -static const match_call_sub0_t sStevenTextScripts[] = { +static const match_call_text_data_t sStevenTextScripts[] = { { gText_Steven_Pokenav_2B5B95, 0xffff, 0xffff }, { gText_Steven_Pokenav_2B5C53, FLAG_0x0C7, 0xffff }, { gText_Steven_Pokenav_2B5CC9, FLAG_0x0D4, 0xffff }, @@ -373,7 +371,7 @@ static const match_call_sub0_t sStevenTextScripts[] = { MATCHCALLDEF(sStevenMatchCallHeader, 0, 0xd5, FLAG_0x131, gStevenMatchCallDesc, gStevenMatchCallName, sStevenTextScripts); -static const match_call_sub0_t sMayTextScripts[] = { +static const match_call_text_data_t sMayTextScripts[] = { { gText_May_Pokenav_2B3AB3, 0xFFFF, 0xFFFF }, { gText_May_Pokenav_2B3B3F, FLAG_0x4F1, 0xFFFF }, { gText_May_Pokenav_2B3C13, FLAG_0x095, 0xFFFF }, @@ -394,7 +392,7 @@ static const match_call_sub0_t sMayTextScripts[] = { MATCHCALLDEF(sMayMatchCallHeader, 4, MALE, FLAG_0x0FD, gMayBrendanMatchCallDesc, gExpandedPlaceholder_May, sMayTextScripts); -static const match_call_sub0_t sBrendanTextScripts[] = { +static const match_call_text_data_t sBrendanTextScripts[] = { { gText_Brendan_Pokenav_2B43EF, 0xFFFF, 0xFFFF }, { gText_Brendan_Pokenav_2B4486, FLAG_0x4F1, 0xFFFF }, { gText_Brendan_Pokenav_2B4560, FLAG_0x095, 0xFFFF }, @@ -415,7 +413,7 @@ static const match_call_sub0_t sBrendanTextScripts[] = { MATCHCALLDEF(sBrendanMatchCallHeader, 4, FEMALE, FLAG_0x0FD, gMayBrendanMatchCallDesc, gExpandedPlaceholder_Brendan, sBrendanTextScripts); -static const match_call_sub0_t sWallyTextScripts[] = { +static const match_call_text_data_t sWallyTextScripts[] = { { gText_Wally_Pokenav_2B4DE2, 0xFFFF, 0xFFFF }, { gText_Wally_Pokenav_2B4E57, FLAG_0x0C7, 0xFFFF }, { gText_Wally_Pokenav_2B4EA5, FLAG_0x4F3, 0xFFFF }, @@ -435,7 +433,7 @@ const struct MatchCallSubstruct2 sWallyAdditionalData[] = { MATCHCALLDEF(sWallyMatchCallHeader, 2, 0, FLAG_0x0D6, REMATCH_WALLY_3, gWallyMatchCallDesc, sWallyTextScripts, sWallyAdditionalData); -static const match_call_sub0_t sScottTextScripts[] = { +static const match_call_text_data_t sScottTextScripts[] = { { gText_Scott_Pokenav_2B5184, 0xFFFF, 0xFFFF }, { gText_Scott_Pokenav_2B5275, FLAG_0x08B, 0xFFFF }, { gText_Scott_Pokenav_2B5323, FLAG_0x097, 0xFFFF }, @@ -449,7 +447,7 @@ static const match_call_sub0_t sScottTextScripts[] = { MATCHCALLDEF(sScottMatchCallHeader, 0, 0xD5, FLAG_0x0D7, gScottMatchCallDesc, gScottMatchCallName, sScottTextScripts); -static const match_call_sub0_t sRoxanneTextScripts[] = { +static const match_call_text_data_t sRoxanneTextScripts[] = { { gText_Roxanne_Pokenav_2B2456, 0xFFFE, 0xFFFF }, { gText_Roxanne_Pokenav_2B250E, 0xFFFF, 0xFFFF }, { gText_Roxanne_Pokenav_2B25C1, 0xFFFF, 0xFFFF }, @@ -459,7 +457,7 @@ static const match_call_sub0_t sRoxanneTextScripts[] = { MATCHCALLDEF(sRoxanneMatchCallHeader, 5, 10, FLAG_0x1D3, 0x41, gRoxanneMatchCallDesc, NULL, sRoxanneTextScripts); -static const match_call_sub0_t sBrawlyTextScripts[] = { +static const match_call_text_data_t sBrawlyTextScripts[] = { { gText_Brawly_Pokenav_2B2659, 0xFFFE, 0xFFFF }, { gText_Brawly_Pokenav_2B275D, 0xFFFF, 0xFFFF }, { gText_Brawly_Pokenav_2B286F, 0xFFFF, 0xFFFF }, @@ -469,7 +467,7 @@ static const match_call_sub0_t sBrawlyTextScripts[] = { MATCHCALLDEF(sBrawlyMatchCallHeader, 5, 2, FLAG_0x1D4, 0x42, gBrawlyMatchCallDesc, NULL, sBrawlyTextScripts); -static const match_call_sub0_t sWattsonTextScripts[] = { +static const match_call_text_data_t sWattsonTextScripts[] = { { gText_Wattson_Pokenav_2B2912, 0xFFFE, 0xFFFF }, { gText_Wattson_Pokenav_2B29CA, 0xFFFF, 0xFFFF }, { gText_Wattson_Pokenav_2B2AB6, 0xFFFF, 0xFFFF }, @@ -479,7 +477,7 @@ static const match_call_sub0_t sWattsonTextScripts[] = { MATCHCALLDEF(sWattsonMatchCallHeader, 5, 9, FLAG_0x1D5, 0x43, gWattsonMatchCallDesc, NULL, sWattsonTextScripts); -static const match_call_sub0_t sFlanneryTextScripts[] = { +static const match_call_text_data_t sFlanneryTextScripts[] = { { gText_Flannery_Pokenav_2B2B4D, 0xFFFE, 0xFFFF }, { gText_Flannery_Pokenav_2B2C0E, 0xFFFF, 0xFFFF }, { gText_Flannery_Pokenav_2B2CF1, 0xFFFF, 0xFFFF }, @@ -489,7 +487,7 @@ static const match_call_sub0_t sFlanneryTextScripts[] = { MATCHCALLDEF(sFlanneryMatchCallHeader, 5, 3, FLAG_0x1D6, 0x44, gFlanneryMatchCallDesc, NULL, sFlanneryTextScripts); -static const match_call_sub0_t sWinonaTextScripts[] = { +static const match_call_text_data_t sWinonaTextScripts[] = { { gText_Winona_Pokenav_2B2DA4, 0xFFFE, 0xFFFF }, { gText_Winona_Pokenav_2B2E2B, 0xFFFF, 0xFFFF }, { gText_Winona_Pokenav_2B2EC2, 0xFFFF, 0xFFFF }, @@ -499,7 +497,7 @@ static const match_call_sub0_t sWinonaTextScripts[] = { MATCHCALLDEF(sWinonaMatchCallHeader, 5, 11, FLAG_0x1D7, 0x46, gWinonaMatchCallDesc, NULL, sWinonaTextScripts); -static const match_call_sub0_t sTateLizaTextScripts[] = { +static const match_call_text_data_t sTateLizaTextScripts[] = { { gText_TateLiza_Pokenav_2B2F97, 0xFFFE, 0xFFFF }, { gText_TateLiza_Pokenav_2B306E, 0xFFFF, 0xFFFF }, { gText_TateLiza_Pokenav_2B3158, 0xFFFF, 0xFFFF }, @@ -509,7 +507,7 @@ static const match_call_sub0_t sTateLizaTextScripts[] = { MATCHCALLDEF(sTateLizaMatchCallHeader, 5, 13, FLAG_0x1D8, 0x47, gTateLizaMatchCallDesc, NULL, sTateLizaTextScripts); -static const match_call_sub0_t sJuanTextScripts[] = { +static const match_call_text_data_t sJuanTextScripts[] = { { gText_Juan_Pokenav_2B3249, 0xFFFE, 0xFFFF }, { gText_Juan_Pokenav_2B32EC, 0xFFFF, 0xFFFF }, { gText_Juan_Pokenav_2B33AA, 0xFFFF, 0xFFFF }, @@ -519,42 +517,42 @@ static const match_call_sub0_t sJuanTextScripts[] = { MATCHCALLDEF(sJuanMatchCallHeader, 5, 14, FLAG_0x1D9, 0x48, gJuanMatchCallDesc, NULL, sJuanTextScripts); -static const match_call_sub0_t sSidneyTextScripts[] = { +static const match_call_text_data_t sSidneyTextScripts[] = { { gText_Sidney_Pokenav_2B34CC, 0xFFFF, 0xFFFF }, { NULL, 0xFFFF, 0xFFFF } }; MATCHCALLDEF(sSidneyMatchCallHeader, 5, 15, FLAG_0x1A5, 0x49, gEliteFourMatchCallDesc, NULL, sSidneyTextScripts); -static const match_call_sub0_t sPhoebeTextScripts[] = { +static const match_call_text_data_t sPhoebeTextScripts[] = { { gText_Phoebe_Pokenav_2B3561, 0xFFFF, 0xFFFF }, { NULL, 0xFFFF, 0xFFFF } }; MATCHCALLDEF(sPhoebeMatchCallHeader, 5, 15, FLAG_0x1A6, 0x4A, gEliteFourMatchCallDesc, NULL, sPhoebeTextScripts); -static const match_call_sub0_t sGlaciaTextScripts[] = { +static const match_call_text_data_t sGlaciaTextScripts[] = { { gText_Glacia_Pokenav_2B35E4, 0xFFFF, 0xFFFF }, { NULL, 0xFFFF, 0xFFFF } }; MATCHCALLDEF(sGlaciaMatchCallHeader, 5, 15, FLAG_0x1A7, 0x4B, gEliteFourMatchCallDesc, NULL, sGlaciaTextScripts); -static const match_call_sub0_t sDrakeTextScripts[] = { +static const match_call_text_data_t sDrakeTextScripts[] = { { gText_Drake_Pokenav_2B368B, 0xFFFF, 0xFFFF }, { NULL, 0xFFFF, 0xFFFF } }; MATCHCALLDEF(sDrakeMatchCallHeader, 5, 15, FLAG_0x1A8, 0x4C, gEliteFourMatchCallDesc, NULL, sDrakeTextScripts); -static const match_call_sub0_t sWallaceTextScripts[] = { +static const match_call_text_data_t sWallaceTextScripts[] = { { gText_Wallace_Pokenav_2B3790, 0xFFFF, 0xFFFF }, { NULL, 0xFFFF, 0xFFFF } }; MATCHCALLDEF(sWallaceMatchCallHeader, 5, 15, FLAG_0x1A9, 0x4D, gChampionMatchCallDesc, NULL, sWallaceTextScripts); -static const match_call_t gUnknown_086252A8[] = { +static const match_call_t sMatchCallHeaders[] = { {.type0 = &sMrStoneMatchCallHeader}, {.type3 = &sProfBirchMatchCallHeader}, {.type4 = &sBrendanMatchCallHeader}, @@ -578,15 +576,15 @@ static const match_call_t gUnknown_086252A8[] = { {.type5 = &sWallaceMatchCallHeader} }; -bool32 (*const gUnknown_086252FC[])(match_call_t) = { - sub_81D1628, - sub_81D164C, - sub_81D1670, - sub_81D1694, - sub_81D16CC +static bool32 (*const sMatchCallGetFlagFuncs[])(match_call_t) = { + sMatchCallGetFlag_Type0, + sMatchCallGetFlag_Type1, + sMatchCallGetFlag_Type2, + sMatchCallGetFlag_Type3, + sMatchCallGetFlag_Type4 }; -u8 (*const gUnknown_08625310[])(match_call_t) = { +static u8 (*const gUnknown_08625310[])(match_call_t) = { sub_81D1714, sub_81D1718, sub_81D171C, @@ -594,15 +592,15 @@ u8 (*const gUnknown_08625310[])(match_call_t) = { sub_81D1754 }; -bool32 (*const gUnknown_08625324[])(match_call_t) = { - sub_81D178C, - sub_81D1790, - sub_81D17C0, - sub_81D17E0, - sub_81D17E4 +static bool32 (*const sMatchCall_IsRematchableFunctions[])(match_call_t) = { + MatchCall_IsRematchable_Type0, + MatchCall_IsRematchable_Type1, + MatchCall_IsRematchable_Type2, + MatchCall_IsRematchable_Type3, + MatchCall_IsRematchable_Type4 }; -bool32 (*const gUnknown_08625338[])(match_call_t) = { +static bool32 (*const gUnknown_08625338[])(match_call_t) = { sub_81D1840, sub_81D1844, sub_81D1848, @@ -626,12 +624,12 @@ static void (*const sMatchCall_GetMessageFunctions[])(match_call_t, u8 *) = { MatchCall_GetMessage_Type4 }; -void (*const gUnknown_08625374[])(match_call_t, const u8 **, const u8 **) = { - sub_81D1AB0, - sub_81D1ABC, - sub_81D1ADC, - sub_81D1AF4, - sub_81D1B00 +static void (*const sMatchCall_GetNameAndDescFunctions[])(match_call_t, const u8 **, const u8 **) = { + MatchCall_GetNameAndDesc_Type0, + MatchCall_GetNameAndDesc_Type1, + MatchCall_GetNameAndDesc_Type2, + MatchCall_GetNameAndDesc_Type3, + MatchCall_GetNameAndDesc_Type4 }; static const struct UnkStruct_08625388 sMatchCallCheckPageOverrides[] = { @@ -643,7 +641,7 @@ static const struct UnkStruct_08625388 sMatchCallCheckPageOverrides[] = { // .text -u32 sub_81D1574(match_call_t matchCall) +static u32 MatchCallGetFunctionIndex(match_call_t matchCall) { switch (matchCall.common->type) { @@ -662,16 +660,16 @@ u32 sub_81D1574(match_call_t matchCall) } } -u32 sub_81D15BC(u32 rematchIdx) +u32 GetTrainerIdxByRematchIdx(u32 rematchIdx) { return gRematchTable[rematchIdx].trainerIds[0]; } -s32 sub_81D15CC(s32 trainerIdx) +s32 GetRematchIdxByTrainerIdx(s32 trainerIdx) { s32 rematchIdx; - for (rematchIdx = 0; rematchIdx < NELEMS(gRematchTable); rematchIdx++) + for (rematchIdx = 0; rematchIdx < REMATCH_TABLE_ENTRIES; rematchIdx++) { if (gRematchTable[rematchIdx].trainerIds[0] == trainerIdx) return rematchIdx; @@ -686,33 +684,33 @@ bool32 MatchCallFlagGetByIndex(u32 idx) if (idx > 20) return FALSE; - matchCall = gUnknown_086252A8[idx]; - i = sub_81D1574(matchCall); - return gUnknown_086252FC[i](matchCall); + matchCall = sMatchCallHeaders[idx]; + i = MatchCallGetFunctionIndex(matchCall); + return sMatchCallGetFlagFuncs[i](matchCall); } -static bool32 sub_81D1628(match_call_t matchCall) +static bool32 sMatchCallGetFlag_Type0(match_call_t matchCall) { if (matchCall.type0->flag == 0xffff) return TRUE; return FlagGet(matchCall.type0->flag); } -static bool32 sub_81D164C(match_call_t matchCall) +static bool32 sMatchCallGetFlag_Type1(match_call_t matchCall) { if (matchCall.type1->flag == 0xffff) return TRUE; return FlagGet(matchCall.type1->flag); } -static bool32 sub_81D1670(match_call_t matchCall) +static bool32 sMatchCallGetFlag_Type2(match_call_t matchCall) { if (matchCall.type2->flag == 0xffff) return TRUE; return FlagGet(matchCall.type2->flag); } -static bool32 sub_81D1694(match_call_t matchCall) +static bool32 sMatchCallGetFlag_Type3(match_call_t matchCall) { if (matchCall.type4->gender != gSaveBlock2Ptr->playerGender) return FALSE; @@ -721,7 +719,7 @@ static bool32 sub_81D1694(match_call_t matchCall) return FlagGet(matchCall.type4->flag); } -static bool32 sub_81D16CC(match_call_t matchCall) +static bool32 sMatchCallGetFlag_Type4(match_call_t matchCall) { return FlagGet(matchCall.type3->flag); } @@ -732,79 +730,79 @@ u8 sub_81D16DC(u32 idx) u32 i; if (idx > 20) - return FALSE; - matchCall = gUnknown_086252A8[idx]; - i = sub_81D1574(matchCall); + return 0; + matchCall = sMatchCallHeaders[idx]; + i = MatchCallGetFunctionIndex(matchCall); return gUnknown_08625310[i](matchCall); } -u8 sub_81D1714(match_call_t matchCall) +static u8 sub_81D1714(match_call_t matchCall) { return matchCall.type0->v1; } -u8 sub_81D1718(match_call_t matchCall) +static u8 sub_81D1718(match_call_t matchCall) { return matchCall.type1->v1; } -u8 sub_81D171C(match_call_t matchCall) +static u8 sub_81D171C(match_call_t matchCall) { s32 i; - for (i = 0; matchCall.type2->v10[i].v0 != 0xffff; i++) + for (i = 0; matchCall.type2->v10[i].flag != 0xffff; i++) { - if (!FlagGet(matchCall.type2->v10[i].v0)) + if (!FlagGet(matchCall.type2->v10[i].flag)) break; } return matchCall.type2->v10[i].v2; } -u8 sub_81D1750(match_call_t matchCall) +static u8 sub_81D1750(match_call_t matchCall) { return 0xd5; } -u8 sub_81D1754(match_call_t matchCall) +static u8 sub_81D1754(match_call_t matchCall) { return 0xd5; } -bool32 sub_81D1758(u32 idx) +bool32 MatchCall_IsRematchable(u32 idx) { match_call_t matchCall; u32 i; if (idx > 20) return 0; - matchCall = gUnknown_086252A8[idx]; - i = sub_81D1574(matchCall); - return gUnknown_08625324[i](matchCall); + matchCall = sMatchCallHeaders[idx]; + i = MatchCallGetFunctionIndex(matchCall); + return sMatchCall_IsRematchableFunctions[i](matchCall); } -bool32 sub_81D178C(match_call_t matchCall) +static bool32 MatchCall_IsRematchable_Type0(match_call_t matchCall) { return FALSE; } -bool32 sub_81D1790(match_call_t matchCall) +static bool32 MatchCall_IsRematchable_Type1(match_call_t matchCall) { if (matchCall.type1->rematchTableIdx >= REMATCH_ELITE_FOUR_ENTRIES) return FALSE; return gSaveBlock1Ptr->trainerRematches[matchCall.type1->rematchTableIdx] ? TRUE : FALSE; } -bool32 sub_81D17C0(match_call_t matchCall) +static bool32 MatchCall_IsRematchable_Type2(match_call_t matchCall) { return gSaveBlock1Ptr->trainerRematches[matchCall.type2->rematchTableIdx] ? TRUE : FALSE; } -bool32 sub_81D17E0(match_call_t matchCall) +static bool32 MatchCall_IsRematchable_Type3(match_call_t matchCall) { return FALSE; } -bool32 sub_81D17E4(match_call_t matchCall) +static bool32 MatchCall_IsRematchable_Type4(match_call_t matchCall) { return FALSE; } @@ -816,8 +814,8 @@ bool32 sub_81D17E8(u32 idx) if (idx > 20) return FALSE; - matchCall = gUnknown_086252A8[idx]; - i = sub_81D1574(matchCall); + matchCall = sMatchCallHeaders[idx]; + i = MatchCallGetFunctionIndex(matchCall); if (gUnknown_08625338[i](matchCall)) return TRUE; for (i = 0; i < 4; i++) @@ -828,27 +826,27 @@ bool32 sub_81D17E8(u32 idx) return FALSE; } -bool32 sub_81D1840(match_call_t matchCall) +static bool32 sub_81D1840(match_call_t matchCall) { return FALSE; } -bool32 sub_81D1844(match_call_t matchCall) +static bool32 sub_81D1844(match_call_t matchCall) { return TRUE; } -bool32 sub_81D1848(match_call_t matchCall) +static bool32 sub_81D1848(match_call_t matchCall) { return TRUE; } -bool32 sub_81D184C(match_call_t matchCall) +static bool32 sub_81D184C(match_call_t matchCall) { return FALSE; } -bool32 sub_81D1850(match_call_t matchCall) +static bool32 sub_81D1850(match_call_t matchCall) { return FALSE; } @@ -860,8 +858,8 @@ u32 MatchCall_GetRematchTableIdx(u32 idx) if (idx > 20) return REMATCH_TABLE_ENTRIES; - matchCall = gUnknown_086252A8[idx]; - i = sub_81D1574(matchCall); + matchCall = sMatchCallHeaders[idx]; + i = MatchCallGetFunctionIndex(matchCall); return sMatchCall_GetRematchTableIdxFunctions[i](matchCall); } @@ -897,8 +895,8 @@ void MatchCall_GetMessage(u32 idx, u8 *dest) if (idx > 20) return; - matchCall = gUnknown_086252A8[idx]; - i = sub_81D1574(matchCall); + matchCall = sMatchCallHeaders[idx]; + i = MatchCallGetFunctionIndex(matchCall); sMatchCall_GetMessageFunctions[i](matchCall, dest); } @@ -930,7 +928,7 @@ static void MatchCall_GetMessage_Type4(match_call_t matchCall, u8 *dest) sub_8197080(dest); } -void sub_81D1920(const match_call_sub0_t *sub0, u8 *dest) +void sub_81D1920(const match_call_text_data_t *sub0, u8 *dest) { u32 i; for (i = 0; sub0[i].text != NULL; i++) @@ -950,7 +948,7 @@ void sub_81D1920(const match_call_sub0_t *sub0, u8 *dest) #ifdef NONMATCHING // There's some weird upmerge going on that I cannot replicate at this time. -void sub_81D199C(const match_call_sub0_t *sub0, u16 idx, u8 *dest) +static void sub_81D199C(const match_call_text_data_t *sub0, u16 idx, u8 *dest) { u32 i; for (i = 0; sub0[i].text != NULL; i++) @@ -982,7 +980,7 @@ void sub_81D199C(const match_call_sub0_t *sub0, u16 idx, u8 *dest) } } #else -ASM_DIRECT void sub_81D199C(const match_call_sub0_t *sub0, u16 idx, u8 *dest) +static ASM_DIRECT void sub_81D199C(const match_call_text_data_t *sub0, u16 idx, u8 *dest) { asm_unified("\tpush {r4-r7,lr}\n" "\tmov r7, r10\n" @@ -1099,48 +1097,48 @@ void sub_81D1A78(u32 idx, const u8 **desc, const u8 **name) if (idx > 20) return; - matchCall = gUnknown_086252A8[idx]; - i = sub_81D1574(matchCall); - gUnknown_08625374[i](matchCall, desc, name); + matchCall = sMatchCallHeaders[idx]; + i = MatchCallGetFunctionIndex(matchCall); + sMatchCall_GetNameAndDescFunctions[i](matchCall, desc, name); } -void sub_81D1AB0(match_call_t matchCall, const u8 **desc, const u8 **name) +static void MatchCall_GetNameAndDesc_Type0(match_call_t matchCall, const u8 **desc, const u8 **name) { *desc = matchCall.type0->desc; *name = matchCall.type0->name; } -void sub_81D1ABC(match_call_t matchCall, const u8 **desc, const u8 **name) +static void MatchCall_GetNameAndDesc_Type1(match_call_t matchCall, const u8 **desc, const u8 **name) { match_call_t _matchCall = matchCall; if (_matchCall.type1->name == NULL) - sub_81D1B0C(_matchCall.type1->rematchTableIdx, desc, name); + MatchCall_GetNameAndDescByRematchIdx(_matchCall.type1->rematchTableIdx, desc, name); else *name = _matchCall.type1->name; *desc = _matchCall.type1->desc; } -void sub_81D1ADC(match_call_t matchCall, const u8 **desc, const u8 **name) +static void MatchCall_GetNameAndDesc_Type2(match_call_t matchCall, const u8 **desc, const u8 **name) { - sub_81D1B0C(matchCall.type2->rematchTableIdx, desc, name); + MatchCall_GetNameAndDescByRematchIdx(matchCall.type2->rematchTableIdx, desc, name); *desc = matchCall.type2->desc; } -void sub_81D1AF4(match_call_t matchCall, const u8 **desc, const u8 **name) +static void MatchCall_GetNameAndDesc_Type3(match_call_t matchCall, const u8 **desc, const u8 **name) { *desc = matchCall.type4->desc; *name = matchCall.type4->name; } -void sub_81D1B00(match_call_t matchCall, const u8 **desc, const u8 **name) +static void MatchCall_GetNameAndDesc_Type4(match_call_t matchCall, const u8 **desc, const u8 **name) { *desc = matchCall.type3->desc; *name = matchCall.type3->name; } -void sub_81D1B0C(u32 idx, const u8 **desc, const u8 **name) +static void MatchCall_GetNameAndDescByRematchIdx(u32 idx, const u8 **desc, const u8 **name) { - const struct Trainer *trainer = gTrainers + sub_81D15BC(idx); + const struct Trainer *trainer = gTrainers + GetTrainerIdxByRematchIdx(idx); *desc = gTrainerClassNames[trainer->trainerClass]; *name = trainer->trainerName; } @@ -1271,7 +1269,7 @@ bool32 sub_81D1BF8(u32 idx) void SetMatchCallRegisteredFlag(void) { - s32 r0 = sub_81D15CC(gSpecialVar_0x8004); + s32 r0 = GetRematchIdxByTrainerIdx(gSpecialVar_0x8004); if (r0 >= 0) FlagSet(FLAG_MATCH_CALL_REGISTERED + r0); } -- cgit v1.2.3 From c5f99a723ee74a182c5444944ecc507bb3c1695e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 28 Mar 2018 21:26:52 -0700 Subject: Remove s prefix from static functions --- src/match_call.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/match_call.c b/src/match_call.c index a7ac3c579..9c1e02947 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -112,11 +112,11 @@ struct UnkStruct_08625388 { // Static ROM declarations -static bool32 sMatchCallGetFlag_Type0(match_call_t); -static bool32 sMatchCallGetFlag_Type1(match_call_t); -static bool32 sMatchCallGetFlag_Type2(match_call_t); -static bool32 sMatchCallGetFlag_Type3(match_call_t); -static bool32 sMatchCallGetFlag_Type4(match_call_t); +static bool32 MatchCallGetFlag_Type0(match_call_t); +static bool32 MatchCallGetFlag_Type1(match_call_t); +static bool32 MatchCallGetFlag_Type2(match_call_t); +static bool32 MatchCallGetFlag_Type3(match_call_t); +static bool32 MatchCallGetFlag_Type4(match_call_t); static u8 sub_81D1714(match_call_t); static u8 sub_81D1718(match_call_t); @@ -577,11 +577,11 @@ static const match_call_t sMatchCallHeaders[] = { }; static bool32 (*const sMatchCallGetFlagFuncs[])(match_call_t) = { - sMatchCallGetFlag_Type0, - sMatchCallGetFlag_Type1, - sMatchCallGetFlag_Type2, - sMatchCallGetFlag_Type3, - sMatchCallGetFlag_Type4 + MatchCallGetFlag_Type0, + MatchCallGetFlag_Type1, + MatchCallGetFlag_Type2, + MatchCallGetFlag_Type3, + MatchCallGetFlag_Type4 }; static u8 (*const gUnknown_08625310[])(match_call_t) = { @@ -689,28 +689,28 @@ bool32 MatchCallFlagGetByIndex(u32 idx) return sMatchCallGetFlagFuncs[i](matchCall); } -static bool32 sMatchCallGetFlag_Type0(match_call_t matchCall) +static bool32 MatchCallGetFlag_Type0(match_call_t matchCall) { if (matchCall.type0->flag == 0xffff) return TRUE; return FlagGet(matchCall.type0->flag); } -static bool32 sMatchCallGetFlag_Type1(match_call_t matchCall) +static bool32 MatchCallGetFlag_Type1(match_call_t matchCall) { if (matchCall.type1->flag == 0xffff) return TRUE; return FlagGet(matchCall.type1->flag); } -static bool32 sMatchCallGetFlag_Type2(match_call_t matchCall) +static bool32 MatchCallGetFlag_Type2(match_call_t matchCall) { if (matchCall.type2->flag == 0xffff) return TRUE; return FlagGet(matchCall.type2->flag); } -static bool32 sMatchCallGetFlag_Type3(match_call_t matchCall) +static bool32 MatchCallGetFlag_Type3(match_call_t matchCall) { if (matchCall.type4->gender != gSaveBlock2Ptr->playerGender) return FALSE; @@ -719,7 +719,7 @@ static bool32 sMatchCallGetFlag_Type3(match_call_t matchCall) return FlagGet(matchCall.type4->flag); } -static bool32 sMatchCallGetFlag_Type4(match_call_t matchCall) +static bool32 MatchCallGetFlag_Type4(match_call_t matchCall) { return FlagGet(matchCall.type3->flag); } -- cgit v1.2.3