Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Created PokeNav COMPOUND_STRINGS #4983

Merged
merged 9 commits into from
Aug 16, 2024
Merged

Created PokeNav COMPOUND_STRINGS #4983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b6d02db
Converted Match Call names and descriptions to COMPOUND_STRINGs
fdeblasio Jul 15, 2024
af67516
Moved May/Brendan and Elite Four descriptions into pokenav_match_call…
fdeblasio Jul 15, 2024
046054e
Moved Steven, Brendan, and May's Match Call text to pokenav_match_cal…
fdeblasio Jul 15, 2024
9f2ef06
Cleaned up Steven's Match Call text
fdeblasio Jul 15, 2024
ab1a203
Added PokeNav option text to match_call_gfx
fdeblasio Jul 15, 2024
e528f10
Moved PokeNav page descriptions to menu_handler_gfx
fdeblasio Jul 15, 2024
88d5e82
Moved help bar texts to pokenav_main_menu.c
fdeblasio Jul 15, 2024
306ab2e
Moved various PokeNav strings out of strings.c and into their relevan…
fdeblasio Jul 16, 2024
0c80f22
Removed unused PokeNav strings
fdeblasio Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 0 additions & 85 deletions include/strings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,23 +986,6 @@ extern const u8 gText_SomeonesPC[];
extern const u8 gText_PlayersPC[];
extern const u8 gText_WhichPCShouldBeAccessed[];

extern const u8 gText_PokenavMatchCall_Strategy[];
extern const u8 gText_PokenavMatchCall_TrainerPokemon[];
extern const u8 gText_PokenavMatchCall_SelfIntroduction[];
extern const u8 gText_Pokenav_ClearButtonList[];
extern const u8 gText_PokenavMap_ZoomedOutButtons[];
extern const u8 gText_PokenavMap_ZoomedInButtons[];
extern const u8 gText_PokenavCondition_MonListButtons[];
extern const u8 gText_PokenavCondition_MonStatusButtons[];
extern const u8 gText_PokenavCondition_MarkingButtons[];
extern const u8 gText_PokenavMatchCall_TrainerListButtons[];
extern const u8 gText_PokenavMatchCall_CallMenuButtons[];
extern const u8 gText_PokenavMatchCall_CheckTrainerButtons[];
extern const u8 gText_PokenavRibbons_MonListButtons[];
extern const u8 gText_PokenavRibbons_RibbonListButtons[];
extern const u8 gText_PokenavRibbons_RibbonCheckButtons[];
extern const u8 gText_Number2[];

extern const u8 gText_Petalburg[];
extern const u8 gText_Slateport[];
extern const u8 gText_Enter2[];
Expand Down Expand Up @@ -2443,43 +2426,6 @@ extern const u8 MatchCall_Text_Phoebe[];
extern const u8 MatchCall_Text_Glacia[];
extern const u8 MatchCall_Text_Drake[];
extern const u8 MatchCall_Text_Wallace[];
extern const u8 gText_MrStoneMatchCallDesc[];
extern const u8 gText_MrStoneMatchCallName[];
extern const u8 gText_StevenMatchCallDesc[];
extern const u8 gText_StevenMatchCallName[];
extern const u8 gText_MayBrendanMatchCallDesc[];
extern const u8 gText_WallyMatchCallDesc[];
extern const u8 gText_NormanMatchCallDesc[];
extern const u8 gText_NormanMatchCallName[];
extern const u8 gText_MomMatchCallDesc[];
extern const u8 gText_MomMatchCallName[];
extern const u8 gText_ScottMatchCallDesc[];
extern const u8 gText_ScottMatchCallName[];
extern const u8 gText_RoxanneMatchCallDesc[];
extern const u8 gText_BrawlyMatchCallDesc[];
extern const u8 gText_WattsonMatchCallDesc[];
extern const u8 gText_FlanneryMatchCallDesc[];
extern const u8 gText_WinonaMatchCallDesc[];
extern const u8 gText_TateLizaMatchCallDesc[];
extern const u8 gText_JuanMatchCallDesc[];
extern const u8 gText_EliteFourMatchCallDesc[];
extern const u8 gText_ChampionMatchCallDesc[];
extern const u8 gText_ProfBirchMatchCallDesc[];
extern const u8 gText_ProfBirchMatchCallName[];
extern const u8 gText_MatchCallSteven_Strategy[];
extern const u8 gText_MatchCallSteven_Pokemon[];
extern const u8 gText_MatchCallSteven_Intro1_BeforeMeteorFallsBattle[];
extern const u8 gText_MatchCallSteven_Intro2_BeforeMeteorFallsBattle[];
extern const u8 gText_MatchCallSteven_Intro1_AfterMeteorFallsBattle[];
extern const u8 gText_MatchCallSteven_Intro2_AfterMeteorFallsBattle[];
extern const u8 gText_MatchCallBrendan_Strategy[];
extern const u8 gText_MatchCallBrendan_Pokemon[];
extern const u8 gText_MatchCallBrendan_Intro1[];
extern const u8 gText_MatchCallBrendan_Intro2[];
extern const u8 gText_MatchCallMay_Strategy[];
extern const u8 gText_MatchCallMay_Pokemon[];
extern const u8 gText_MatchCallMay_Intro1[];
extern const u8 gText_MatchCallMay_Intro2[];

