Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-03-21 17:54:57 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added more descriptive names for Match Call text flags

Browse Source
This commit is contained in:
Frank 2026-01-18 01:00:03 -05:00
parent 2ea4cf42cc
commit cc882e5de2
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pokenav_match_call_data.c
View File

@ -28,8 +28,8 @@ enum
typedef struct MatchCallTextDataStruct {
const u8 *text;
u16 flag;
u16 flag2;
u16 availabilityFlag;
u16 flagToSetOnCompletion;
} match_call_text_data_t;
struct MatchCallStructCommon {
@ -993,12 +993,12 @@ static void MatchCall_BufferCallMessageText(const match_call_text_data_t *textDa
i--;
while (i)
{
if (textData[i].flag != 0xFFFF && FlagGet(textData[i].flag) == TRUE)
if (textData[i].availabilityFlag != 0xFFFF && FlagGet(textData[i].flag) == TRUE)
break;
i--;
}
if (textData[i].flag2 != 0xFFFF)
FlagSet(textData[i].flag2);
if (textData[i].flagToSetOnCompletion != 0xFFFF)
FlagSet(textData[i].flagToSetOnCompletion);
StringExpandPlaceholders(dest, textData[i].text);
}
@ -1007,17 +1007,17 @@ static void MatchCall_BufferCallMessageTextByRematchTeam(const match_call_text_d
u32 i;
for (i = 0; textData[i].text != NULL; i++)
{
if (textData[i].flag == 0xFFFE)
if (textData[i].availabilityFlag == 0xFFFE)
break;
if (textData[i].flag != 0xFFFF && !FlagGet(textData[i].flag))
if (textData[i].availabilityFlag != 0xFFFF && !FlagGet(textData[i].flag))
break;
}
if (textData[i].flag != 0xFFFE)
if (textData[i].availabilityFlag != 0xFFFE)
{
if (i)
i--;
if (textData[i].flag2 != 0xFFFF)
FlagSet(textData[i].flag2);
if (textData[i].flagToSetOnCompletion != 0xFFFF)
FlagSet(textData[i].flagToSetOnCompletion);
StringExpandPlaceholders(dest, textData[i].text);
}
else