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

Moreee

Browse Source
This commit is contained in:
Eduardo Quezada
2025-01-14 21:17:39 -03:00
parent 585dcb58b8
commit 1a6be8f822
10 changed files with 95 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/strings.h
View File

@@ -3031,9 +3031,9 @@ extern const u8 gText_PkmnForSwap[];
extern const u8 gText_SamePkmnInPartyAlready[];
extern const u8 gText_Cancel3[];
#if EUROPE
extern const u8 gText_Eleve[];
extern const u8 gText_Dresseur[];
extern const u8 gText_Champion[];
extern const u8 gText_SchoolKidFemale[];
extern const u8 gText_TrainerFemale[];
extern const u8 gText_LeaderPlural[];
#endif
// Naming Screen

21
src/international_string_util.c
View File

@@ -88,12 +88,13 @@ int Intl_GetListMenuWidth(const struct ListMenuTemplate *listMenu)
void CopyMonCategoryText(int dexNum, u8 *dest)
{
#if FRENCH
// Just category name in French
u8 *str = StringCopy(dest, gPokedexEntries[dexNum].categoryName);
#elif ITALIAN
const u8 *categoryText = gPokedexEntries[dexNum].categoryName;
#elif ITALIAN || SPANISH
const u8 *categoryName = gPokedexEntries[dexNum].categoryName;
u8 *str = StringCopy(dest, gText_Pokemon);
*str++ = CHAR_SPACE;
StringCopy(str, categoryText);
StringCopy(str, categoryName);
#else //ENGLISH
u8 *str = StringCopy(dest, gPokedexEntries[dexNum].categoryName);
*str = CHAR_SPACE;
@@ -269,11 +270,11 @@ u8 *StringAppendWithPlaceholder(u8 *dest, const u8 *src, u8 *placeholderStr)
}
#if FRENCH
const u8 gText_LevyTatia[] = _("LEVY&TATIA");
const u8 gText_TateLiza[] = _("LEVY&TATIA");
#elif ITALIAN
const u8 gText_LevyTatia[] = _("TELL & PAT");
const u8 gText_TateLiza[] = _("TELL & PAT");
#elif SPANISH
const u8 gText_LevyTatia[] = _("VITO-LETI");
const u8 gText_TateLiza[] = _("VITO-LETI");
#endif
const u8 *GetTrainerClassNameGenderSpecific(s32 trainerClassId, u32 trainerGender, const u8 *trainerName)
@@ -282,16 +283,16 @@ const u8 *GetTrainerClassNameGenderSpecific(s32 trainerClassId, u32 trainerGende
{
case TRAINER_CLASS_SCHOOL_KID:
if (trainerGender != 0)
return gText_Eleve; // ELEVE
return gText_SchoolKidFemale;
return gTrainerClassNames[trainerClassId];
case TRAINER_CLASS_RIVAL:
case TRAINER_CLASS_RS_PROTAG:
if (trainerGender != 0)
return gText_Dresseur; // DRESSEUR
return gText_TrainerFemale;
break;
case TRAINER_CLASS_LEADER:
if (trainerName != NULL && StringCompare(trainerName, gText_LevyTatia) == 0)
return gText_Champion; // CHAMPION
if (trainerName != NULL && StringCompare(trainerName, gText_TateLiza) == 0)
return gText_LeaderPlural; // Returns the plural for Leader for Tate & Liza's battle
break;
}
trainerName = gTrainerClassNames[trainerClassId];

3
src/item.c
View File

@@ -115,7 +115,8 @@ void GetBerryCountString(u8 *dst, const u8 *berryName, u32 quantity)
else
berryString = gText_Berries;
#if FRENCH
#if FRENCH || SPANISH
// Swaps berry name and string
txtPtr = StringCopy(dst, berryString);
*txtPtr = CHAR_SPACE;
StringCopy(txtPtr + 1, berryName);

14
src/item_menu.c
View File

@@ -146,7 +146,7 @@ static void Task_CloseBagMenu(u8);
static u8 AddItemMessageWindow(u8);
static void RemoveItemMessageWindow(u8);
static void ReturnToItemList(u8);
#if FRENCH || ITALIAN
#if EUROPE
static void PrintItemQuantity(u8, s16, u32);
#else //ENGLISH
static void PrintItemQuantity(u8, s16);
@@ -279,7 +279,7 @@ static const struct MenuAction sItemMenuActions[] = {
[ACTION_WALK] = {gMenuText_Walk, {ItemMenu_UseOutOfBattle}},
[ACTION_DESELECT] = {gMenuText_Deselect, {ItemMenu_Register}},
[ACTION_CHECK_TAG] = {gMenuText_CheckTag, {ItemMenu_CheckTag}},
#if FRENCH || ITALIAN
#if EUROPE
[ACTION_CONFIRM] = {gMenuText_Confirm2, {Task_FadeAndCloseBagMenu}},
#else //ENGLISH
[ACTION_CONFIRM] = {gMenuText_Confirm, {Task_FadeAndCloseBagMenu}},
@@ -1201,7 +1201,7 @@ void CloseItemMessage(u8 taskId)
static void AddItemQuantityWindow(u8 windowType)
{
#if FRENCH || ITALIAN
#if EUROPE
u32 windowId = BagMenu_AddWindow(windowType);
PrintItemQuantity(windowId, 1, TEXT_SKIP_DRAW);
CopyWindowToVram(windowId, 3);
@@ -1210,7 +1210,7 @@ static void AddItemQuantityWindow(u8 windowType)
#endif
}
#if FRENCH || ITALIAN
#if EUROPE
static void PrintItemQuantity(u8 windowId, s16 quantity, u32 speed)
#else //ENGLISH
static void PrintItemQuantity(u8 windowId, s16 quantity)
@@ -1219,7 +1219,7 @@ static void PrintItemQuantity(u8 windowId, s16 quantity)
u8 numDigits = (gBagPosition.pocket == BERRIES_POCKET) ? BERRY_CAPACITY_DIGITS : BAG_ITEM_CAPACITY_DIGITS;
ConvertIntToDecimalStringN(gStringVar1, quantity, STR_CONV_MODE_LEADING_ZEROS, numDigits);
StringExpandPlaceholders(gStringVar4, gText_xVar1);
#if FRENCH || ITALIAN
#if EUROPE
AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVar4, GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 40), 2, speed, NULL);
#else //ENGLISH
AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVar4, GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 40), 2, 0, 0);
@@ -1880,7 +1880,7 @@ static void Task_ChooseHowManyToToss(u8 taskId)
if (AdjustQuantityAccordingToDPadInput(&tItemCount, tQuantity) == TRUE)
{
#if FRENCH || ITALIAN
#if EUROPE
PrintItemQuantity(gBagMenu->windowIds[ITEMWIN_QUANTITY], tItemCount, 0);
#else //ENGLISH
PrintItemQuantity(gBagMenu->windowIds[ITEMWIN_QUANTITY], tItemCount);
@@ -2247,7 +2247,7 @@ static void Task_ChooseHowManyToDeposit(u8 taskId)
if (AdjustQuantityAccordingToDPadInput(&tItemCount, tQuantity) == TRUE)
{
#if FRENCH || ITALIAN
#if EUROPE
PrintItemQuantity(gBagMenu->windowIds[ITEMWIN_QUANTITY], tItemCount, 0);
#else //ENGLISH
PrintItemQuantity(gBagMenu->windowIds[ITEMWIN_QUANTITY], tItemCount);

43
src/landmark.c
View File

@@ -101,6 +101,49 @@ static const u8 LandmarkName_MirageTower[] = _("TORRE MIRAGGIO");
static const u8 LandmarkName_AlteringCave[] = _("GROTTA MUTEVOLE");
static const u8 LandmarkName_DesertUnderpass[] = _("GALLERIA DESERTO");
static const u8 LandmarkName_TrainerHill[] = _("MONTE ALLENATORI");
#elif SPANISH
static const u8 LandmarkName_FlowerShop[] = _("FLORISTERÍA");
static const u8 LandmarkName_PetalburgWoods[] = _("BOSQUE PETALIA");
static const u8 LandmarkName_MrBrineysCottage[] = _("CASA del SR. ARENQUE");
static const u8 LandmarkName_AbandonedShip[] = _("NAO ABANDONADA");
static const u8 LandmarkName_SeashoreHouse[] = _("CASA de la PLAYA");
static const u8 LandmarkName_SlateportBeach[] = _("PLAYA de CDAD. PORTUAL");
static const u8 LandmarkName_CyclingRoad[] = _("CAMINO de BICIS");
static const u8 LandmarkName_NewMauville[] = _("MALVALANOVA");
static const u8 LandmarkName_TrickHouse[] = _("CASA TRETA");
static const u8 LandmarkName_OldLadysRestShop[] = _("POSADA de la ABUELA");
static const u8 LandmarkName_Desert[] = _("DESIERTO");
static const u8 LandmarkName_WinstrateFamily[] = _("La familia ESTRATEGA");
static const u8 LandmarkName_CableCar[] = _("TELEFÉRICO");
static const u8 LandmarkName_GlassWorkshop[] = _("TALLER de VIDRIO");
static const u8 LandmarkName_WeatherInstitute[] = _("INST. METEOROLÓGICO");
static const u8 LandmarkName_MeteorFalls[] = _("CASCADA METEORO");
static const u8 LandmarkName_TunnelersRestHouse[] = _("POSADA del TUNELERO");
static const u8 LandmarkName_RusturfTunnel[] = _("TÚNEL FERVERGAL");
static const u8 LandmarkName_PokemonDayCare[] = _("GUARDERÍA POKéMON");
static const u8 LandmarkName_SafariZoneEntrance[] = _("ENTRADA al SAFARI");
static const u8 LandmarkName_MtPyre[] = _("MONTE PÍRICO");
static const u8 LandmarkName_ShoalCave[] = _("CUEVA CARDUMEN");
static const u8 LandmarkName_SeafloorCavern[] = _("CAVERNA ABISAL");
static const u8 LandmarkName_GraniteCave[] = _("CUEVA GRANITO");
static const u8 LandmarkName_OceanCurrent[] = _("CORRIENTE OCEÁNICA");
static const u8 LandmarkName_LanettesHouse[] = _("CASA de AREDIA");
static const u8 LandmarkName_FieryPath[] = _("SENDA ÍGNEA");
static const u8 LandmarkName_JaggedPass[] = _("DESFILADERO");
static const u8 LandmarkName_SkyPillar[] = _("PILAR CELESTE");
static const u8 LandmarkName_BerryMastersHouse[] = _("CASA del BAYÓLOGO");
static const u8 LandmarkName_IslandCave[] = _("CUEVA INSULAR");
static const u8 LandmarkName_DesertRuins[] = _("RUINAS DESIERTO");
static const u8 LandmarkName_ScorchedSlab[] = _("GRUTA SOLAR");
static const u8 LandmarkName_AncientTomb[] = _("TUMBA ANTIGUA");
static const u8 LandmarkName_SealedChamber[] = _("CÁMARA SELLADA");
static const u8 LandmarkName_FossilManiacsHouse[] = _("CASA del FOSILMANÍACO");
static const u8 LandmarkName_HuntersHouse[] = _("CASA del BUSCATESOROS");
static const u8 LandmarkName_MagmaHideout[] = _("GUARIDA MAGMA");
static const u8 LandmarkName_MirageTower[] = _("TORRE ESPEJISMO");
static const u8 LandmarkName_AlteringCave[] = _("CUEVA CAMBIANTE");
static const u8 LandmarkName_DesertUnderpass[] = _("GRUTA DESÉRTICA");
static const u8 LandmarkName_TrainerHill[] = _("COLINA DESAFÍO");
#else //ENGLISH
static const u8 LandmarkName_FlowerShop[] = _("FLOWER SHOP");
static const u8 LandmarkName_PetalburgWoods[] = _("PETALBURG WOODS");

2
src/lilycove_lady.c
View File

@@ -396,7 +396,7 @@ static u8 BufferQuizAuthorName(void)
sQuizLadyPtr = &gSaveBlock1Ptr->lilycoveLady.quiz;
if (sQuizLadyPtr->playerName[0] == EOS)
{
#if FRENCH || ITALIAN
#if EUROPE
StringCopy(gStringVar1, gText_QuizLady_Lady);
#else //ENGLISH
StringCopy_PlayerName(gStringVar1, gText_QuizLady_Lady);

6
src/main.c
View File

@@ -35,10 +35,10 @@ const u8 gGameVersion = GAME_VERSION;
const u8 gGameLanguage = GAME_LANGUAGE;
#if FRENCH
const char BuildDateTime[] = "2005 07 01 18:30";
#elif ITALIAN
#if ITALIAN
const char BuildDateTime[] = "2005 07 07 18:00";
#elif FRENCH || SPANISH
const char BuildDateTime[] = "2005 07 01 18:30";
#else //ENGLISH
const char BuildDateTime[] = "2005 02 21 11:10";
#endif

9
src/map_name_popup.c
View File

@@ -195,6 +195,15 @@ static const u8 sText_PyramidFloor5[] = _("PIRAMIDE 5º P.");
static const u8 sText_PyramidFloor6[] = _("PIRAMIDE 6º P.");
static const u8 sText_PyramidFloor7[] = _("PIRAMIDE 7º P.");
static const u8 sText_Pyramid[] = _("PIRAMIDE");
#elif SPANISH
static const u8 sText_PyramidFloor1[] = _("PIRÁMIDE- NV. 1");
static const u8 sText_PyramidFloor2[] = _("PIRÁMIDE- NV. 2");
static const u8 sText_PyramidFloor3[] = _("PIRÁMIDE- NV. 3");
static const u8 sText_PyramidFloor4[] = _("PIRÁMIDE- NV. 4");
static const u8 sText_PyramidFloor5[] = _("PIRÁMIDE- NV. 5");
static const u8 sText_PyramidFloor6[] = _("PIRÁMIDE- NV. 6");
static const u8 sText_PyramidFloor7[] = _("PIRÁMIDE- NV. 7");
static const u8 sText_Pyramid[] = _("PIRÁMIDE");
#else //ENGLISH
static const u8 sText_PyramidFloor1[] = _("PYRAMID FLOOR 1");
static const u8 sText_PyramidFloor2[] = _("PYRAMID FLOOR 2");

7
src/mauville_old_man.c
View File

@@ -52,6 +52,13 @@ static const u16 sDefaultBardSongLyrics[BARD_SONG_LENGTH] = {
EC_WORD_MAGAZINE,
EC_WORD_LISTEN,
EC_WORD_PLUS,
#elif SPANISH
EC_WORD_WINNER,
EC_WORD_HIYAH,
EC_WORD_WINNER,
EC_WORD_HIYAH,
EC_WORD_WINNER,
EC_WORD_HIYAH,
#else //ENGLISH
EC_WORD_SHAKE,
EC_WORD_IT,

18
src/strings.c
View File

@@ -6686,9 +6686,9 @@ const u8 gText_PokeBalls[] = _("POKé BALLS");
const u8 gText_Berry[] = _("BAIE");
const u8 gText_Berries[] = _("BAIES");
// new strings
const u8 gText_Eleve[] = _("ELEVE");
const u8 gText_Dresseur[] = _("DRESSEUR");
const u8 gText_Champion[] = _("CHAMPION");
const u8 gText_SchoolKidFemale[] = _("ELEVE");
const u8 gText_TrainerFemale[] = _("DRESSEUR");
const u8 gText_LeaderPlural[] = _("CHAMPION");
#elif ITALIAN
@@ -6854,9 +6854,9 @@ const u8 gText_PokeBalls[] = _("POKé BALL");
const u8 gText_Berry[] = _("BACCA");
const u8 gText_Berries[] = _("BACCA");
// new strings
const u8 gText_Eleve[] = _("SCOLARA");
const u8 gText_Dresseur[] = _("ALLENATORE");
const u8 gText_Champion[] = _("CAPIPALESTRA");
const u8 gText_SchoolKidFemale[] = _("SCOLARA");
const u8 gText_TrainerFemale[] = _("ALLENATORE");
const u8 gText_LeaderPlural[] = _("CAPIPALESTRA");
#elif SPANISH
@@ -7022,9 +7022,9 @@ const u8 gText_PokeBalls[] = _("POKé BALLS");
const u8 gText_Berry[] = _("BAYA");
const u8 gText_Berries[] = _("BAYAS");
// new strings
const u8 gText_Eleve[] = _("ESCOLAR");
const u8 gText_Dresseur[] = _("ENTRENADORA");
const u8 gText_Champion[] = _("LÍDERES");
const u8 gText_SchoolKidFemale[] = _("ESCOLAR");
const u8 gText_TrainerFemale[] = _("ENTRENADORA");
const u8 gText_LeaderPlural[] = _("LÍDERES");
#else //ENGLISH