// Contest Link
extern const u8 gText_ColorDarkGray[];
Expand Down Expand Up @@ -2897,37 +2843,6 @@ extern const u8 gText_CutenessContest[];
extern const u8 gText_SmartnessContest[];
extern const u8 gText_ToughnessContest[];

// PokéNav Match Call
extern const u8 gText_CallCantBeMadeHere[];
extern const u8 gText_NumberRegistered[];
extern const u8 gText_NumberOfBattles[];
extern const u8 gText_Unknown[];
extern const u8 gText_TrainerCloseBy[];
extern const u8 gText_Call[];
extern const u8 gText_Check[];
extern const u8 gText_Cancel6[];

// PokéNav Menu Handler
extern const u8 gText_CheckMapOfHoenn[];
extern const u8 gText_CheckPokemonInDetail[];
extern const u8 gText_CallRegisteredTrainer[];
extern const u8 gText_CheckObtainedRibbons[];
extern const u8 gText_PutAwayPokenav[];
extern const u8 gText_CheckPartyPokemonInDetail[];
extern const u8 gText_CheckAllPokemonInDetail[];
extern const u8 gText_ReturnToPokenavMenu[];
extern const u8 gText_FindCoolPokemon[];
extern const u8 gText_FindBeautifulPokemon[];
extern const u8 gText_FindCutePokemon[];
extern const u8 gText_FindSmartPokemon[];
extern const u8 gText_FindToughPokemon[];
extern const u8 gText_ReturnToConditionMenu[];
extern const u8 gText_NoRibbonWinners[];

// PokéNav
extern const u8 gText_NumberIndex[];
extern const u8 gText_RibbonsF700[];

