atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Created PokeNav COMPOUND_STRINGS (#4983)

Browse source 
* Converted Match Call names and descriptions to COMPOUND_STRINGs

* Moved May/Brendan and Elite Four descriptions into pokenav_match_call_data.c

* Moved Steven, Brendan, and May's Match Call text to pokenav_match_call_data.c

* Cleaned up Steven's Match Call text

* Added PokeNav option text to match_call_gfx

* Moved PokeNav page descriptions to menu_handler_gfx

* Moved help bar texts to pokenav_main_menu.c

* Moved various PokeNav strings out of strings.c and into their relevant files

* Removed unused PokeNav strings
This commit is contained in:
Frank DeBlasio 2024-08-16 16:41:26 -04:00 committed by GitHub
parent fe275ef062
commit bced2c97a1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 90 additions and 223 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
include/strings.h
View file

@ -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[];
@ -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[];
@ -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[];

2
src/pokenav_conditions_gfx.c
View file

@ -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] =
{
{

2
src/pokenav_conditions_search_results.c
View file

@ -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 *);

4
src/pokenav_list.c
View file

@ -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)

24
src/pokenav_main_menu.c
View file

@ -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] =

67
src/pokenav_match_call_data.c
View file

@ -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
};
@ -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
};
@ -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[] = {
@ -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
};
@ -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 },
@ -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
};
@ -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
};
@ -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
};
@ -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
};
@ -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
};
@ -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
};
@ -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
};
@ -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
};
@ -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 }
@ -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
};
@ -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,
@ -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!")
}
},
{
@ -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!")
}
},
{

11
src/pokenav_match_call_gfx.c
View file

@ -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] =
{
{
@ -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

2
src/pokenav_match_call_list.c
View file

@ -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[] =

30
src/pokenav_menu_handler_gfx.c
View file

@ -108,6 +108,8 @@ static const u32 sPokenavDeviceBgTilemap[] = INCBIN_U32("graphics/pokenav/device
static const u16 sMatchCallBlueLightPal[] = INCBIN_U16("graphics/pokenav/blue_light.gbapal");
static const u32 sMatchCallBlueLightTiles[] = INCBIN_U32("graphics/pokenav/blue_light.4bpp.lz");
static const u8 gText_NoRibbonWinners[] = _("There are no RIBBON winners.");
static const struct BgTemplate sPokenavMainMenuBgTemplates[] = {
{
.bg = 1,
@ -267,20 +269,20 @@ static const struct WindowTemplate sOptionDescWindowTemplate =
static const u8 *const sPageDescriptions[] =
{
[POKENAV_MENUITEM_MAP] = gText_CheckMapOfHoenn,
[POKENAV_MENUITEM_CONDITION] = gText_CheckPokemonInDetail,
[POKENAV_MENUITEM_MATCH_CALL] = gText_CallRegisteredTrainer,
[POKENAV_MENUITEM_RIBBONS] = gText_CheckObtainedRibbons,
[POKENAV_MENUITEM_SWITCH_OFF] = gText_PutAwayPokenav,
[POKENAV_MENUITEM_CONDITION_PARTY] = gText_CheckPartyPokemonInDetail,
[POKENAV_MENUITEM_CONDITION_SEARCH] = gText_CheckAllPokemonInDetail,
[POKENAV_MENUITEM_CONDITION_CANCEL] = gText_ReturnToPokenavMenu,
[POKENAV_MENUITEM_CONDITION_SEARCH_COOL] = gText_FindCoolPokemon,
[POKENAV_MENUITEM_CONDITION_SEARCH_BEAUTY] = gText_FindBeautifulPokemon,
[POKENAV_MENUITEM_CONDITION_SEARCH_CUTE] = gText_FindCutePokemon,
[POKENAV_MENUITEM_CONDITION_SEARCH_SMART] = gText_FindSmartPokemon,
[POKENAV_MENUITEM_CONDITION_SEARCH_TOUGH] = gText_FindToughPokemon,
[POKENAV_MENUITEM_CONDITION_SEARCH_CANCEL] = gText_ReturnToConditionMenu
[POKENAV_MENUITEM_MAP] = COMPOUND_STRING("Check the map of the HOENN region"),
[POKENAV_MENUITEM_CONDITION] = COMPOUND_STRING("Check POKéMON in detail."),
[POKENAV_MENUITEM_MATCH_CALL] = COMPOUND_STRING("Call a registered TRAINER."),
[POKENAV_MENUITEM_RIBBONS] = COMPOUND_STRING("Check obtained RIBBONS."),
[POKENAV_MENUITEM_SWITCH_OFF] = COMPOUND_STRING("Put away the POKéNAV."),
[POKENAV_MENUITEM_CONDITION_PARTY] = COMPOUND_STRING("Check party POKéMON in detail."),
[POKENAV_MENUITEM_CONDITION_SEARCH] = COMPOUND_STRING("Check all POKéMON in detail."),
[POKENAV_MENUITEM_CONDITION_CANCEL] = COMPOUND_STRING("Return to the POKéNAV menu."),
[POKENAV_MENUITEM_CONDITION_SEARCH_COOL] = COMPOUND_STRING("Find cool POKéMON."),
[POKENAV_MENUITEM_CONDITION_SEARCH_BEAUTY] = COMPOUND_STRING("Find beautiful POKéMON."),
[POKENAV_MENUITEM_CONDITION_SEARCH_CUTE] = COMPOUND_STRING("Find cute POKéMON."),
[POKENAV_MENUITEM_CONDITION_SEARCH_SMART] = COMPOUND_STRING("Find smart POKéMON."),
[POKENAV_MENUITEM_CONDITION_SEARCH_TOUGH] = COMPOUND_STRING("Find tough POKéMON."),
[POKENAV_MENUITEM_CONDITION_SEARCH_CANCEL] = COMPOUND_STRING("Return to the CONDITION menu.")
};
static const u8 sOptionDescTextColors[] = {TEXT_COLOR_GREEN, TEXT_COLOR_BLUE, TEXT_COLOR_LIGHT_GREEN};

2
src/pokenav_ribbons_summary.c
View file

@ -40,6 +40,8 @@ enum
#define MON_SPRITE_X_OFF -32
#define MON_SPRITE_Y 104
static const u8 gText_RibbonsF700[] = _("RIBBONS {DYNAMIC 0}");
struct Pokenav_RibbonsSummaryList
{
u8 unused1[8];

84
src/strings.c
View file

@ -20,7 +20,6 @@ const u8 gText_ExpandedPlaceholder_Brendan[] = _("BRENDAN");
const u8 gText_ExpandedPlaceholder_May[] = _("MAY");
const u8 gText_EggNickname[] = _("EGG");
const u8 gText_Pokemon[] = _("POKéMON");
const u8 gText_ProfBirchMatchCallName[] = _("PROF. BIRCH");
const u8 gText_Player[] = _("PLAYER"); // Unused
const u8 gText_Pokedex[] = _("POKéDEX"); // Unused
const u8 gText_Time[] = _("TIME");
@ -897,57 +896,11 @@ const u8 gText_SeeYaDescription[] = _("Return to the previous menu.");
const u8 gText_JustOnePkmn[] = _("There is just one POKéMON with you.");
const u8 gText_PartyFull[] = _("Your party is full!");
const u8 gText_Box[] = _("BOX");
const u8 gText_CheckMapOfHoenn[] = _("Check the map of the HOENN region.");
const u8 gText_CheckPokemonInDetail[] = _("Check POKéMON in detail.");
const u8 gText_CallRegisteredTrainer[] = _("Call a registered TRAINER.");
const u8 gText_CheckObtainedRibbons[] = _("Check obtained RIBBONS.");
const u8 gText_PutAwayPokenav[] = _("Put away the POKéNAV.");
const u8 gText_NoRibbonWinners[] = _("There are no RIBBON winners.");
const u8 gText_NoTrainersRegistered[] = _("No TRAINERS are registered."); // Unused
const u8 gText_CheckPartyPokemonInDetail[] = _("Check party POKéMON in detail.");
const u8 gText_CheckAllPokemonInDetail[] = _("Check all POKéMON in detail.");
const u8 gText_ReturnToPokenavMenu[] = _("Return to the POKéNAV menu.");
const u8 gText_FindCoolPokemon[] = _("Find cool POKéMON.");
const u8 gText_FindBeautifulPokemon[] = _("Find beautiful POKéMON.");
const u8 gText_FindCutePokemon[] = _("Find cute POKéMON.");
const u8 gText_FindSmartPokemon[] = _("Find smart POKéMON.");
const u8 gText_FindToughPokemon[] = _("Find tough POKéMON.");
const u8 gText_ReturnToConditionMenu[] = _("Return to the CONDITION menu.");
const u8 gText_NumberRegistered[] = _("No. registered");
const u8 gText_NumberOfBattles[] = _("No. of battles");
const u8 gText_Detail[] = _("DETAIL"); // Unused
const u8 gText_Call2[] = _("CALL"); // Unused
const u8 gText_UnusedExit[] = _("EXIT"); // Unused
const u8 gText_CantCallOpponentHere[] = _("Can't call opponent here."); // Unused
const u8 gText_PokenavMatchCall_Strategy[] = _("STRATEGY");
const u8 gText_PokenavMatchCall_TrainerPokemon[] = _("TRAINER'S POKéMON");
const u8 gText_PokenavMatchCall_SelfIntroduction[] = _("SELF-INTRODUCTION");
const u8 gText_Pokenav_ClearButtonList[] = _("{CLEAR 0x80}");
const u8 gText_PokenavMap_ZoomedOutButtons[] = _("{A_BUTTON}ZOOM {B_BUTTON}CANCEL");
const u8 gText_PokenavMap_ZoomedInButtons[] = _("{A_BUTTON}FULL {B_BUTTON}CANCEL");
const u8 gText_PokenavCondition_MonListButtons[] = _("{A_BUTTON}CONDITION {B_BUTTON}CANCEL");
const u8 gText_PokenavCondition_MonStatusButtons[] = _("{A_BUTTON}MARKINGS {B_BUTTON}CANCEL");
const u8 gText_PokenavCondition_MarkingButtons[] = _("{A_BUTTON}SELECT MARK {B_BUTTON}CANCEL");
const u8 gText_PokenavMatchCall_TrainerListButtons[] = _("{A_BUTTON}MENU {B_BUTTON}CANCEL");
const u8 gText_PokenavMatchCall_CallMenuButtons[] = _("{A_BUTTON}OK {B_BUTTON}CANCEL");
const u8 gText_PokenavMatchCall_CheckTrainerButtons[] = _("{B_BUTTON}CANCEL");
const u8 gText_PokenavRibbons_MonListButtons[] = _("{A_BUTTON}RIBBONS {B_BUTTON}CANCEL");
const u8 gText_PokenavRibbons_RibbonListButtons[] = _("{A_BUTTON}CHECK {B_BUTTON}CANCEL");
const u8 gText_PokenavRibbons_RibbonCheckButtons[] = _("{B_BUTTON}CANCEL");
const u8 gText_NatureSlash[] = _("NATURE/");
const u8 gText_TrainerCloseBy[] = _("That TRAINER is close by.\nTalk to the TRAINER in person!");
const u8 gText_InParty[] = _("IN PARTY");
const u8 gText_Number2[] = _("No. ");
const u8 gText_Ribbons[] = _("RIBBONS"); // Unused
const u8 gText_PokemonMaleLv[] = _("{DYNAMIC 0}{COLOR_HIGHLIGHT_SHADOW LIGHT_RED WHITE GREEN}♂{COLOR_HIGHLIGHT_SHADOW DARK_GRAY WHITE LIGHT_GRAY}/{LV}{DYNAMIC 1}"); // Unused
const u8 gText_PokemonFemaleLv[] = _("{DYNAMIC 0}{COLOR_HIGHLIGHT_SHADOW LIGHT_GREEN WHITE BLUE}♀{COLOR_HIGHLIGHT_SHADOW DARK_GRAY WHITE LIGHT_GRAY}/{LV}{DYNAMIC 1}"); // Unused
const u8 gText_PokemonNoGenderLv[] = _("{DYNAMIC 0}/{LV}{DYNAMIC 1}"); // Unused
const u8 gText_Unknown[] = _("UNKNOWN");
const u8 gText_Call[] = _("CALL");
const u8 gText_Check[] = _("CHECK");
const u8 gText_Cancel6[] = _("CANCEL");
const u8 gText_NumberIndex[] = _("No. {DYNAMIC 0}");
const u8 gText_RibbonsF700[] = _("RIBBONS {DYNAMIC 0}");
const u8 gText_PokemonMaleLv2[] = _("{DYNAMIC 0}{COLOR_HIGHLIGHT_SHADOW LIGHT_RED WHITE GREEN}♂{COLOR_HIGHLIGHT_SHADOW DARK_GRAY WHITE LIGHT_GRAY}/{LV}{DYNAMIC 1}{DYNAMIC 2}"); // Unused
const u8 gText_PokemonFemaleLv2[] = _("{DYNAMIC 0}{COLOR_HIGHLIGHT_SHADOW LIGHT_GREEN WHITE BLUE}♀{COLOR_HIGHLIGHT_SHADOW DARK_GRAY WHITE LIGHT_GRAY}/{LV}{DYNAMIC 1}{DYNAMIC 2}"); // Unused
const u8 gText_PokemonNoGenderLv2[] = _("{DYNAMIC 0}/{LV}{DYNAMIC 1}{DYNAMIC 2}"); // Unused
@ -1240,20 +1193,6 @@ const u8 gText_ThankYou[] = _("THANK YOU");
const u8 gText_ByeBye[] = _("BYE-BYE!");
const u8 gText_PlayerScurriedToCenter[] = _("{PLAYER} scurried to a POKéMON CENTER,\nprotecting the exhausted and fainted\nPOKéMON from further harm…\p");
const u8 gText_PlayerScurriedBackHome[] = _("{PLAYER} scurried back home, protecting\nthe exhausted and fainted POKéMON from\nfurther harm…\p");
const u8 gText_MatchCallSteven_Strategy[] = _("Attack the weak points!");
const u8 gText_MatchCallSteven_Pokemon[] = _("Ultimate STEEL POKéMON.");
const u8 gText_MatchCallSteven_Intro1_BeforeMeteorFallsBattle[] = _("I'd climb even waterfalls");
const u8 gText_MatchCallSteven_Intro2_BeforeMeteorFallsBattle[] = _("to find a rare stone!");
const u8 gText_MatchCallSteven_Intro1_AfterMeteorFallsBattle[] = _("I'm the strongest and most");
const u8 gText_MatchCallSteven_Intro2_AfterMeteorFallsBattle[] = _("energetic after all!");
const u8 gText_MatchCallBrendan_Strategy[] = _("Battle with knowledge!");
const u8 gText_MatchCallBrendan_Pokemon[] = _("I will use various POKéMON.");
const u8 gText_MatchCallBrendan_Intro1[] = _("I'll be a better POKéMON");
const u8 gText_MatchCallBrendan_Intro2[] = _("prof than my father is!");
const u8 gText_MatchCallMay_Strategy[] = _("I'm not so good at battles.");
const u8 gText_MatchCallMay_Pokemon[] = _("I'll use any POKéMON!");
const u8 gText_MatchCallMay_Intro1[] = _("My POKéMON and I help");
const u8 gText_MatchCallMay_Intro2[] = _("my father's research.");
const u8 gText_HatchedFromEgg[] = _("{STR_VAR_1} hatched from the EGG!");
const u8 gText_NicknameHatchPrompt[] = _("Would you like to nickname the newly\nhatched {STR_VAR_1}?");
ALIGNED(4) const u8 gText_ReadyPickBerry[] = _("Are you ready to BERRY-CRUSH?\nPlease pick a BERRY for use.\p");
@ -1549,7 +1488,6 @@ const u8 gText_BoxName[] = _("BOX NAME?");
const u8 gText_PkmnsNickname[] = _("{STR_VAR_1}'s nickname?");
const u8 gText_TellHimTheWords[] = _("Tell him the words.");
const u8 gText_MoveOkBack[] = _("{DPAD_NONE}MOVE {A_BUTTON}OK {B_BUTTON}BACK");
const u8 gText_CallCantBeMadeHere[] = _("A call can't be made from here.");
const u8 gText_RentalPkmn2[] = _("RENTAL POKéMON");
const u8 gText_SelectFirstPkmn[] = _("Select the first POKéMON.");
const u8 gText_SelectSecondPkmn[] = _("Select the second POKéMON.");
@ -1720,28 +1658,6 @@ const u8 gText_ClearingData[] = _("Clearing data…\nPlease wait.");
const u8 gText_IsThisTheCorrectTime[] = _("Is this the correct time?");
const u8 gText_Confirm3[] = _("CONFIRM");
const u8 gText_Cancel4[] = _("CANCEL");
const u8 gText_MrStoneMatchCallDesc[] = _("DEVON PRES");
const u8 gText_MrStoneMatchCallName[] = _("MR. STONE");
const u8 gText_StevenMatchCallDesc[] = _("HARD AS ROCK");
const u8 gText_StevenMatchCallName[] = _("STEVEN");
const u8 gText_MayBrendanMatchCallDesc[] = _("RAD NEIGHBOR");
const u8 gText_NormanMatchCallDesc[] = _("RELIABLE ONE");
const u8 gText_MomMatchCallDesc[] = _("CALM & KIND");
const u8 gText_WallyMatchCallDesc[] = _("{PKMN} LOVER");
const u8 gText_NormanMatchCallName[] = _("DAD");
const u8 gText_MomMatchCallName[] = _("MOM");
const u8 gText_ScottMatchCallDesc[] = _("ELUSIVE EYES");
const u8 gText_ScottMatchCallName[] = _("SCOTT");
const u8 gText_RoxanneMatchCallDesc[] = _("ROCKIN' WHIZ");
const u8 gText_BrawlyMatchCallDesc[] = _("THE BIG HIT");
const u8 gText_WattsonMatchCallDesc[] = _("SWELL SHOCK");
const u8 gText_FlanneryMatchCallDesc[] = _("PASSION BURN");
const u8 gText_WinonaMatchCallDesc[] = _("SKY TAMER");
const u8 gText_TateLizaMatchCallDesc[] = _("MYSTIC DUO");
const u8 gText_JuanMatchCallDesc[] = _("DANDY CHARM");
const u8 gText_EliteFourMatchCallDesc[] = _("ELITE FOUR");
const u8 gText_ChampionMatchCallDesc[] = _("CHAMPION");
const u8 gText_ProfBirchMatchCallDesc[] = _("{PKMN} PROF.");
const u8 gText_CommStandbyAwaitingOtherPlayer[] = _("Communication standby…\nAwaiting another player to choose.");
const u8 gText_BattleWasRefused[] = _("The battle was refused.{PAUSE 60}");
const u8 gText_RefusedBattle[] = _("Refused the battle.{PAUSE 60}");