diff --git a/src/pokenav_match_call_data.c b/src/pokenav_match_call_data.c index 06bc6111f7..9a27058e2c 100644 --- a/src/pokenav_match_call_data.c +++ b/src/pokenav_match_call_data.c @@ -157,21 +157,24 @@ static void MatchCall_BufferCallMessageText(const match_call_text_data_t *, u8 * static void MatchCall_BufferCallMessageTextByRematchTeam(const match_call_text_data_t *, u16, u8 *); static void MatchCall_GetNameAndDescByRematchIdx(u32, const u8 **, const u8 **); +#define ALWAYS_AVAILABLE 0xFFFF +#define NO_FLAG_TO_SET 0xFFFF + // .rodata static const match_call_text_data_t sMrStoneTextScripts[] = { - { MatchCall_Text_MrStone1, 0xFFFF, FLAG_ENABLE_MR_STONE_POKENAV }, - { MatchCall_Text_MrStone2, FLAG_ENABLE_MR_STONE_POKENAV, 0xFFFF }, - { MatchCall_Text_MrStone3, FLAG_DELIVERED_STEVEN_LETTER, 0xFFFF }, - { MatchCall_Text_MrStone4, FLAG_RECEIVED_EXP_SHARE, 0xFFFF }, - { MatchCall_Text_MrStone5, FLAG_RECEIVED_HM_STRENGTH, 0xFFFF }, - { MatchCall_Text_MrStone6, FLAG_DEFEATED_PETALBURG_GYM, 0xFFFF }, - { MatchCall_Text_MrStone7, FLAG_RECEIVED_CASTFORM, 0xFFFF }, - { MatchCall_Text_MrStone8, FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, 0xFFFF }, - { MatchCall_Text_MrStone9, FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, 0xFFFF }, - { MatchCall_Text_MrStone10, FLAG_DEFEATED_SOOTOPOLIS_GYM, 0xFFFF }, - { MatchCall_Text_MrStone11, FLAG_SYS_GAME_CLEAR, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { MatchCall_Text_MrStone1, ALWAYS_AVAILABLE, FLAG_ENABLE_MR_STONE_POKENAV }, + { MatchCall_Text_MrStone2, FLAG_ENABLE_MR_STONE_POKENAV, NO_FLAG_TO_SET }, + { MatchCall_Text_MrStone3, FLAG_DELIVERED_STEVEN_LETTER, NO_FLAG_TO_SET }, + { MatchCall_Text_MrStone4, FLAG_RECEIVED_EXP_SHARE, NO_FLAG_TO_SET }, + { MatchCall_Text_MrStone5, FLAG_RECEIVED_HM_STRENGTH, NO_FLAG_TO_SET }, + { MatchCall_Text_MrStone6, FLAG_DEFEATED_PETALBURG_GYM, NO_FLAG_TO_SET }, + { MatchCall_Text_MrStone7, FLAG_RECEIVED_CASTFORM, NO_FLAG_TO_SET }, + { MatchCall_Text_MrStone8, FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, NO_FLAG_TO_SET }, + { MatchCall_Text_MrStone9, FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, NO_FLAG_TO_SET }, + { MatchCall_Text_MrStone10, FLAG_DEFEATED_SOOTOPOLIS_GYM, NO_FLAG_TO_SET }, + { MatchCall_Text_MrStone11, FLAG_SYS_GAME_CLEAR, NO_FLAG_TO_SET }, + { NULL, ALWAYS_AVAILABLE, NO_FLAG_TO_SET } }; static const struct MatchCallStructNPC sMrStoneMatchCallHeader = @@ -185,16 +188,16 @@ static const struct MatchCallStructNPC sMrStoneMatchCallHeader = }; static const match_call_text_data_t sNormanTextScripts[] = { - { MatchCall_Text_Norman1, FLAG_ENABLE_NORMAN_MATCH_CALL, 0xFFFF }, - { MatchCall_Text_Norman2, FLAG_DEFEATED_DEWFORD_GYM, 0xFFFF }, - { MatchCall_Text_Norman3, FLAG_DEFEATED_LAVARIDGE_GYM, 0xFFFF }, - { MatchCall_Text_Norman4, FLAG_DEFEATED_PETALBURG_GYM, 0xFFFF }, - { MatchCall_Text_Norman5, FLAG_RECEIVED_RED_OR_BLUE_ORB, 0xFFFF }, - { MatchCall_Text_Norman6, 0xFFFE, 0xFFFF }, - { MatchCall_Text_Norman7, FLAG_SYS_GAME_CLEAR, 0xFFFF }, - { MatchCall_Text_Norman8, FLAG_SYS_GAME_CLEAR, 0xFFFF }, - { MatchCall_Text_Norman9, FLAG_SYS_GAME_CLEAR, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { MatchCall_Text_Norman1, FLAG_ENABLE_NORMAN_MATCH_CALL, NO_FLAG_TO_SET }, + { MatchCall_Text_Norman2, FLAG_DEFEATED_DEWFORD_GYM, NO_FLAG_TO_SET }, + { MatchCall_Text_Norman3, FLAG_DEFEATED_LAVARIDGE_GYM, NO_FLAG_TO_SET }, + { MatchCall_Text_Norman4, FLAG_DEFEATED_PETALBURG_GYM, NO_FLAG_TO_SET }, + { MatchCall_Text_Norman5, FLAG_RECEIVED_RED_OR_BLUE_ORB, NO_FLAG_TO_SET }, + { MatchCall_Text_Norman6, 0xFFFE, NO_FLAG_TO_SET }, + { MatchCall_Text_Norman7, FLAG_SYS_GAME_CLEAR, NO_FLAG_TO_SET }, + { MatchCall_Text_Norman8, FLAG_SYS_GAME_CLEAR, NO_FLAG_TO_SET }, + { MatchCall_Text_Norman9, FLAG_SYS_GAME_CLEAR, NO_FLAG_TO_SET }, + { NULL, ALWAYS_AVAILABLE, NO_FLAG_TO_SET } }; static const struct MatchCallStructTrainer sNormanMatchCallHeader = @@ -218,10 +221,10 @@ static const struct MatchCallBirch sProfBirchMatchCallHeader = }; static const match_call_text_data_t sMomTextScripts[] = { - { MatchCall_Text_Mom1, 0xFFFF, 0xFFFF }, - { MatchCall_Text_Mom2, FLAG_DEFEATED_PETALBURG_GYM, 0xFFFF }, - { MatchCall_Text_Mom3, FLAG_SYS_GAME_CLEAR, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { MatchCall_Text_Mom1, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { MatchCall_Text_Mom2, FLAG_DEFEATED_PETALBURG_GYM, NO_FLAG_TO_SET }, + { MatchCall_Text_Mom3, FLAG_SYS_GAME_CLEAR, NO_FLAG_TO_SET }, + { NULL, ALWAYS_AVAILABLE, NO_FLAG_TO_SET } }; static const struct MatchCallStructNPC sMomMatchCallHeader = @@ -235,14 +238,14 @@ static const struct MatchCallStructNPC sMomMatchCallHeader = }; static const match_call_text_data_t sStevenTextScripts[] = { - { MatchCall_Text_Steven1, 0xFFFF, 0xFFFF }, - { MatchCall_Text_Steven2, FLAG_RUSTURF_TUNNEL_OPENED, 0xFFFF }, - { MatchCall_Text_Steven3, FLAG_RECEIVED_RED_OR_BLUE_ORB, 0xFFFF }, - { MatchCall_Text_Steven4, FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, 0xFFFF }, - { MatchCall_Text_Steven5, FLAG_DEFEATED_MOSSDEEP_GYM, 0xFFFF }, - { MatchCall_Text_Steven6, FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, 0xFFFF }, - { MatchCall_Text_Steven7, FLAG_SYS_GAME_CLEAR, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF }, + { MatchCall_Text_Steven1, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { MatchCall_Text_Steven2, FLAG_RUSTURF_TUNNEL_OPENED, NO_FLAG_TO_SET }, + { MatchCall_Text_Steven3, FLAG_RECEIVED_RED_OR_BLUE_ORB, NO_FLAG_TO_SET }, + { MatchCall_Text_Steven4, FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, NO_FLAG_TO_SET }, + { MatchCall_Text_Steven5, FLAG_DEFEATED_MOSSDEEP_GYM, NO_FLAG_TO_SET }, + { MatchCall_Text_Steven6, FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, NO_FLAG_TO_SET }, + { MatchCall_Text_Steven7, FLAG_SYS_GAME_CLEAR, NO_FLAG_TO_SET }, + { NULL, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, }; static const struct MatchCallStructNPC sStevenMatchCallHeader = @@ -256,22 +259,22 @@ static const struct MatchCallStructNPC sStevenMatchCallHeader = }; static const match_call_text_data_t sMayTextScripts[] = { - { MatchCall_Text_May1, 0xFFFF, 0xFFFF }, - { MatchCall_Text_May2, FLAG_DEFEATED_DEWFORD_GYM, 0xFFFF }, - { MatchCall_Text_May3, FLAG_DELIVERED_DEVON_GOODS, 0xFFFF }, - { MatchCall_Text_May4, FLAG_HIDE_MAUVILLE_CITY_WALLY, 0xFFFF }, - { MatchCall_Text_May5, FLAG_RECEIVED_HM_STRENGTH, 0xFFFF }, - { MatchCall_Text_May6, FLAG_DEFEATED_LAVARIDGE_GYM, 0xFFFF }, - { MatchCall_Text_May7, FLAG_DEFEATED_PETALBURG_GYM, 0xFFFF }, - { MatchCall_Text_May8, FLAG_RECEIVED_CASTFORM, 0xFFFF }, - { MatchCall_Text_May9, FLAG_RECEIVED_RED_OR_BLUE_ORB, 0xFFFF }, - { MatchCall_Text_May10, FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, 0xFFFF }, - { MatchCall_Text_May11, FLAG_MET_TEAM_AQUA_HARBOR, 0xFFFF }, - { MatchCall_Text_May12, FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, 0xFFFF }, - { MatchCall_Text_May13, FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, 0xFFFF }, - { MatchCall_Text_May14, FLAG_DEFEATED_SOOTOPOLIS_GYM, 0xFFFF }, - { MatchCall_Text_May15, FLAG_SYS_GAME_CLEAR, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { MatchCall_Text_May1, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { MatchCall_Text_May2, FLAG_DEFEATED_DEWFORD_GYM, NO_FLAG_TO_SET }, + { MatchCall_Text_May3, FLAG_DELIVERED_DEVON_GOODS, NO_FLAG_TO_SET }, + { MatchCall_Text_May4, FLAG_HIDE_MAUVILLE_CITY_WALLY, NO_FLAG_TO_SET }, + { MatchCall_Text_May5, FLAG_RECEIVED_HM_STRENGTH, NO_FLAG_TO_SET }, + { MatchCall_Text_May6, FLAG_DEFEATED_LAVARIDGE_GYM, NO_FLAG_TO_SET }, + { MatchCall_Text_May7, FLAG_DEFEATED_PETALBURG_GYM, NO_FLAG_TO_SET }, + { MatchCall_Text_May8, FLAG_RECEIVED_CASTFORM, NO_FLAG_TO_SET }, + { MatchCall_Text_May9, FLAG_RECEIVED_RED_OR_BLUE_ORB, NO_FLAG_TO_SET }, + { MatchCall_Text_May10, FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, NO_FLAG_TO_SET }, + { MatchCall_Text_May11, FLAG_MET_TEAM_AQUA_HARBOR, NO_FLAG_TO_SET }, + { MatchCall_Text_May12, FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, NO_FLAG_TO_SET }, + { MatchCall_Text_May13, FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, NO_FLAG_TO_SET }, + { MatchCall_Text_May14, FLAG_DEFEATED_SOOTOPOLIS_GYM, NO_FLAG_TO_SET }, + { MatchCall_Text_May15, FLAG_SYS_GAME_CLEAR, NO_FLAG_TO_SET }, + { NULL, ALWAYS_AVAILABLE, NO_FLAG_TO_SET } }; static const struct MatchCallRival sMayMatchCallHeader = @@ -285,22 +288,22 @@ static const struct MatchCallRival sMayMatchCallHeader = }; static const match_call_text_data_t sBrendanTextScripts[] = { - { MatchCall_Text_Brendan1, 0xFFFF, 0xFFFF }, - { MatchCall_Text_Brendan2, FLAG_DEFEATED_DEWFORD_GYM, 0xFFFF }, - { MatchCall_Text_Brendan3, FLAG_DELIVERED_DEVON_GOODS, 0xFFFF }, - { MatchCall_Text_Brendan4, FLAG_HIDE_MAUVILLE_CITY_WALLY, 0xFFFF }, - { MatchCall_Text_Brendan5, FLAG_RECEIVED_HM_STRENGTH, 0xFFFF }, - { MatchCall_Text_Brendan6, FLAG_DEFEATED_LAVARIDGE_GYM, 0xFFFF }, - { MatchCall_Text_Brendan7, FLAG_DEFEATED_PETALBURG_GYM, 0xFFFF }, - { MatchCall_Text_Brendan8, FLAG_RECEIVED_CASTFORM, 0xFFFF }, - { MatchCall_Text_Brendan9, FLAG_RECEIVED_RED_OR_BLUE_ORB, 0xFFFF }, - { MatchCall_Text_Brendan10, FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, 0xFFFF }, - { MatchCall_Text_Brendan11, FLAG_MET_TEAM_AQUA_HARBOR, 0xFFFF }, - { MatchCall_Text_Brendan12, FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, 0xFFFF }, - { MatchCall_Text_Brendan13, FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, 0xFFFF }, - { MatchCall_Text_Brendan14, FLAG_DEFEATED_SOOTOPOLIS_GYM, 0xFFFF }, - { MatchCall_Text_Brendan15, FLAG_SYS_GAME_CLEAR, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { MatchCall_Text_Brendan1, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { MatchCall_Text_Brendan2, FLAG_DEFEATED_DEWFORD_GYM, NO_FLAG_TO_SET }, + { MatchCall_Text_Brendan3, FLAG_DELIVERED_DEVON_GOODS, NO_FLAG_TO_SET }, + { MatchCall_Text_Brendan4, FLAG_HIDE_MAUVILLE_CITY_WALLY, NO_FLAG_TO_SET }, + { MatchCall_Text_Brendan5, FLAG_RECEIVED_HM_STRENGTH, NO_FLAG_TO_SET }, + { MatchCall_Text_Brendan6, FLAG_DEFEATED_LAVARIDGE_GYM, NO_FLAG_TO_SET }, + { MatchCall_Text_Brendan7, FLAG_DEFEATED_PETALBURG_GYM, NO_FLAG_TO_SET }, + { MatchCall_Text_Brendan8, FLAG_RECEIVED_CASTFORM, NO_FLAG_TO_SET }, + { MatchCall_Text_Brendan9, FLAG_RECEIVED_RED_OR_BLUE_ORB, NO_FLAG_TO_SET }, + { MatchCall_Text_Brendan10, FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, NO_FLAG_TO_SET }, + { MatchCall_Text_Brendan11, FLAG_MET_TEAM_AQUA_HARBOR, NO_FLAG_TO_SET }, + { MatchCall_Text_Brendan12, FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, NO_FLAG_TO_SET }, + { MatchCall_Text_Brendan13, FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, NO_FLAG_TO_SET }, + { MatchCall_Text_Brendan14, FLAG_DEFEATED_SOOTOPOLIS_GYM, NO_FLAG_TO_SET }, + { MatchCall_Text_Brendan15, FLAG_SYS_GAME_CLEAR, NO_FLAG_TO_SET }, + { NULL, ALWAYS_AVAILABLE, NO_FLAG_TO_SET } }; static const struct MatchCallRival sBrendanMatchCallHeader = @@ -314,14 +317,14 @@ static const struct MatchCallRival sBrendanMatchCallHeader = }; static const match_call_text_data_t sWallyTextScripts[] = { - { MatchCall_Text_Wally1, 0xFFFF, 0xFFFF }, - { MatchCall_Text_Wally2, FLAG_RUSTURF_TUNNEL_OPENED, 0xFFFF }, - { MatchCall_Text_Wally3, FLAG_DEFEATED_LAVARIDGE_GYM, 0xFFFF }, - { MatchCall_Text_Wally4, FLAG_RECEIVED_CASTFORM, 0xFFFF }, - { MatchCall_Text_Wally5, FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, 0xFFFF }, - { MatchCall_Text_Wally6, FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, 0xFFFF }, - { MatchCall_Text_Wally7, FLAG_DEFEATED_WALLY_VICTORY_ROAD, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { MatchCall_Text_Wally1, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { MatchCall_Text_Wally2, FLAG_RUSTURF_TUNNEL_OPENED, NO_FLAG_TO_SET }, + { MatchCall_Text_Wally3, FLAG_DEFEATED_LAVARIDGE_GYM, NO_FLAG_TO_SET }, + { MatchCall_Text_Wally4, FLAG_RECEIVED_CASTFORM, NO_FLAG_TO_SET }, + { MatchCall_Text_Wally5, FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, NO_FLAG_TO_SET }, + { MatchCall_Text_Wally6, FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, NO_FLAG_TO_SET }, + { MatchCall_Text_Wally7, FLAG_DEFEATED_WALLY_VICTORY_ROAD, NO_FLAG_TO_SET }, + { NULL, ALWAYS_AVAILABLE, NO_FLAG_TO_SET } }; static const struct MatchCallLocationOverride sWallyLocationData[] = { @@ -343,14 +346,14 @@ static const struct MatchCallWally sWallyMatchCallHeader = }; static const match_call_text_data_t sScottTextScripts[] = { - { MatchCall_Text_Scott1, 0xFFFF, 0xFFFF }, - { MatchCall_Text_Scott2, FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, 0xFFFF }, - { MatchCall_Text_Scott3, FLAG_RECEIVED_CASTFORM, 0xFFFF }, - { MatchCall_Text_Scott4, FLAG_RECEIVED_RED_OR_BLUE_ORB, 0xFFFF }, - { MatchCall_Text_Scott5, FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, 0xFFFF }, - { MatchCall_Text_Scott6, FLAG_DEFEATED_SOOTOPOLIS_GYM, 0xFFFF }, - { MatchCall_Text_Scott7, FLAG_SYS_GAME_CLEAR, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { MatchCall_Text_Scott1, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { MatchCall_Text_Scott2, FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, NO_FLAG_TO_SET }, + { MatchCall_Text_Scott3, FLAG_RECEIVED_CASTFORM, NO_FLAG_TO_SET }, + { MatchCall_Text_Scott4, FLAG_RECEIVED_RED_OR_BLUE_ORB, NO_FLAG_TO_SET }, + { MatchCall_Text_Scott5, FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, NO_FLAG_TO_SET }, + { MatchCall_Text_Scott6, FLAG_DEFEATED_SOOTOPOLIS_GYM, NO_FLAG_TO_SET }, + { MatchCall_Text_Scott7, FLAG_SYS_GAME_CLEAR, NO_FLAG_TO_SET }, + { NULL, ALWAYS_AVAILABLE, NO_FLAG_TO_SET } }; @@ -365,11 +368,11 @@ static const struct MatchCallStructNPC sScottMatchCallHeader = }; static const match_call_text_data_t sRoxanneTextScripts[] = { - { MatchCall_Text_Roxanne1, 0xFFFE, 0xFFFF }, - { MatchCall_Text_Roxanne2, 0xFFFF, 0xFFFF }, - { MatchCall_Text_Roxanne3, 0xFFFF, 0xFFFF }, - { MatchCall_Text_Roxanne4, FLAG_SYS_GAME_CLEAR, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { MatchCall_Text_Roxanne1, 0xFFFE, NO_FLAG_TO_SET }, + { MatchCall_Text_Roxanne2, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { MatchCall_Text_Roxanne3, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { MatchCall_Text_Roxanne4, FLAG_SYS_GAME_CLEAR, NO_FLAG_TO_SET }, + { NULL, ALWAYS_AVAILABLE, NO_FLAG_TO_SET } }; static const struct MatchCallStructTrainer sRoxanneMatchCallHeader = @@ -384,11 +387,11 @@ static const struct MatchCallStructTrainer sRoxanneMatchCallHeader = }; static const match_call_text_data_t sBrawlyTextScripts[] = { - { MatchCall_Text_Brawly1, 0xFFFE, 0xFFFF }, - { MatchCall_Text_Brawly2, 0xFFFF, 0xFFFF }, - { MatchCall_Text_Brawly3, 0xFFFF, 0xFFFF }, - { MatchCall_Text_Brawly4, FLAG_SYS_GAME_CLEAR, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { MatchCall_Text_Brawly1, 0xFFFE, NO_FLAG_TO_SET }, + { MatchCall_Text_Brawly2, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { MatchCall_Text_Brawly3, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { MatchCall_Text_Brawly4, FLAG_SYS_GAME_CLEAR, NO_FLAG_TO_SET }, + { NULL, ALWAYS_AVAILABLE, NO_FLAG_TO_SET } }; static const struct MatchCallStructTrainer sBrawlyMatchCallHeader = @@ -403,11 +406,11 @@ static const struct MatchCallStructTrainer sBrawlyMatchCallHeader = }; static const match_call_text_data_t sWattsonTextScripts[] = { - { MatchCall_Text_Wattson1, 0xFFFE, 0xFFFF }, - { MatchCall_Text_Wattson2, 0xFFFF, 0xFFFF }, - { MatchCall_Text_Wattson3, 0xFFFF, 0xFFFF }, - { MatchCall_Text_Wattson4, FLAG_SYS_GAME_CLEAR, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { MatchCall_Text_Wattson1, 0xFFFE, NO_FLAG_TO_SET }, + { MatchCall_Text_Wattson2, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { MatchCall_Text_Wattson3, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { MatchCall_Text_Wattson4, FLAG_SYS_GAME_CLEAR, NO_FLAG_TO_SET }, + { NULL, ALWAYS_AVAILABLE, NO_FLAG_TO_SET } }; static const struct MatchCallStructTrainer sWattsonMatchCallHeader = @@ -422,11 +425,11 @@ static const struct MatchCallStructTrainer sWattsonMatchCallHeader = }; static const match_call_text_data_t sFlanneryTextScripts[] = { - { MatchCall_Text_Flannery1, 0xFFFE, 0xFFFF }, - { MatchCall_Text_Flannery2, 0xFFFF, 0xFFFF }, - { MatchCall_Text_Flannery3, 0xFFFF, 0xFFFF }, - { MatchCall_Text_Flannery4, FLAG_SYS_GAME_CLEAR, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { MatchCall_Text_Flannery1, 0xFFFE, NO_FLAG_TO_SET }, + { MatchCall_Text_Flannery2, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { MatchCall_Text_Flannery3, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { MatchCall_Text_Flannery4, FLAG_SYS_GAME_CLEAR, NO_FLAG_TO_SET }, + { NULL, ALWAYS_AVAILABLE, NO_FLAG_TO_SET } }; static const struct MatchCallStructTrainer sFlanneryMatchCallHeader = @@ -441,11 +444,11 @@ static const struct MatchCallStructTrainer sFlanneryMatchCallHeader = }; static const match_call_text_data_t sWinonaTextScripts[] = { - { MatchCall_Text_Winona1, 0xFFFE, 0xFFFF }, - { MatchCall_Text_Winona2, 0xFFFF, 0xFFFF }, - { MatchCall_Text_Winona3, 0xFFFF, 0xFFFF }, - { MatchCall_Text_Winona4, FLAG_SYS_GAME_CLEAR, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { MatchCall_Text_Winona1, 0xFFFE, NO_FLAG_TO_SET }, + { MatchCall_Text_Winona2, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { MatchCall_Text_Winona3, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { MatchCall_Text_Winona4, FLAG_SYS_GAME_CLEAR, NO_FLAG_TO_SET }, + { NULL, ALWAYS_AVAILABLE, NO_FLAG_TO_SET } }; static const struct MatchCallStructTrainer sWinonaMatchCallHeader = @@ -460,11 +463,11 @@ static const struct MatchCallStructTrainer sWinonaMatchCallHeader = }; static const match_call_text_data_t sTateLizaTextScripts[] = { - { MatchCall_Text_TateLiza1, 0xFFFE, 0xFFFF }, - { MatchCall_Text_TateLiza2, 0xFFFF, 0xFFFF }, - { MatchCall_Text_TateLiza3, 0xFFFF, 0xFFFF }, - { MatchCall_Text_TateLiza4, FLAG_SYS_GAME_CLEAR, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { MatchCall_Text_TateLiza1, 0xFFFE, NO_FLAG_TO_SET }, + { MatchCall_Text_TateLiza2, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { MatchCall_Text_TateLiza3, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { MatchCall_Text_TateLiza4, FLAG_SYS_GAME_CLEAR, NO_FLAG_TO_SET }, + { NULL, ALWAYS_AVAILABLE, NO_FLAG_TO_SET } }; static const struct MatchCallStructTrainer sTateLizaMatchCallHeader = @@ -479,11 +482,11 @@ static const struct MatchCallStructTrainer sTateLizaMatchCallHeader = }; static const match_call_text_data_t sJuanTextScripts[] = { - { MatchCall_Text_Juan1, 0xFFFE, 0xFFFF }, - { MatchCall_Text_Juan2, 0xFFFF, 0xFFFF }, - { MatchCall_Text_Juan3, 0xFFFF, 0xFFFF }, - { MatchCall_Text_Juan4, FLAG_SYS_GAME_CLEAR, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { MatchCall_Text_Juan1, 0xFFFE, NO_FLAG_TO_SET }, + { MatchCall_Text_Juan2, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { MatchCall_Text_Juan3, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { MatchCall_Text_Juan4, FLAG_SYS_GAME_CLEAR, NO_FLAG_TO_SET }, + { NULL, ALWAYS_AVAILABLE, NO_FLAG_TO_SET } }; static const struct MatchCallStructTrainer sJuanMatchCallHeader = @@ -498,8 +501,8 @@ static const struct MatchCallStructTrainer sJuanMatchCallHeader = }; static const match_call_text_data_t sSidneyTextScripts[] = { - { MatchCall_Text_Sidney, 0xFFFF, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { MatchCall_Text_Sidney, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { NULL, ALWAYS_AVAILABLE, NO_FLAG_TO_SET } }; static const struct MatchCallStructTrainer sSidneyMatchCallHeader = @@ -514,8 +517,8 @@ static const struct MatchCallStructTrainer sSidneyMatchCallHeader = }; static const match_call_text_data_t sPhoebeTextScripts[] = { - { MatchCall_Text_Phoebe, 0xFFFF, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { MatchCall_Text_Phoebe, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { NULL, ALWAYS_AVAILABLE, NO_FLAG_TO_SET } }; static const struct MatchCallStructTrainer sPhoebeMatchCallHeader = @@ -530,8 +533,8 @@ static const struct MatchCallStructTrainer sPhoebeMatchCallHeader = }; static const match_call_text_data_t sGlaciaTextScripts[] = { - { MatchCall_Text_Glacia, 0xFFFF, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { MatchCall_Text_Glacia, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { NULL, ALWAYS_AVAILABLE, NO_FLAG_TO_SET } }; static const struct MatchCallStructTrainer sGlaciaMatchCallHeader = @@ -546,8 +549,8 @@ static const struct MatchCallStructTrainer sGlaciaMatchCallHeader = }; static const match_call_text_data_t sDrakeTextScripts[] = { - { MatchCall_Text_Drake, 0xFFFF, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { MatchCall_Text_Drake, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { NULL, ALWAYS_AVAILABLE, NO_FLAG_TO_SET } }; static const struct MatchCallStructTrainer sDrakeMatchCallHeader = @@ -562,8 +565,8 @@ static const struct MatchCallStructTrainer sDrakeMatchCallHeader = }; static const match_call_text_data_t sWallaceTextScripts[] = { - { MatchCall_Text_Wallace, 0xFFFF, 0xFFFF }, - { NULL, 0xFFFF, 0xFFFF } + { MatchCall_Text_Wallace, ALWAYS_AVAILABLE, NO_FLAG_TO_SET }, + { NULL, ALWAYS_AVAILABLE, NO_FLAG_TO_SET } }; static const struct MatchCallStructTrainer sWallaceMatchCallHeader = @@ -993,11 +996,11 @@ static void MatchCall_BufferCallMessageText(const match_call_text_data_t *textDa i--; while (i) { - if (textData[i].availabilityFlag != 0xFFFF && FlagGet(textData[i].flag) == TRUE) + if (textData[i].availabilityFlag != ALWAYS_AVAILABLE && FlagGet(textData[i].flag) == TRUE) break; i--; } - if (textData[i].flagToSetOnCompletion != 0xFFFF) + if (textData[i].flagToSetOnCompletion != NO_FLAG_TO_SET) FlagSet(textData[i].flagToSetOnCompletion); StringExpandPlaceholders(dest, textData[i].text); } @@ -1009,14 +1012,14 @@ static void MatchCall_BufferCallMessageTextByRematchTeam(const match_call_text_d { if (textData[i].availabilityFlag == 0xFFFE) break; - if (textData[i].availabilityFlag != 0xFFFF && !FlagGet(textData[i].flag)) + if (textData[i].availabilityFlag != ALWAYS_AVAILABLE && !FlagGet(textData[i].flag)) break; } if (textData[i].availabilityFlag != 0xFFFE) { if (i) i--; - if (textData[i].flagToSetOnCompletion != 0xFFFF) + if (textData[i].flagToSetOnCompletion != NO_FLAG_TO_SET) FlagSet(textData[i].flagToSetOnCompletion); StringExpandPlaceholders(dest, textData[i].text); }