// use_pokeblock
extern const u8 gText_Coolness[];
extern const u8 gText_Toughness[];
Expand Down
2 changes: 2 additions & 0 deletions src/pokenav_conditions_gfx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ static const u32 sConditionGraphData_Gfx[] = INCBIN_U32("graphics/pokenav/condit
static const u32 sConditionGraphData_Tilemap[] = INCBIN_U32("graphics/pokenav/condition/graph_data.bin.lz");
static const u16 sMonMarkings_Pal[] = INCBIN_U16("graphics/pokenav/condition/mon_markings.gbapal");

static const u8 gText_Number2[] = _("No. ");

static const struct BgTemplate sMenuBgTemplates[3] =
{
{
Expand Down
2 changes: 2 additions & 0 deletions src/pokenav_conditions_search_results.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ enum
CONDITION_SEARCH_FUNC_SELECT_MON,
};

static const u8 gText_NumberIndex[] = _("No. {DYNAMIC 0}");

struct Pokenav_SearchResults
{
u32 (*callback)(struct Pokenav_SearchResults *);
Expand Down
4 changes: 4 additions & 0 deletions src/pokenav_list.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@ static u32 LoopedTask_PrintCheckPageInfo(s32);
static const u16 sListArrow_Pal[] = INCBIN_U16("graphics/pokenav/list_arrows.gbapal");
static const u32 sListArrow_Gfx[] = INCBIN_U32("graphics/pokenav/list_arrows.4bpp.lz");

static const u8 gText_PokenavMatchCall_Strategy[] = _("STRATEGY");
static const u8 gText_PokenavMatchCall_TrainerPokemon[] = _("TRAINER'S POKéMON");
static const u8 gText_PokenavMatchCall_SelfIntroduction[] = _("SELF-INTRODUCTION");

static EWRAM_DATA u32 sMoveWindowDownIndex = 0; // Read, but pointlessly

bool32 CreatePokenavList(const struct BgTemplate *bgTemplate, struct PokenavListTemplate *listTemplate, s32 tileOffset)
Expand Down
24 changes: 12 additions & 12 deletions src/pokenav_main_menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,18 +86,18 @@ static const struct WindowTemplate sHelpBarWindowTemplate[] =

static const u8 *const sHelpBarTexts[HELPBAR_COUNT] =
{
[HELPBAR_NONE] = gText_Pokenav_ClearButtonList,
[HELPBAR_MAP_ZOOMED_OUT] = gText_PokenavMap_ZoomedOutButtons,
[HELPBAR_MAP_ZOOMED_IN] = gText_PokenavMap_ZoomedInButtons,
[HELPBAR_CONDITION_MON_LIST] = gText_PokenavCondition_MonListButtons,
[HELPBAR_CONDITION_MON_STATUS] = gText_PokenavCondition_MonStatusButtons,
[HELPBAR_CONDITION_MARKINGS] = gText_PokenavCondition_MarkingButtons,
[HELPBAR_MC_TRAINER_LIST] = gText_PokenavMatchCall_TrainerListButtons,
[HELPBAR_MC_CALL_MENU] = gText_PokenavMatchCall_CallMenuButtons,
[HELPBAR_MC_CHECK_PAGE] = gText_PokenavMatchCall_CheckTrainerButtons,
[HELPBAR_RIBBONS_MON_LIST] = gText_PokenavRibbons_MonListButtons,
[HELPBAR_RIBBONS_LIST] = gText_PokenavRibbons_RibbonListButtons,
[HELPBAR_RIBBONS_CHECK] = gText_PokenavRibbons_RibbonCheckButtons,
[HELPBAR_NONE] = COMPOUND_STRING("{CLEAR 0x80}"),
[HELPBAR_MAP_ZOOMED_OUT] = COMPOUND_STRING("{A_BUTTON}ZOOM {B_BUTTON}CANCEL"),
[HELPBAR_MAP_ZOOMED_IN] = COMPOUND_STRING("{A_BUTTON}FULL {B_BUTTON}CANCEL"),
[HELPBAR_CONDITION_MON_LIST] = COMPOUND_STRING("{A_BUTTON}CONDITION {B_BUTTON}CANCEL"),
[HELPBAR_CONDITION_MON_STATUS] = COMPOUND_STRING("{A_BUTTON}MARKINGS {B_BUTTON}CANCEL"),
[HELPBAR_CONDITION_MARKINGS] = COMPOUND_STRING("{A_BUTTON}SELECT MARK {B_BUTTON}CANCEL"),
[HELPBAR_MC_TRAINER_LIST] = COMPOUND_STRING("{A_BUTTON}MENU {B_BUTTON}CANCEL"),
[HELPBAR_MC_CALL_MENU] = COMPOUND_STRING("{A_BUTTON}OK {B_BUTTON}CANCEL"),
[HELPBAR_MC_CHECK_PAGE] = COMPOUND_STRING("{B_BUTTON}CANCEL"),
[HELPBAR_RIBBONS_MON_LIST] = COMPOUND_STRING("{A_BUTTON}RIBBONS {B_BUTTON}CANCEL"),
[HELPBAR_RIBBONS_LIST] = COMPOUND_STRING("{A_BUTTON}CHECK {B_BUTTON}CANCEL"),
[HELPBAR_RIBBONS_CHECK] = COMPOUND_STRING("{B_BUTTON}CANCEL"),
};

static const u8 sHelpBarTextColors[3] =
Expand Down
67 changes: 42 additions & 25 deletions src/pokenav_match_call_data.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ static const struct MatchCallStructNPC sMrStoneMatchCallHeader =
.type = MC_TYPE_NPC,
.mapSec = MAPSEC_RUSTBORO_CITY,
.flag = 0xFFFF,
.desc = gText_MrStoneMatchCallDesc,
.name = gText_MrStoneMatchCallName,
.desc = COMPOUND_STRING("DEVON PRES"),
.name = COMPOUND_STRING("MR. STONE"),
.textData = sMrStoneTextScripts
};

Expand All @@ -203,8 +203,8 @@ static const struct MatchCallStructTrainer sNormanMatchCallHeader =
.mapSec = MAPSEC_PETALBURG_CITY,
.flag = FLAG_ENABLE_NORMAN_MATCH_CALL,
.rematchTableIdx = REMATCH_NORMAN,
.desc = gText_NormanMatchCallDesc,
.name = gText_NormanMatchCallName,
.desc = COMPOUND_STRING("RELIABLE ONE"),
.name = COMPOUND_STRING("DAD"),
.textData = sNormanTextScripts
};

Expand All @@ -213,8 +213,8 @@ static const struct MatchCallBirch sProfBirchMatchCallHeader =
.type = MC_TYPE_BIRCH,
.mapSec = 0,
.flag = FLAG_ENABLE_PROF_BIRCH_MATCH_CALL,
.desc = gText_ProfBirchMatchCallDesc,
.name = gText_ProfBirchMatchCallName
.desc = COMPOUND_STRING("{PKMN} PROF."),
.name = COMPOUND_STRING("PROF. BIRCH")
};

