ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 22:03:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update pokenav_match_call_data.c

Browse Source
This commit is contained in:
GriffinR 2019-08-02 10:52:40 -04:00 committed by GitHub
parent 4cea2ffa32
commit a9247181e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/pokenav_match_call_data.c
View File

@ -18,13 +18,13 @@ typedef struct MatchCallTextDataStruct {
struct MatchCallStructCommon { struct MatchCallStructCommon {
u8 type; u8 type;
u8 v1; u8 mapSec;
u16 flag; u16 flag;
}; };
struct MatchCallStruct0 { struct MatchCallStruct0 {
u8 type; u8 type;
u8 v1; u8 mapSec;
u16 flag; u16 flag;
const u8 *desc; const u8 *desc;
const u8 *name; const u8 *name;
@ -33,7 +33,7 @@ struct MatchCallStruct0 {
struct MatchCallStruct1 { struct MatchCallStruct1 {
u8 type; u8 type;
u8 v1; u8 mapSec;
u16 flag; u16 flag;
u16 rematchTableIdx; u16 rematchTableIdx;
const u8 *desc; const u8 *desc;
@ -48,7 +48,7 @@ struct MatchCallSubstruct2 {
struct MatchCallStruct2 { struct MatchCallStruct2 {
u8 type; u8 type;
u8 v1; u8 mapSec;
u16 flag; u16 flag;
u16 rematchTableIdx; u16 rematchTableIdx;
const u8 *desc; const u8 *desc;
@ -58,7 +58,7 @@ struct MatchCallStruct2 {
struct MatchCallStruct3 { struct MatchCallStruct3 {
u8 type; u8 type;
u8 v1; u8 mapSec;
u16 flag; u16 flag;
const u8 *desc; const u8 *desc;
const u8 *name; const u8 *name;
@ -76,7 +76,7 @@ struct MatchCallStruct4 {
// Note: Type1 and Type5 have identical struct layouts. // Note: Type1 and Type5 have identical struct layouts.
struct MatchCallStruct5 { struct MatchCallStruct5 {
u8 type; u8 type;
u8 v1; u8 mapSec;
u16 flag; u16 flag;
u16 rematchTableIdx; u16 rematchTableIdx;
const u8 *desc; const u8 *desc;
@ -326,7 +326,7 @@ static const match_call_text_data_t sMrStoneTextScripts[] = {
static const struct MatchCallStruct0 sMrStoneMatchCallHeader = static const struct MatchCallStruct0 sMrStoneMatchCallHeader =
{ {
.type = 0, .type = 0,
.v1 = MAPSEC_RUSTBORO_CITY, .mapSec = MAPSEC_RUSTBORO_CITY,
.flag = 0xFFFF, .flag = 0xFFFF,
.desc = gMrStoneMatchCallDesc, .desc = gMrStoneMatchCallDesc,
.name = gMrStoneMatchCallName, .name = gMrStoneMatchCallName,
@ -349,7 +349,7 @@ static const match_call_text_data_t sNormanTextScripts[] = {
static const struct MatchCallStruct5 sNormanMatchCallHeader = static const struct MatchCallStruct5 sNormanMatchCallHeader =
{ {
.type = 5, .type = 5,
.v1 = MAPSEC_PETALBURG_CITY, .mapSec = MAPSEC_PETALBURG_CITY,
.flag = FLAG_ENABLE_NORMAN_MATCH_CALL, .flag = FLAG_ENABLE_NORMAN_MATCH_CALL,
.rematchTableIdx = REMATCH_NORMAN, .rematchTableIdx = REMATCH_NORMAN,
.desc = gNormanMatchCallDesc, .desc = gNormanMatchCallDesc,
@ -360,7 +360,7 @@ static const struct MatchCallStruct5 sNormanMatchCallHeader =
static const struct MatchCallStruct3 sProfBirchMatchCallHeader = static const struct MatchCallStruct3 sProfBirchMatchCallHeader =
{ {
.type = 3, .type = 3,
.v1 = 0, .mapSec = 0,
.flag = FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, .flag = FLAG_ENABLE_PROF_BIRCH_MATCH_CALL,
.desc = gProfBirchMatchCallDesc, .desc = gProfBirchMatchCallDesc,
.name = gProfBirchMatchCallName .name = gProfBirchMatchCallName
@ -376,7 +376,7 @@ static const match_call_text_data_t sMomTextScripts[] = {
static const struct MatchCallStruct0 sMomMatchCallHeader = static const struct MatchCallStruct0 sMomMatchCallHeader =
{ {
.type = 0, .type = 0,
.v1 = MAPSEC_LITTLEROOT_TOWN, .mapSec = MAPSEC_LITTLEROOT_TOWN,
.flag = FLAG_ENABLE_MOM_MATCH_CALL, .flag = FLAG_ENABLE_MOM_MATCH_CALL,
.desc = gMomMatchCallDesc, .desc = gMomMatchCallDesc,
.name = gMomMatchCallName, .name = gMomMatchCallName,
@ -397,7 +397,7 @@ static const match_call_text_data_t sStevenTextScripts[] = {
static const struct MatchCallStruct0 sStevenMatchCallHeader = static const struct MatchCallStruct0 sStevenMatchCallHeader =
{ {
.type = 0, .type = 0,
.v1 = MAPSEC_NONE, .mapSec = MAPSEC_NONE,
.flag = FLAG_REGISTERED_STEVEN_POKENAV, .flag = FLAG_REGISTERED_STEVEN_POKENAV,
.desc = gStevenMatchCallDesc, .desc = gStevenMatchCallDesc,
.name = gStevenMatchCallName, .name = gStevenMatchCallName,
@ -483,7 +483,7 @@ const struct MatchCallSubstruct2 sWallyAdditionalData[] = {
static const struct MatchCallStruct2 sWallyMatchCallHeader = static const struct MatchCallStruct2 sWallyMatchCallHeader =
{ {
.type = 2, .type = 2,
.v1 = 0, .mapSec = 0,
.flag = FLAG_ENABLE_WALLY_MATCH_CALL, .flag = FLAG_ENABLE_WALLY_MATCH_CALL,
.rematchTableIdx = REMATCH_WALLY_3, .rematchTableIdx = REMATCH_WALLY_3,
.desc = gWallyMatchCallDesc, .desc = gWallyMatchCallDesc,
@ -506,7 +506,7 @@ static const match_call_text_data_t sScottTextScripts[] = {
static const struct MatchCallStruct0 sScottMatchCallHeader = static const struct MatchCallStruct0 sScottMatchCallHeader =
{ {
.type = 0, .type = 0,
.v1 = MAPSEC_NONE, .mapSec = MAPSEC_NONE,
.flag = FLAG_ENABLE_SCOTT_MATCH_CALL, .flag = FLAG_ENABLE_SCOTT_MATCH_CALL,
.desc = gScottMatchCallDesc, .desc = gScottMatchCallDesc,
.name = gScottMatchCallName, .name = gScottMatchCallName,
@ -524,7 +524,7 @@ static const match_call_text_data_t sRoxanneTextScripts[] = {
static const struct MatchCallStruct5 sRoxanneMatchCallHeader = static const struct MatchCallStruct5 sRoxanneMatchCallHeader =
{ {
.type = 5, .type = 5,
.v1 = MAPSEC_RUSTBORO_CITY, .mapSec = MAPSEC_RUSTBORO_CITY,
.flag = FLAG_ENABLE_ROXANNE_MATCH_CALL, .flag = FLAG_ENABLE_ROXANNE_MATCH_CALL,
.rematchTableIdx = REMATCH_ROXANNE, .rematchTableIdx = REMATCH_ROXANNE,
.desc = gRoxanneMatchCallDesc, .desc = gRoxanneMatchCallDesc,
@ -543,7 +543,7 @@ static const match_call_text_data_t sBrawlyTextScripts[] = {
static const struct MatchCallStruct5 sBrawlyMatchCallHeader = static const struct MatchCallStruct5 sBrawlyMatchCallHeader =
{ {
.type = 5, .type = 5,
.v1 = MAPSEC_DEWFORD_TOWN, .mapSec = MAPSEC_DEWFORD_TOWN,
.flag = FLAG_ENABLE_BRAWLY_MATCH_CALL, .flag = FLAG_ENABLE_BRAWLY_MATCH_CALL,
.rematchTableIdx = REMATCH_BRAWLY, .rematchTableIdx = REMATCH_BRAWLY,
.desc = gBrawlyMatchCallDesc, .desc = gBrawlyMatchCallDesc,
@ -562,7 +562,7 @@ static const match_call_text_data_t sWattsonTextScripts[] = {
static const struct MatchCallStruct5 sWattsonMatchCallHeader = static const struct MatchCallStruct5 sWattsonMatchCallHeader =
{ {
.type = 5, .type = 5,
.v1 = MAPSEC_MAUVILLE_CITY, .mapSec = MAPSEC_MAUVILLE_CITY,
.flag = FLAG_ENABLE_WATTSON_MATCH_CALL, .flag = FLAG_ENABLE_WATTSON_MATCH_CALL,
.rematchTableIdx = REMATCH_WATTSON, .rematchTableIdx = REMATCH_WATTSON,
.desc = gWattsonMatchCallDesc, .desc = gWattsonMatchCallDesc,
@ -581,7 +581,7 @@ static const match_call_text_data_t sFlanneryTextScripts[] = {
static const struct MatchCallStruct5 sFlanneryMatchCallHeader = static const struct MatchCallStruct5 sFlanneryMatchCallHeader =
{ {
.type = 5, .type = 5,
.v1 = MAPSEC_LAVARIDGE_TOWN, .mapSec = MAPSEC_LAVARIDGE_TOWN,
.flag = FLAG_ENABLE_FLANNERY_MATCH_CALL, .flag = FLAG_ENABLE_FLANNERY_MATCH_CALL,
.rematchTableIdx = REMATCH_FLANNERY, .rematchTableIdx = REMATCH_FLANNERY,
.desc = gFlanneryMatchCallDesc, .desc = gFlanneryMatchCallDesc,
@ -600,7 +600,7 @@ static const match_call_text_data_t sWinonaTextScripts[] = {
static const struct MatchCallStruct5 sWinonaMatchCallHeader = static const struct MatchCallStruct5 sWinonaMatchCallHeader =
{ {
.type = 5, .type = 5,
.v1 = MAPSEC_FORTREE_CITY, .mapSec = MAPSEC_FORTREE_CITY,
.flag = FLAG_ENABLE_WINONA_MATCH_CALL, .flag = FLAG_ENABLE_WINONA_MATCH_CALL,
.rematchTableIdx = REMATCH_WINONA, .rematchTableIdx = REMATCH_WINONA,
.desc = gWinonaMatchCallDesc, .desc = gWinonaMatchCallDesc,
@ -619,7 +619,7 @@ static const match_call_text_data_t sTateLizaTextScripts[] = {
static const struct MatchCallStruct5 sTateLizaMatchCallHeader = static const struct MatchCallStruct5 sTateLizaMatchCallHeader =
{ {
.type = 5, .type = 5,
.v1 = MAPSEC_MOSSDEEP_CITY, .mapSec = MAPSEC_MOSSDEEP_CITY,
.flag = FLAG_ENABLE_TATE_AND_LIZA_MATCH_CALL, .flag = FLAG_ENABLE_TATE_AND_LIZA_MATCH_CALL,
.rematchTableIdx = REMATCH_TATE_AND_LIZA, .rematchTableIdx = REMATCH_TATE_AND_LIZA,
.desc = gTateLizaMatchCallDesc, .desc = gTateLizaMatchCallDesc,
@ -638,7 +638,7 @@ static const match_call_text_data_t sJuanTextScripts[] = {
static const struct MatchCallStruct5 sJuanMatchCallHeader = static const struct MatchCallStruct5 sJuanMatchCallHeader =
{ {
.type = 5, .type = 5,
.v1 = MAPSEC_SOOTOPOLIS_CITY, .mapSec = MAPSEC_SOOTOPOLIS_CITY,
.flag = FLAG_ENABLE_JUAN_MATCH_CALL, .flag = FLAG_ENABLE_JUAN_MATCH_CALL,
.rematchTableIdx = REMATCH_JUAN, .rematchTableIdx = REMATCH_JUAN,
.desc = gJuanMatchCallDesc, .desc = gJuanMatchCallDesc,
@ -654,7 +654,7 @@ static const match_call_text_data_t sSidneyTextScripts[] = {
static const struct MatchCallStruct5 sSidneyMatchCallHeader = static const struct MatchCallStruct5 sSidneyMatchCallHeader =
{ {
.type = 5, .type = 5,
.v1 = MAPSEC_EVER_GRANDE_CITY, .mapSec = MAPSEC_EVER_GRANDE_CITY,
.flag = FLAG_REMATCH_SIDNEY, .flag = FLAG_REMATCH_SIDNEY,
.rematchTableIdx = REMATCH_SIDNEY, .rematchTableIdx = REMATCH_SIDNEY,
.desc = gEliteFourMatchCallDesc, .desc = gEliteFourMatchCallDesc,
@ -670,7 +670,7 @@ static const match_call_text_data_t sPhoebeTextScripts[] = {
static const struct MatchCallStruct5 sPhoebeMatchCallHeader = static const struct MatchCallStruct5 sPhoebeMatchCallHeader =
{ {
.type = 5, .type = 5,
.v1 = MAPSEC_EVER_GRANDE_CITY, .mapSec = MAPSEC_EVER_GRANDE_CITY,
.flag = FLAG_REMATCH_PHOEBE, .flag = FLAG_REMATCH_PHOEBE,
.rematchTableIdx = REMATCH_PHOEBE, .rematchTableIdx = REMATCH_PHOEBE,
.desc = gEliteFourMatchCallDesc, .desc = gEliteFourMatchCallDesc,
@ -686,7 +686,7 @@ static const match_call_text_data_t sGlaciaTextScripts[] = {
static const struct MatchCallStruct5 sGlaciaMatchCallHeader = static const struct MatchCallStruct5 sGlaciaMatchCallHeader =
{ {
.type = 5, .type = 5,
.v1 = MAPSEC_EVER_GRANDE_CITY, .mapSec = MAPSEC_EVER_GRANDE_CITY,
.flag = FLAG_REMATCH_GLACIA, .flag = FLAG_REMATCH_GLACIA,
.rematchTableIdx = REMATCH_GLACIA, .rematchTableIdx = REMATCH_GLACIA,
.desc = gEliteFourMatchCallDesc, .desc = gEliteFourMatchCallDesc,
@ -702,7 +702,7 @@ static const match_call_text_data_t sDrakeTextScripts[] = {
static const struct MatchCallStruct5 sDrakeMatchCallHeader = static const struct MatchCallStruct5 sDrakeMatchCallHeader =
{ {
.type = 5, .type = 5,
.v1 = MAPSEC_EVER_GRANDE_CITY, .mapSec = MAPSEC_EVER_GRANDE_CITY,
.flag = FLAG_REMATCH_DRAKE, .flag = FLAG_REMATCH_DRAKE,
.rematchTableIdx = REMATCH_DRAKE, .rematchTableIdx = REMATCH_DRAKE,
.desc = gEliteFourMatchCallDesc, .desc = gEliteFourMatchCallDesc,
@ -718,7 +718,7 @@ static const match_call_text_data_t sWallaceTextScripts[] = {
static const struct MatchCallStruct5 sWallaceMatchCallHeader = static const struct MatchCallStruct5 sWallaceMatchCallHeader =
{ {
.type = 5, .type = 5,
.v1 = MAPSEC_EVER_GRANDE_CITY, .mapSec = MAPSEC_EVER_GRANDE_CITY,
.flag = FLAG_REMATCH_WALLACE, .flag = FLAG_REMATCH_WALLACE,
.rematchTableIdx = REMATCH_WALLACE, .rematchTableIdx = REMATCH_WALLACE,
.desc = gChampionMatchCallDesc, .desc = gChampionMatchCallDesc,
@ -912,12 +912,12 @@ u8 sub_81D16DC(u32 idx)
static u8 sub_81D1714(match_call_t matchCall) static u8 sub_81D1714(match_call_t matchCall)
{ {
return matchCall.type0->v1; return matchCall.type0->mapSec;
} }
static u8 sub_81D1718(match_call_t matchCall) static u8 sub_81D1718(match_call_t matchCall)
{ {
return matchCall.type1->v1; return matchCall.type1->mapSec;
} }
static u8 sub_81D171C(match_call_t matchCall) static u8 sub_81D171C(match_call_t matchCall)