static const match_call_text_data_t sMomTextScripts[] = {
Expand All @@ -229,8 +229,8 @@ static const struct MatchCallStructNPC sMomMatchCallHeader =
.type = MC_TYPE_NPC,
.mapSec = MAPSEC_LITTLEROOT_TOWN,
.flag = FLAG_ENABLE_MOM_MATCH_CALL,
.desc = gText_MomMatchCallDesc,
.name = gText_MomMatchCallName,
.desc = COMPOUND_STRING("CALM & KIND"),
.name = COMPOUND_STRING("MOM"),
.textData = sMomTextScripts
};

Expand All @@ -250,11 +250,13 @@ static const struct MatchCallStructNPC sStevenMatchCallHeader =
.type = MC_TYPE_NPC,
.mapSec = MAPSEC_NONE,
.flag = FLAG_REGISTERED_STEVEN_POKENAV,
.desc = gText_StevenMatchCallDesc,
.name = gText_StevenMatchCallName,
.desc = COMPOUND_STRING("HARD AS ROCK"),
.name = COMPOUND_STRING("STEVEN"),
.textData = sStevenTextScripts
};

static const u8 gText_MayBrendanMatchCallDesc[] = _("RAD NEIGHBOR");

static const match_call_text_data_t sMayTextScripts[] = {
{ MatchCall_Text_May1, 0xFFFF, 0xFFFF },
{ MatchCall_Text_May2, FLAG_DEFEATED_DEWFORD_GYM, 0xFFFF },
Expand Down Expand Up @@ -337,7 +339,7 @@ static const struct MatchCallWally sWallyMatchCallHeader =
.mapSec = 0,
.flag = FLAG_ENABLE_WALLY_MATCH_CALL,
.rematchTableIdx = REMATCH_WALLY_VR,
.desc = gText_WallyMatchCallDesc,
.desc = COMPOUND_STRING("{PKMN} LOVER"),
.textData = sWallyTextScripts,
.locationData = sWallyLocationData
};
Expand All @@ -359,8 +361,8 @@ static const struct MatchCallStructNPC sScottMatchCallHeader =
.type = 0,
.mapSec = MAPSEC_NONE,
.flag = FLAG_ENABLE_SCOTT_MATCH_CALL,
.desc = gText_ScottMatchCallDesc,
.name = gText_ScottMatchCallName,
.desc = COMPOUND_STRING("ELUSIVE EYES"),
.name = COMPOUND_STRING("SCOTT"),
.textData = sScottTextScripts
};

Expand All @@ -378,7 +380,7 @@ static const struct MatchCallStructTrainer sRoxanneMatchCallHeader =
.mapSec = MAPSEC_RUSTBORO_CITY,
.flag = FLAG_ENABLE_ROXANNE_MATCH_CALL,
.rematchTableIdx = REMATCH_ROXANNE,
.desc = gText_RoxanneMatchCallDesc,
.desc = COMPOUND_STRING("ROCKIN' WHIZ"),
.name = NULL,
.textData = sRoxanneTextScripts
};
Expand All @@ -397,7 +399,7 @@ static const struct MatchCallStructTrainer sBrawlyMatchCallHeader =
.mapSec = MAPSEC_DEWFORD_TOWN,
.flag = FLAG_ENABLE_BRAWLY_MATCH_CALL,
.rematchTableIdx = REMATCH_BRAWLY,
.desc = gText_BrawlyMatchCallDesc,
.desc = COMPOUND_STRING("THE BIG HIT"),
.name = NULL,
.textData = sBrawlyTextScripts
};
Expand All @@ -416,7 +418,7 @@ static const struct MatchCallStructTrainer sWattsonMatchCallHeader =
.mapSec = MAPSEC_MAUVILLE_CITY,
.flag = FLAG_ENABLE_WATTSON_MATCH_CALL,
.rematchTableIdx = REMATCH_WATTSON,
.desc = gText_WattsonMatchCallDesc,
.desc = COMPOUND_STRING("SWELL SHOCK"),
.name = NULL,
.textData = sWattsonTextScripts
};
Expand All @@ -435,7 +437,7 @@ static const struct MatchCallStructTrainer sFlanneryMatchCallHeader =
.mapSec = MAPSEC_LAVARIDGE_TOWN,
.flag = FLAG_ENABLE_FLANNERY_MATCH_CALL,
.rematchTableIdx = REMATCH_FLANNERY,
.desc = gText_FlanneryMatchCallDesc,
.desc = COMPOUND_STRING("PASSION BURN"),
.name = NULL,
.textData = sFlanneryTextScripts
};
Expand All @@ -454,7 +456,7 @@ static const struct MatchCallStructTrainer sWinonaMatchCallHeader =
.mapSec = MAPSEC_FORTREE_CITY,
.flag = FLAG_ENABLE_WINONA_MATCH_CALL,
.rematchTableIdx = REMATCH_WINONA,
.desc = gText_WinonaMatchCallDesc,
.desc = COMPOUND_STRING("SKY TAMER"),
.name = NULL,
.textData = sWinonaTextScripts
};
Expand All @@ -473,7 +475,7 @@ static const struct MatchCallStructTrainer sTateLizaMatchCallHeader =
.mapSec = MAPSEC_MOSSDEEP_CITY,
.flag = FLAG_ENABLE_TATE_AND_LIZA_MATCH_CALL,
.rematchTableIdx = REMATCH_TATE_AND_LIZA,
.desc = gText_TateLizaMatchCallDesc,
.desc = COMPOUND_STRING("MYSTIC DUO"),
.name = NULL,
.textData = sTateLizaTextScripts
};
Expand All @@ -492,11 +494,13 @@ static const struct MatchCallStructTrainer sJuanMatchCallHeader =
.mapSec = MAPSEC_SOOTOPOLIS_CITY,
.flag = FLAG_ENABLE_JUAN_MATCH_CALL,
.rematchTableIdx = REMATCH_JUAN,
.desc = gText_JuanMatchCallDesc,
.desc = COMPOUND_STRING("DANDY CHARM"),
.name = NULL,
.textData = sJuanTextScripts
};

static const u8 gText_EliteFourMatchCallDesc[] = _("ELITE FOUR");

static const match_call_text_data_t sSidneyTextScripts[] = {
{ MatchCall_Text_Sidney, 0xFFFF, 0xFFFF },
{ NULL, 0xFFFF, 0xFFFF }
Expand Down Expand Up @@ -572,7 +576,7 @@ static const struct MatchCallStructTrainer sWallaceMatchCallHeader =
.mapSec = MAPSEC_EVER_GRANDE_CITY,
.flag = FLAG_REMATCH_WALLACE,
.rematchTableIdx = REMATCH_WALLACE,
.desc = gText_ChampionMatchCallDesc,
.desc = COMPOUND_STRING("CHAMPION"),
.name = NULL,
.textData = sWallaceTextScripts
};
Expand Down Expand Up @@ -657,6 +661,19 @@ static void (*const sMatchCall_GetNameAndDescFunctions[])(match_call_t, const u8
MatchCall_GetNameAndDesc_Birch
};

static const u8 gText_MatchCallSteven_Strategy[] = _("Attack the weak points!");
static const u8 gText_MatchCallSteven_Pokemon[] = _("Ultimate STEEL POKéMON.");

static const u8 gText_MatchCallBrendan_Strategy[] = _("Battle with knowledge!");
static const u8 gText_MatchCallBrendan_Pokemon[] = _("I will use various POKéMON.");
static const u8 gText_MatchCallBrendan_Intro1[] = _("I'll be a better POKéMON");
static const u8 gText_MatchCallBrendan_Intro2[] = _("prof than my father is!");

static const u8 gText_MatchCallMay_Strategy[] = _("I'm not so good at battles.");
static const u8 gText_MatchCallMay_Pokemon[] = _("I'll use any POKéMON!");
static const u8 gText_MatchCallMay_Intro1[] = _("My POKéMON and I help");
static const u8 gText_MatchCallMay_Intro2[] = _("my father's research.");

static const struct MatchCallCheckPageOverride sCheckPageOverrides[] = {
{
.idx = MC_HEADER_STEVEN,
Expand All @@ -665,8 +682,8 @@ static const struct MatchCallCheckPageOverride sCheckPageOverrides[] = {
.flavorTexts = {
[CHECK_PAGE_STRATEGY] = gText_MatchCallSteven_Strategy,
[CHECK_PAGE_POKEMON] = gText_MatchCallSteven_Pokemon,
[CHECK_PAGE_INTRO_1] = gText_MatchCallSteven_Intro1_BeforeMeteorFallsBattle,
[CHECK_PAGE_INTRO_2] = gText_MatchCallSteven_Intro2_BeforeMeteorFallsBattle
[CHECK_PAGE_INTRO_1] = COMPOUND_STRING("I'd climb even waterfalls"),
[CHECK_PAGE_INTRO_2] = COMPOUND_STRING("to find a rare stone!")
}
},
{
Expand All @@ -676,8 +693,8 @@ static const struct MatchCallCheckPageOverride sCheckPageOverrides[] = {
.flavorTexts = {
[CHECK_PAGE_STRATEGY] = gText_MatchCallSteven_Strategy,
[CHECK_PAGE_POKEMON] = gText_MatchCallSteven_Pokemon,
[CHECK_PAGE_INTRO_1] = gText_MatchCallSteven_Intro1_AfterMeteorFallsBattle,
[CHECK_PAGE_INTRO_2] = gText_MatchCallSteven_Intro2_AfterMeteorFallsBattle
[CHECK_PAGE_INTRO_1] = COMPOUND_STRING("I'm the strongest and most"),
[CHECK_PAGE_INTRO_2] = COMPOUND_STRING("energetic after all!")
}
},
{
Expand Down
11 changes: 8 additions & 3 deletions src/pokenav_match_call_gfx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@ static const u16 sListWindow_Pal[] = INCBIN_U16("graphics/pokenav/match_call/lis
static const u16 sPokeball_Pal[] = INCBIN_U16("graphics/pokenav/match_call/pokeball.gbapal");
static const u32 sPokeball_Gfx[] = INCBIN_U32("graphics/pokenav/match_call/pokeball.4bpp.lz");

static const u8 gText_NumberRegistered[] = _("No. registered");
static const u8 gText_NumberOfBattles[] = _("No. of battles");
static const u8 gText_TrainerCloseBy[] = _("That TRAINER is close by.\nTalk to the TRAINER in person!");
static const u8 gText_Unknown[] = _("UNKNOWN");

static const struct BgTemplate sMatchCallBgTemplates[3] =
{
{
Expand Down Expand Up @@ -199,9 +204,9 @@ static const struct WindowTemplate sMatchCallInfoBoxWindowTemplate =

static const u8 *const sMatchCallOptionTexts[MATCH_CALL_OPTION_COUNT] =
{
[MATCH_CALL_OPTION_CALL] = gText_Call,
[MATCH_CALL_OPTION_CHECK] = gText_Check,
[MATCH_CALL_OPTION_CANCEL] = gText_Cancel6
[MATCH_CALL_OPTION_CALL] = COMPOUND_STRING("CALL"),
[MATCH_CALL_OPTION_CHECK] = COMPOUND_STRING("CHECK"),
[MATCH_CALL_OPTION_CANCEL] = COMPOUND_STRING("CANCEL")
};

// The series of 5 dots that appear when someone is called with Match Call
Expand Down
2 changes: 2 additions & 0 deletions src/pokenav_match_call_list.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ static u32 CB2_HandleCallExitInput(struct Pokenav_MatchCallMenu *);
static u32 LoopedTask_BuildMatchCallList(s32);
static bool32 ShouldDoNearbyMessage(void);

static const u8 gText_CallCantBeMadeHere[] = _("A call can't be made from here.");

#include "data/text/match_call_messages.h"

static const u8 sMatchCallOptionsNoCheckPage[] =
Expand Down
Loading
Loading