diff --git a/include/battle_message.h b/include/battle_message.h index 7d000d289fda..a5c9e637ce88 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -289,16 +289,13 @@ extern const u8 gText_LinkStandby[]; extern const u8 gText_BattleMenu[]; extern const u8 gText_SafariZoneMenu[]; extern const u8 gText_MoveInterfacePP[]; -extern const u8 gText_MoveInterfaceType[]; extern const u8 gText_MoveInterfacePpType[]; extern const u8 gText_MoveInterfaceDynamicColors[]; extern const u8 gText_WhichMoveToForget4[]; extern const u8 gText_BattleYesNoChoice[]; extern const u8 gText_BattleSwitchWhich[]; -extern const u8 gText_BattleSwitchWhich2[]; extern const u8 gText_BattleSwitchWhich3[]; extern const u8 gText_BattleSwitchWhich4[]; -extern const u8 gText_BattleSwitchWhich5[]; extern const u8 gText_SafariBalls[]; extern const u8 gText_SafariBallLeft[]; extern const u8 gText_Sleep[]; @@ -310,11 +307,9 @@ extern const u8 gText_Confusion[]; extern const u8 gText_Love[]; extern const u8 gText_SpaceAndSpace[]; extern const u8 gText_CommaSpace[]; -extern const u8 gText_Space2[]; extern const u8 gText_LineBreak[]; extern const u8 gText_NewLine[]; extern const u8 gText_Are[]; -extern const u8 gText_Are2[]; extern const u8 gText_BadEgg[]; extern const u8 gText_BattleWallyName[]; extern const u8 gText_Win[]; @@ -341,7 +336,6 @@ extern const u8 gText_Mind[]; extern const u8 gText_Skill[]; extern const u8 gText_Body[]; extern const u8 gText_Judgment[]; -extern const u8 gText_EmptyString3[]; extern const u8 gText_RecordBattleToPass[]; extern const u8 gText_BattleRecordedOnPass[]; extern const u8 gText_BattleTourney[]; diff --git a/include/strings.h b/include/strings.h index 8e1f797079e1..990cf066cba3 100644 --- a/include/strings.h +++ b/include/strings.h @@ -5,8 +5,6 @@ extern const u8 gText_ExpandedPlaceholder_Empty[]; extern const u8 gText_ExpandedPlaceholder_Kun[]; extern const u8 gText_ExpandedPlaceholder_Chan[]; -extern const u8 gText_ExpandedPlaceholder_Sapphire[]; -extern const u8 gText_ExpandedPlaceholder_Ruby[]; extern const u8 gText_ExpandedPlaceholder_Emerald[]; extern const u8 gText_ExpandedPlaceholder_Aqua[]; extern const u8 gText_ExpandedPlaceholder_Magma[]; @@ -42,20 +40,11 @@ extern const u8 gText_Super[]; extern const u8 gText_Hyper[]; extern const u8 gText_Master[]; -extern const u8 gText_Cool2[]; -extern const u8 gText_Beauty2[]; -extern const u8 gText_Cute2[]; -extern const u8 gText_Smart2[]; -extern const u8 gText_Tough2[]; - extern const u8 gText_Items[]; extern const u8 gText_Key_Items[]; extern const u8 gText_Poke_Balls[]; -extern const u8 gText_TMs_Hms[]; -extern const u8 gText_Berries2[]; +extern const u8 gText_TMs_HMs[]; -extern const u8 gText_Single2[]; -extern const u8 gText_Double2[]; extern const u8 gText_Multi[]; extern const u8 gText_MultiLink[]; @@ -112,7 +101,6 @@ extern const u8 gText_Color161Shadow161[]; extern const u8 gText_GoBackPrevMenu[]; extern const u8 gText_CantPlaceInRoom[]; extern const u8 gText_NoMoreDecorations[]; -extern const u8 gText_NoMoreDecorations2[]; extern const u8 gText_InUseAlready[]; extern const u8 gText_CancelDecorating[]; extern const u8 gText_PlaceItHere[]; @@ -125,7 +113,6 @@ extern const u8 gText_DecorationWillBeDiscarded[]; extern const u8 gText_CantThrowAwayInUse[]; extern const u8 gText_DecorationThrownAway[]; -extern const u8 gText_PokeBalls[]; extern const u8 gText_Berries[]; extern const u8 gText_Berry[]; @@ -143,7 +130,6 @@ extern const u8 gText_Doll[]; extern const u8 gText_Cushion[]; extern const u8 gText_Decorate[]; extern const u8 gText_PutAway[]; -extern const u8 gText_Toss2[]; extern const u8 gText_Hoenn[]; extern const u8 gText_Ferry[]; extern const u8 gText_SecretBase[]; @@ -163,9 +149,7 @@ extern const u8 gText_ABtnTitleScreen[]; extern const u8 gText_ABtnRegistrationCounter[]; extern const u8 gText_MixingRecords[]; extern const u8 gText_RecordMixingComplete[]; -extern const u8 gText_EmptyString2[]; -extern const u8 gText_Confirm3[]; -extern const u8 gText_Cancel4[]; +extern const u8 gText_EmptyString[]; extern const u8 gText_IsThisTheCorrectTime[]; extern const u8 gText_PkmnFainted_FldPsn[]; extern const u8 gText_Coins[]; @@ -175,10 +159,7 @@ extern const u8 gText_Gold[]; extern const u8 gMenuText_Use[]; extern const u8 gMenuText_Toss[]; extern const u8 gMenuText_Give[]; -extern const u8 gMenuText_Give2[]; -extern const u8 gMenuText_Register[]; extern const u8 gMenuText_Confirm[]; -extern const u8 gMenuText_Give2[]; extern const u8 gText_EggNickname[]; extern const u8 gText_Pokemon[]; @@ -187,8 +168,6 @@ extern const u8 gText_InGameClockUsable[]; // reset rtc screen texts extern const u8 gText_Day[]; -extern const u8 gText_Colon3[]; -extern const u8 gText_Confirm2[]; extern const u8 gText_PresentTime[]; extern const u8 gText_PreviousTime[]; extern const u8 gText_ResetRTCConfirmCancel[]; @@ -199,16 +178,7 @@ extern const u8 gText_SaveCompleted[]; extern const u8 gText_SaveFailed[]; // menu texts -extern const u8 gText_MenuPokedex[]; -extern const u8 gText_MenuPokemon[]; -extern const u8 gText_MenuBag[]; -extern const u8 gText_MenuPokenav[]; extern const u8 gText_MenuPlayer[]; -extern const u8 gText_MenuSave[]; -extern const u8 gText_MenuOption[]; -extern const u8 gText_MenuExit[]; -extern const u8 gText_MenuRetire[]; -extern const u8 gText_MenuRest[]; extern const u8 gText_Floor1[]; extern const u8 gText_Floor2[]; extern const u8 gText_Floor3[]; @@ -220,13 +190,10 @@ extern const u8 gText_Peak[]; extern const u8 gText_SafariBallStock[]; extern const u8 gText_BattlePyramidFloor[]; -extern const u8 gText_MenuOptionPokedex[]; -extern const u8 gText_MenuOptionPokemon[]; -extern const u8 gText_MenuOptionBag[]; -extern const u8 gText_MenuOptionPokenav[]; -extern const u8 gText_MenuOptionSave[]; -extern const u8 gText_MenuOptionOption[]; -extern const u8 gText_MenuOptionExit[]; +extern const u8 gText_Pokedex[]; +extern const u8 gText_Bag[]; +extern const u8 gText_Pokenav[]; +extern const u8 gText_Save[]; // save menu texts extern const u8 gText_ConfirmSave[]; @@ -236,10 +203,8 @@ extern const u8 gText_SavingDontTurnOff[]; extern const u8 gText_PlayerSavedGame[]; extern const u8 gText_SaveError[]; extern const u8 gText_SavingDontTurnOffPower[]; -extern const u8 gText_SavingPlayer[]; -extern const u8 gText_SavingBadges[]; -extern const u8 gText_SavingPokedex[]; -extern const u8 gText_SavingTime[]; +extern const u8 gText_Player[]; +extern const u8 gText_Badges[]; // Battle pyramid menu texts extern const u8 gText_BattlePyramidConfirmRest[]; @@ -267,13 +232,11 @@ extern const u8 gText_BattleScene[]; extern const u8 gText_BattleStyle[]; extern const u8 gText_Sound[]; extern const u8 gText_Frame[]; -extern const u8 gText_OptionMenuCancel[]; extern const u8 gText_ButtonMode[]; extern const u8 gText_MaleSymbol[]; extern const u8 gText_FemaleSymbol[]; -extern const u8 gText_SelectorArrow3[]; extern const u8 gText_YesNo[]; // main menu/birch speech text @@ -304,7 +267,6 @@ extern const u8 gText_NumberItem_HM[]; extern const u8 gText_NumberItem_TMBerry[]; extern const u8 gText_xVar1[]; extern const u8 gText_ReturnToVar1[]; -extern const u8 gText_SelectorArrow2[]; extern const u8 gText_MoveVar1Where[]; extern const u8 gText_Var1IsSelected[]; extern const u8 gText_TossHowManyVar1s[]; @@ -357,9 +319,7 @@ extern const u8 gText_PkmnCuredOfParalysis[]; extern const u8 gText_PkmnGotOverInfatuation[]; extern const u8 gText_PkmnTransformed[]; extern const u8 gText_PkmnBecameHealthy[]; -extern const u8 gText_HP3[]; -extern const u8 gText_SpAtk3[]; -extern const u8 gText_SpDef3[]; +extern const u8 gText_HP[]; extern const u8 gText_PkmnBaseVar2StatIncreased[]; extern const u8 gText_MovesPPIncreased[]; extern const u8 gText_PPWasRestored[]; @@ -371,10 +331,10 @@ extern const u8 gText_PkmnAdoresBaseVar2Fell[]; extern const u8 gText_PkmnAlreadyKnows[]; extern const u8 gText_PkmnCantLearnMove[]; extern const u8 gText_PkmnNeedsToReplaceMove[]; -extern const u8 gText_PkmnLearnedMove3[]; +extern const u8 gText_PkmnLearnedMove[]; extern const u8 gText_WhichMoveToForget[]; extern const u8 gText_12PoofForgotMove[]; -extern const u8 gText_StopLearningMove2[]; +extern const u8 gText_StopLearningMove[]; extern const u8 gText_MoveNotLearned[]; extern const u8 gText_PkmnElevatedToLvVar2[]; extern const u8 gText_PkmnGainedExp[]; @@ -397,7 +357,6 @@ extern const u8 gText_Defense[]; extern const u8 gText_SpAtk[]; extern const u8 gText_SpDef[]; extern const u8 gText_Speed[]; -extern const u8 gText_Dash[]; extern const u8 gText_Plus[]; //Pokédex text @@ -446,8 +405,6 @@ extern const u8 gText_NoMailHere[]; extern const u8 gText_GoBackPrevMenu[]; extern const u8 gText_Cancel[]; -extern const u8 gText_Cancel2[]; - extern const u8 gText_NoItems[]; extern const u8 gText_WhatToDoWithVar1sMail[]; extern const u8 gText_MessageWillBeLost[]; @@ -499,7 +456,6 @@ extern const u8 gText_B4F[]; extern const u8 gText_Rooftop[]; extern const u8 gText_ElevatorNowOn[]; -extern const u8 gText_BattleTower2[]; extern const u8 gText_BattleDome[]; extern const u8 gText_BattlePalace[]; extern const u8 gText_BattleArena[]; @@ -662,22 +618,16 @@ extern const u8 gText_Winona[]; extern const u8 gText_Phoebe[]; extern const u8 gText_Glacia[]; -extern const u8 gText_MoveRelearnerPkmnLearnedMove[]; extern const u8 gText_MoveRelearnerPkmnTryingToLearnMove[]; extern const u8 gText_MoveRelearnerWhichMoveToForget[]; -extern const u8 gText_MoveRelearnerStopTryingToTeachMove[]; extern const u8 gText_MoveRelearnerAndPoof[]; extern const u8 gText_MoveRelearnerPkmnForgotMoveAndLearnedNew[]; extern const u8 gText_TeachWhichMoveToPkmn[]; extern const u8 gText_MoveRelearnerGiveUp[]; extern const u8 gText_MoveRelearnerTeachMoveConfirm[]; -extern const u8 gText_MoveRelearnerBattleMoves[]; extern const u8 gText_MoveRelearnerPP[]; extern const u8 gText_MoveRelearnerPower[]; extern const u8 gText_MoveRelearnerAccuracy[]; -extern const u8 gText_MoveRelearnerContestMovesTitle[]; -extern const u8 gText_MoveRelearnerAppeal[]; -extern const u8 gText_MoveRelearnerJam[]; extern const u8 gText_Kira[]; extern const u8 gText_Amy[]; @@ -694,7 +644,6 @@ extern const u8 gText_BoxFull[]; extern const u8 gText_WontHaveEffect[]; extern const u8 gText_NextFusionMon[]; -extern const u8 gText_LevelSymbol[]; extern const u8 gText_PkmnInfo[]; extern const u8 gText_PkmnSkills[]; extern const u8 gText_BattleMoves[]; @@ -704,12 +653,6 @@ extern const u8 gText_Info[]; extern const u8 gText_Switch[]; extern const u8 gText_RentalPkmn[]; extern const u8 gText_TypeSlash[]; -extern const u8 gText_HP4[]; -extern const u8 gText_Attack3[]; -extern const u8 gText_Defense3[]; -extern const u8 gText_SpAtk4[]; -extern const u8 gText_SpDef4[]; -extern const u8 gText_Speed2[]; extern const u8 gText_ExpPoints[]; extern const u8 gText_NextLv[]; extern const u8 gText_Status[]; @@ -727,7 +670,6 @@ extern const u8 gText_XNatureMetSomewhereAt[]; extern const u8 gText_XNatureFatefulEncounter[]; extern const u8 gText_XNatureProbablyMetAt[]; extern const u8 gText_XNatureObtainedInTrade[]; -extern const u8 gText_EmptyString5[]; extern const u8 gText_EggWillTakeALongTime[]; extern const u8 gText_EggAboutToHatch[]; extern const u8 gText_EggWillHatchSoon[]; @@ -752,15 +694,12 @@ extern const u8 gText_AwaitingLinkup[]; extern const u8 gText_PleaseWaitForLink[]; extern const u8 gText_BronzeCard[]; extern const u8 gText_CopperCard[]; -extern const u8 gText_SilverCard[]; -extern const u8 gText_GoldCard[]; extern const u8 gText_CanIHelpWithAnythingElse[]; extern const u8 gText_AnythingElseICanHelp[]; extern const u8 gText_QuitShopping[]; extern const u8 gText_PokedollarVar1[]; extern const u8 gText_YouDontHaveMoney[]; -extern const u8 gText_Var1CertainlyHowMany2[]; extern const u8 gText_Var1CertainlyHowMany[]; extern const u8 gText_Var1IsItThatllBeVar2[]; extern const u8 gText_YouWantedVar1ThatllBeVar2[]; @@ -791,8 +730,7 @@ extern const u8 gText_SomeonesPC[]; extern const u8 gText_PlayersPC[]; extern const u8 gText_WhichPCShouldBeAccessed[]; -extern const u8 gText_Info2[]; -extern const u8 gText_Decoration2[]; +extern const u8 gText_Decoration[]; extern const u8 gText_PackUp[]; extern const u8 gText_Registry[]; extern const u8 gText_Information[]; @@ -844,9 +782,7 @@ extern const u8 gText_DexSortHeaviestDescription[]; extern const u8 gText_DexSortLightestDescription[]; extern const u8 gText_DexSortTallestDescription[]; extern const u8 gText_DexSortSmallestDescription[]; -extern const u8 gText_DexEmptyString[]; extern const u8 gText_DexSearchDontSpecify[]; -extern const u8 gText_DexSearchTypeNone[]; extern const u8 gText_LilycoveCity[]; extern const u8 gText_RedShard[]; @@ -856,14 +792,11 @@ extern const u8 gText_GreenShard[]; extern const u8 gText_Opponent[]; extern const u8 gText_Tourney_Tree[]; extern const u8 gText_ReadyToStart[]; -extern const u8 gText_Record2[]; extern const u8 gText_Rest[]; extern const u8 gText_Retire[]; extern const u8 gText_TradeCenter[]; extern const u8 gText_Colosseum[]; extern const u8 gText_RecordCorner[]; -extern const u8 gText_BerryCrush3[]; -extern const u8 gText_Blank[]; extern const u8 gText_BattleRules[]; extern const u8 gText_JudgeMind[]; extern const u8 gText_JudgeSkill[]; @@ -881,10 +814,6 @@ extern const u8 gText_ExpertTagMatch[]; extern const u8 gText_TimeBoard[]; extern const u8 gText_TimeCleared[]; extern const u8 gText_XMinYDotZSec[]; -extern const u8 gText_TrainerHill1F[]; -extern const u8 gText_TrainerHill2F[]; -extern const u8 gText_TrainerHill3F[]; -extern const u8 gText_TrainerHill4F[]; // Cable Club multichoice text extern const u8 CableClub_Text_TradeUsingLinkCable[]; @@ -906,7 +835,6 @@ extern const u8 gText_SingleBattleRoomResults[]; extern const u8 gText_DoubleBattleRoomResults[]; extern const u8 gText_MultiBattleRoomResults[]; extern const u8 gText_LinkMultiBattleRoomResults[]; -extern const u8 gText_Lv502[]; extern const u8 gText_OpenLv[]; extern const u8 gText_RentalSwap[]; extern const u8 gText_ClearStreak[]; @@ -935,9 +863,7 @@ extern const u8 gText_CommaSpace[]; extern const u8 gText_NewLine[]; extern const u8 gText_LineBreak[]; extern const u8 gText_Space[]; -extern const u8 gText_Space2[]; extern const u8 gText_Are[]; -extern const u8 gText_Are2[]; extern const u8 gText_123Dot[][3]; // Frontier util. @@ -945,10 +871,7 @@ extern const u8 gText_FacilitySingle[]; extern const u8 gText_FacilityDouble[]; extern const u8 gText_FacilityMulti[]; extern const u8 gText_FacilityLink[]; -extern const u8 gText_Facility[]; -extern const u8 gText_RecordsLv50[]; -extern const u8 gText_RecordsOpenLevel[]; extern const u8 gText_FrontierFacilityWinStreak[]; extern const u8 gText_FrontierFacilityClearStreak[]; extern const u8 gText_FrontierFacilityRoomsCleared[]; @@ -1566,11 +1489,6 @@ extern const u8 gText_Name[]; extern const u8 gText_Time[]; // daycare -extern const u8 gText_MaleSymbol4[]; -extern const u8 gText_FemaleSymbol4[]; -extern const u8 gText_GenderlessSymbol[]; -extern const u8 gText_NewLine2[]; -extern const u8 gText_Exit4[]; extern const u8 gText_Lv[]; extern const u8 gExpandedPlaceholder_Empty[]; extern const u8 gText_Exit[]; @@ -1592,10 +1510,8 @@ extern const u8 gText_CantSurfHere[]; extern const u8 gText_AlreadySurfing[]; extern const u8 gText_CurrentIsTooFast[]; extern const u8 gText_EnjoyCycling[]; -extern const u8 gText_InUseAlready_PM[]; extern const u8 gText_CantUseHere[]; extern const u8 gText_NoPokemonForBattle[]; -extern const u8 gText_ChoosePokemon2[]; extern const u8 gText_NotEnoughHp[]; extern const u8 gText_PokemonAreNeeded[]; extern const u8 gText_PokemonCantBeSame[]; @@ -1613,14 +1529,12 @@ extern const u8 gText_First_PM[]; extern const u8 gText_Second_PM[]; extern const u8 gText_Third_PM[]; extern const u8 gText_Fourth[]; -extern const u8 gText_Able2[]; extern const u8 gText_NotAble[]; extern const u8 gText_Able3[]; extern const u8 gText_NotAble2[]; extern const u8 gText_Learned[]; extern const u8 gText_Have[]; extern const u8 gText_DontHave[]; -extern const u8 gText_Cancel2[]; extern const u8 gText_Register[]; extern const u8 gText_NotPkmnOtherTrainerWants[]; extern const u8 gText_ThatIsntAnEgg[]; @@ -1633,7 +1547,6 @@ extern const u8 gText_XWillBeSentToY[]; extern const u8 gText_ByeByeVar1[]; extern const u8 gText_XSentOverY[]; extern const u8 gText_TakeGoodCareOfX[]; -extern const u8 gText_CommunicationStandby5[]; // match call extern const u8 MatchCall_WildBattleText1[]; @@ -1962,13 +1875,9 @@ extern const u8 gText_LinkCableBattles[]; extern const u8 gText_LinkBattles[]; extern const u8 gText_WaitingTrainerFinishReading[]; extern const u8 gText_TrainerCardName[]; -extern const u8 gText_TrainerCardIDNo[]; extern const u8 gText_TrainerCardMoney[]; extern const u8 gText_PokedollarVar1[]; -extern const u8 gText_EmptyString6[]; -extern const u8 gText_TrainerCardPokedex[]; -extern const u8 gText_TrainerCardTime[]; -extern const u8 gText_Colon2[]; +extern const u8 gText_Colon[]; extern const u8 gText_Var1sTrainerCard[]; extern const u8 gText_HallOfFameDebut[]; extern const u8 gText_WinsLosses[]; @@ -2001,14 +1910,6 @@ extern const u8 gText_BattleArenaGutsSymbol[]; extern const u8 gText_BattleFactoryKnowledgeSymbol[]; extern const u8 gText_BattlePikeLuckSymbol[]; extern const u8 gText_BattlePyramidBraveSymbol[]; -extern const u8 gText_EmptyString7[]; -extern const u8 gText_BattleTower3[]; -extern const u8 gText_BattleDome2[]; -extern const u8 gText_BattlePalace2[]; -extern const u8 gText_BattleArena2[]; -extern const u8 gText_BattleFactory2[]; -extern const u8 gText_BattlePike2[]; -extern const u8 gText_BattlePyramid2[]; extern const u8 gText_BattleTowerDesc[]; extern const u8 gText_BattleDomeDesc[]; extern const u8 gText_BattlePalaceDesc[]; @@ -2053,7 +1954,6 @@ extern const u8 gText_WhatYouSayIfYouWin[]; extern const u8 gText_UponLosingABattle[]; extern const u8 gText_WhatYouSayIfYouLose[]; extern const u8 gText_CombineNineWordsOrPhrases[]; -extern const u8 gText_AndMakeAMessage2[]; extern const u8 gText_TheMailMessage[]; extern const u8 gText_Interview[]; extern const u8 gText_LetsReplyToTheInterview[]; @@ -2083,14 +1983,12 @@ extern const u8 gText_FindWordsWhichFit[]; extern const u8 gText_TheTrainersImage[]; extern const u8 gText_ApprenticePhrase[]; extern const u8 gText_GoodSaying[]; -extern const u8 gText_CombineTwoWordsOrPhrases2[]; extern const u8 gText_ToTeachHerAGoodSaying[]; extern const u8 gText_FansQuestion[]; extern const u8 gText_TheImage[]; extern const u8 gText_Questionnaire[]; extern const u8 gText_AndFillOutTheQuestionnaire[]; extern const u8 gText_DelAll[]; -extern const u8 gText_Cancel5[]; extern const u8 gText_Ok2[]; extern const u8 gText_Quiz[]; extern const u8 gText_Answer[]; @@ -2140,20 +2038,16 @@ extern const u8 gText_UnionRoomChatKeyboard_KLMNO[]; extern const u8 gText_UnionRoomChatKeyboard_PQRST[]; extern const u8 gText_UnionRoomChatKeyboard_UVWXY[]; extern const u8 gText_UnionRoomChatKeyboard_Z[]; -extern const u8 gText_UnionRoomChatKeyboard_01234Upper[]; -extern const u8 gText_UnionRoomChatKeyboard_56789Upper[]; -extern const u8 gText_UnionRoomChatKeyboard_PunctuationUpper[]; -extern const u8 gText_UnionRoomChatKeyboard_SymbolsUpper[]; +extern const u8 gText_UnionRoomChatKeyboard_01234[]; +extern const u8 gText_UnionRoomChatKeyboard_56789[]; +extern const u8 gText_UnionRoomChatKeyboard_Punctuation[]; +extern const u8 gText_UnionRoomChatKeyboard_Symbols[]; extern const u8 gText_UnionRoomChatKeyboard_abcde[]; extern const u8 gText_UnionRoomChatKeyboard_fghij[]; extern const u8 gText_UnionRoomChatKeyboard_klmno[]; extern const u8 gText_UnionRoomChatKeyboard_pqrst[]; extern const u8 gText_UnionRoomChatKeyboard_uvwxy[]; extern const u8 gText_UnionRoomChatKeyboard_z[]; -extern const u8 gText_UnionRoomChatKeyboard_01234Lower[]; -extern const u8 gText_UnionRoomChatKeyboard_56789Lower[]; -extern const u8 gText_UnionRoomChatKeyboard_PunctuationLower[]; -extern const u8 gText_UnionRoomChatKeyboard_SymbolsLower[]; extern const u8 gText_UnionRoomChatKeyboard_Emoji1[]; extern const u8 gText_UnionRoomChatKeyboard_Emoji2[]; extern const u8 gText_UnionRoomChatKeyboard_Emoji3[]; @@ -2187,7 +2081,6 @@ extern const u8 gText_Powder[]; extern const u8 gText_F700JoinedChat[]; extern const u8 gText_F700LeftChat[]; extern const u8 gText_Hello[]; -extern const u8 gText_Pokemon2[]; extern const u8 gText_Trade[]; extern const u8 gText_Battle[]; extern const u8 gText_Lets[]; @@ -2205,10 +2098,8 @@ extern const u8 gJPText_MysteryGift[]; extern const u8 gJPText_DecideStop[]; extern const u8 gText_WonderCards[]; extern const u8 gText_WonderNews[]; -extern const u8 gText_Exit3[]; extern const u8 gText_WirelessCommunication[]; extern const u8 gText_Friend2[]; -extern const u8 gText_Cancel2[]; extern const u8 gText_Receive[]; extern const u8 gText_Send[]; extern const u8 gText_Toss[]; @@ -2278,14 +2169,12 @@ extern const u8 gText_ExitingChat[]; extern const u8 gText_LeaderLeftEndingChat[]; extern const u8 gText_RegisteredTextChangedOKToSave[]; extern const u8 gText_AlreadySavedFile_Chat[]; -extern const u8 gText_SavingDontTurnOff_Chat[]; extern const u8 gText_PlayerSavedGame_Chat[]; extern const u8 gText_IfLeaderLeavesChatEnds[]; extern const u8 gText_Upper[]; extern const u8 gText_Lower[]; +extern const u8 gText_Others[]; extern const u8 gText_Symbols[]; -extern const u8 gText_Register2[]; -extern const u8 gText_Exit2[]; // Dodrio Berry Picking extern const u8 gText_BerryPickingRecords[]; @@ -2306,21 +2195,13 @@ extern const u8 gText_CantHoldAnyMore[]; extern const u8 gText_FilledStorageSpace[]; extern const u8 gText_BerryPickingResults[]; extern const u8 gText_WantToPlayAgain[]; -extern const u8 gText_CommunicationStandby3[]; extern const u8 gText_SomeoneDroppedOut[]; // Pokémon jump -extern const u8 gText_WantToPlayAgain2[]; -extern const u8 gText_SomeoneDroppedOut2[]; -extern const u8 gText_CommunicationStandby4[]; extern const u8 gText_AwesomeWonF701F700[]; -extern const u8 gText_FilledStorageSpace2[]; -extern const u8 gText_CantHoldMore[]; -extern const u8 gText_SpacePoints2[]; -extern const u8 gText_SpaceTimes3[]; +extern const u8 gText_SpaceTimes[]; extern const u8 gText_PkmnJumpRecords[]; extern const u8 gText_JumpsInARow[]; -extern const u8 gText_BestScore2[]; extern const u8 gText_ExcellentsInARow[]; // Berry crush @@ -2330,17 +2211,14 @@ extern const u8 gText_1DotBlueF700[]; extern const u8 gText_1DotF700[]; extern const u8 gText_TimeColon[]; extern const u8 gText_SpaceSec[]; -extern const u8 gText_XDotY2[]; extern const u8 gText_SpaceMin[]; extern const u8 gText_StrVar1[]; extern const u8 gText_PressingSpeed[]; extern const u8 gText_TimesPerSec[]; -extern const u8 gText_XDotY3[]; extern const u8 gText_Silkiness[]; extern const u8 gText_Var1Percent[]; extern const u8 gText_PressesRankings[]; extern const u8 gText_CrushingResults[]; -extern const u8 gText_BerryCrush2[]; extern const u8 gText_PressingSpeedRankings[]; extern const u8 gText_Var1Players[]; extern const u8 gText_ReadyPickBerry[]; @@ -2351,8 +2229,6 @@ extern const u8 gText_PlayBerryCrushAgain[]; extern const u8 gText_YouHaveNoBerries[]; extern const u8 gText_MemberDroppedOut[]; extern const u8 gText_TimesUpNoGoodPowder[]; -extern const u8 gText_CommunicationStandby2[]; -extern const u8 gText_SpaceTimes2[]; extern const u8 gText_XDotY[]; extern const u8 gText_Var1Berry[]; extern const u8 gText_NeatnessRankings[]; @@ -2378,7 +2254,6 @@ extern const u8 gText_BlenderMaxSpeedRecord[]; extern const u8 gText_234Players[]; // Battle Factory Screen -extern const u8 gText_RentalPkmn2[]; extern const u8 gText_SelectFirstPkmn[]; extern const u8 gText_SelectSecondPkmn[]; extern const u8 gText_SelectThirdPkmn[]; @@ -2388,21 +2263,14 @@ extern const u8 gText_Summary[]; extern const u8 gText_Rechoose[]; extern const u8 gText_Deselect[]; extern const u8 gText_Rent[]; -extern const u8 gText_Others2[]; -extern const u8 gText_Yes2[]; -extern const u8 gText_Yes3[]; -extern const u8 gText_No2[]; -extern const u8 gText_No3[]; extern const u8 gText_QuitSwapping[]; extern const u8 gText_AcceptThisPkmn[]; extern const u8 gText_SelectPkmnToAccept[]; extern const u8 gText_SelectPkmnToSwap[]; extern const u8 gText_PkmnSwap[]; extern const u8 gText_Swap[]; -extern const u8 gText_Summary2[]; extern const u8 gText_PkmnForSwap[]; extern const u8 gText_SamePkmnInPartyAlready[]; -extern const u8 gText_Cancel3[]; // Naming Screen extern const u8 gText_MoveOkBack[]; diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 33969994873f..4af31ebe50e4 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -25,6 +25,7 @@ #include "recorded_battle.h" #include "reshow_battle_screen.h" #include "sound.h" +#include "strings.h" #include "string_util.h" #include "task.h" #include "test_runner.h" @@ -1714,7 +1715,7 @@ static void MoveSelectionDisplayMoveType(u32 battler) u8 type; u32 speciesId; struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct *)(&gBattleResources->bufferA[battler][4]); - txtPtr = StringCopy(gDisplayedStringBattle, gText_MoveInterfaceType); + txtPtr = StringCopy(gDisplayedStringBattle, gText_TypeSlash); type = gMovesInfo[moveInfo->moves[gMoveSelectionCursor[battler]]].type; if (moveInfo->moves[gMoveSelectionCursor[battler]] == MOVE_TERA_BLAST) @@ -1771,11 +1772,11 @@ static void MoveSelectionDisplayMoveDescription(u32 battler) LoadMessageBoxAndBorderGfx(); DrawStdWindowFrame(B_WIN_MOVE_DESCRIPTION, FALSE); if (pwr < 2) - StringCopy(pwr_num, gText_BattleSwitchWhich5); + StringCopy(pwr_num, gText_OneDash); else ConvertIntToDecimalStringN(pwr_num, pwr, STR_CONV_MODE_LEFT_ALIGN, 3); if (acc < 2) - StringCopy(acc_num, gText_BattleSwitchWhich5); + StringCopy(acc_num, gText_OneDash); else ConvertIntToDecimalStringN(acc_num, acc, STR_CONV_MODE_LEFT_ALIGN, 3); StringCopy(gDisplayedStringBattle, cat_start); diff --git a/src/battle_debug.c b/src/battle_debug.c index b03ef194f042..0c5a402adc09 100644 --- a/src/battle_debug.c +++ b/src/battle_debug.c @@ -406,7 +406,6 @@ static const u8 sText_ShowHP[] = _("Show HP"); static const u8 sText_SubstituteHp[] = _("Substitute HP"); static const u8 sText_InLove[] = _("In Love"); static const u8 sText_Unknown[] = _("Unknown"); -static const u8 sText_EmptyString[] = _(""); static const struct BitfieldInfo sStatus1Bitfield[] = { @@ -656,15 +655,15 @@ static const struct ListMenuItem sVariousListItems[] = static const struct ListMenuItem sSecondaryListItems[] = { - {sText_EmptyString, 0}, - {sText_EmptyString, 1}, - {sText_EmptyString, 2}, - {sText_EmptyString, 3}, - {sText_EmptyString, 4}, - {sText_EmptyString, 5}, - {sText_EmptyString, 6}, - {sText_EmptyString, 7}, - {sText_EmptyString, 8}, + {gText_EmptyString, 0}, + {gText_EmptyString, 1}, + {gText_EmptyString, 2}, + {gText_EmptyString, 3}, + {gText_EmptyString, 4}, + {gText_EmptyString, 5}, + {gText_EmptyString, 6}, + {gText_EmptyString, 7}, + {gText_EmptyString, 8}, }; diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 4119db47bd21..a3b2fce7dbde 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -1851,7 +1851,7 @@ static void Select_ErasePopupMenu(u8 windowId) static void Select_PrintRentalPkmnString(void) { FillWindowPixelBuffer(SELECT_WIN_TITLE, PIXEL_FILL(0)); - AddTextPrinterParameterized(SELECT_WIN_TITLE, FONT_NORMAL, gText_RentalPkmn2, 2, 1, 0, NULL); + AddTextPrinterParameterized(SELECT_WIN_TITLE, FONT_NORMAL, gText_RentalPkmn, 2, 1, 0, NULL); CopyWindowToVram(SELECT_WIN_TITLE, COPYWIN_FULL); } @@ -1906,7 +1906,7 @@ static void Select_PrintMenuOptions(void) else AddTextPrinterParameterized3(SELECT_WIN_OPTIONS, FONT_NORMAL, 7, 17, sMenuOptionTextColors, 0, gText_Rent); - AddTextPrinterParameterized3(SELECT_WIN_OPTIONS, FONT_NORMAL, 7, 33, sMenuOptionTextColors, 0, gText_Others2); + AddTextPrinterParameterized3(SELECT_WIN_OPTIONS, FONT_NORMAL, 7, 33, sMenuOptionTextColors, 0, gText_Others); CopyWindowToVram(SELECT_WIN_OPTIONS, COPYWIN_FULL); } @@ -1914,8 +1914,8 @@ static void Select_PrintYesNoOptions(void) { PutWindowTilemap(SELECT_WIN_YES_NO); FillWindowPixelBuffer(SELECT_WIN_YES_NO, PIXEL_FILL(0)); - AddTextPrinterParameterized3(SELECT_WIN_YES_NO, FONT_NORMAL, 7, 1, sMenuOptionTextColors, 0, gText_Yes2); - AddTextPrinterParameterized3(SELECT_WIN_YES_NO, FONT_NORMAL, 7, 17, sMenuOptionTextColors, 0, gText_No2); + AddTextPrinterParameterized3(SELECT_WIN_YES_NO, FONT_NORMAL, 7, 1, sMenuOptionTextColors, 0, gText_Yes); + AddTextPrinterParameterized3(SELECT_WIN_YES_NO, FONT_NORMAL, 7, 17, sMenuOptionTextColors, 0, gText_No); CopyWindowToVram(SELECT_WIN_YES_NO, COPYWIN_FULL); } @@ -3787,7 +3787,7 @@ static void Swap_PrintMenuOptions(void) { PutWindowTilemap(SWAP_WIN_OPTIONS); FillWindowPixelBuffer(SWAP_WIN_OPTIONS, PIXEL_FILL(0)); - AddTextPrinterParameterized3(SWAP_WIN_OPTIONS, FONT_NORMAL, 15, 1, sSwapMenuOptionsTextColors, 0, gText_Summary2); + AddTextPrinterParameterized3(SWAP_WIN_OPTIONS, FONT_NORMAL, 15, 1, sSwapMenuOptionsTextColors, 0, gText_Summary); AddTextPrinterParameterized3(SWAP_WIN_OPTIONS, FONT_NORMAL, 15, 17, sSwapMenuOptionsTextColors, 0, gText_Swap); AddTextPrinterParameterized3(SWAP_WIN_OPTIONS, FONT_NORMAL, 15, 33, sSwapMenuOptionsTextColors, 0, gText_Rechoose); CopyWindowToVram(SWAP_WIN_OPTIONS, COPYWIN_FULL); @@ -3797,8 +3797,8 @@ static void Swap_PrintYesNoOptions(void) { PutWindowTilemap(SWAP_WIN_YES_NO); FillWindowPixelBuffer(SWAP_WIN_YES_NO, PIXEL_FILL(0)); - AddTextPrinterParameterized3(SWAP_WIN_YES_NO, FONT_NORMAL, 7, 1, sSwapMenuOptionsTextColors, 0, gText_Yes3); - AddTextPrinterParameterized3(SWAP_WIN_YES_NO, FONT_NORMAL, 7, 17, sSwapMenuOptionsTextColors, 0, gText_No3); + AddTextPrinterParameterized3(SWAP_WIN_YES_NO, FONT_NORMAL, 7, 1, sSwapMenuOptionsTextColors, 0, gText_Yes); + AddTextPrinterParameterized3(SWAP_WIN_YES_NO, FONT_NORMAL, 7, 17, sSwapMenuOptionsTextColors, 0, gText_No); CopyWindowToVram(SWAP_WIN_YES_NO, COPYWIN_FULL); } @@ -3816,7 +3816,7 @@ static void Swap_PrintActionStrings(void) case TRUE: Swap_PrintActionString(gText_PkmnForSwap, 0, SWAP_WIN_ACTION_FADE); case FALSE: - Swap_PrintActionString(gText_Cancel3, 24, SWAP_WIN_ACTION_FADE); + Swap_PrintActionString(gText_Cancel, 24, SWAP_WIN_ACTION_FADE); break; } CopyWindowToVram(SWAP_WIN_ACTION_FADE, COPYWIN_FULL); @@ -3830,7 +3830,7 @@ static void Swap_PrintActionStrings2(void) case TRUE: Swap_PrintActionString(gText_PkmnForSwap, 8, SWAP_WIN_OPTIONS); case FALSE: - Swap_PrintActionString(gText_Cancel3, 32, SWAP_WIN_OPTIONS); + Swap_PrintActionString(gText_Cancel, 32, SWAP_WIN_OPTIONS); break; } CopyWindowToVram(SWAP_WIN_OPTIONS, COPYWIN_FULL); @@ -3845,7 +3845,7 @@ static void Swap_PrintOneActionString(u8 which) Swap_PrintActionString(gText_PkmnForSwap, 8, SWAP_WIN_OPTIONS); break; case 1: - Swap_PrintActionString(gText_Cancel3, 32, SWAP_WIN_OPTIONS); + Swap_PrintActionString(gText_Cancel, 32, SWAP_WIN_OPTIONS); break; } CopyWindowToVram(SWAP_WIN_OPTIONS, COPYWIN_FULL); diff --git a/src/battle_main.c b/src/battle_main.c index 5fee90f94e50..c27cdf2cafa2 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3928,7 +3928,7 @@ static void TryDoEventsBeforeFirstTurn(void) TurnValuesCleanUp(FALSE); SpecialStatusesClear(); *(&gBattleStruct->absentBattlerFlags) = gAbsentBattlerFlags; - BattlePutTextOnWindow(gText_EmptyString3, B_WIN_MSG); + BattlePutTextOnWindow(gText_EmptyString, B_WIN_MSG); AssignUsableGimmicks(); gBattleMainFunc = HandleTurnActionSelectionState; ResetSentPokesToOpponentValue(); @@ -4051,7 +4051,7 @@ void BattleTurnPassed(void) *(gBattleStruct->monToSwitchIntoId + i) = PARTY_SIZE; *(&gBattleStruct->absentBattlerFlags) = gAbsentBattlerFlags; - BattlePutTextOnWindow(gText_EmptyString3, B_WIN_MSG); + BattlePutTextOnWindow(gText_EmptyString, B_WIN_MSG); AssignUsableGimmicks(); SetShellSideArmCategory(); SetAiLogicDataForTurn(AI_DATA); // get assumed abilities, hold effects, etc of all battlers diff --git a/src/battle_message.c b/src/battle_message.c index 74f44448f268..48916ce8ef7b 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -49,9 +49,6 @@ struct BattleWindowText u8 shadowColor; }; -static void ChooseMoveUsedParticle(u8 *textPtr); -static void ChooseTypeOfMoveUsedString(u8 *dst); - #if TESTING EWRAM_DATA u16 sBattlerAbilities[MAX_BATTLERS_COUNT] = {0}; #else @@ -61,8 +58,6 @@ EWRAM_DATA struct BattleMsgData *gBattleMsgDataPtr = NULL; // todo: make some of those names less vague: attacker/target vs pkmn, etc. -static const u8 sText_EmptyString4[] = _(""); - const u8 gText_PkmnShroudedInMist[] = _("{B_ATK_TEAM1} team became shrouded in mist!"); const u8 gText_PkmnGettingPumped[] = _("{B_DEF_NAME_WITH_PREFIX} is getting pumped!"); const u8 gText_PkmnsXPreventsSwitching[] = _("{B_BUFF1} is preventing switching out with its {B_LAST_ABILITY} Ability!\p"); @@ -82,7 +77,6 @@ static const u8 sText_TwoWildFled[] = _("{PLAY_SE SE_FLEE}{B_LINK_OPPONENT1_NAME static const u8 sText_PlayerDefeatedLinkTrainerTrainer1[] = _("You defeated {B_TRAINER1_NAME_WITH_CLASS}!\p"); static const u8 sText_OpponentMon1Appeared[] = _("{B_OPPONENT_MON1_NAME} appeared!\p"); static const u8 sText_WildPkmnAppeared[] = _("You encountered a wild {B_OPPONENT_MON1_NAME}!\p"); -static const u8 sText_LegendaryPkmnAppeared[] = _("You encountered a wild {B_OPPONENT_MON1_NAME}!\p"); static const u8 sText_WildPkmnAppearedPause[] = _("You encountered a wild {B_OPPONENT_MON1_NAME}!{PAUSE 127}"); static const u8 sText_TwoWildPkmnAppeared[] = _("Oh! A wild {B_OPPONENT_MON1_NAME} and {B_OPPONENT_MON2_NAME} appeared!\p"); static const u8 sText_Trainer1WantsToBattle[] = _("You are challenged by {B_TRAINER1_NAME_WITH_CLASS}!\p"); @@ -116,20 +110,9 @@ static const u8 sText_WildPkmnPrefix[] = _("The wild "); static const u8 sText_FoePkmnPrefix[] = _("The opposing "); static const u8 sText_WildPkmnPrefixLower[] = _("the wild "); static const u8 sText_FoePkmnPrefixLower[] = _("the opposing "); -static const u8 sText_EmptyString8[] = _(""); static const u8 sText_FoePkmnPrefix2[] = _("Opposing"); static const u8 sText_AllyPkmnPrefix[] = _("Ally"); -static const u8 sText_FoePkmnPrefix3[] = _("Opposing"); -static const u8 sText_AllyPkmnPrefix2[] = _("Ally"); -static const u8 sText_FoePkmnPrefix4[] = _("Opposing"); -static const u8 sText_AllyPkmnPrefix3[] = _("Ally"); static const u8 sText_AttackerUsedX[] = _("{B_ATK_NAME_WITH_PREFIX} used {B_BUFF3}!"); -static const u8 sText_ExclamationMark[] = _("!"); -static const u8 sText_ExclamationMark2[] = _("!"); -static const u8 sText_ExclamationMark3[] = _("!"); -static const u8 sText_ExclamationMark4[] = _("!"); -static const u8 sText_ExclamationMark5[] = _("!"); -static const u8 sText_HP[] = _("HP"); static const u8 sText_Attack[] = _("Attack"); static const u8 sText_Defense[] = _("Defense"); static const u8 sText_Speed[] = _("Speed"); @@ -140,7 +123,7 @@ static const u8 sText_Evasiveness[] = _("evasiveness"); const u8 *const gStatNamesTable[NUM_BATTLE_STATS] = { - sText_HP, sText_Attack, sText_Defense, + gText_HP, sText_Attack, sText_Defense, sText_Speed, sText_SpAttack, sText_SpDefense, sText_Accuracy, sText_Evasiveness }; @@ -157,14 +140,12 @@ static const u8 sText_Someones[] = _("someone's"); static const u8 sText_Lanettes[] = _("LANETTE's"); //no decapitalize until it is everywhere static const u8 sText_EnigmaBerry[] = _("ENIGMA BERRY"); //no decapitalize until it is everywhere static const u8 sText_BerrySuffix[] = _(" BERRY"); //no decapitalize until it is everywhere -const u8 gText_EmptyString3[] = _(""); static const u8 sText_TwoInGameTrainersDefeated[] = _("You defeated {B_TRAINER1_NAME_WITH_CLASS} and {B_TRAINER2_NAME_WITH_CLASS}!\p"); // New battle strings. const u8 gText_drastically[] = _("drastically "); const u8 gText_severely[] = _("severely "); -static const u8 sText_TerrainReturnedToNormal[] = _("The terrain returned to normal!"); // Unused const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = { @@ -376,7 +357,7 @@ const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = [STRINGID_ATTACKERSSTATROSE] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1} {B_BUFF2}"), [STRINGID_DEFENDERSSTATROSE] = gText_DefendersStatRose, [STRINGID_ATTACKERSSTATFELL] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1} {B_BUFF2}"), - [STRINGID_DEFENDERSSTATFELL] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1} {B_BUFF2}"), + [STRINGID_DEFENDERSSTATFELL] = gText_DefendersStatRose, [STRINGID_CRITICALHIT] = COMPOUND_STRING("A critical hit!"), [STRINGID_ONEHITKO] = COMPOUND_STRING("It's a one-hit KO!"), [STRINGID_123POOF] = COMPOUND_STRING("One…{PAUSE 10}two…{PAUSE 10}and…{PAUSE 10}{PAUSE 20}{PLAY_SE SE_BALL_BOUNCE_1}ta-da!\p"), @@ -464,7 +445,7 @@ const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = [STRINGID_PKMNSITEMRESTOREDHPALITTLE] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX} restored a little HP using its {B_LAST_ITEM}!"), [STRINGID_ITEMALLOWSONLYYMOVE] = COMPOUND_STRING("{B_LAST_ITEM} only allows the use of {B_CURRENT_MOVE}!\p"), [STRINGID_PKMNHUNGONWITHX] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} hung on using its {B_LAST_ITEM}!"), - [STRINGID_EMPTYSTRING3] = gText_EmptyString3, + [STRINGID_EMPTYSTRING3] = gText_EmptyString, [STRINGID_PKMNSXPREVENTSBURNS] = COMPOUND_STRING("{B_EFF_NAME_WITH_PREFIX}'s {B_EFF_ABILITY} prevents burns!"), //not in gen 5+, ability popup [STRINGID_PKMNSXBLOCKSY] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY} blocks {B_CURRENT_MOVE}!"), //not in gen 5+, ability popup [STRINGID_PKMNSXRESTOREDHPALITTLE2] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX}'s {B_ATK_ABILITY} restored its HP a little!"), //not in gen 5+, ability popup @@ -489,7 +470,7 @@ const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = [STRINGID_PKMNUSEDXTOGETPUMPED] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX} used the {B_LAST_ITEM} to get pumped!"), [STRINGID_PKMNSXMADEYUSELESS] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY} made {B_CURRENT_MOVE} useless!"), //not in gen 5+, ability popup [STRINGID_PKMNTRAPPEDBYSANDTOMB] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} became trapped by the quicksand!"), - [STRINGID_EMPTYSTRING4] = COMPOUND_STRING(""), + [STRINGID_EMPTYSTRING4] = gText_EmptyString, [STRINGID_ABOOSTED] = COMPOUND_STRING(" a boosted"), [STRINGID_PKMNSXINTENSIFIEDSUN] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY} intensified the sun's rays!"), //not in gen 5+, ability popup [STRINGID_PKMNMAKESGROUNDMISS] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} makes Ground-type moves miss with {B_DEF_ABILITY}!"), //not in gen 5+, ability popup @@ -581,10 +562,10 @@ const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = [STRINGID_FELLSTRAIGHTDOWN] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} fell straight down!"), [STRINGID_TARGETCHANGEDTYPE] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} transformed into the {B_BUFF1} type!"), [STRINGID_PKMNACQUIREDSIMPLE] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} acquired Simple!"), //shouldn't directly use the name - [STRINGID_EMPTYSTRING5] = sText_EmptyString4, + [STRINGID_EMPTYSTRING5] = gText_EmptyString, [STRINGID_KINDOFFER] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} took the kind offer!"), [STRINGID_RESETSTARGETSSTATLEVELS] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX}'s stat changes were removed!"), - [STRINGID_EMPTYSTRING6] = sText_EmptyString4, + [STRINGID_EMPTYSTRING6] = gText_EmptyString, [STRINGID_ALLYSWITCHPOSITION] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} and {B_SCR_NAME_WITH_PREFIX2} switched places!"), [STRINGID_RESTORETARGETSHEALTH] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX}'s HP was restored!"), [STRINGID_TOOKPJMNINTOTHESKY] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} took {B_DEF_NAME_WITH_PREFIX2} into the sky!"), @@ -1411,16 +1392,13 @@ const u8 gText_LinkStandby[] = _("{PAUSE 16}Link standby…"); const u8 gText_BattleMenu[] = _("Battle{CLEAR_TO 56}Bag\nPokémon{CLEAR_TO 56}Run"); const u8 gText_SafariZoneMenu[] = _("Ball{CLEAR_TO 56}{POKEBLOCK}\nGo Near{CLEAR_TO 56}Run"); const u8 gText_MoveInterfacePP[] = _("PP "); -const u8 gText_MoveInterfaceType[] = _("TYPE/"); const u8 gText_MoveInterfacePpType[] = _("{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW DYNAMIC_COLOR4 DYNAMIC_COLOR5 DYNAMIC_COLOR6}PP\nTYPE/"); const u8 gText_MoveInterfaceDynamicColors[] = _("{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW DYNAMIC_COLOR4 DYNAMIC_COLOR5 DYNAMIC_COLOR6}"); const u8 gText_WhichMoveToForget4[] = _("{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW DYNAMIC_COLOR4 DYNAMIC_COLOR5 DYNAMIC_COLOR6}Which move should\nbe forgotten?"); const u8 gText_BattleYesNoChoice[] = _("{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW DYNAMIC_COLOR4 DYNAMIC_COLOR5 DYNAMIC_COLOR6}Yes\nNo"); const u8 gText_BattleSwitchWhich[] = _("{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW DYNAMIC_COLOR4 DYNAMIC_COLOR5 DYNAMIC_COLOR6}Switch\nwhich?"); -const u8 gText_BattleSwitchWhich2[] = _("{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW DYNAMIC_COLOR4 DYNAMIC_COLOR5 DYNAMIC_COLOR6}"); const u8 gText_BattleSwitchWhich3[] = _("{UP_ARROW}"); const u8 gText_BattleSwitchWhich4[] = _("{ESCAPE 4}"); -const u8 gText_BattleSwitchWhich5[] = _("-"); const u8 gText_SafariBalls[] = _("{HIGHLIGHT DARK_GRAY}Safari Balls"); const u8 gText_SafariBallLeft[] = _("{HIGHLIGHT DARK_GRAY}Left: $" "{HIGHLIGHT DARK_GRAY}"); const u8 gText_Sleep[] = _("sleep"); @@ -1432,11 +1410,9 @@ const u8 gText_Confusion[] = _("confusion"); const u8 gText_Love[] = _("love"); const u8 gText_SpaceAndSpace[] = _(" and "); const u8 gText_CommaSpace[] = _(", "); -const u8 gText_Space2[] = _(" "); const u8 gText_LineBreak[] = _("\l"); const u8 gText_NewLine[] = _("\n"); const u8 gText_Are[] = _("are"); -const u8 gText_Are2[] = _("are"); const u8 gText_BadEgg[] = _("Bad Egg"); const u8 gText_BattleWallyName[] = _("WALLY"); const u8 gText_Win[] = _("{HIGHLIGHT TRANSPARENT}Win"); @@ -1503,49 +1479,6 @@ static const u8 sText_Your1[] = _("Your"); static const u8 sText_Opposing1[] = _("The opposing"); static const u8 sText_Your2[] = _("your"); static const u8 sText_Opposing2[] = _("the opposing"); - -// This is four lists of moves which use a different attack string in Japanese -// to the default. See the documentation for ChooseTypeOfMoveUsedString for more detail. -static const u16 sGrammarMoveUsedTable[] = -{ - MOVE_SWORDS_DANCE, MOVE_STRENGTH, MOVE_GROWTH, - MOVE_HARDEN, MOVE_MINIMIZE, MOVE_SMOKESCREEN, - MOVE_WITHDRAW, MOVE_DEFENSE_CURL, MOVE_EGG_BOMB, - MOVE_SMOG, MOVE_BONE_CLUB, MOVE_FLASH, MOVE_SPLASH, - MOVE_ACID_ARMOR, MOVE_BONEMERANG, MOVE_REST, MOVE_SHARPEN, - MOVE_SUBSTITUTE, MOVE_MIND_READER, MOVE_SNORE, - MOVE_PROTECT, MOVE_SPIKES, MOVE_ENDURE, MOVE_ROLLOUT, - MOVE_SWAGGER, MOVE_SLEEP_TALK, MOVE_HIDDEN_POWER, - MOVE_PSYCH_UP, MOVE_EXTREME_SPEED, MOVE_FOLLOW_ME, - MOVE_TRICK, MOVE_ASSIST, MOVE_INGRAIN, MOVE_KNOCK_OFF, - MOVE_CAMOUFLAGE, MOVE_ASTONISH, MOVE_ODOR_SLEUTH, - MOVE_GRASS_WHISTLE, MOVE_SHEER_COLD, MOVE_MUDDY_WATER, - MOVE_IRON_DEFENSE, MOVE_BOUNCE, 0, - - MOVE_TELEPORT, MOVE_RECOVER, MOVE_BIDE, MOVE_AMNESIA, - MOVE_FLAIL, MOVE_TAUNT, MOVE_BULK_UP, 0, - - MOVE_MEDITATE, MOVE_AGILITY, MOVE_MIMIC, MOVE_DOUBLE_TEAM, - MOVE_BARRAGE, MOVE_TRANSFORM, MOVE_STRUGGLE, MOVE_SCARY_FACE, - MOVE_CHARGE, MOVE_WISH, MOVE_BRICK_BREAK, MOVE_YAWN, - MOVE_FEATHER_DANCE, MOVE_TEETER_DANCE, MOVE_MUD_SPORT, - MOVE_FAKE_TEARS, MOVE_WATER_SPORT, MOVE_CALM_MIND, 0, - - MOVE_POUND, MOVE_SCRATCH, MOVE_VISE_GRIP, - MOVE_WING_ATTACK, MOVE_FLY, MOVE_BIND, MOVE_SLAM, - MOVE_HORN_ATTACK, MOVE_WRAP, MOVE_THRASH, MOVE_TAIL_WHIP, - MOVE_LEER, MOVE_BITE, MOVE_GROWL, MOVE_ROAR, - MOVE_SING, MOVE_PECK, MOVE_ABSORB, MOVE_STRING_SHOT, - MOVE_EARTHQUAKE, MOVE_FISSURE, MOVE_DIG, MOVE_TOXIC, - MOVE_SCREECH, MOVE_METRONOME, MOVE_LICK, MOVE_CLAMP, - MOVE_CONSTRICT, MOVE_POISON_GAS, MOVE_BUBBLE, - MOVE_SLASH, MOVE_SPIDER_WEB, MOVE_NIGHTMARE, MOVE_CURSE, - MOVE_FORESIGHT, MOVE_CHARM, MOVE_ATTRACT, MOVE_ROCK_SMASH, - MOVE_UPROAR, MOVE_SPIT_UP, MOVE_SWALLOW, MOVE_TORMENT, - MOVE_FLATTER, MOVE_ROLE_PLAY, MOVE_ENDEAVOR, MOVE_TICKLE, - MOVE_COVET, 0 -}; - static const u8 sText_EmptyStatus[] = _("$$$$$$$"); static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = @@ -2120,9 +2053,7 @@ void BufferStringBattle(u16 stringID, u32 battler) } else { - if (gBattleTypeFlags & BATTLE_TYPE_LEGENDARY) - stringPtr = sText_LegendaryPkmnAppeared; - else if (IsDoubleBattle() && IsValidForBattle(&gEnemyParty[gBattlerPartyIndexes[GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)]])) + if (IsDoubleBattle() && IsValidForBattle(&gEnemyParty[gBattlerPartyIndexes[GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)]])) stringPtr = sText_TwoWildPkmnAppeared; else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL) stringPtr = sText_WildPkmnAppearedPause; @@ -2889,42 +2820,22 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst, u32 dstSize) else toCpy = sText_Someones; break; - case B_TXT_ATK_PREFIX2: - if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) - toCpy = sText_AllyPkmnPrefix2; - else - toCpy = sText_FoePkmnPrefix3; - break; - case B_TXT_DEF_PREFIX2: - if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER) - toCpy = sText_AllyPkmnPrefix2; - else - toCpy = sText_FoePkmnPrefix3; - break; case B_TXT_ATK_PREFIX1: + case B_TXT_ATK_PREFIX2: + case B_TXT_ATK_PREFIX3: if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) toCpy = sText_AllyPkmnPrefix; else toCpy = sText_FoePkmnPrefix2; break; case B_TXT_DEF_PREFIX1: + case B_TXT_DEF_PREFIX2: + case B_TXT_DEF_PREFIX3: if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER) toCpy = sText_AllyPkmnPrefix; else toCpy = sText_FoePkmnPrefix2; break; - case B_TXT_ATK_PREFIX3: - if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) - toCpy = sText_AllyPkmnPrefix3; - else - toCpy = sText_FoePkmnPrefix4; - break; - case B_TXT_DEF_PREFIX3: - if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER) - toCpy = sText_AllyPkmnPrefix3; - else - toCpy = sText_FoePkmnPrefix4; - break; case B_TXT_TRAINER2_CLASS: toCpy = BattleStringGetOpponentClassByTrainerId(gTrainerBattleOpponent_B); break; @@ -3316,86 +3227,6 @@ void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) } } -// Loads one of two text strings into the provided buffer. This is functionally -// unused, since the value loaded into the buffer is not read; it loaded one of -// two particles (either "?" or "?") which works in tandem with ChooseTypeOfMoveUsedString -// below to effect changes in the meaning of the line. -static void UNUSED ChooseMoveUsedParticle(u8 *textBuff) -{ - s32 counter = 0; - u32 i = 0; - - while (counter != MAX_MON_MOVES) - { - if (sGrammarMoveUsedTable[i] == 0) - counter++; - if (sGrammarMoveUsedTable[i++] == gBattleMsgDataPtr->currentMove) - break; - } - - if (counter >= 0) - { - if (counter <= 2) - StringCopy(textBuff, sText_SpaceIs); // is - else if (counter <= MAX_MON_MOVES) - StringCopy(textBuff, sText_ApostropheS); // 's - } -} - -// Appends "!" to the text buffer `dst`. In the original Japanese this looked -// into the table of moves at sGrammarMoveUsedTable and varied the line accordingly. -// -// sText_ExclamationMark was a plain "!", used for any attack not on the list. -// It resulted in the translation "'s !". -// -// sText_ExclamationMark2 was "? ????!". This resulted in the translation -// " used !", which was used for all attacks in English. -// -// sText_ExclamationMark3 was "??!". This was used for those moves whose -// names were verbs, such as Recover, and resulted in translations like " -// recovered itself!". -// -// sText_ExclamationMark4 was "? ??!" This resulted in a translation of -// " did an !". -// -// sText_ExclamationMark5 was " ????!" This resulted in a translation of -// "'s attack!". -static void UNUSED ChooseTypeOfMoveUsedString(u8 *dst) -{ - s32 counter = 0; - s32 i = 0; - - while (*dst != EOS) - dst++; - - while (counter != MAX_MON_MOVES) - { - if (sGrammarMoveUsedTable[i] == MOVE_NONE) - counter++; - if (sGrammarMoveUsedTable[i++] == gBattleMsgDataPtr->currentMove) - break; - } - - switch (counter) - { - case 0: - StringCopy(dst, sText_ExclamationMark); - break; - case 1: - StringCopy(dst, sText_ExclamationMark2); - break; - case 2: - StringCopy(dst, sText_ExclamationMark3); - break; - case 3: - StringCopy(dst, sText_ExclamationMark4); - break; - case 4: - StringCopy(dst, sText_ExclamationMark5); - break; - } -} - void BattlePutTextOnWindow(const u8 *text, u8 windowId) { const struct BattleWindowText *textInfo = sBattleTextOnWindowsInfo[gBattleScripting.windowsType]; diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index be6c5bf9915e..abc8df3fd7f2 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -177,9 +177,9 @@ static const struct MenuAction sMenuActions[] = [ACTION_USE_FIELD] = { gMenuText_Use, {BagAction_UseOnField} }, [ACTION_TOSS] = { gMenuText_Toss, {BagAction_Toss} }, [ACTION_GIVE] = { gMenuText_Give, {BagAction_Give} }, - [ACTION_CANCEL] = { gText_Cancel2, {BagAction_Cancel} }, + [ACTION_CANCEL] = { gText_Cancel, {BagAction_Cancel} }, [ACTION_USE_BATTLE] = { gMenuText_Use, {BagAction_UseInBattle} }, - [ACTION_DUMMY] = { gText_EmptyString2, {NULL} }, + [ACTION_DUMMY] = { gText_EmptyString, {NULL} }, }; static const u8 sMenuActionIds_Field[] = {ACTION_USE_FIELD, ACTION_GIVE, ACTION_TOSS, ACTION_CANCEL}; @@ -863,7 +863,7 @@ static void PrintSelectorArrowAtPos(u8 y, u8 colorId) if (colorId == COLORID_NONE) // If 'no color', erase arrow FillWindowPixelRect(WIN_LIST, PIXEL_FILL(0), 0, y, GetMenuCursorDimensionByFont(FONT_NORMAL, 0), GetMenuCursorDimensionByFont(FONT_NORMAL, 1)); else - PyramidBagPrint(WIN_LIST, gText_SelectorArrow2, 0, y, 0, 0, 0, colorId); + PyramidBagPrint(WIN_LIST, gText_SelectorArrow, 0, y, 0, 0, 0, colorId); } void CloseBattlePyramidBag(u8 taskId) diff --git a/src/battle_setup.c b/src/battle_setup.c index 0c13fcdd09ca..6649596b8346 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1619,7 +1619,7 @@ void PlayTrainerEncounterMusic(void) static const u8 *ReturnEmptyStringIfNull(const u8 *string) { if (string == NULL) - return gText_EmptyString2; + return gText_EmptyString; else return string; } diff --git a/src/battle_z_move.c b/src/battle_z_move.c index 5e6cfe8e0e79..fff430a528c7 100644 --- a/src/battle_z_move.c +++ b/src/battle_z_move.c @@ -272,7 +272,7 @@ bool32 MoveSelectionDisplayZMove(u16 zmove, u32 battler) for (i = 0; i < MAX_MON_MOVES; ++i) { MoveSelectionDestroyCursorAt(i); - StringCopy(gDisplayedStringBattle, gText_EmptyString2); + StringCopy(gDisplayedStringBattle, gText_EmptyString); BattlePutTextOnWindow(gDisplayedStringBattle, i + 3); } @@ -417,7 +417,7 @@ static void ZMoveSelectionDisplayMoveType(u16 zMove, u32 battler) u8 *txtPtr, *end; u32 zMoveType = GetMoveType(zMove); - txtPtr = StringCopy(gDisplayedStringBattle, gText_MoveInterfaceType); + txtPtr = StringCopy(gDisplayedStringBattle, gText_TypeSlash); *(txtPtr)++ = EXT_CTRL_CODE_BEGIN; *(txtPtr)++ = EXT_CTRL_CODE_FONT; *(txtPtr)++ = FONT_NORMAL; diff --git a/src/berry_blender.c b/src/berry_blender.c index bf094b6fb98a..5c01afab3c70 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -264,12 +264,11 @@ static const u8 *const sBlenderOpponentsNames[] = [BLENDER_MISTER] = COMPOUND_STRING("MISTER"), [BLENDER_LADDIE] = COMPOUND_STRING("LADDIE"), [BLENDER_LASSIE] = COMPOUND_STRING("LASSIE"), - [BLENDER_MASTER] = COMPOUND_STRING("MASTER"), + [BLENDER_MASTER] = gText_Master, [BLENDER_DUDE] = COMPOUND_STRING("DUDE"), [BLENDER_MISS] = COMPOUND_STRING("MISS"), }; -static const u8 sText_CommunicationStandby[] = _("Communication standby…"); static const u8 sText_WouldLikeToBlendAnotherBerry[] = _("Would you like to blend another BERRY?"); static const u8 sText_RunOutOfBerriesForBlending[] = _("You've run out of BERRIES for\nblending in the BERRY BLENDER.\p"); static const u8 sText_YourPokeblockCaseIsFull[] = _("Your {POKEBLOCK} CASE is full.\p"); @@ -277,17 +276,12 @@ static const u8 sText_HasNoBerriesToPut[] = _(" has no BERRIES to put in\nthe BE static const u8 sText_ApostropheSPokeblockCaseIsFull[] = _("'s {POKEBLOCK} CASE is full.\p"); static const u8 sText_BlendingResults[] = _("RESULTS OF BLENDING"); static const u8 sText_SpaceBerry[] = _(" BERRY"); -static const u8 sText_Time[] = _("Time:"); -static const u8 sText_Min[] = _(" min. "); -static const u8 sText_Sec[] = _(" sec."); static const u8 sText_MaximumSpeed[] = _("MAXIMUM SPEED"); static const u8 sText_RPM[] = _(" RPM"); static const u8 sText_Dot[] = _("."); -static const u8 sText_NewLine[] = _("\n"); static const u8 sText_Ranking[] = _("RANKING"); static const u8 sText_TheLevelIs[] = _("The level is "); static const u8 sText_TheFeelIs[] = _(", and the feel is "); -static const u8 sText_Dot2[] = _("."); static const struct BgTemplate sBgTemplates[3] = { @@ -1328,7 +1322,7 @@ static void CB2_StartBlenderLink(void) } break; case 5: - PrintMessage(&sBerryBlender->textState, sText_CommunicationStandby, 0); + PrintMessage(&sBerryBlender->textState, gText_CommunicationStandby, 0); sBerryBlender->mainState = 8; sBerryBlender->framesToWait = 0; break; @@ -2728,7 +2722,7 @@ static void CB2_EndBlenderGame(void) sBerryBlender->gameEndState++; break; case 13: - if (PrintMessage(&sBerryBlender->textState, sText_CommunicationStandby, GetPlayerTextSpeedDelay())) + if (PrintMessage(&sBerryBlender->textState, gText_CommunicationStandby, GetPlayerTextSpeedDelay())) { SetMainCallback2(CB2_CheckPlayAgainLink); sBerryBlender->gameEndState = 0; @@ -3508,16 +3502,16 @@ static bool8 PrintBlendingResults(void) xPos = GetStringRightAlignXOffset(FONT_NORMAL, sBerryBlender->stringVar, 0xA8); Blender_AddTextPrinter(WIN_RESULTS, sBerryBlender->stringVar, xPos, 0x51, TEXT_SKIP_DRAW, 3); - Blender_AddTextPrinter(WIN_RESULTS, sText_Time, 0, 0x61, TEXT_SKIP_DRAW, 3); + Blender_AddTextPrinter(WIN_RESULTS, gText_TimeColon, 0, 0x61, TEXT_SKIP_DRAW, 3); seconds = (sBerryBlender->gameFrameTime / 60) % 60; minutes = (sBerryBlender->gameFrameTime / (60 * 60)); ConvertIntToDecimalStringN(sBerryBlender->stringVar, minutes, STR_CONV_MODE_LEADING_ZEROS, 2); - txtPtr = StringAppend(sBerryBlender->stringVar, sText_Min); + txtPtr = StringAppend(sBerryBlender->stringVar, gText_SpaceMin); ConvertIntToDecimalStringN(txtPtr, seconds, STR_CONV_MODE_LEADING_ZEROS, 2); - StringAppend(sBerryBlender->stringVar, sText_Sec); + StringAppend(sBerryBlender->stringVar, gText_SpaceSec); xPos = GetStringRightAlignXOffset(FONT_NORMAL, sBerryBlender->stringVar, 0xA8); Blender_AddTextPrinter(WIN_RESULTS, sBerryBlender->stringVar, xPos, 0x61, TEXT_SKIP_DRAW, 3); @@ -3580,7 +3574,7 @@ static void PrintMadePokeblockString(struct Pokeblock *pokeblock, u8 *dst) dst[0] = EOS; StringCopy(dst, gPokeblockNames[pokeblock->color]); StringAppend(dst, sText_WasMade); - StringAppend(dst, sText_NewLine); + StringAppend(dst, gText_NewLine); flavorLvl = GetHighestPokeblocksFlavorLevel(pokeblock); feel = GetPokeblocksFeel(pokeblock); @@ -3593,7 +3587,7 @@ static void PrintMadePokeblockString(struct Pokeblock *pokeblock, u8 *dst) ConvertIntToDecimalStringN(text, feel, STR_CONV_MODE_LEFT_ALIGN, 3); StringAppend(dst, text); - StringAppend(dst, sText_Dot2); + StringAppend(dst, sText_Dot); StringAppend(dst, sText_NewParagraph); } diff --git a/src/berry_crush.c b/src/berry_crush.c index 2bb03e60a363..cf25d56adc5e 100755 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -412,7 +412,7 @@ static const u8 *const sMessages[] = [MSG_NO_BERRIES] = gText_YouHaveNoBerries, [MSG_DROPPED] = gText_MemberDroppedOut, [MSG_TIMES_UP] = gText_TimesUpNoGoodPowder, - [MSG_COMM_STANDBY] = gText_CommunicationStandby2, + [MSG_COMM_STANDBY] = gText_CommunicationStandby, }; static const struct BgTemplate sBgTemplates[4] = @@ -905,8 +905,8 @@ static const struct DigitObjUtilTemplate sDigitObjTemplates[] = static const u8 *const sResultsTexts[] = { - [RESULTS_PAGE_PRESSES] = gText_SpaceTimes2, // " times" - [RESULTS_PAGE_RANDOM] = gText_XDotY, // "##.##", for Neatness, Cooperation, or Power value + [RESULTS_PAGE_PRESSES] = gText_SpaceTimes, // " times" + [RESULTS_PAGE_RANDOM] = gText_XDotY, // "##.##", for Neatness, Cooperation, or Power value [RESULTS_PAGE_CRUSHING] = gText_Var1Berry, [RESULTS_PAGE_NEATNESS + NUM_RESULTS_PAGES] = gText_NeatnessRankings, @@ -1680,7 +1680,7 @@ static void PrintCrushingResults(struct BerryCrushGame *game) // Print seconds value ConvertIntToDecimalStringN(gStringVar1, game->gfx.secondsInt, STR_CONV_MODE_LEADING_ZEROS, 2); ConvertIntToDecimalStringN(gStringVar2, game->gfx.secondsFrac, STR_CONV_MODE_LEADING_ZEROS, 2); - StringExpandPlaceholders(gStringVar4, gText_XDotY2); + StringExpandPlaceholders(gStringVar4, gText_XDotY); x -= GetStringWidth(FONT_SHORT, gStringVar4, -1); AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_SHORT, x, y, sTextColorTable[COLORID_GRAY], 0, gStringVar4); @@ -1706,7 +1706,7 @@ static void PrintCrushingResults(struct BerryCrushGame *game) pressingSpeedFrac += *(i + sPressingSpeedConversionTable); // It's accessed in a different way here for unknown reason ConvertIntToDecimalStringN(gStringVar1, game->pressingSpeed >> 8, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar2, pressingSpeedFrac / 1000000, STR_CONV_MODE_LEADING_ZEROS, 2); - StringExpandPlaceholders(gStringVar4, gText_XDotY3); + StringExpandPlaceholders(gStringVar4, gText_XDotY); x -= GetStringWidth(FONT_SHORT, gStringVar4, -1); if (game->newRecord) AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_SHORT, x, y, sTextColorTable[COLORID_RED], 0, gStringVar4); @@ -1809,8 +1809,8 @@ static void Task_ShowRankings(u8 taskId) break; case 1: // Print header text - xPos = 96 - GetStringWidth(FONT_NORMAL, gText_BerryCrush2, -1) / 2u; - AddTextPrinterParameterized3(tWindowId, FONT_NORMAL, xPos, 1, sTextColorTable[COLORID_BLUE], 0, gText_BerryCrush2); + xPos = 96 - GetStringWidth(FONT_NORMAL, gText_BerryCrush, -1) / 2u; + AddTextPrinterParameterized3(tWindowId, FONT_NORMAL, xPos, 1, sTextColorTable[COLORID_BLUE], 0, gText_BerryCrush); xPos = 96 - GetStringWidth(FONT_NORMAL, gText_PressingSpeedRankings, -1) / 2u; AddTextPrinterParameterized3(tWindowId, FONT_NORMAL, xPos, 17, sTextColorTable[COLORID_BLUE], 0, gText_PressingSpeedRankings); @@ -1830,7 +1830,7 @@ static void Task_ShowRankings(u8 taskId) } ConvertIntToDecimalStringN(gStringVar1, (u16)tPressingSpeeds(i) >> 8, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar2, score / 1000000, STR_CONV_MODE_LEADING_ZEROS, 2); - StringExpandPlaceholders(gStringVar4, gText_XDotY3); + StringExpandPlaceholders(gStringVar4, gText_XDotY); xPos -= GetStringWidth(FONT_NORMAL, gStringVar4, -1); AddTextPrinterParameterized3(tWindowId, FONT_NORMAL, xPos, yPos, sTextColorTable[COLORID_GRAY], 0, gStringVar4); yPos += 16; diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index fcd322ce3374..2471dd315db6 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -143,7 +143,7 @@ static const struct WindowTemplate sWindowTemplates[] = static const u8 *const sBerryFirmnessStrings[] = { - [BERRY_FIRMNESS_UNKNOWN] = COMPOUND_STRING("???"), + [BERRY_FIRMNESS_UNKNOWN] = gText_ThreeQuestionMarks, [BERRY_FIRMNESS_VERY_SOFT] = COMPOUND_STRING("Very soft"), [BERRY_FIRMNESS_SOFT] = COMPOUND_STRING("Soft"), [BERRY_FIRMNESS_HARD] = COMPOUND_STRING("Hard"), @@ -178,7 +178,6 @@ static const u8 sText_FirmSlash[] = _("FIRM /"); static const u8 sText_Var1DotVar2[] = _("{STR_VAR_1}.{STR_VAR_2}”"); static const u8 sText_NumberVar1Var2[] = _("{NO}{STR_VAR_1} {STR_VAR_2}"); static const u8 sText_BerryTag[] = _("BERRY TAG"); -static const u8 sText_ThreeMarks[] = _("???"); // code void DoBerryTagScreen(void) @@ -438,7 +437,7 @@ static void PrintBerrySize(void) } else { - AddTextPrinterParameterized(WIN_SIZE_FIRM, FONT_NORMAL, sText_ThreeMarks, 0x28, 1, 0, NULL); + AddTextPrinterParameterized(WIN_SIZE_FIRM, FONT_NORMAL, gText_ThreeQuestionMarks, 0x28, 1, 0, NULL); } } @@ -449,7 +448,7 @@ static void PrintBerryFirmness(void) if (berry->firmness != 0) AddTextPrinterParameterized(WIN_SIZE_FIRM, FONT_NORMAL, sBerryFirmnessStrings[berry->firmness], 0x28, 0x11, 0, NULL); else - AddTextPrinterParameterized(WIN_SIZE_FIRM, FONT_NORMAL, sText_ThreeMarks, 0x28, 0x11, 0, NULL); + AddTextPrinterParameterized(WIN_SIZE_FIRM, FONT_NORMAL, gText_ThreeQuestionMarks, 0x28, 0x11, 0, NULL); } static void PrintBerryDescription1(void) diff --git a/src/cable_club.c b/src/cable_club.c index d6a2903fd47a..366f2238f1cd 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -48,8 +48,8 @@ static const struct WindowTemplate sWindowTemplate_LinkPlayerCount = { static const u8 *const sTrainerCardColorNames[] = { gText_BronzeCard, gText_CopperCard, - gText_SilverCard, - gText_GoldCard + gText_Silver, + gText_Gold }; static void Task_LinkupStart(u8 taskId); diff --git a/src/contest.c b/src/contest.c index e03d5e8b3b84..e138eea7fb1e 100644 --- a/src/contest.c +++ b/src/contest.c @@ -742,11 +742,11 @@ const u8 *const gContestEffectDescriptionPointers[] = const u8 *const gContestMoveTypeTextPointers[] = { - [CONTEST_CATEGORY_COOL] = COMPOUND_STRING("COOL"), - [CONTEST_CATEGORY_BEAUTY] = COMPOUND_STRING("BEAUTY"), - [CONTEST_CATEGORY_CUTE] = COMPOUND_STRING("CUTE"), - [CONTEST_CATEGORY_SMART] = COMPOUND_STRING("SMART"), - [CONTEST_CATEGORY_TOUGH] = COMPOUND_STRING("TOUGH"), + [CONTEST_CATEGORY_COOL] = gText_Cool, + [CONTEST_CATEGORY_BEAUTY] = gText_Beauty, + [CONTEST_CATEGORY_CUTE] = gText_Cute, + [CONTEST_CATEGORY_SMART] = gText_Smart, + [CONTEST_CATEGORY_TOUGH] = gText_Tough, }; static const u8 *const sContestConditions[] = @@ -765,7 +765,7 @@ static const u8 *const sInvalidContestMoveNames[] = [CONTEST_CATEGORY_CUTE] = COMPOUND_STRING("CUTE Move"), [CONTEST_CATEGORY_SMART] = COMPOUND_STRING("SMART Move"), [CONTEST_CATEGORY_TOUGH] = COMPOUND_STRING("TOUGH Move"), - [CONTEST_CATEGORIES_COUNT] = COMPOUND_STRING("???"), + [CONTEST_CATEGORIES_COUNT] = gText_ThreeQuestionMarks, }; // Takes the .attentionLevel of a contestant as an index. diff --git a/src/contest_effect.c b/src/contest_effect.c index aa22f1d13dc8..077ac099e401 100644 --- a/src/contest_effect.c +++ b/src/contest_effect.c @@ -132,7 +132,7 @@ static void ContestEffect_UserLessEasilyStartled(void) SetContestantEffectStringID(eContestAppealResults.contestant,CONTEST_STRING_STOPPED_CARING); } -// Slightly startles the POKMON in front. +// Slightly startles the POKéMON in front. static void ContestEffect_StartleFrontMon(void) { u8 idx = 0; @@ -180,7 +180,7 @@ static void ContestEffect_StartlePrevMons(void) SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_ATTEMPT_STARTLE); } -// Startles the POKMON that appealed before the user. +// Startles the POKéMON that appealed before the user. static void ContestEffect_StartlePrevMon2(void) { u8 rval = Random() % 10; @@ -197,7 +197,7 @@ static void ContestEffect_StartlePrevMon2(void) ContestEffect_StartleFrontMon(); } -// Startles all POKMON that appealed before the user. +// Startles all POKéMON that appealed before the user. static void ContestEffect_StartlePrevMons2(void) { u8 numStartled = 0; @@ -273,7 +273,7 @@ static void ContestEffect_ShiftJudgeAttention(void) } } -// Startles the POKMON that has the JUDGE's attention. +// Startles the POKéMON that has the JUDGE's attention. static void ContestEffect_StartleMonWithJudgesAttention(void) { u8 numStartled = 0; @@ -311,7 +311,7 @@ static void ContestEffect_JamsOthersButMissOneTurn(void) SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_ATTEMPT_STARTLE); } -// Startles POKMON that made a same-type appeal. +// Startles POKéMON that made a same-type appeal. static void ContestEffect_StartleMonsSameTypeAppeal(void) { u16 move = eContestantStatus[eContestAppealResults.contestant].currMove; @@ -319,42 +319,42 @@ static void ContestEffect_StartleMonsSameTypeAppeal(void) SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_ATTEMPT_STARTLE); } -// Badly startles POKMON that made COOL appeals. +// Badly startles POKéMON that made COOL appeals. static void ContestEffect_StartleMonsCoolAppeal(void) { JamByMoveCategory(CONTEST_CATEGORY_COOL); SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_ATTEMPT_STARTLE); } -// Badly startles POKMON that made BEAUTY appeals. +// Badly startles POKéMON that made BEAUTY appeals. static void ContestEffect_StartleMonsBeautyAppeal(void) { JamByMoveCategory(CONTEST_CATEGORY_BEAUTY); SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_ATTEMPT_STARTLE); } -// Badly startles POKMON that made CUTE appeals. +// Badly startles POKéMON that made CUTE appeals. static void ContestEffect_StartleMonsCuteAppeal(void) { JamByMoveCategory(CONTEST_CATEGORY_CUTE); SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_ATTEMPT_STARTLE); } -// Badly startles POKMON that made SMART appeals. +// Badly startles POKéMON that made SMART appeals. static void ContestEffect_StartleMonsSmartAppeal(void) { JamByMoveCategory(CONTEST_CATEGORY_SMART); SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_ATTEMPT_STARTLE); } -// Badly startles POKMON that made TOUGH appeals. +// Badly startles POKéMON that made TOUGH appeals. static void ContestEffect_StartleMonsToughAppeal(void) { JamByMoveCategory(CONTEST_CATEGORY_TOUGH); SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_ATTEMPT_STARTLE); } -// Makes one POKMON after the user nervous. +// Makes one POKéMON after the user nervous. static void ContestEffect_MakeFollowingMonNervous(void) { bool32 hitAny = FALSE; @@ -386,7 +386,7 @@ static void ContestEffect_MakeFollowingMonNervous(void) SetContestantEffectStringID2(eContestAppealResults.contestant, CONTEST_STRING_MESSED_UP2); } -// Makes all POKMON after the user nervous. +// Makes all POKéMON after the user nervous. static void ContestEffect_MakeFollowingMonsNervous(void) { u8 numUnnerved = 0; @@ -493,7 +493,7 @@ static void ContestEffect_WorsenConditionOfPrevMons(void) SetContestantEffectStringID2(eContestAppealResults.contestant, CONTEST_STRING_IGNORED); } -// Badly startles POKMON in good condition. +// Badly startles POKéMON in good condition. static void ContestEffect_BadlyStartlesMonsInGoodCondition(void) { u8 numHit = 0; @@ -892,7 +892,7 @@ static void ContestEffect_ExciteAudienceInAnyContest(void) } } -// Badly startles all POKMON that made good appeals. +// Badly startles all POKéMON that made good appeals. static void ContestEffect_BadlyStartleMonsWithGoodAppeals(void) { int i; diff --git a/src/credits.c b/src/credits.c index 5d5a80cf78ed..6cf5fc22619e 100644 --- a/src/credits.c +++ b/src/credits.c @@ -15,6 +15,7 @@ #include "constants/rgb.h" #include "trainer_pokemon_sprites.h" #include "starter_choose.h" +#include "strings.h" #include "decompress.h" #include "intro_credits_graphics.h" #include "sound.h" diff --git a/src/data/credits.h b/src/data/credits.h index 3b92ae26f78f..d274603d9766 100644 --- a/src/data/credits.h +++ b/src/data/credits.h @@ -62,7 +62,6 @@ enum #define ENTRIES_PER_PAGE 5 -static const u8 sCreditsText_EmptyString[] = _(""); static const u8 sCreditsText_PkmnEmeraldVersion[] = _("POKéMON EMERALD VERSION"); static const u8 sCreditsText_Credits[] = _("Credits"); static const u8 sCreditsText_ExecutiveDirector[] = _("Executive Director"); @@ -221,7 +220,7 @@ static const u8 sCreditsText_MotoyasuTojima[] = _("Motoyasu Toji static const u8 sCreditsText_NicolaPrattBarlow[] = _("Nicola Pratt-Barlow"); static const u8 sCreditsText_ShellieDow[] = _("Shellie Dow"); static const u8 sCreditsText_ErikJohnson[] = _("Erik Johnson"); -static const struct CreditsEntry sCreditsEntry_EmptyString = { 0, FALSE, sCreditsText_EmptyString}; +static const struct CreditsEntry sCreditsEntry_EmptyString = { 0, FALSE, gText_EmptyString}; static const struct CreditsEntry sCreditsEntry_PkmnEmeraldVersion = { 7, TRUE, sCreditsText_PkmnEmeraldVersion}; static const struct CreditsEntry sCreditsEntry_Credits = {11, TRUE, sCreditsText_Credits}; static const struct CreditsEntry sCreditsEntry_ExecutiveDirector = { 8, TRUE, sCreditsText_ExecutiveDirector}; diff --git a/src/data/items.h b/src/data/items.h index 2b560ad9d5fd..912c8f98460e 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -124,8 +124,6 @@ static const u8 sFigyBerryDesc[] = _("A hold item that\n" "restores HP but\n" "may confuse."); -static const u8 sQuestionMarksDesc[] = _("?????"); - static const u8 sKeyToRoomDesc[] = _("A key that opens a\n" "door inside the\n" "Abandoned Ship."); @@ -144,7 +142,7 @@ const struct Item gItemsInfo[] = { .name = _("????????"), .price = 0, - .description = sQuestionMarksDesc, + .description = gText_FiveMarks, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -11172,7 +11170,7 @@ const struct Item gItemsInfo[] = { .name = _("TM51"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11184,7 +11182,7 @@ const struct Item gItemsInfo[] = { .name = _("TM52"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11196,7 +11194,7 @@ const struct Item gItemsInfo[] = { .name = _("TM53"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11208,7 +11206,7 @@ const struct Item gItemsInfo[] = { .name = _("TM54"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11220,7 +11218,7 @@ const struct Item gItemsInfo[] = { .name = _("TM55"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11232,7 +11230,7 @@ const struct Item gItemsInfo[] = { .name = _("TM56"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11244,7 +11242,7 @@ const struct Item gItemsInfo[] = { .name = _("TM57"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11256,7 +11254,7 @@ const struct Item gItemsInfo[] = { .name = _("TM58"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11268,7 +11266,7 @@ const struct Item gItemsInfo[] = { .name = _("TM59"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11280,7 +11278,7 @@ const struct Item gItemsInfo[] = { .name = _("TM60"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11292,7 +11290,7 @@ const struct Item gItemsInfo[] = { .name = _("TM61"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11304,7 +11302,7 @@ const struct Item gItemsInfo[] = { .name = _("TM62"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11316,7 +11314,7 @@ const struct Item gItemsInfo[] = { .name = _("TM63"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11328,7 +11326,7 @@ const struct Item gItemsInfo[] = { .name = _("TM64"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11340,7 +11338,7 @@ const struct Item gItemsInfo[] = { .name = _("TM65"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11352,7 +11350,7 @@ const struct Item gItemsInfo[] = { .name = _("TM66"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11364,7 +11362,7 @@ const struct Item gItemsInfo[] = { .name = _("TM67"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11376,7 +11374,7 @@ const struct Item gItemsInfo[] = { .name = _("TM68"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11388,7 +11386,7 @@ const struct Item gItemsInfo[] = { .name = _("TM69"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11400,7 +11398,7 @@ const struct Item gItemsInfo[] = { .name = _("TM70"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11412,7 +11410,7 @@ const struct Item gItemsInfo[] = { .name = _("TM71"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11424,7 +11422,7 @@ const struct Item gItemsInfo[] = { .name = _("TM72"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11436,7 +11434,7 @@ const struct Item gItemsInfo[] = { .name = _("TM73"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11448,7 +11446,7 @@ const struct Item gItemsInfo[] = { .name = _("TM74"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11460,7 +11458,7 @@ const struct Item gItemsInfo[] = { .name = _("TM75"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11472,7 +11470,7 @@ const struct Item gItemsInfo[] = { .name = _("TM76"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11484,7 +11482,7 @@ const struct Item gItemsInfo[] = { .name = _("TM77"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11496,7 +11494,7 @@ const struct Item gItemsInfo[] = { .name = _("TM78"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11508,7 +11506,7 @@ const struct Item gItemsInfo[] = { .name = _("TM79"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11520,7 +11518,7 @@ const struct Item gItemsInfo[] = { .name = _("TM80"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11532,7 +11530,7 @@ const struct Item gItemsInfo[] = { .name = _("TM81"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11544,7 +11542,7 @@ const struct Item gItemsInfo[] = { .name = _("TM82"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11556,7 +11554,7 @@ const struct Item gItemsInfo[] = { .name = _("TM83"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11568,7 +11566,7 @@ const struct Item gItemsInfo[] = { .name = _("TM84"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11580,7 +11578,7 @@ const struct Item gItemsInfo[] = { .name = _("TM85"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11592,7 +11590,7 @@ const struct Item gItemsInfo[] = { .name = _("TM86"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11604,7 +11602,7 @@ const struct Item gItemsInfo[] = { .name = _("TM87"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11616,7 +11614,7 @@ const struct Item gItemsInfo[] = { .name = _("TM88"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11628,7 +11626,7 @@ const struct Item gItemsInfo[] = { .name = _("TM89"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11640,7 +11638,7 @@ const struct Item gItemsInfo[] = { .name = _("TM90"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11652,7 +11650,7 @@ const struct Item gItemsInfo[] = { .name = _("TM91"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11664,7 +11662,7 @@ const struct Item gItemsInfo[] = { .name = _("TM92"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11676,7 +11674,7 @@ const struct Item gItemsInfo[] = { .name = _("TM93"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11688,7 +11686,7 @@ const struct Item gItemsInfo[] = { .name = _("TM94"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11700,7 +11698,7 @@ const struct Item gItemsInfo[] = { .name = _("TM95"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11712,7 +11710,7 @@ const struct Item gItemsInfo[] = { .name = _("TM96"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11724,7 +11722,7 @@ const struct Item gItemsInfo[] = { .name = _("TM97"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11736,7 +11734,7 @@ const struct Item gItemsInfo[] = { .name = _("TM98"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11748,7 +11746,7 @@ const struct Item gItemsInfo[] = { .name = _("TM99"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -11760,7 +11758,7 @@ const struct Item gItemsInfo[] = { .name = _("TM100"), .price = 3000, - .description = sQuestionMarksDesc, // Todo + .description = gText_FiveMarks, // Todo .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -14044,7 +14042,7 @@ const struct Item gItemsInfo[] = { .name = _("Choice Dumpling"), .price = 1200, - .description = sQuestionMarksDesc, + .description = gText_FiveMarks, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -14057,7 +14055,7 @@ const struct Item gItemsInfo[] = { .name = _("Swap Snack"), .price = 1200, - .description = sQuestionMarksDesc, + .description = gText_FiveMarks, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -14070,7 +14068,7 @@ const struct Item gItemsInfo[] = { .name = _("Twice-Spiced Radish"), .price = 1600, - .description = sQuestionMarksDesc, + .description = gText_FiveMarks, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, diff --git a/src/data/moves_info.h b/src/data/moves_info.h index 49d35c089764..45aa506f338f 100644 --- a/src/data/moves_info.h +++ b/src/data/moves_info.h @@ -28,8 +28,6 @@ const u8 gNotDoneYetDescription[] = _( "This move can't be used. Its\n" "effect is in development."); -static const u8 sNullDescription[] = _(""); - static const u8 sMegaDrainDescription[] = _( "An attack that absorbs\n" "half the damage inflicted."); @@ -114,8 +112,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = { [MOVE_NONE] = { - .name = COMPOUND_STRING("-"), - .description = COMPOUND_STRING(""), + .name = gText_OneDash, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 0, .type = TYPE_NORMAL, @@ -20119,7 +20117,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BLAZING_TORQUE] = { .name = COMPOUND_STRING("Blazing Torque"), - .description = COMPOUND_STRING("---"), + .description = gText_ThreeDashes, .effect = EFFECT_HIT, .power = 80, .type = TYPE_FIRE, @@ -20148,7 +20146,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_WICKED_TORQUE] = { .name = COMPOUND_STRING("Wicked Torque"), - .description = COMPOUND_STRING("---"), + .description = gText_ThreeDashes, .effect = EFFECT_HIT, .power = 80, .type = TYPE_DARK, @@ -20177,7 +20175,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_NOXIOUS_TORQUE] = { .name = COMPOUND_STRING("Noxious Torque"), - .description = COMPOUND_STRING("---"), + .description = gText_ThreeDashes, .effect = EFFECT_HIT, .power = 100, .type = TYPE_POISON, @@ -20206,7 +20204,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_COMBAT_TORQUE] = { .name = COMPOUND_STRING("Combat Torque"), - .description = COMPOUND_STRING("---"), + .description = gText_ThreeDashes, .effect = EFFECT_HIT, .power = 100, .type = TYPE_FIGHTING, @@ -20235,7 +20233,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAGICAL_TORQUE] = { .name = COMPOUND_STRING("Magical Torque"), - .description = COMPOUND_STRING("---"), + .description = gText_ThreeDashes, .effect = EFFECT_HIT, .power = 100, .type = TYPE_FAIRY, @@ -20684,7 +20682,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BREAKNECK_BLITZ] = { .name = COMPOUND_STRING("Breakneck Blitz"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 1, .type = TYPE_NORMAL, @@ -20698,7 +20696,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ALL_OUT_PUMMELING] = { .name = COMPOUND_STRING("All Out Pummeling"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 1, .type = TYPE_FIGHTING, @@ -20712,7 +20710,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SUPERSONIC_SKYSTRIKE] = { .name = COMPOUND_STRING("Supersonic Skystrike"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 1, .type = TYPE_FLYING, @@ -20726,7 +20724,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_ACID_DOWNPOUR] = { .name = COMPOUND_STRING("Acid Downpour"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 1, .type = TYPE_POISON, @@ -20740,7 +20738,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TECTONIC_RAGE] = { .name = COMPOUND_STRING("Tectonic Rage"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 1, .type = TYPE_GROUND, @@ -20755,7 +20753,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CONTINENTAL_CRUSH] = { .name = COMPOUND_STRING("Continental Crush"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 1, .type = TYPE_ROCK, @@ -20769,7 +20767,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SAVAGE_SPIN_OUT] = { .name = COMPOUND_STRING("Savage Spin Out"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 1, .type = TYPE_BUG, @@ -20783,7 +20781,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_NEVER_ENDING_NIGHTMARE] = { .name = COMPOUND_STRING("Never Ending Nightmare"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 1, .type = TYPE_GHOST, @@ -20797,7 +20795,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CORKSCREW_CRASH] = { .name = COMPOUND_STRING("Corkscrew Crash"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 1, .type = TYPE_STEEL, @@ -20811,7 +20809,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_INFERNO_OVERDRIVE] = { .name = COMPOUND_STRING("Inferno Overdrive"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 1, .type = TYPE_FIRE, @@ -20825,7 +20823,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_VORTEX] = { .name = COMPOUND_STRING("Hydro Vortex"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 1, .type = TYPE_WATER, @@ -20839,7 +20837,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BLOOM_DOOM] = { .name = COMPOUND_STRING("Bloom Doom"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 1, .type = TYPE_GRASS, @@ -20853,7 +20851,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GIGAVOLT_HAVOC] = { .name = COMPOUND_STRING("Gigavolt Havoc"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 1, .type = TYPE_ELECTRIC, @@ -20867,7 +20865,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SHATTERED_PSYCHE] = { .name = COMPOUND_STRING("Shattered Psyche"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 1, .type = TYPE_PSYCHIC, @@ -20881,7 +20879,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SUBZERO_SLAMMER] = { .name = COMPOUND_STRING("Subzero Slammer"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 1, .type = TYPE_ICE, @@ -20895,7 +20893,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_DEVASTATING_DRAKE] = { .name = COMPOUND_STRING("Devastating Drake"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 1, .type = TYPE_DRAGON, @@ -20909,7 +20907,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_BLACK_HOLE_ECLIPSE] = { .name = COMPOUND_STRING("Black Hole Eclipse"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 1, .type = TYPE_DARK, @@ -20923,7 +20921,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_TWINKLE_TACKLE] = { .name = COMPOUND_STRING("Twinkle Tackle"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 1, .type = TYPE_FAIRY, @@ -20937,7 +20935,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CATASTROPIKA] = { .name = COMPOUND_STRING("Catastropika"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 210, .type = TYPE_ELECTRIC, @@ -20951,7 +20949,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_10000000_VOLT_THUNDERBOLT] = { .name = COMPOUND_STRING("10,000,000 Volt Thunderbolt"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 195, .type = TYPE_ELECTRIC, @@ -20966,7 +20964,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_STOKED_SPARKSURFER] = { .name = COMPOUND_STRING("Stoked Sparksurfer"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 175, .type = TYPE_ELECTRIC, @@ -20984,7 +20982,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_EXTREME_EVOBOOST] = { .name = COMPOUND_STRING("Extreme Evoboost"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_EXTREME_EVOBOOST, .power = 0, .type = TYPE_NORMAL, @@ -20998,7 +20996,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_PULVERIZING_PANCAKE] = { .name = COMPOUND_STRING("Pulverizing Pancake"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 210, .type = TYPE_NORMAL, @@ -21012,7 +21010,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GENESIS_SUPERNOVA] = { .name = COMPOUND_STRING("Genesis Supernova"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 185, .type = TYPE_PSYCHIC, @@ -21027,7 +21025,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SINISTER_ARROW_RAID] = { .name = COMPOUND_STRING("Sinister Arrow Raid"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 180, .type = TYPE_GHOST, @@ -21041,7 +21039,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MALICIOUS_MOONSAULT] = { .name = COMPOUND_STRING("Malicious Moonsault"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 180, .type = TYPE_DARK, @@ -21055,7 +21053,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_OCEANIC_OPERETTA] = { .name = COMPOUND_STRING("Oceanic Operetta"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 195, .type = TYPE_WATER, @@ -21069,7 +21067,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SPLINTERED_STORMSHARDS] = { .name = COMPOUND_STRING("Splintered Stormshards"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 190, .type = TYPE_ROCK, @@ -21084,7 +21082,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LETS_SNUGGLE_FOREVER] = { .name = COMPOUND_STRING("Let's Snuggle Forever"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 190, .type = TYPE_FAIRY, @@ -21098,7 +21096,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_CLANGOROUS_SOULBLAZE] = { .name = COMPOUND_STRING("Clangorous Soulblaze"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 185, .type = TYPE_DRAGON, @@ -21119,7 +21117,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_GUARDIAN_OF_ALOLA] = { .name = COMPOUND_STRING("Guardian of Alola"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_GUARDIAN_OF_ALOLA, .power = 1, .type = TYPE_FAIRY, @@ -21133,7 +21131,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SEARING_SUNRAZE_SMASH] = { .name = COMPOUND_STRING("Searing Sunraze Smash"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 200, .type = TYPE_STEEL, @@ -21148,7 +21146,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MENACING_MOONRAZE_MAELSTROM] = { .name = COMPOUND_STRING("Menacing Moonraze Maelstrom"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 200, .type = TYPE_GHOST, @@ -21163,7 +21161,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_LIGHT_THAT_BURNS_THE_SKY] = { .name = COMPOUND_STRING("Light That Burns The Sky"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_PHOTON_GEYSER, .power = 200, .type = TYPE_PSYCHIC, @@ -21178,7 +21176,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_SOUL_STEALING_7_STAR_STRIKE] = { .name = COMPOUND_STRING("Soul Stealing 7 Star Strike"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_HIT, .power = 195, .type = TYPE_GHOST, @@ -21193,7 +21191,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_GUARD] = { .name = COMPOUND_STRING("Max Guard"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_NORMAL, @@ -21208,7 +21206,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_FLARE] = { .name = COMPOUND_STRING("Max Flare"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_FIRE, @@ -21224,7 +21222,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_FLUTTERBY] = { .name = COMPOUND_STRING("Max Flutterby"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_BUG, @@ -21240,7 +21238,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_LIGHTNING] = { .name = COMPOUND_STRING("Max Lightning"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_ELECTRIC, @@ -21256,7 +21254,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STRIKE] = { .name = COMPOUND_STRING("Max Strike"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_NORMAL, @@ -21272,7 +21270,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_KNUCKLE] = { .name = COMPOUND_STRING("Max Knuckle"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_FIGHTING, @@ -21288,7 +21286,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_PHANTASM] = { .name = COMPOUND_STRING("Max Phantasm"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_GHOST, @@ -21304,7 +21302,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_HAILSTORM] = { .name = COMPOUND_STRING("Max Hailstorm"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_ICE, @@ -21320,7 +21318,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_OOZE] = { .name = COMPOUND_STRING("Max Ooze"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_POISON, @@ -21336,7 +21334,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_GEYSER] = { .name = COMPOUND_STRING("Max Geyser"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_WATER, @@ -21352,7 +21350,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_AIRSTREAM] = { .name = COMPOUND_STRING("Max Airstream"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_FLYING, @@ -21368,7 +21366,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STARFALL] = { .name = COMPOUND_STRING("Max Starfall"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_FAIRY, @@ -21384,7 +21382,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_WYRMWIND] = { .name = COMPOUND_STRING("Max Wyrmwind"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_DRAGON, @@ -21400,7 +21398,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_MINDSTORM] = { .name = COMPOUND_STRING("Max Mindstorm"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_PSYCHIC, @@ -21416,7 +21414,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_ROCKFALL] = { .name = COMPOUND_STRING("Max Rockfall"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_ROCK, @@ -21432,7 +21430,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_QUAKE] = { .name = COMPOUND_STRING("Max Quake"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_GROUND, @@ -21449,7 +21447,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_DARKNESS] = { .name = COMPOUND_STRING("Max Darkness"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 1, .type = TYPE_DARK, @@ -21465,7 +21463,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_OVERGROWTH] = { .name = COMPOUND_STRING("Max Overgrowth"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GRASS, @@ -21481,7 +21479,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_MAX_STEELSPIKE] = { .name = COMPOUND_STRING("Max Steelspike"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_STEEL, @@ -21497,7 +21495,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VINE_LASH] = { .name = COMPOUND_STRING("G-Max Vine Lash"), - .description = sNullDescription, //ANIM TODO + .description = gText_EmptyString, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GRASS, @@ -21513,7 +21511,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_WILDFIRE] = { .name = COMPOUND_STRING("G-Max Wildfire"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FIRE, @@ -21529,7 +21527,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CANNONADE] = { .name = COMPOUND_STRING("G-Max Canonade"), - .description = sNullDescription, //ANIM TODO + .description = gText_EmptyString, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_WATER, @@ -21545,7 +21543,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_BEFUDDLE] = { .name = COMPOUND_STRING("G-Max Befuddle"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_BUG, @@ -21561,7 +21559,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VOLT_CRASH] = { .name = COMPOUND_STRING("G-Max Volt Crash"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_ELECTRIC, @@ -21577,7 +21575,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_GOLD_RUSH] = { .name = COMPOUND_STRING("G-Max Gold Rush"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_NORMAL, @@ -21593,7 +21591,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CHI_STRIKE] = { .name = COMPOUND_STRING("G-Max Chi Strike"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FIGHTING, @@ -21609,7 +21607,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_TERROR] = { .name = COMPOUND_STRING("G-Max Terror"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GHOST, @@ -21625,7 +21623,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FOAM_BURST] = { .name = COMPOUND_STRING("G-Max Foam Burst"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_WATER, @@ -21641,7 +21639,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_RESONANCE] = { .name = COMPOUND_STRING("G-Max Resonance"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_ICE, @@ -21657,7 +21655,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CUDDLE] = { .name = COMPOUND_STRING("G-Max Cuddle"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_NORMAL, @@ -21673,7 +21671,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_REPLENISH] = { .name = COMPOUND_STRING("G-Max Replenish"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_NORMAL, @@ -21689,7 +21687,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_MALODOR] = { .name = COMPOUND_STRING("G-Max Malodor"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_POISON, @@ -21705,7 +21703,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_MELTDOWN] = { .name = COMPOUND_STRING("G-Max Meltdown"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_STEEL, @@ -21721,7 +21719,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_DRUM_SOLO] = { .name = COMPOUND_STRING("G-Max Drum Solo"), - .description = sNullDescription, //ANIM TODO + .description = gText_EmptyString, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GRASS, @@ -21738,7 +21736,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FIREBALL] = { .name = COMPOUND_STRING("G-Max Fireball"), - .description = sNullDescription, //ANIM TODO + .description = gText_EmptyString, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FIRE, @@ -21755,7 +21753,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_HYDROSNIPE] = { .name = COMPOUND_STRING("G-Max Hydrosnipe"), - .description = sNullDescription, //ANIM TODO + .description = gText_EmptyString, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_WATER, @@ -21772,7 +21770,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_WIND_RAGE] = { .name = COMPOUND_STRING("G-Max Wind Rage"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FLYING, @@ -21788,7 +21786,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_GRAVITAS] = { .name = COMPOUND_STRING("G-Max Gravitas"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_PSYCHIC, @@ -21804,7 +21802,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STONESURGE] = { .name = COMPOUND_STRING("G-Max Stonesurge"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_WATER, @@ -21820,7 +21818,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_VOLCALITH] = { .name = COMPOUND_STRING("G-Max Volcalith"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_ROCK, @@ -21836,7 +21834,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_TARTNESS] = { .name = COMPOUND_STRING("G-Max Tartness"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GRASS, @@ -21852,7 +21850,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SWEETNESS] = { .name = COMPOUND_STRING("G-Max Sweetness"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GRASS, @@ -21868,7 +21866,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SANDBLAST] = { .name = COMPOUND_STRING("G-Max Sandblast"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_GROUND, @@ -21884,7 +21882,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STUN_SHOCK] = { .name = COMPOUND_STRING("G-Max Stun Shock"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_ELECTRIC, @@ -21900,7 +21898,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_CENTIFERNO] = { .name = COMPOUND_STRING("G-Max Centiferno"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FIRE, @@ -21916,7 +21914,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SMITE] = { .name = COMPOUND_STRING("G-Max Smite"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FAIRY, @@ -21933,7 +21931,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_SNOOZE] = { .name = COMPOUND_STRING("G-Max Snooze"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_DARK, @@ -21949,7 +21947,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_FINALE] = { .name = COMPOUND_STRING("G-Max Finale"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_FAIRY, @@ -21965,7 +21963,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_STEELSURGE] = { .name = COMPOUND_STRING("G-Max Steelsurge"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_STEEL, @@ -21981,7 +21979,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_DEPLETION] = { .name = COMPOUND_STRING("G-Max Depletion"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_DRAGON, @@ -21997,7 +21995,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_ONE_BLOW] = { .name = COMPOUND_STRING("G-Max One Blow"), - .description = sNullDescription, + .description = gText_EmptyString, .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_DARK, @@ -22013,7 +22011,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = [MOVE_G_MAX_RAPID_FLOW] = { .name = COMPOUND_STRING("G-Max Rapid Flow"), - .description = sNullDescription, //ANIM TODO + .description = gText_EmptyString, //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, .type = TYPE_WATER, diff --git a/src/data/party_menu.h b/src/data/party_menu.h index 3bc86593fa01..01aa16913e0d 100644 --- a/src/data/party_menu.h +++ b/src/data/party_menu.h @@ -642,15 +642,15 @@ static const u8 *const sActionStringTable[] = [PARTY_MSG_ALREADY_SURFING] = gText_AlreadySurfing, [PARTY_MSG_CURRENT_TOO_FAST] = gText_CurrentIsTooFast, [PARTY_MSG_ENJOY_CYCLING] = gText_EnjoyCycling, - [PARTY_MSG_ALREADY_IN_USE] = gText_InUseAlready_PM, + [PARTY_MSG_ALREADY_IN_USE] = gText_InUseAlready, [PARTY_MSG_CANT_USE_HERE] = gText_CantUseHere, [PARTY_MSG_NO_MON_FOR_BATTLE] = gText_NoPokemonForBattle, - [PARTY_MSG_CHOOSE_MON_2] = gText_ChoosePokemon2, + [PARTY_MSG_CHOOSE_MON_2] = gText_ChoosePokemon, [PARTY_MSG_NOT_ENOUGH_HP] = gText_NotEnoughHp, [PARTY_MSG_X_MONS_ARE_NEEDED] = gText_PokemonAreNeeded, [PARTY_MSG_MONS_CANT_BE_SAME] = gText_PokemonCantBeSame, [PARTY_MSG_NO_SAME_HOLD_ITEMS] = gText_NoIdenticalHoldItems, - [PARTY_MSG_UNUSED] = gText_EmptyString2, + [PARTY_MSG_UNUSED] = gText_EmptyString, [PARTY_MSG_DO_WHAT_WITH_MON] = gText_DoWhatWithPokemon, [PARTY_MSG_RESTORE_WHICH_MOVE] = gText_RestoreWhichMove, [PARTY_MSG_BOOST_PP_WHICH_MOVE] = gText_BoostPp, @@ -669,7 +669,7 @@ static const u8 *const sDescriptionStringTable[] = [PARTYBOX_DESC_SECOND] = gText_Second_PM, [PARTYBOX_DESC_THIRD] = gText_Third_PM, [PARTYBOX_DESC_FOURTH] = gText_Fourth, - [PARTYBOX_DESC_ABLE] = gText_Able2, + [PARTYBOX_DESC_ABLE] = gText_Able, [PARTYBOX_DESC_NOT_ABLE] = gText_NotAble, [PARTYBOX_DESC_ABLE_2] = gText_Able3, [PARTYBOX_DESC_NOT_ABLE_2] = gText_NotAble2, @@ -686,32 +686,30 @@ static const u16 sUnusedData[] = 0x0121, 0x013b, 0x000f, 0x0013, 0x0039, 0x0046, 0x0094, 0x00f9, 0x007f, 0x0123, }; -static const u8 sText_Trade4[] = _("TRADE"); - struct { const u8 *text; TaskFunc func; } static const sCursorOptions[MENU_FIELD_MOVES] = { - [MENU_SUMMARY] = {COMPOUND_STRING("SUMMARY"), CursorCb_Summary}, - [MENU_SWITCH] = {COMPOUND_STRING("SWITCH"), CursorCb_Switch}, - [MENU_CANCEL1] = {gText_Cancel2, CursorCb_Cancel1}, + [MENU_SUMMARY] = {gText_Summary, CursorCb_Summary}, + [MENU_SWITCH] = {gText_Switch, CursorCb_Switch}, + [MENU_CANCEL1] = {gText_Cancel, CursorCb_Cancel1}, [MENU_ITEM] = {COMPOUND_STRING("ITEM"), CursorCb_Item}, [MENU_GIVE] = {gMenuText_Give, CursorCb_Give}, [MENU_TAKE_ITEM] = {COMPOUND_STRING("TAKE"), CursorCb_TakeItem}, [MENU_MAIL] = {COMPOUND_STRING("MAIL"), CursorCb_Mail}, [MENU_TAKE_MAIL] = {COMPOUND_STRING("TAKE"), CursorCb_TakeMail}, [MENU_READ] = {COMPOUND_STRING("READ"), CursorCb_Read}, - [MENU_CANCEL2] = {gText_Cancel2, CursorCb_Cancel2}, + [MENU_CANCEL2] = {gText_Cancel, CursorCb_Cancel2}, [MENU_SHIFT] = {COMPOUND_STRING("SHIFT"), CursorCb_SendMon}, [MENU_SEND_OUT] = {COMPOUND_STRING("SEND OUT"), CursorCb_SendMon}, [MENU_ENTER] = {COMPOUND_STRING("ENTER"), CursorCb_Enter}, [MENU_NO_ENTRY] = {COMPOUND_STRING("NO ENTRY"), CursorCb_NoEntry}, [MENU_STORE] = {COMPOUND_STRING("STORE"), CursorCb_Store}, [MENU_REGISTER] = {gText_Register, CursorCb_Register}, - [MENU_TRADE1] = {sText_Trade4, CursorCb_Trade1}, - [MENU_TRADE2] = {sText_Trade4, CursorCb_Trade2}, + [MENU_TRADE1] = {gText_Trade, CursorCb_Trade1}, + [MENU_TRADE2] = {gText_Trade, CursorCb_Trade2}, [MENU_TOSS] = {gMenuText_Toss, CursorCb_Toss}, [MENU_CATALOG_BULB] = {COMPOUND_STRING("Light bulb"), CursorCb_CatalogBulb}, [MENU_CATALOG_OVEN] = {COMPOUND_STRING("Microwave oven"), CursorCb_CatalogOven}, @@ -1134,12 +1132,12 @@ const struct SpriteTemplate gSpriteTemplate_StatusIcons = static const u8 *const sUnused_StatStrings[] = { - gText_HP4, - gText_Attack3, - gText_Defense3, - gText_SpAtk4, - gText_SpDef4, - gText_Speed2 + gText_HP, + gText_Attack, + gText_Defense, + gText_SpAtk, + gText_SpDef, + gText_Speed }; #define ROTOM_BASE_MOVE MOVE_THUNDER_SHOCK diff --git a/src/data/script_menu.h b/src/data/script_menu.h index fc0b574a2f1f..8dbeec5bec65 100644 --- a/src/data/script_menu.h +++ b/src/data/script_menu.h @@ -9,7 +9,7 @@ static const struct MenuAction MultichoiceList_BrineyOnDewford[] = static const struct MenuAction MultichoiceList_EnterInfo[] = { {COMPOUND_STRING("ENTER")}, - {gText_Info2}, + {gText_Info}, {gText_Exit}, }; @@ -18,7 +18,7 @@ static const struct MenuAction MultichoiceList_ContestInfo[] = {COMPOUND_STRING("What's a CONTEST?")}, {COMPOUND_STRING("Types of CONTESTS")}, {COMPOUND_STRING("Ranks")}, - {gText_Cancel2}, + {gText_Cancel}, }; static const struct MenuAction MultichoiceList_ContestType[] = @@ -33,7 +33,7 @@ static const struct MenuAction MultichoiceList_ContestType[] = static const struct MenuAction MultichoiceList_BasePCWithRegistry[] = { - {gText_Decoration2}, + {gText_Decoration}, {gText_PackUp}, {gText_Registry}, {gText_Exit}, @@ -41,17 +41,17 @@ static const struct MenuAction MultichoiceList_BasePCWithRegistry[] = static const struct MenuAction MultichoiceList_BasePCNoRegistry[] = { - {gText_Decoration2}, + {gText_Decoration}, {gText_PackUp}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_RegisterMenu[] = { - {gMenuText_Register}, + {gText_Register}, {gText_Registry}, {gText_Information}, - {gText_Cancel2}, + {gText_Cancel}, }; static const struct MenuAction MultichoiceList_Bike[] = @@ -86,13 +86,13 @@ static const struct MenuAction MultichoiceList_YesNoInfo2[] = { {gText_Yes}, {gText_No}, - {gText_Info2}, + {gText_Info}, }; static const struct MenuAction MultichoiceList_ChallengeInfo[] = { {COMPOUND_STRING("CHALLENGE")}, - {COMPOUND_STRING("INFO")}, + {gText_Info}, {gText_Exit}, }; @@ -254,7 +254,7 @@ static const struct MenuAction MultichoiceList_UnusedAshVendor[] = {COMPOUND_STRING("BLACK FLUTE")}, {COMPOUND_STRING("GLASS CHAIR")}, {COMPOUND_STRING("GLASS DESK")}, - {gText_Cancel2}, + {gText_Cancel}, }; static const struct MenuAction MultichoiceList_GameCornerDolls[] = @@ -284,7 +284,7 @@ static const struct MenuAction MultichoiceList_GameCornerCoins[] = static const struct MenuAction MultichoiceList_HowsFishing[] = { - {COMPOUND_STRING("Excellent")}, + {gText_Excellent}, {COMPOUND_STRING("Not so good")}, }; @@ -436,7 +436,7 @@ static const struct MenuAction MultichoiceList_TourneyWithRecord[] = {gText_Opponent}, {gText_Tourney_Tree}, {gText_ReadyToStart}, - {gText_Record2}, + {gText_Record}, {gText_Rest}, {gText_Retire}, }; @@ -468,7 +468,7 @@ static const struct MenuAction MultichoiceList_YesNoInfo[] = { {gText_Yes}, {gText_No}, - {gText_Info2}, + {gText_Info}, }; static const struct MenuAction MultichoiceList_BattleMode[] = @@ -476,7 +476,7 @@ static const struct MenuAction MultichoiceList_BattleMode[] = {COMPOUND_STRING("SINGLE BATTLE")}, {COMPOUND_STRING("DOUBLE BATTLE")}, {COMPOUND_STRING("MULTI BATTLE")}, - {gText_Info2}, + {gText_Info}, {gText_Exit}, }; @@ -484,7 +484,7 @@ static const struct MenuAction MultichoiceList_LinkServicesNoRecord[] = { {gText_TradeCenter}, {gText_Colosseum}, - {gText_BerryCrush3}, + {gText_BerryCrush}, {gText_Exit}, }; @@ -493,7 +493,7 @@ static const struct MenuAction MultichoiceList_LinkServicesAll[] = {gText_TradeCenter}, {gText_Colosseum}, {gText_RecordCorner}, - {gText_BerryCrush3}, + {gText_BerryCrush}, {gText_Exit}, }; @@ -539,7 +539,7 @@ static const struct MenuAction MultichoiceList_LinkContestInfo[] = {COMPOUND_STRING("LINK CONTEST")}, {COMPOUND_STRING("ABOUT E-MODE")}, {COMPOUND_STRING("ABOUT G-MODE")}, - {gText_Cancel2}, + {gText_Cancel}, }; static const struct MenuAction MultichoiceList_LinkContestMode[] = @@ -551,14 +551,14 @@ static const struct MenuAction MultichoiceList_LinkContestMode[] = static const struct MenuAction MultichoiceList_ForcedStartMenu[] = { - {gText_MenuOptionPokedex}, - {gText_MenuOptionPokemon}, - {gText_MenuOptionBag}, - {gText_MenuOptionPokenav}, - {gText_Blank}, // blank because it's filled by the player's name - {gText_MenuOptionSave}, - {gText_MenuOptionOption}, - {gText_MenuOptionExit}, + {gText_Pokedex}, + {gText_Pokemon}, + {gText_Bag}, + {gText_Pokenav}, + {gText_EmptyString}, // blank because it's filled by the player's name + {gText_Save}, + {gText_Option}, + {gText_Exit}, }; static const struct MenuAction MultichoiceList_FrontierGamblerBet[] = @@ -608,14 +608,14 @@ static const struct MenuAction MultichoiceList_Fossil[] = static const struct MenuAction MultichoiceList_YesNo[] = { {gText_Yes}, - {COMPOUND_STRING("NO")}, + {gText_No}, }; static const struct MenuAction MultichoiceList_FrontierRules[] = { {COMPOUND_STRING("TWO STYLES")}, - {COMPOUND_STRING("LV. 50")}, - {COMPOUND_STRING("OPEN LEVEL")}, + {gText_Lv50}, + {gText_OpenLevel}, {COMPOUND_STRING("{PKMN} TYPE & NO.")}, {COMPOUND_STRING("HOLD ITEMS")}, {gText_Exit}, @@ -623,8 +623,8 @@ static const struct MenuAction MultichoiceList_FrontierRules[] = static const struct MenuAction MultichoiceList_FrontierPassInfo[] = { - {COMPOUND_STRING("SYMBOLS")}, - {COMPOUND_STRING("RECORD")}, + {gText_Symbols}, + {gText_Record}, {COMPOUND_STRING("BATTLE PTS")}, {gText_Exit}, }; @@ -643,14 +643,14 @@ static const struct MenuAction MultichoiceList_BattleTowerRules[] = {COMPOUND_STRING("TOWER INFO")}, {COMPOUND_STRING("BATTLE {PKMN}")}, {COMPOUND_STRING("BATTLE SALON")}, - {COMPOUND_STRING("MULTI-LINK")}, + {gText_MultiLink}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_BattleDomeRules[] = { {COMPOUND_STRING("MATCHUP")}, - {COMPOUND_STRING("TOURNEY TREE")}, + {gText_Tourney_Tree}, {COMPOUND_STRING("DOUBLE KO")}, {gText_Exit}, }; @@ -661,7 +661,7 @@ static const struct MenuAction MultichoiceList_BattleFactoryRules[] = {gText_SwapPartners}, {gText_SwapNumber}, {gText_SwapNotes}, - {COMPOUND_STRING("OPEN LEVEL")}, + {gText_OpenLevel}, {gText_Exit}, }; @@ -695,7 +695,7 @@ static const struct MenuAction MultichoiceList_BattlePikeRules[] = static const struct MenuAction MultichoiceList_GoOnRecordRestRetire[] = { {gText_GoOn}, - {gText_Record2}, + {gText_Record}, {gText_Rest}, {gText_Retire}, }; @@ -710,7 +710,7 @@ static const struct MenuAction MultichoiceList_GoOnRestRetire[] = static const struct MenuAction MultichoiceList_GoOnRecordRetire[] = { {gText_GoOn}, - {gText_Record2}, + {gText_Record}, {gText_Retire}, }; @@ -722,8 +722,8 @@ static const struct MenuAction MultichoiceList_GoOnRetire[] = static const struct MenuAction MultichoiceList_TVLati[] = { - {COMPOUND_STRING("RED")}, - {COMPOUND_STRING("BLUE")}, + {gText_DexSearchColorRed}, + {gText_DexSearchColorBlue}, }; static const struct MenuAction MultichoiceList_BattleTowerFeelings[] = @@ -919,21 +919,21 @@ const u8 *const gStdStrings[] = [STDSTRING_SUPER] = gText_Super, [STDSTRING_HYPER] = gText_Hyper, [STDSTRING_MASTER] = gText_Master, - [STDSTRING_COOL2] = gText_Cool2, - [STDSTRING_BEAUTY2] = gText_Beauty2, - [STDSTRING_CUTE2] = gText_Cute2, - [STDSTRING_SMART2] = gText_Smart2, - [STDSTRING_TOUGH2] = gText_Tough2, + [STDSTRING_COOL2] = gText_Cool, + [STDSTRING_BEAUTY2] = gText_Beauty, + [STDSTRING_CUTE2] = gText_Cute, + [STDSTRING_SMART2] = gText_Smart, + [STDSTRING_TOUGH2] = gText_Tough, [STDSTRING_ITEMS] = gText_Items, [STDSTRING_KEYITEMS] = gText_Key_Items, [STDSTRING_POKEBALLS] = gText_Poke_Balls, - [STDSTRING_TMHMS] = gText_TMs_Hms, - [STDSTRING_BERRIES] = gText_Berries2, - [STDSTRING_SINGLE] = gText_Single2, - [STDSTRING_DOUBLE] = gText_Double2, + [STDSTRING_TMHMS] = gText_TMs_HMs, + [STDSTRING_BERRIES] = gText_Berries, + [STDSTRING_SINGLE] = gText_Single, + [STDSTRING_DOUBLE] = gText_Double, [STDSTRING_MULTI] = gText_Multi, [STDSTRING_MULTI_LINK] = gText_MultiLink, - [STDSTRING_BATTLE_TOWER] = gText_BattleTower2, + [STDSTRING_BATTLE_TOWER] = gText_BattleTower, [STDSTRING_BATTLE_DOME] = gText_BattleDome, [STDSTRING_BATTLE_FACTORY] = gText_BattleFactory, [STDSTRING_BATTLE_PALACE] = gText_BattlePalace, diff --git a/src/data/text/gift_ribbon_descriptions.h b/src/data/text/gift_ribbon_descriptions.h index 0ba7a33d5080..99339d4126e0 100644 --- a/src/data/text/gift_ribbon_descriptions.h +++ b/src/data/text/gift_ribbon_descriptions.h @@ -15,7 +15,6 @@ const u8 gGiftRibbonDescriptionPart2_Participation[] = _("Participation RIBBON") const u8 gGiftRibbonDescriptionPart1_PokemonLeague[] = _("POKéMON LEAGUE"); const u8 gGiftRibbonDescriptionPart1_AdvanceCup[] = _("ADVANCE CUP"); const u8 gGiftRibbonDescriptionPart1_PokemonTournament[] = _("POKéMON Tournament"); -const u8 gGiftRibbonDescriptionPart2_Participation2[] = _("Participation RIBBON"); const u8 gGiftRibbonDescriptionPart1_PokemonEvent[] = _("POKéMON Event"); const u8 gGiftRibbonDescriptionPart1_PokemonFestival[] = _("POKéMON Festival"); const u8 gGiftRibbonDescriptionPart1_DifficultyClearing[] = _("Difficulty-clearing"); @@ -33,7 +32,6 @@ const u8 gGiftRibbonDescriptionPart1_PokemonCenterOsaka[] = _("POKéMON CENTER O const u8 gGiftRibbonDescriptionPart1_PokemonCenterNagoya[] = _("POKéMON CENTER NAGOYA"); const u8 gGiftRibbonDescriptionPart1_PokemonCenterNY[] = _("POKéMON CENTER NY"); const u8 gGiftRibbonDescriptionPart1_SummerHolidays[] = _("Summer Holidays RIBBON"); -const u8 gGiftRibbonDescriptionPart2_EmptyString[] = _(""); const u8 gGiftRibbonDescriptionPart1_WinterHolidays[] = _("Winter Holidays RIBBON"); const u8 gGiftRibbonDescriptionPart1_SpringHolidays[] = _("Spring Holidays RIBBON"); const u8 gGiftRibbonDescriptionPart1_Evergreen[] = _("Evergreen RIBBON"); @@ -87,9 +85,9 @@ const u8 *const gGiftRibbonDescriptionPointers[MAX_GIFT_RIBBON][2] = {gGiftRibbonDescriptionPart1_AdvanceCup, gGiftRibbonDescriptionPart2_RunnerUp}, {gGiftRibbonDescriptionPart1_AdvanceCup, gGiftRibbonDescriptionPart2_Semifinalist}, {gGiftRibbonDescriptionPart1_AdvanceCup, gGiftRibbonDescriptionPart2_Participation}, - {gGiftRibbonDescriptionPart1_PokemonTournament, gGiftRibbonDescriptionPart2_Participation2}, - {gGiftRibbonDescriptionPart1_PokemonEvent, gGiftRibbonDescriptionPart2_Participation2}, - {gGiftRibbonDescriptionPart1_PokemonFestival, gGiftRibbonDescriptionPart2_Participation2}, + {gGiftRibbonDescriptionPart1_PokemonTournament, gGiftRibbonDescriptionPart2_Participation}, + {gGiftRibbonDescriptionPart1_PokemonEvent, gGiftRibbonDescriptionPart2_Participation}, + {gGiftRibbonDescriptionPart1_PokemonFestival, gGiftRibbonDescriptionPart2_Participation}, {gGiftRibbonDescriptionPart1_DifficultyClearing, gGiftRibbonDescriptionPart2_Commemorative}, {gGiftRibbonDescriptionPart1_ClearingAllChallenges, gGiftRibbonDescriptionPart2_ClearingAllChallenges}, {gGiftRibbonDescriptionPart1_100StraightWin, gGiftRibbonDescriptionPart2_Commemorative}, @@ -102,14 +100,14 @@ const u8 *const gGiftRibbonDescriptionPointers[MAX_GIFT_RIBBON][2] = {gGiftRibbonDescriptionPart1_PokemonCenterOsaka, gGiftRibbonDescriptionPart2_Commemorative}, {gGiftRibbonDescriptionPart1_PokemonCenterNagoya, gGiftRibbonDescriptionPart2_Commemorative}, {gGiftRibbonDescriptionPart1_PokemonCenterNY, gGiftRibbonDescriptionPart2_Commemorative}, - {gGiftRibbonDescriptionPart1_SummerHolidays, gGiftRibbonDescriptionPart2_EmptyString}, - {gGiftRibbonDescriptionPart1_WinterHolidays, gGiftRibbonDescriptionPart2_EmptyString}, - {gGiftRibbonDescriptionPart1_SpringHolidays, gGiftRibbonDescriptionPart2_EmptyString}, - {gGiftRibbonDescriptionPart1_Evergreen, gGiftRibbonDescriptionPart2_EmptyString}, - {gGiftRibbonDescriptionPart1_SpecialHoliday, gGiftRibbonDescriptionPart2_EmptyString}, - {gGiftRibbonDescriptionPart1_HardWorker, gGiftRibbonDescriptionPart2_EmptyString}, - {gGiftRibbonDescriptionPart1_LotsOfFriends, gGiftRibbonDescriptionPart2_EmptyString}, - {gGiftRibbonDescriptionPart1_FullOfEnergy, gGiftRibbonDescriptionPart2_EmptyString}, + {gGiftRibbonDescriptionPart1_SummerHolidays, gText_EmptyString}, + {gGiftRibbonDescriptionPart1_WinterHolidays, gText_EmptyString}, + {gGiftRibbonDescriptionPart1_SpringHolidays, gText_EmptyString}, + {gGiftRibbonDescriptionPart1_Evergreen, gText_EmptyString}, + {gGiftRibbonDescriptionPart1_SpecialHoliday, gText_EmptyString}, + {gGiftRibbonDescriptionPart1_HardWorker, gText_EmptyString}, + {gGiftRibbonDescriptionPart1_LotsOfFriends, gText_EmptyString}, + {gGiftRibbonDescriptionPart1_FullOfEnergy, gText_EmptyString}, {gGiftRibbonDescriptionPart1_LovedPokemon, gGiftRibbonDescriptionPart2_LovedPokemon}, {gGiftRibbonDescriptionPart1_LoveForPokemon, gGiftRibbonDescriptionPart2_LoveForPokemon} }; diff --git a/src/data/text/ribbon_descriptions.h b/src/data/text/ribbon_descriptions.h index 4de90d2e46f7..eda593ecc583 100644 --- a/src/data/text/ribbon_descriptions.h +++ b/src/data/text/ribbon_descriptions.h @@ -10,14 +10,14 @@ const u8 gRibbonDescriptionPart2_SuperRank[] = _("Super Rank winner!"); const u8 gRibbonDescriptionPart2_HyperRank[] = _("Hyper Rank winner!"); const u8 gRibbonDescriptionPart2_MasterRank[] = _("Master Rank winner!"); const u8 gRibbonDescriptionPart1_Winning[] = _("For clearing LV50"); -const u8 gRibbonDescriptionPart2_Winning[] = _("at the BATTLE TOWER."); const u8 gRibbonDescriptionPart1_Victory[] = _("For clearing Open Level"); -const u8 gRibbonDescriptionPart2_Victory[] = _("at the BATTLE TOWER."); const u8 gRibbonDescriptionPart1_Artist[] = _("RIBBON for being chosen"); const u8 gRibbonDescriptionPart2_Artist[] = _("as a super sketch model."); const u8 gRibbonDescriptionPart1_Effort[] = _("RIBBON awarded for"); const u8 gRibbonDescriptionPart2_Effort[] = _("being a hard worker."); +const u8 gRibbonDescriptionPart2_AtTheBattleTower[] = _("at the BATTLE TOWER."); + const u8 *const gRibbonDescriptionPointers[][2] = { [CHAMPION_RIBBON] = {gRibbonDescriptionPart1_Champion, gRibbonDescriptionPart2_Champion}, @@ -41,8 +41,8 @@ const u8 *const gRibbonDescriptionPointers[][2] = [TOUGH_RIBBON_SUPER] = {gRibbonDescriptionPart1_ToughContest, gRibbonDescriptionPart2_SuperRank}, [TOUGH_RIBBON_HYPER] = {gRibbonDescriptionPart1_ToughContest, gRibbonDescriptionPart2_HyperRank}, [TOUGH_RIBBON_MASTER] = {gRibbonDescriptionPart1_ToughContest, gRibbonDescriptionPart2_MasterRank}, - [WINNING_RIBBON] = {gRibbonDescriptionPart1_Winning, gRibbonDescriptionPart2_Winning}, - [VICTORY_RIBBON] = {gRibbonDescriptionPart1_Victory, gRibbonDescriptionPart2_Victory}, + [WINNING_RIBBON] = {gRibbonDescriptionPart1_Winning, gRibbonDescriptionPart2_AtTheBattleTower}, + [VICTORY_RIBBON] = {gRibbonDescriptionPart1_Victory, gRibbonDescriptionPart2_AtTheBattleTower}, [ARTIST_RIBBON] = {gRibbonDescriptionPart1_Artist, gRibbonDescriptionPart2_Artist}, [EFFORT_RIBBON] = {gRibbonDescriptionPart1_Effort, gRibbonDescriptionPart2_Effort}, }; diff --git a/src/data/trade.h b/src/data/trade.h index ba49f4b8743c..3febbed6e308 100644 --- a/src/data/trade.h +++ b/src/data/trade.h @@ -1,3 +1,5 @@ +#include "strings.h" + #define GFXTAG_MENU_TEXT 200 // Used as a base tag in CB2_CreateTradeMenu and CB2_ReturnToTradeMenu #define GFXTAG_CURSOR 300 #define GFXTAG_LINK_MON_GLOW 5550 @@ -28,30 +30,13 @@ static const u16 sTradeMovesBoxTilemap[] = INCBIN_U16("graphics/trade/moves_box_ static const u16 sTradePartyBoxTilemap[] = INCBIN_U16("graphics/trade/party_box_map.bin"); static const u8 sTradeStripesBG2Tilemap[] = INCBIN_U8("graphics/trade/stripes_bg2_map.bin"); static const u8 sTradeStripesBG3Tilemap[] = INCBIN_U8("graphics/trade/stripes_bg3_map.bin"); -static const u8 sText_EmptyString[] = _(""); static const u8 sText_UnusedTextFormat[] = _("{COLOR WHITE}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GRAY}"); -const u8 gText_MaleSymbol4[] = _("♂"); -const u8 gText_FemaleSymbol4[] = _("♀"); -const u8 gText_GenderlessSymbol[] = _(""); -static const u8 sText_SpaceMove[] = _(" MOVE"); // unused -static const u8 sText_NewLine[] = _("\n"); -static const u8 sText_Slash[] = _("/"); -static const u8 sText_Lv[] = _("Lv. "); -static const u8 sText_ThreeDashes[] = _("---"); static const u8 sText_FourQuestionMarks[] = _("????"); -static const u8 sText_UnusedEmpty[] = _(""); static const u8 sText_IsThisTradeOkay[] = _("Is this trade okay?"); -static const u8 sText_Cancel[] = _("CANCEL"); -static const u8 sText_ChooseAPkmn[] = _("Choose a POKéMON."); -static const u8 sText_Summary[] = _("SUMMARY"); -static const u8 sText_Trade[] = _("TRADE"); static const u8 sText_CancelTrade[] = _("Cancel trade?"); static const u8 sJPText_PressBButtonToQuit[] = _("Bボタン で もどります"); -static const u8 sText_Summary2[] = _("SUMMARY"); -static const u8 sText_Trade2[] = _("TRADE"); static const u8 sText_CommunicationStandby[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}Communication standby…\nPlease wait."); static const u8 sText_TheTradeHasBeenCanceled[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}The trade has\nbeen canceled."); -static const u8 sText_OnlyPkmnForBattle[] = _("That's your only\nPOKéMON for battle."); static const u8 sText_WaitingForYourFriend[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}Waiting for your friend\nto finish…"); static const u8 sText_YourFriendWantsToTrade[] = _("Your friend wants\nto trade POKéMON."); @@ -362,25 +347,25 @@ static const u8 sUnusedCoords[][2] = static const u8 *const sActionTexts[] = { - [TEXT_CANCEL] = sText_Cancel, - [TEXT_CHOOSE_MON] = sText_ChooseAPkmn, - [TEXT_SUMMARY] = sText_Summary, - [TEXT_TRADE] = sText_Trade, + [TEXT_CANCEL] = gText_Cancel, + [TEXT_CHOOSE_MON] = gText_ChoosePokemon, + [TEXT_SUMMARY] = gText_Summary, + [TEXT_TRADE] = gText_Trade, [TEXT_CANCEL_TRADE] = sText_CancelTrade, [TEXT_JP_QUIT] = sJPText_PressBButtonToQuit }; static const struct MenuAction sSelectTradeMonActions[] = { - {sText_Summary2, {Task_DrawSelectionSummary}}, - {sText_Trade2, {Task_DrawSelectionTrade}} + {gText_Summary, {Task_DrawSelectionSummary}}, + {gText_Trade, {Task_DrawSelectionTrade}} }; static const u8 *const sMessages[] = { [MSG_STANDBY] = sText_CommunicationStandby, [MSG_CANCELED] = sText_TheTradeHasBeenCanceled, - [MSG_ONLY_MON1] = sText_OnlyPkmnForBattle, + [MSG_ONLY_MON1] = gText_OnlyPkmnForBattle, [MSG_ONLY_MON2] = gText_OnlyPkmnForBattle, //identical text to above [MSG_WAITING_FOR_FRIEND] = sText_WaitingForYourFriend, [MSG_FRIEND_WANTS_TO_TRADE] = sText_YourFriendWantsToTrade, diff --git a/src/data/union_room.h b/src/data/union_room.h index ada118b96aae..2d3edbb7fda3 100644 --- a/src/data/union_room.h +++ b/src/data/union_room.h @@ -1,5 +1,3 @@ -ALIGNED(4) static const u8 sText_EmptyString[] = _(""); -ALIGNED(4) static const u8 sText_Colon[] = _(":"); ALIGNED(4) static const u8 sText_ID[] = _("{ID}"); ALIGNED(4) static const u8 sText_PleaseStartOver[] = _("Please start over from the beginning."); ALIGNED(4) static const u8 sText_WirelessSearchCanceled[] = _("The WIRELESS COMMUNICATION\nSYSTEM search has been canceled."); @@ -149,15 +147,6 @@ static const u8 *const sLinkDroppedTexts[] = { [RFU_STATUS_LEAVE_GROUP] = NULL }; -ALIGNED(4) static const u8 sText_DoYouWantXMode[] = _("Do you want the {STR_VAR_2}\nMODE?"); -ALIGNED(4) static const u8 sText_DoYouWantXMode2[] = _("Do you want the {STR_VAR_2}\nMODE?"); - -// Unused -static const u8 *const sDoYouWantModeTexts[] = { - sText_DoYouWantXMode, - sText_DoYouWantXMode2 -}; - ALIGNED(4) static const u8 sText_CommunicatingPleaseWait[] = _("Communicating…\nPlease wait."); // Unused ALIGNED(4) static const u8 sText_AwaitingPlayersResponseAboutTrade[] = _("Awaiting {STR_VAR_1}'s response about\nthe trade…"); ALIGNED(4) static const u8 sText_Communicating[] = _("Communicating{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.\n" @@ -275,7 +264,6 @@ static const u8 *const sText_WaitOrShowCardTexts[GENDER_COUNT][4] = { } }; -ALIGNED(4) static const u8 sText_WaitForChatMale2[] = _("You want to chat, huh?\nSure, just wait a little."); // Unused ALIGNED(4) static const u8 sText_DoneWaitingBattleMale[] = _("Thanks for waiting!\nLet's get our battle started!{PAUSE 60}"); ALIGNED(4) static const u8 sText_DoneWaitingChatMale[] = _("All right!\nLet's chat!{PAUSE 60}"); ALIGNED(4) static const u8 sText_DoneWaitingBattleFemale[] = _("Sorry I made you wait!\nLet's get started!{PAUSE 60}"); @@ -446,8 +434,6 @@ ALIGNED(4) static const u8 sText_TradingBoardInfo[] = _("This TRADING BOARD is u "and trade them with many, many\l" "other TRAINERS.\p" "Would you like to register one of\nyour POKéMON?"); -ALIGNED(4) static const u8 sText_ThankYouForRegistering[] = _("We have registered your POKéMON for\ntrade on the TRADING BOARD.\pThank you for using this service!\p"); // unused -ALIGNED(4) static const u8 sText_NobodyHasRegistered[] = _("Nobody has registered any POKéMON\nfor trade on the TRADING BOARD.\p\n"); // unused ALIGNED(4) static const u8 sText_ChooseRequestedMonType[] = _("Please choose the type of POKéMON\nthat you would like in the trade.\n"); ALIGNED(4) static const u8 sText_WhichMonWillYouOffer[] = _("Which of your party POKéMON will\nyou offer in trade?\p"); ALIGNED(4) static const u8 sText_RegistrationCanceled[] = _("Registration has been canceled.\p"); @@ -456,21 +442,9 @@ ALIGNED(4) static const u8 sText_TradeCanceled[] = _("The trade has been cancele ALIGNED(4) static const u8 sText_CancelRegistrationOfMon[] = _("Cancel the registration of your\nLv. {STR_VAR_2} {STR_VAR_1}?"); ALIGNED(4) static const u8 sText_CancelRegistrationOfEgg[] = _("Cancel the registration of your\nEGG?"); ALIGNED(4) static const u8 sText_RegistrationCanceled2[] = _("The registration has been canceled.\p"); -ALIGNED(4) static const u8 sText_TradeTrainersWillBeListed[] = _("TRAINERS wishing to make a trade\nwill be listed."); // unused -ALIGNED(4) static const u8 sText_ChooseTrainerToTradeWith2[] = _("Please choose the TRAINER with whom\nyou would like to trade POKéMON."); // unused ALIGNED(4) static const u8 sText_AskTrainerToMakeTrade[] = _("Would you like to ask {STR_VAR_1} to\nmake a trade?"); -ALIGNED(4) static const u8 sText_AwaitingResponseFromTrainer2[] = _("Awaiting a response from\nthe other TRAINER…"); // unused -ALIGNED(4) static const u8 sText_NotRegisteredAMonForTrade[] = _("You have not registered a POKéMON\nfor trading.\p"); // unused ALIGNED(4) static const u8 sText_DontHaveTypeTrainerWants[] = _("You don't have a {STR_VAR_2}-type\nPOKéMON that {STR_VAR_1} wants.\p"); ALIGNED(4) static const u8 sText_DontHaveEggTrainerWants[] = _("You don't have an EGG that\n{STR_VAR_1} wants.\p"); -ALIGNED(4) static const u8 sText_PlayerCantTradeForYourMon[] = _("{STR_VAR_1} can't make a trade for\nyour POKéMON right now.\p"); -ALIGNED(4) static const u8 sText_CantTradeForPartnersMon[] = _("You can't make a trade for\n{STR_VAR_1}'s POKéMON right now.\p"); - -// Unused -static const u8 *const sCantTradeMonTexts[] = { - sText_PlayerCantTradeForYourMon, - sText_CantTradeForPartnersMon -}; ALIGNED(4) static const u8 sText_TradeOfferRejected[] = _("Your trade offer was rejected.\p"); ALIGNED(4) static const u8 sText_EggTrade[] = _("EGG TRADE"); @@ -535,29 +509,18 @@ static const u8 *const sNoWonderSharedTexts[] = { sText_NoNewsSharedRightNow }; -ALIGNED(4) static const u8 sText_Battle[] = _("BATTLE"); -ALIGNED(4) static const u8 sText_Chat2[] = _("CHAT"); ALIGNED(4) static const u8 sText_Greetings[] = _("GREETINGS"); -ALIGNED(4) static const u8 sText_Exit[] = _("EXIT"); -ALIGNED(4) static const u8 sText_Exit2[] = _("EXIT"); -ALIGNED(4) static const u8 sText_Info[] = _("INFO"); ALIGNED(4) static const u8 sText_NameWantedOfferLv[] = _("NAME{CLEAR_TO 60}WANTED{CLEAR_TO 110}OFFER{CLEAR_TO 198}LV."); ALIGNED(4) static const u8 sText_SingleBattle[] = _("SINGLE BATTLE"); ALIGNED(4) static const u8 sText_DoubleBattle[] = _("DOUBLE BATTLE"); ALIGNED(4) static const u8 sText_MultiBattle[] = _("MULTI BATTLE"); -ALIGNED(4) static const u8 sText_PokemonTrades[] = _("POKéMON TRADES"); ALIGNED(4) static const u8 sText_Chat[] = _("CHAT"); ALIGNED(4) static const u8 sText_Cards[] = _("CARDS"); -ALIGNED(4) static const u8 sText_WonderCards[] = _("WONDER CARDS"); -ALIGNED(4) static const u8 sText_WonderNews[] = _("WONDER NEWS"); ALIGNED(4) static const u8 sText_PokemonJump[] = _("POKéMON JUMP"); -ALIGNED(4) static const u8 sText_BerryCrush[] = _("BERRY CRUSH"); ALIGNED(4) static const u8 sText_BerryPicking[] = _("BERRY-PICKING"); ALIGNED(4) static const u8 sText_Search[] = _("SEARCH"); ALIGNED(4) static const u8 sText_BerryBlender[] = _("BERRY BLENDER"); -ALIGNED(4) static const u8 sText_RecordCorner[] = _("RECORD CORNER"); ALIGNED(4) static const u8 sText_CoolContest[] = _("COOL CONTEST"); -ALIGNED(4) static const u8 sText_BeautyContest[] = _("BEAUTY CONTEST"); ALIGNED(4) static const u8 sText_CuteContest[] = _("CUTE CONTEST"); ALIGNED(4) static const u8 sText_SmartContest[] = _("SMART CONTEST"); ALIGNED(4) static const u8 sText_ToughContest[] = _("TOUGH CONTEST"); @@ -590,31 +553,31 @@ static const u8 *const sGladToMeetYouTexts[GENDER_COUNT] = { ALIGNED(4) static const u8 sText_FinishedCheckingPlayersTrainerCard[] = _("Finished checking {DYNAMIC 1}'s\nTRAINER CARD.{PAUSE 60}"); static const u8 *const sLinkGroupActivityNameTexts[] = { - [ACTIVITY_NONE] = sText_EmptyString, + [ACTIVITY_NONE] = gText_EmptyString, [ACTIVITY_BATTLE_SINGLE] = sText_SingleBattle, [ACTIVITY_BATTLE_DOUBLE] = sText_DoubleBattle, [ACTIVITY_BATTLE_MULTI] = sText_MultiBattle, - [ACTIVITY_TRADE] = sText_PokemonTrades, + [ACTIVITY_TRADE] = gText_PokemonTrades, [ACTIVITY_CHAT] = sText_Chat, - [ACTIVITY_WONDER_CARD_DUP] = sText_WonderCards, - [ACTIVITY_WONDER_NEWS_DUP] = sText_WonderNews, + [ACTIVITY_WONDER_CARD_DUP] = gText_WonderCards, + [ACTIVITY_WONDER_NEWS_DUP] = gText_WonderNews, [ACTIVITY_CARD] = sText_Cards, [ACTIVITY_POKEMON_JUMP] = sText_PokemonJump, - [ACTIVITY_BERRY_CRUSH] = sText_BerryCrush, + [ACTIVITY_BERRY_CRUSH] = gText_BerryCrush, [ACTIVITY_BERRY_PICK] = sText_BerryPicking, [ACTIVITY_SEARCH] = sText_Search, - [ACTIVITY_SPIN_TRADE] = sText_EmptyString, + [ACTIVITY_SPIN_TRADE] = gText_EmptyString, [ACTIVITY_BATTLE_TOWER_OPEN] = sText_BattleTowerOpenLv, - [ACTIVITY_RECORD_CORNER] = sText_RecordCorner, + [ACTIVITY_RECORD_CORNER] = gText_RecordCorner, [ACTIVITY_BERRY_BLENDER] = sText_BerryBlender, - [ACTIVITY_ACCEPT] = sText_EmptyString, - [ACTIVITY_DECLINE] = sText_EmptyString, - [ACTIVITY_NPCTALK] = sText_EmptyString, - [ACTIVITY_PLYRTALK] = sText_EmptyString, - [ACTIVITY_WONDER_CARD] = sText_WonderCards, - [ACTIVITY_WONDER_NEWS] = sText_WonderNews, + [ACTIVITY_ACCEPT] = gText_EmptyString, + [ACTIVITY_DECLINE] = gText_EmptyString, + [ACTIVITY_NPCTALK] = gText_EmptyString, + [ACTIVITY_PLYRTALK] = gText_EmptyString, + [ACTIVITY_WONDER_CARD] = gText_WonderCards, + [ACTIVITY_WONDER_NEWS] = gText_WonderNews, [ACTIVITY_CONTEST_COOL] = sText_CoolContest, - [ACTIVITY_CONTEST_BEAUTY] = sText_BeautyContest, + [ACTIVITY_CONTEST_BEAUTY] = gText_BeautyContest, [ACTIVITY_CONTEST_CUTE] = sText_CuteContest, [ACTIVITY_CONTEST_SMART] = sText_SmartContest, [ACTIVITY_CONTEST_TOUGH] = sText_ToughContest, @@ -694,11 +657,11 @@ static const struct WindowTemplate sWindowTemplate_NumPlayerMode = { }; static const struct ListMenuItem sPossibleGroupMembersListMenuItems[] = { - { sText_EmptyString, 0 }, - { sText_EmptyString, 1 }, - { sText_EmptyString, 2 }, - { sText_EmptyString, 3 }, - { sText_EmptyString, 4 } + { gText_EmptyString, 0 }, + { gText_EmptyString, 1 }, + { gText_EmptyString, 2 }, + { gText_EmptyString, 3 }, + { gText_EmptyString, 4 } }; static const struct ListMenuTemplate sListMenuTemplate_PossibleGroupMembers = { @@ -743,22 +706,22 @@ static const struct WindowTemplate sWindowTemplate_PlayerNameAndId = { }; static const struct ListMenuItem sUnionRoomGroupsMenuItems[] = { - { sText_EmptyString, 0 }, - { sText_EmptyString, 1 }, - { sText_EmptyString, 2 }, - { sText_EmptyString, 3 }, - { sText_EmptyString, 4 }, - { sText_EmptyString, 5 }, - { sText_EmptyString, 6 }, - { sText_EmptyString, 7 }, - { sText_EmptyString, 8 }, - { sText_EmptyString, 9 }, - { sText_EmptyString, 10 }, - { sText_EmptyString, 11 }, - { sText_EmptyString, 12 }, - { sText_EmptyString, 13 }, - { sText_EmptyString, 14 }, - { sText_EmptyString, 15 } + { gText_EmptyString, 0 }, + { gText_EmptyString, 1 }, + { gText_EmptyString, 2 }, + { gText_EmptyString, 3 }, + { gText_EmptyString, 4 }, + { gText_EmptyString, 5 }, + { gText_EmptyString, 6 }, + { gText_EmptyString, 7 }, + { gText_EmptyString, 8 }, + { gText_EmptyString, 9 }, + { gText_EmptyString, 10 }, + { gText_EmptyString, 11 }, + { gText_EmptyString, 12 }, + { gText_EmptyString, 13 }, + { gText_EmptyString, 14 }, + { gText_EmptyString, 15 } }; static const struct ListMenuTemplate sListMenuTemplate_UnionRoomGroups = { @@ -794,9 +757,9 @@ static const struct WindowTemplate sWindowTemplate_InviteToActivity = { static const struct ListMenuItem sInviteToActivityMenuItems[] = { { sText_Greetings, ACTIVITY_CARD | LINK_GROUP_CAPACITY(0, 2)}, - { sText_Battle, ACTIVITY_BATTLE_SINGLE | IN_UNION_ROOM | LINK_GROUP_CAPACITY(0, 2)}, - { sText_Chat2, ACTIVITY_CHAT | IN_UNION_ROOM | LINK_GROUP_CAPACITY(0, 2)}, - { sText_Exit, ACTIVITY_NONE | IN_UNION_ROOM } + { gText_Battle, ACTIVITY_BATTLE_SINGLE | IN_UNION_ROOM | LINK_GROUP_CAPACITY(0, 2)}, + { sText_Chat, ACTIVITY_CHAT | IN_UNION_ROOM | LINK_GROUP_CAPACITY(0, 2)}, + { gText_Exit, ACTIVITY_NONE | IN_UNION_ROOM } }; static const struct ListMenuTemplate sListMenuTemplate_InviteToActivity = { @@ -832,8 +795,8 @@ static const struct WindowTemplate sWindowTemplate_RegisterForTrade = { static const struct ListMenuItem sRegisterForTradeListMenuItems[] = { { gText_Register, 1 }, - { sText_Info, 2 }, - { sText_Exit, 3 } + { gText_Info, 2 }, + { gText_Exit, 3 } }; static const struct ListMenuTemplate sListMenuTemplate_RegisterForTrade = { @@ -886,7 +849,7 @@ static const struct ListMenuItem sTradingBoardTypes[NUMBER_OF_MON_TYPES] = { { gTypesInfo[TYPE_STEEL].name, TYPE_STEEL }, { gTypesInfo[TYPE_DARK].name, TYPE_DARK }, { gTypesInfo[TYPE_FAIRY].name, TYPE_FAIRY }, - { sText_Exit, NUMBER_OF_MON_TYPES } + { gText_Exit, NUMBER_OF_MON_TYPES } }; static const struct ListMenuTemplate sMenuTemplate_TradingBoardRequestType = { @@ -931,16 +894,16 @@ static const struct WindowTemplate sWindowTemplate_TradingBoardMain = { }; static const struct ListMenuItem sTradeBoardListMenuItems[] = { - { sText_EmptyString, LIST_HEADER }, - { sText_EmptyString, 0 }, - { sText_EmptyString, 1 }, - { sText_EmptyString, 2 }, - { sText_EmptyString, 3 }, - { sText_EmptyString, 4 }, - { sText_EmptyString, 5 }, - { sText_EmptyString, 6 }, - { sText_EmptyString, 7 }, - { sText_Exit2, 8 } + { gText_EmptyString, LIST_HEADER }, + { gText_EmptyString, 0 }, + { gText_EmptyString, 1 }, + { gText_EmptyString, 2 }, + { gText_EmptyString, 3 }, + { gText_EmptyString, 4 }, + { gText_EmptyString, 5 }, + { gText_EmptyString, 6 }, + { gText_EmptyString, 7 }, + { gText_Exit, 8 } }; static const struct ListMenuTemplate sTradeBoardListMenuTemplate = { @@ -976,22 +939,22 @@ static const struct WindowTemplate sWindowTemplate_Unused = { }; static const struct ListMenuItem sEmptyListMenuItems[] = { - { sText_EmptyString, 0 }, - { sText_EmptyString, 1 }, - { sText_EmptyString, 2 }, - { sText_EmptyString, 3 }, - { sText_EmptyString, 4 }, - { sText_EmptyString, 5 }, - { sText_EmptyString, 6 }, - { sText_EmptyString, 7 }, - { sText_EmptyString, 8 }, - { sText_EmptyString, 9 }, - { sText_EmptyString, 10 }, - { sText_EmptyString, 11 }, - { sText_EmptyString, 12 }, - { sText_EmptyString, 13 }, - { sText_EmptyString, 14 }, - { sText_EmptyString, 15 } + { gText_EmptyString, 0 }, + { gText_EmptyString, 1 }, + { gText_EmptyString, 2 }, + { gText_EmptyString, 3 }, + { gText_EmptyString, 4 }, + { gText_EmptyString, 5 }, + { gText_EmptyString, 6 }, + { gText_EmptyString, 7 }, + { gText_EmptyString, 8 }, + { gText_EmptyString, 9 }, + { gText_EmptyString, 10 }, + { gText_EmptyString, 11 }, + { gText_EmptyString, 12 }, + { gText_EmptyString, 13 }, + { gText_EmptyString, 14 }, + { gText_EmptyString, 15 } }; // Unused diff --git a/src/daycare.c b/src/daycare.c index 013e0b05ba99..9fe086e805c2 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -1386,15 +1386,15 @@ static u8 *AppendGenderSymbol(u8 *name, u8 gender) if (gender == MON_MALE) { if (!NameHasGenderSymbol(name, MON_MALE)) - return StringAppend(name, gText_MaleSymbol4); + return StringAppend(name, gText_MaleSymbol); } else if (gender == MON_FEMALE) { if (!NameHasGenderSymbol(name, MON_FEMALE)) - return StringAppend(name, gText_FemaleSymbol4); + return StringAppend(name, gText_FemaleSymbol); } - return StringAppend(name, gText_GenderlessSymbol); + return StringAppend(name, gText_EmptyString); // genderless } static u8 *AppendMonGenderSymbol(u8 *name, struct BoxPokemon *boxMon) @@ -1415,10 +1415,10 @@ static void UNUSED GetDaycareLevelMenuText(struct DayCare *daycare, u8 *dest) } StringCopy(dest, monNames[0]); - StringAppend(dest, gText_NewLine2); + StringAppend(dest, gText_NewLine); StringAppend(dest, monNames[1]); - StringAppend(dest, gText_NewLine2); - StringAppend(dest, gText_Exit4); + StringAppend(dest, gText_NewLine); + StringAppend(dest, gText_Exit); } static void UNUSED GetDaycareLevelMenuLevelText(struct DayCare *daycare, u8 *dest) @@ -1434,7 +1434,7 @@ static void UNUSED GetDaycareLevelMenuLevelText(struct DayCare *daycare, u8 *des level = GetLevelAfterDaycareSteps(&daycare->mons[i].mon, daycare->mons[i].steps); ConvertIntToDecimalStringN(text, level, STR_CONV_MODE_LEFT_ALIGN, 3); StringAppend(dest, text); - StringAppend(dest, gText_NewLine2); + StringAppend(dest, gText_NewLine); } } diff --git a/src/debug.c b/src/debug.c index f1c403fc1e80..3c193df561ea 100644 --- a/src/debug.c +++ b/src/debug.c @@ -492,8 +492,6 @@ static const u8 sDebugText_True[] = _("TRUE"); static const u8 sDebugText_False[] = _("FALSE"); static const u8 sDebugText_Colored_True[] = _("{COLOR GREEN}TRUE"); static const u8 sDebugText_Colored_False[] = _("{COLOR RED}FALSE"); -static const u8 sDebugText_Dashes[] = _("---"); -static const u8 sDebugText_Empty[] = _(""); static const u8 sDebugText_Continue[] = _("Continue…{CLEAR_TO 110}{RIGHT_ARROW}"); // Main Menu static const u8 sDebugText_Utilities[] = _("Utilities…{CLEAR_TO 110}{RIGHT_ARROW}"); @@ -504,7 +502,6 @@ static const u8 sDebugText_FlagsVars[] = _("Flags & Vars…{CLEAR_TO 110}{RI static const u8 sDebugText_Battle[] = _("Battle Test{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Give[] = _("Give X…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Sound[] = _("Sound…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_Cancel[] = _("Cancel"); // Script menu static const u8 sDebugText_Util_Script_1[] = _("Script 1"); static const u8 sDebugText_Util_Script_2[] = _("Script 2"); @@ -704,7 +701,7 @@ static const struct ListMenuItem sDebugMenu_Items_Main[] = [DEBUG_MENU_ITEM_FLAGVAR] = {sDebugText_FlagsVars, DEBUG_MENU_ITEM_FLAGVAR}, //[DEBUG_MENU_ITEM_BATTLE] = {sDebugText_Battle, DEBUG_MENU_ITEM_BATTLE}, [DEBUG_MENU_ITEM_SOUND] = {sDebugText_Sound, DEBUG_MENU_ITEM_SOUND}, - [DEBUG_MENU_ITEM_CANCEL] = {sDebugText_Cancel, DEBUG_MENU_ITEM_CANCEL}, + [DEBUG_MENU_ITEM_CANCEL] = {gText_Cancel, DEBUG_MENU_ITEM_CANCEL}, }; static const struct ListMenuItem sDebugMenu_Items_Utilities[] = @@ -1375,7 +1372,7 @@ static void Debug_GenerateListMenuNames(u32 totalItems) } else { - StringCopy(&sDebugMenuListData->itemNames[i][0], sDebugText_Dashes); + StringCopy(&sDebugMenuListData->itemNames[i][0], gText_ThreeDashes); } } else diff --git a/src/decoration.c b/src/decoration.c index d450ad7dfba0..84ceed87a90c 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -231,7 +231,7 @@ static const struct MenuAction sDecorationMainMenuActions[] = .func = { .void_u8 = DecorationMenuAction_PutAway }, }, { - .text = gText_Toss2, + .text = gMenuText_Toss, .func = { .void_u8 = DecorationMenuAction_Toss }, }, { @@ -1340,14 +1340,7 @@ static void DecorationItemsMenuAction_AttemptPlace(u8 taskId) else { ConvertIntToDecimalStringN(gStringVar1, sDecorationContext.size, STR_CONV_MODE_RIGHT_ALIGN, 2); - if (sDecorationContext.isPlayerRoom == FALSE) - { - StringExpandPlaceholders(gStringVar4, gText_NoMoreDecorations); - } - else - { - StringExpandPlaceholders(gStringVar4, gText_NoMoreDecorations2); - } + StringExpandPlaceholders(gStringVar4, gText_NoMoreDecorations); DisplayItemMessageOnField(taskId, gStringVar4, ReturnToDecorationItemsAfterInvalidSelection); } } diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c index ce1877c6cd27..66d7388006c4 100644 --- a/src/dodrio_berry_picking.c +++ b/src/dodrio_berry_picking.c @@ -4953,7 +4953,7 @@ static void Msg_WantToPlayAgain(void) AddTextPrinterParameterized(sGfx->windowIds[WIN_PLAY_AGAIN], FONT_NORMAL, gText_WantToPlayAgain, 0, 5, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], FONT_NORMAL, gText_Yes, 8, 1, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], FONT_NORMAL, gText_No, 8, 17, TEXT_SKIP_DRAW, NULL); - AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], FONT_NORMAL, gText_SelectorArrow2, 0, 1, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], FONT_NORMAL, gText_SelectorArrow, 0, 1, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sGfx->windowIds[WIN_PLAY_AGAIN], COPYWIN_GFX); CopyWindowToVram(sGfx->windowIds[WIN_YES_NO], COPYWIN_GFX); sGfx->state++; @@ -4976,7 +4976,7 @@ static void Msg_WantToPlayAgain(void) FillWindowPixelBuffer(sGfx->windowIds[WIN_YES_NO], PIXEL_FILL(1)); AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], FONT_NORMAL, gText_Yes, 8, 1, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], FONT_NORMAL, gText_No, 8, 17, TEXT_SKIP_DRAW, NULL); - AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], FONT_NORMAL, gText_SelectorArrow2, 0, ((y - 1) * 16) + 1, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], FONT_NORMAL, gText_SelectorArrow, 0, ((y - 1) * 16) + 1, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sGfx->windowIds[WIN_YES_NO], COPYWIN_FULL); // Increment state only if A or B button have been pressed. @@ -5067,7 +5067,7 @@ static void Msg_CommunicationStandby(void) break; case 1: FillWindowPixelBuffer(sGfx->windowIds[0], PIXEL_FILL(1)); - AddTextPrinterParameterized(sGfx->windowIds[0], FONT_NORMAL, gText_CommunicationStandby3, 0, 5, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sGfx->windowIds[0], FONT_NORMAL, gText_CommunicationStandby, 0, 5, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sGfx->windowIds[0], COPYWIN_GFX); sGfx->state++; break; diff --git a/src/easy_chat.c b/src/easy_chat.c index ce3b4fe907ce..b0c56ec67beb 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -482,7 +482,7 @@ static const struct EasyChatScreenTemplate sEasyChatScreenTemplates[] = { .fourFooterOptions = FALSE, .titleText = NULL, .instructionsText1 = gText_CombineNineWordsOrPhrases, - .instructionsText2 = gText_AndMakeAMessage2, + .instructionsText2 = gText_AndMakeAMessage, .confirmText1 = gText_TheMailMessage, .confirmText2 = gText_IsAsShownOkay, }, @@ -613,7 +613,7 @@ static const struct EasyChatScreenTemplate sEasyChatScreenTemplates[] = { .frameId = FRAMEID_COMBINE_TWO_WORDS, .fourFooterOptions = FALSE, .titleText = gText_GoodSaying, - .instructionsText1 = gText_CombineTwoWordsOrPhrases2, + .instructionsText1 = gText_CombineTwoWordsOrPhrases, .instructionsText2 = gText_ToTeachHerAGoodSaying, .confirmText1 = gText_TheAnswer, .confirmText2 = gText_IsAsShownOkay, @@ -1204,9 +1204,9 @@ static const u8 sFooterOptionXOffsets[NUM_FOOTER_TYPES][4] = { }; static const u8 *const sFooterTextOptions[NUM_FOOTER_TYPES][4] = { - [FOOTER_NORMAL] = {gText_DelAll, gText_Cancel5, gText_Ok2, NULL}, - [FOOTER_QUIZ] = {gText_DelAll, gText_Cancel5, gText_Ok2, gText_Quiz}, - [FOOTER_ANSWER] = {gText_DelAll, gText_Cancel5, gText_Ok2, gText_Answer}, + [FOOTER_NORMAL] = {gText_DelAll, gText_Cancel, gText_Ok2, NULL}, + [FOOTER_QUIZ] = {gText_DelAll, gText_Cancel, gText_Ok2, gText_Quiz}, + [FOOTER_ANSWER] = {gText_DelAll, gText_Cancel, gText_Ok2, gText_Answer}, }; #include "data/easy_chat/easy_chat_groups.h" diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 20eb136f39fb..f63e45e74788 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -1222,7 +1222,7 @@ static void Task_TradeEvolutionScene(u8 taskId) else { PlayBGM(MUS_EVOLUTION); - DrawTextOnTradeWindow(0, gText_CommunicationStandby5, 1); + DrawTextOnTradeWindow(0, gText_CommunicationStandby, 1); gTasks[taskId].tState++; } } diff --git a/src/field_specials.c b/src/field_specials.c index 680b527dc7cc..93670250e33b 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -155,7 +155,6 @@ static const u8 sText_Daughter[] = _("daughter"); static const u8 sText_99TimesPlus[] = _("99 times +"); static const u8 sText_1MinutePlus[] = _("1 minute +"); static const u8 sText_SpaceSeconds[] = _(" seconds"); -static const u8 sText_SpaceTimes[] = _(" time(s)"); void Special_ShowDiploma(void) { @@ -200,7 +199,7 @@ static void DetermineCyclingRoadResults(u32 numFrames, u8 numBikeCollisions) if (numBikeCollisions < 100) { ConvertIntToDecimalStringN(gStringVar1, numBikeCollisions, STR_CONV_MODE_LEFT_ALIGN, 2); - StringAppend(gStringVar1, sText_SpaceTimes); + StringAppend(gStringVar1, gText_SpaceTimes); } else { @@ -2517,7 +2516,7 @@ static const u8 *const sScrollableMultichoiceOptions[][MAX_SCROLL_MULTI_LENGTH] }, [SCROLL_MULTI_BF_RECEPTIONIST] = { - gText_BattleTower2, + gText_BattleTower, gText_BattleDome, gText_BattlePalace, gText_BattleArena, diff --git a/src/frontier_pass.c b/src/frontier_pass.c index a351d81ce940..570df2eb0292 100644 --- a/src/frontier_pass.c +++ b/src/frontier_pass.c @@ -543,7 +543,7 @@ static const u8 *const sPassAreaDescriptions[CURSOR_AREA_COUNT + 1] = [CURSOR_AREA_SYMBOL_FACTORY] = gText_BattleFactoryKnowledgeSymbol, [CURSOR_AREA_SYMBOL_PIKE] = gText_BattlePikeLuckSymbol, [CURSOR_AREA_SYMBOL_PYRAMID] = gText_BattlePyramidBraveSymbol, - [CURSOR_AREA_COUNT] = gText_EmptyString7, + [CURSOR_AREA_COUNT] = gText_EmptyString, }; struct @@ -555,13 +555,13 @@ struct u8 animNum; } static const sMapLandmarks[NUM_FRONTIER_FACILITIES] = { - [FRONTIER_FACILITY_TOWER] = {gText_BattleTower3, gText_BattleTowerDesc, 89, 40, MAP_INDICATOR_SQUARE}, - [FRONTIER_FACILITY_DOME] = {gText_BattleDome2, gText_BattleDomeDesc, 33, 42, MAP_INDICATOR_SQUARE}, - [FRONTIER_FACILITY_PALACE] = {gText_BattlePalace2, gText_BattlePalaceDesc, 120, 86, MAP_INDICATOR_RECTANGLE}, - [FRONTIER_FACILITY_ARENA] = {gText_BattleArena2, gText_BattleArenaDesc, 114, 59, MAP_INDICATOR_RECTANGLE}, - [FRONTIER_FACILITY_FACTORY] = {gText_BattleFactory2, gText_BattleFactoryDesc, 25, 67, MAP_INDICATOR_RECTANGLE}, - [FRONTIER_FACILITY_PIKE] = {gText_BattlePike2, gText_BattlePikeDesc, 57, 57, MAP_INDICATOR_SQUARE}, - [FRONTIER_FACILITY_PYRAMID] = {gText_BattlePyramid2, gText_BattlePyramidDesc, 134, 41, MAP_INDICATOR_SQUARE}, + [FRONTIER_FACILITY_TOWER] = {gText_BattleTower, gText_BattleTowerDesc, 89, 40, MAP_INDICATOR_SQUARE}, + [FRONTIER_FACILITY_DOME] = {gText_BattleDome, gText_BattleDomeDesc, 33, 42, MAP_INDICATOR_SQUARE}, + [FRONTIER_FACILITY_PALACE] = {gText_BattlePalace, gText_BattlePalaceDesc, 120, 86, MAP_INDICATOR_RECTANGLE}, + [FRONTIER_FACILITY_ARENA] = {gText_BattleArena, gText_BattleArenaDesc, 114, 59, MAP_INDICATOR_RECTANGLE}, + [FRONTIER_FACILITY_FACTORY] = {gText_BattleFactory, gText_BattleFactoryDesc, 25, 67, MAP_INDICATOR_RECTANGLE}, + [FRONTIER_FACILITY_PIKE] = {gText_BattlePike, gText_BattlePikeDesc, 57, 57, MAP_INDICATOR_SQUARE}, + [FRONTIER_FACILITY_PYRAMID] = {gText_BattlePyramid, gText_BattlePyramidDesc, 134, 41, MAP_INDICATOR_SQUARE}, }; static void ResetGpuRegsAndBgs(void) diff --git a/src/frontier_util.c b/src/frontier_util.c index 44246766444b..4e59ee8eace6 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -752,22 +752,22 @@ static const struct WindowTemplate sRankingHallRecordsWindowTemplate = static const u8 *const sRecordsWindowChallengeTexts[][2] = { - [RANKING_HALL_TOWER_SINGLES] = {gText_BattleTower2, gText_FacilitySingle}, - [RANKING_HALL_TOWER_DOUBLES] = {gText_BattleTower2, gText_FacilityDouble}, - [RANKING_HALL_TOWER_MULTIS] = {gText_BattleTower2, gText_FacilityMulti}, + [RANKING_HALL_TOWER_SINGLES] = {gText_BattleTower, gText_FacilitySingle}, + [RANKING_HALL_TOWER_DOUBLES] = {gText_BattleTower, gText_FacilityDouble}, + [RANKING_HALL_TOWER_MULTIS] = {gText_BattleTower, gText_FacilityMulti}, [RANKING_HALL_DOME] = {gText_BattleDome, gText_FacilitySingle}, [RANKING_HALL_PALACE] = {gText_BattlePalace, gText_FacilitySingle}, - [RANKING_HALL_ARENA] = {gText_BattleArena, gText_Facility}, + [RANKING_HALL_ARENA] = {gText_BattleArena, gText_StrVar1}, [RANKING_HALL_FACTORY] = {gText_BattleFactory, gText_FacilitySingle}, - [RANKING_HALL_PIKE] = {gText_BattlePike, gText_Facility}, - [RANKING_HALL_PYRAMID] = {gText_BattlePyramid, gText_Facility}, - [RANKING_HALL_TOWER_LINK] = {gText_BattleTower2, gText_FacilityLink}, + [RANKING_HALL_PIKE] = {gText_BattlePike, gText_StrVar1}, + [RANKING_HALL_PYRAMID] = {gText_BattlePyramid, gText_StrVar1}, + [RANKING_HALL_TOWER_LINK] = {gText_BattleTower, gText_FacilityLink}, }; static const u8 *const sLevelModeText[] = { - [FRONTIER_LVL_50] = gText_RecordsLv50, - [FRONTIER_LVL_OPEN] = gText_RecordsOpenLevel, + [FRONTIER_LVL_50] = gText_Lv50, + [FRONTIER_LVL_OPEN] = gText_OpenLevel, }; static const u8 *const sHallFacilityToRecordsText[] = @@ -1058,7 +1058,7 @@ static void ShowTowerResultsWindow(u8 battleMode) StringExpandPlaceholders(gStringVar4, gText_LinkMultiBattleRoomResults); PrintAligned(gStringVar4, 2); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv502, 16, 49, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv50, 16, 49, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_OpenLv, 16, 97, TEXT_SKIP_DRAW, NULL); PrintHyphens(10); TowerPrintPrevOrCurrentStreak(battleMode, FRONTIER_LVL_50, 72, 132, 49); @@ -1125,7 +1125,7 @@ static void ShowDomeResultsWindow(u8 battleMode) StringExpandPlaceholders(gStringVar4, gText_DoubleBattleTourneyResults); PrintAligned(gStringVar4, 0); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv502, 8, 33, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv50, 8, 33, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_OpenLv, 8, 97, TEXT_SKIP_DRAW, NULL); PrintHyphens(10); DomePrintPrevOrCurrentStreak(battleMode, FRONTIER_LVL_50, 64, 121, 33); @@ -1201,7 +1201,7 @@ static void ShowPalaceResultsWindow(u8 battleMode) StringExpandPlaceholders(gStringVar4, gText_DoubleBattleHallResults); PrintAligned(gStringVar4, 2); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv502, 16, 49, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv50, 16, 49, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_OpenLv, 16, 97, TEXT_SKIP_DRAW, NULL); PrintHyphens(10); PalacePrintPrevOrCurrentStreak(battleMode, FRONTIER_LVL_50, 72, 131, 49); @@ -1253,7 +1253,7 @@ static void ShowPikeResultsWindow(void) FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); StringExpandPlaceholders(gStringVar4, gText_BattleChoiceResults); PrintAligned(gStringVar4, 0); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv502, 8, 33, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv50, 8, 33, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_OpenLv, 8, 97, TEXT_SKIP_DRAW, NULL); PrintHyphens(10); PikePrintPrevOrCurrentStreak(FRONTIER_LVL_50, 64, 114, 33); @@ -1316,7 +1316,7 @@ static void ShowArenaResultsWindow(void) PrintHyphens(10); StringExpandPlaceholders(gStringVar4, gText_SetKOTourneyResults); PrintAligned(gStringVar4, 2); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv502, 16, 49, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv50, 16, 49, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_OpenLv, 16, 97, TEXT_SKIP_DRAW, NULL); ArenaPrintPrevOrCurrentStreak(FRONTIER_LVL_50, 72, 126, 49); ArenaPrintRecordStreak(FRONTIER_LVL_50, 72, 126, 65); @@ -1405,7 +1405,7 @@ static void ShowFactoryResultsWindow(u8 battleMode) StringExpandPlaceholders(gStringVar4, gText_BattleSwapDoubleResults); PrintAligned(gStringVar4, 0); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv502, 8, 33, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv50, 8, 33, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_RentalSwap, 152, 33, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_OpenLv, 8, 97, TEXT_SKIP_DRAW, NULL); PrintHyphens(10); @@ -1466,7 +1466,7 @@ static void ShowPyramidResultsWindow(void) FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); StringExpandPlaceholders(gStringVar4, gText_BattleQuestResults); PrintAligned(gStringVar4, 2); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv502, 8, 49, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv50, 8, 49, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_OpenLv, 8, 97, TEXT_SKIP_DRAW, NULL); PrintHyphens(10); PyramidPrintPrevOrCurrentStreak(FRONTIER_LVL_50, 64, 111, 49); @@ -2082,7 +2082,7 @@ static void CheckPartyIneligibility(void) if (totalCaughtBanned == 0) { - StringAppend(gStringVar1, gText_Space2); + StringAppend(gStringVar1, gText_Space); StringAppend(gStringVar1, gText_Are); } else @@ -2090,8 +2090,8 @@ static void CheckPartyIneligibility(void) if (totalCaughtBanned % SPECIES_PER_LINE == SPECIES_PER_LINE - 1) StringAppend(gStringVar1, gText_LineBreak); else - StringAppend(gStringVar1, gText_Space2); - StringAppend(gStringVar1, gText_Are2); + StringAppend(gStringVar1, gText_Space); + StringAppend(gStringVar1, gText_Are); } } else diff --git a/src/item_menu.c b/src/item_menu.c index 709dded46bae..4d2816739cc0 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -274,19 +274,19 @@ static const struct ListMenuTemplate sItemListMenu = static const struct MenuAction sItemMenuActions[] = { [ACTION_USE] = {gMenuText_Use, {ItemMenu_UseOutOfBattle}}, [ACTION_TOSS] = {gMenuText_Toss, {ItemMenu_Toss}}, - [ACTION_REGISTER] = {gMenuText_Register, {ItemMenu_Register}}, + [ACTION_REGISTER] = {gText_Register, {ItemMenu_Register}}, [ACTION_GIVE] = {gMenuText_Give, {ItemMenu_Give}}, - [ACTION_CANCEL] = {gText_Cancel2, {ItemMenu_Cancel}}, + [ACTION_CANCEL] = {gText_Cancel, {ItemMenu_Cancel}}, [ACTION_BATTLE_USE] = {gMenuText_Use, {ItemMenu_UseInBattle}}, [ACTION_CHECK] = {COMPOUND_STRING("CHECK"), {ItemMenu_UseOutOfBattle}}, [ACTION_WALK] = {COMPOUND_STRING("WALK"), {ItemMenu_UseOutOfBattle}}, [ACTION_DESELECT] = {COMPOUND_STRING("CHECK TAG"), {ItemMenu_Register}}, - [ACTION_CHECK_TAG] = {COMPOUND_STRING("DESELECT"), {ItemMenu_CheckTag}}, + [ACTION_CHECK_TAG] = {gText_Deselect, {ItemMenu_CheckTag}}, [ACTION_CONFIRM] = {gMenuText_Confirm, {Task_FadeAndCloseBagMenu}}, [ACTION_SHOW] = {COMPOUND_STRING("SHOW"), {ItemMenu_Show}}, - [ACTION_GIVE_FAVOR_LADY] = {gMenuText_Give2, {ItemMenu_GiveFavorLady}}, + [ACTION_GIVE_FAVOR_LADY] = {gMenuText_Give, {ItemMenu_GiveFavorLady}}, [ACTION_CONFIRM_QUIZ_LADY] = {gMenuText_Confirm, {ItemMenu_ConfirmQuizLady}}, - [ACTION_DUMMY] = {gText_EmptyString2, {NULL}} + [ACTION_DUMMY] = {gText_EmptyString, {NULL}} }; // these are all 2D arrays with a width of 2 but are represented as 1D arrays @@ -1032,7 +1032,7 @@ static void BagMenu_PrintCursorAtPos(u8 y, u8 colorIndex) if (colorIndex == COLORID_NONE) FillWindowPixelRect(WIN_ITEM_LIST, PIXEL_FILL(0), 0, y, GetMenuCursorDimensionByFont(FONT_NORMAL, 0), GetMenuCursorDimensionByFont(FONT_NORMAL, 1)); else - BagMenu_Print(WIN_ITEM_LIST, FONT_NORMAL, gText_SelectorArrow2, 0, y, 0, 0, 0, colorIndex); + BagMenu_Print(WIN_ITEM_LIST, FONT_NORMAL, gText_SelectorArrow, 0, y, 0, 0, 0, colorIndex); } diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 5acb9d3a40d6..b69f3cef61fd 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -396,7 +396,7 @@ static u8 BufferQuizAuthorName(void) sQuizLadyPtr = &gSaveBlock1Ptr->lilycoveLady.quiz; if (sQuizLadyPtr->playerName[0] == EOS) { - StringCopy_PlayerName(gStringVar1, COMPOUND_STRING("Lady")); + StringCopy_PlayerName(gStringVar1, gText_Lady); authorNameId = QUIZ_AUTHOR_NAME_LADY; } else diff --git a/src/list_menu.c b/src/list_menu.c index ab93961fd5f2..ca8ea44e250b 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -660,7 +660,7 @@ static void ListMenuDrawCursor(struct ListMenu *list) switch (list->template.cursorKind) { case CURSOR_BLACK_ARROW: - ListMenuPrint(list, gText_SelectorArrow2, x, y); + ListMenuPrint(list, gText_SelectorArrow, x, y); break; case CURSOR_INVISIBLE: break; diff --git a/src/main_menu.c b/src/main_menu.c index 504fbfb18642..9e97a1b968bd 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -264,19 +264,11 @@ static const u8 gText_BatteryRunDry[] = _("The internal battery has run dry.\nTh static const u8 gText_MainMenuNewGame[] = _("NEW GAME"); static const u8 gText_MainMenuContinue[] = _("CONTINUE"); -static const u8 gText_MainMenuOption[] = _("OPTION"); -static const u8 gText_MainMenuMysteryGift[] = _("MYSTERY GIFT"); -static const u8 gText_MainMenuMysteryGift2[] = _("MYSTERY GIFT"); static const u8 gText_MainMenuMysteryEvents[] = _("MYSTERY EVENTS"); static const u8 gText_WirelessNotConnected[] = _("The Wireless Adapter is not\nconnected."); static const u8 gText_MysteryGiftCantUse[] = _("MYSTERY GIFT can't be used while\nthe Wireless Adapter is attached."); static const u8 gText_MysteryEventsCantUse[] = _("MYSTERY EVENTS can't be used while\nthe Wireless Adapter is attached."); -static const u8 gText_ContinueMenuPlayer[] = _("PLAYER"); -static const u8 gText_ContinueMenuTime[] = _("TIME"); -static const u8 gText_ContinueMenuPokedex[] = _("POKéDEX"); -static const u8 gText_ContinueMenuBadges[] = _("BADGES"); - #define MENU_LEFT 2 #define MENU_TOP_WIN0 1 #define MENU_TOP_WIN1 5 @@ -804,7 +796,7 @@ static void Task_DisplayMainMenu(u8 taskId) FillWindowPixelBuffer(0, PIXEL_FILL(0xA)); FillWindowPixelBuffer(1, PIXEL_FILL(0xA)); AddTextPrinterParameterized3(0, FONT_NORMAL, 0, 1, sTextColor_Headers, TEXT_SKIP_DRAW, gText_MainMenuNewGame); - AddTextPrinterParameterized3(1, FONT_NORMAL, 0, 1, sTextColor_Headers, TEXT_SKIP_DRAW, gText_MainMenuOption); + AddTextPrinterParameterized3(1, FONT_NORMAL, 0, 1, sTextColor_Headers, TEXT_SKIP_DRAW, gText_Option); PutWindowTilemap(0); PutWindowTilemap(1); CopyWindowToVram(0, COPYWIN_GFX); @@ -818,7 +810,7 @@ static void Task_DisplayMainMenu(u8 taskId) FillWindowPixelBuffer(4, PIXEL_FILL(0xA)); AddTextPrinterParameterized3(2, FONT_NORMAL, 0, 1, sTextColor_Headers, TEXT_SKIP_DRAW, gText_MainMenuContinue); AddTextPrinterParameterized3(3, FONT_NORMAL, 0, 1, sTextColor_Headers, TEXT_SKIP_DRAW, gText_MainMenuNewGame); - AddTextPrinterParameterized3(4, FONT_NORMAL, 0, 1, sTextColor_Headers, TEXT_SKIP_DRAW, gText_MainMenuOption); + AddTextPrinterParameterized3(4, FONT_NORMAL, 0, 1, sTextColor_Headers, TEXT_SKIP_DRAW, gText_Option); MainMenu_FormatSavegameText(); PutWindowTilemap(2); PutWindowTilemap(3); @@ -837,8 +829,8 @@ static void Task_DisplayMainMenu(u8 taskId) FillWindowPixelBuffer(5, PIXEL_FILL(0xA)); AddTextPrinterParameterized3(2, FONT_NORMAL, 0, 1, sTextColor_Headers, TEXT_SKIP_DRAW, gText_MainMenuContinue); AddTextPrinterParameterized3(3, FONT_NORMAL, 0, 1, sTextColor_Headers, TEXT_SKIP_DRAW, gText_MainMenuNewGame); - AddTextPrinterParameterized3(4, FONT_NORMAL, 0, 1, sTextColor_Headers, TEXT_SKIP_DRAW, gText_MainMenuMysteryGift); - AddTextPrinterParameterized3(5, FONT_NORMAL, 0, 1, sTextColor_Headers, TEXT_SKIP_DRAW, gText_MainMenuOption); + AddTextPrinterParameterized3(4, FONT_NORMAL, 0, 1, sTextColor_Headers, TEXT_SKIP_DRAW, gText_MysteryGift); + AddTextPrinterParameterized3(5, FONT_NORMAL, 0, 1, sTextColor_Headers, TEXT_SKIP_DRAW, gText_Option); MainMenu_FormatSavegameText(); PutWindowTilemap(2); PutWindowTilemap(3); @@ -861,9 +853,9 @@ static void Task_DisplayMainMenu(u8 taskId) FillWindowPixelBuffer(6, PIXEL_FILL(0xA)); AddTextPrinterParameterized3(2, FONT_NORMAL, 0, 1, sTextColor_Headers, TEXT_SKIP_DRAW, gText_MainMenuContinue); AddTextPrinterParameterized3(3, FONT_NORMAL, 0, 1, sTextColor_Headers, TEXT_SKIP_DRAW, gText_MainMenuNewGame); - AddTextPrinterParameterized3(4, FONT_NORMAL, 0, 1, sTextColor_Headers, TEXT_SKIP_DRAW, gText_MainMenuMysteryGift2); + AddTextPrinterParameterized3(4, FONT_NORMAL, 0, 1, sTextColor_Headers, TEXT_SKIP_DRAW, gText_MysteryGift); AddTextPrinterParameterized3(5, FONT_NORMAL, 0, 1, sTextColor_Headers, TEXT_SKIP_DRAW, gText_MainMenuMysteryEvents); - AddTextPrinterParameterized3(6, FONT_NORMAL, 0, 1, sTextColor_Headers, TEXT_SKIP_DRAW, gText_MainMenuOption); + AddTextPrinterParameterized3(6, FONT_NORMAL, 0, 1, sTextColor_Headers, TEXT_SKIP_DRAW, gText_Option); MainMenu_FormatSavegameText(); PutWindowTilemap(2); PutWindowTilemap(3); @@ -2158,7 +2150,7 @@ static void MainMenu_FormatSavegameText(void) static void MainMenu_FormatSavegamePlayer(void) { - StringExpandPlaceholders(gStringVar4, gText_ContinueMenuPlayer); + StringExpandPlaceholders(gStringVar4, gText_Player); AddTextPrinterParameterized3(2, FONT_NORMAL, 0, 17, sTextColor_MenuInfo, TEXT_SKIP_DRAW, gStringVar4); AddTextPrinterParameterized3(2, FONT_NORMAL, GetStringRightAlignXOffset(FONT_NORMAL, gSaveBlock2Ptr->playerName, 100), 17, sTextColor_MenuInfo, TEXT_SKIP_DRAW, gSaveBlock2Ptr->playerName); } @@ -2168,7 +2160,7 @@ static void MainMenu_FormatSavegameTime(void) u8 str[0x20]; u8 *ptr; - StringExpandPlaceholders(gStringVar4, gText_ContinueMenuTime); + StringExpandPlaceholders(gStringVar4, gText_Time); AddTextPrinterParameterized3(2, FONT_NORMAL, 0x6C, 17, sTextColor_MenuInfo, TEXT_SKIP_DRAW, gStringVar4); ptr = ConvertIntToDecimalStringN(str, gSaveBlock2Ptr->playTimeHours, STR_CONV_MODE_LEFT_ALIGN, 3); *ptr = 0xF0; @@ -2187,7 +2179,7 @@ static void MainMenu_FormatSavegamePokedex(void) dexCount = GetNationalPokedexCount(FLAG_GET_CAUGHT); else dexCount = GetHoennPokedexCount(FLAG_GET_CAUGHT); - StringExpandPlaceholders(gStringVar4, gText_ContinueMenuPokedex); + StringExpandPlaceholders(gStringVar4, gText_Pokedex); AddTextPrinterParameterized3(2, FONT_NORMAL, 0, 33, sTextColor_MenuInfo, TEXT_SKIP_DRAW, gStringVar4); ConvertIntToDecimalStringN(str, dexCount, STR_CONV_MODE_LEFT_ALIGN, 4); AddTextPrinterParameterized3(2, FONT_NORMAL, GetStringRightAlignXOffset(FONT_NORMAL, str, 100), 33, sTextColor_MenuInfo, TEXT_SKIP_DRAW, str); @@ -2205,7 +2197,7 @@ static void MainMenu_FormatSavegameBadges(void) if (FlagGet(i)) badgeCount++; } - StringExpandPlaceholders(gStringVar4, gText_ContinueMenuBadges); + StringExpandPlaceholders(gStringVar4, gText_Badges); AddTextPrinterParameterized3(2, FONT_NORMAL, 0x6C, 33, sTextColor_MenuInfo, TEXT_SKIP_DRAW, gStringVar4); ConvertIntToDecimalStringN(str, badgeCount, STR_CONV_MODE_LEADING_ZEROS, 1); AddTextPrinterParameterized3(2, FONT_NORMAL, GetStringRightAlignXOffset(FONT_NORMAL, str, 0xD0), 33, sTextColor_MenuInfo, TEXT_SKIP_DRAW, str); diff --git a/src/match_call.c b/src/match_call.c index 662dd209a49b..54cf4285eb65 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -1812,7 +1812,7 @@ static void PopulateSpeciesFromTrainerParty(int matchCallId, u8 *destStr) static const u8 *const sBattleFrontierFacilityNames[NUM_FRONTIER_FACILITIES] = { - [FRONTIER_FACILITY_TOWER] = gText_BattleTower2, + [FRONTIER_FACILITY_TOWER] = gText_BattleTower, [FRONTIER_FACILITY_DOME] = gText_BattleDome, [FRONTIER_FACILITY_PALACE] = gText_BattlePalace, [FRONTIER_FACILITY_ARENA] = gText_BattleArena, diff --git a/src/menu.c b/src/menu.c index d9b331a8b2fd..b500c208cfbe 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1065,7 +1065,7 @@ void RedrawMenuCursor(u8 oldPos, u8 newPos) width = GetMenuCursorDimensionByFont(sMenu.fontId, 0); height = GetMenuCursorDimensionByFont(sMenu.fontId, 1); FillWindowPixelRect(sMenu.windowId, PIXEL_FILL(1), sMenu.left, sMenu.optionHeight * oldPos + sMenu.top, width, height); - AddTextPrinterParameterized(sMenu.windowId, sMenu.fontId, gText_SelectorArrow3, sMenu.left, sMenu.optionHeight * newPos + sMenu.top, 0, 0); + AddTextPrinterParameterized(sMenu.windowId, sMenu.fontId, gText_SelectorArrow, sMenu.left, sMenu.optionHeight * newPos + sMenu.top, 0, 0); } u8 Menu_MoveCursor(s8 cursorDelta) @@ -1444,7 +1444,7 @@ static void MoveMenuGridCursor(u8 oldCursorPos, u8 newCursorPos) xPos = (newCursorPos % sMenu.columns) * sMenu.optionWidth + sMenu.left; yPos = (newCursorPos / sMenu.columns) * sMenu.optionHeight + sMenu.top; - AddTextPrinterParameterized(sMenu.windowId, sMenu.fontId, gText_SelectorArrow3, xPos, yPos, 0, 0); + AddTextPrinterParameterized(sMenu.windowId, sMenu.fontId, gText_SelectorArrow, xPos, yPos, 0, 0); } u8 ChangeMenuGridCursorPosition(s8 deltaX, s8 deltaY) diff --git a/src/menu_specialized.c b/src/menu_specialized.c index 693e9f12bc02..ec2cec6fe7fc 100644 --- a/src/menu_specialized.c +++ b/src/menu_specialized.c @@ -75,8 +75,6 @@ static const u8 sPlayerNameTextColors[] = TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY }; -static const u8 sEmptyItemName[] = _(""); - static const struct ScanlineEffectParams sConditionGraphScanline = { .dmaDest = ®_WIN0H, @@ -262,11 +260,11 @@ u8 MailboxMenu_CreateList(struct PlayerPCItemPageStruct *page) u16 i; for (i = 0; i < page->count; i++) { - sMailboxList[i].name = sEmptyItemName; + sMailboxList[i].name = gText_EmptyString; sMailboxList[i].id = i; } - sMailboxList[i].name = gText_Cancel2; + sMailboxList[i].name = gText_Cancel; sMailboxList[i].id = LIST_CANCEL; gMultiuseListMenuTemplate.items = sMailboxList; @@ -760,7 +758,7 @@ static void MoveRelearnerLoadBattleMoveDescription(u32 chosenMove) MoveRelearnerShowHideCategoryIcon(chosenMove); FillWindowPixelBuffer(RELEARNERWIN_DESC_BATTLE, PIXEL_FILL(1)); - str = gText_MoveRelearnerBattleMoves; + str = gText_BattleMoves; x = GetStringCenterAlignXOffset(FONT_NORMAL, str, 128); AddTextPrinterParameterized(RELEARNERWIN_DESC_BATTLE, FONT_NORMAL, str, x, 1, TEXT_SKIP_DRAW, NULL); @@ -826,15 +824,15 @@ static void MoveRelearnerMenuLoadContestMoveDescription(u32 chosenMove) MoveRelearnerShowHideHearts(chosenMove); FillWindowPixelBuffer(RELEARNERWIN_DESC_CONTEST, PIXEL_FILL(1)); - str = gText_MoveRelearnerContestMovesTitle; + str = gText_ContestMoves; x = GetStringCenterAlignXOffset(FONT_NORMAL, str, 128); AddTextPrinterParameterized(RELEARNERWIN_DESC_CONTEST, FONT_NORMAL, str, x, 1, TEXT_SKIP_DRAW, NULL); - str = gText_MoveRelearnerAppeal; + str = gText_Appeal; x = GetStringRightAlignXOffset(FONT_NORMAL, str, 92); AddTextPrinterParameterized(RELEARNERWIN_DESC_CONTEST, FONT_NORMAL, str, x, 25, TEXT_SKIP_DRAW, NULL); - str = gText_MoveRelearnerJam; + str = gText_Jam; x = GetStringRightAlignXOffset(FONT_NORMAL, str, 92); AddTextPrinterParameterized(RELEARNERWIN_DESC_CONTEST, FONT_NORMAL, str, x, 41, TEXT_SKIP_DRAW, NULL); @@ -1548,7 +1546,7 @@ void DrawLevelUpWindowPg1(u16 windowId, u16 *statsBefore, u16 *statsAfter, u8 bg TEXT_SKIP_DRAW, sLvlUpStatStrings[i]); - StringCopy(text, (statsDiff[i] >= 0) ? gText_Plus : gText_Dash); + StringCopy(text, (statsDiff[i] >= 0) ? gText_Plus : gText_OneDash); AddTextPrinterParameterized3(windowId, FONT_NORMAL, 56, diff --git a/src/move_relearner.c b/src/move_relearner.c index a4cc778a4555..969158657607 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -532,7 +532,7 @@ static void DoMoveRelearnerMain(void) { if (GiveMoveToMon(&gPlayerParty[sMoveRelearnerStruct->partyMon], GetCurrentSelectedMove()) != MON_HAS_MAX_MOVES) { - PrintMessageWithPlaceholders(gText_MoveRelearnerPkmnLearnedMove); + PrintMessageWithPlaceholders(gText_PkmnLearnedMove); gSpecialVar_0x8004 = TRUE; sMoveRelearnerStruct->state = MENU_STATE_PRINT_TEXT_THEN_FANFARE; } @@ -611,7 +611,7 @@ static void DoMoveRelearnerMain(void) break; case MENU_STATE_PRINT_STOP_TEACHING: StringCopy(gStringVar2, GetMoveName(GetCurrentSelectedMove())); - PrintMessageWithPlaceholders(gText_MoveRelearnerStopTryingToTeachMove); + PrintMessageWithPlaceholders(gText_StopLearningMove); sMoveRelearnerStruct->state++; break; case MENU_STATE_WAIT_FOR_STOP_TEACHING: diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c index 179be0d56bca..79cba071473e 100644 --- a/src/mystery_gift_menu.c +++ b/src/mystery_gift_menu.c @@ -217,13 +217,13 @@ static const struct WindowTemplate sWindowTemplate_GiftSelect_1Option = { static const struct ListMenuItem sListMenuItems_CardsOrNews[] = { { gText_WonderCards, 0 }, { gText_WonderNews, 1 }, - { gText_Exit3, LIST_CANCEL } + { gText_Exit, LIST_CANCEL } }; static const struct ListMenuItem sListMenuItems_WirelessOrFriend[] = { { gText_WirelessCommunication, 0 }, { gText_Friend2, 1 }, - { gText_Cancel2, LIST_CANCEL } + { gText_Cancel, LIST_CANCEL } }; static const struct ListMenuTemplate sListMenuTemplate_ThreeOptions = { @@ -251,24 +251,24 @@ static const struct ListMenuItem sListMenuItems_ReceiveSendToss[] = { { gText_Receive, 0 }, { gText_Send, 1 }, { gText_Toss, 2 }, - { gText_Cancel2, LIST_CANCEL } + { gText_Cancel, LIST_CANCEL } }; static const struct ListMenuItem sListMenuItems_ReceiveToss[] = { { gText_Receive, 0 }, { gText_Toss, 2 }, - { gText_Cancel2, LIST_CANCEL } + { gText_Cancel, LIST_CANCEL } }; static const struct ListMenuItem sListMenuItems_ReceiveSend[] = { { gText_Receive, 0 }, { gText_Send, 1 }, - { gText_Cancel2, LIST_CANCEL } + { gText_Cancel, LIST_CANCEL } }; static const struct ListMenuItem sListMenuItems_Receive[] = { { gText_Receive, 0 }, - { gText_Cancel2, LIST_CANCEL } + { gText_Cancel, LIST_CANCEL } }; static const struct ListMenuTemplate sListMenu_ReceiveSendToss = { diff --git a/src/option_menu.c b/src/option_menu.c index fda3a24c4779..33e3ec717f99 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -84,7 +84,7 @@ static const u8 *const sOptionMenuItemsNames[MENUITEM_COUNT] = [MENUITEM_SOUND] = gText_Sound, [MENUITEM_BUTTONMODE] = gText_ButtonMode, [MENUITEM_FRAMETYPE] = gText_Frame, - [MENUITEM_CANCEL] = gText_OptionMenuCancel, + [MENUITEM_CANCEL] = gText_Cancel, }; static const struct WindowTemplate sOptionMenuWinTemplates[] = diff --git a/src/party_menu.c b/src/party_menu.c index 285ad5e8396f..c421878d0a7d 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -2272,16 +2272,9 @@ static void CreateCancelConfirmWindows(bool8 chooseHalf) FillWindowPixelBuffer(cancelWindowId, PIXEL_FILL(0)); // Branches are functionally identical. Second branch is never reached, Spin Trade wasnt fully implemented - if (gPartyMenu.menuType != PARTY_MENU_TYPE_SPIN_TRADE) - { - mainOffset = GetStringCenterAlignXOffset(FONT_SMALL, gText_Cancel, 48); - AddTextPrinterParameterized3(cancelWindowId, FONT_SMALL, mainOffset + offset, 1, sFontColorTable[0], TEXT_SKIP_DRAW, gText_Cancel); - } - else - { - mainOffset = GetStringCenterAlignXOffset(FONT_SMALL, gText_Cancel2, 48); - AddTextPrinterParameterized3(cancelWindowId, FONT_SMALL, mainOffset + offset, 1, sFontColorTable[0], TEXT_SKIP_DRAW, gText_Cancel2); - } + mainOffset = GetStringCenterAlignXOffset(FONT_SMALL, gText_Cancel, 48); + AddTextPrinterParameterized3(cancelWindowId, FONT_SMALL, mainOffset + offset, 1, sFontColorTable[0], TEXT_SKIP_DRAW, gText_Cancel); + PutWindowTilemap(cancelWindowId); CopyWindowToVram(cancelWindowId, COPYWIN_GFX); ScheduleBgCopyTilemapToVram(0); @@ -2466,7 +2459,7 @@ static void DisplayPartyPokemonLevelCheck(struct Pokemon *mon, struct PartyMenuB static void DisplayPartyPokemonLevel(u8 level, struct PartyMenuBox *menuBox) { ConvertIntToDecimalStringN(gStringVar2, level, STR_CONV_MODE_LEFT_ALIGN, 3); - StringCopy(gStringVar1, gText_LevelSymbol); + StringCopy(gStringVar1, gText_Lv); StringAppend(gStringVar1, gStringVar2); DisplayPartyPokemonBarDetail(menuBox->windowId, gStringVar1, 0, &menuBox->infoRects->dimensions[4]); } @@ -4535,27 +4528,27 @@ static void GetMedicineItemEffectMessage(u16 item, u32 statusCured) StringExpandPlaceholders(gStringVar4, gText_PkmnBecameHealthy); break; case ITEM_EFFECT_HP_EV: - StringCopy(gStringVar2, gText_HP3); + StringCopy(gStringVar2, gText_HP); StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased); break; case ITEM_EFFECT_ATK_EV: - StringCopy(gStringVar2, gText_Attack3); + StringCopy(gStringVar2, gText_Attack); StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased); break; case ITEM_EFFECT_DEF_EV: - StringCopy(gStringVar2, gText_Defense3); + StringCopy(gStringVar2, gText_Defense); StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased); break; case ITEM_EFFECT_SPEED_EV: - StringCopy(gStringVar2, gText_Speed2); + StringCopy(gStringVar2, gText_Speed); StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased); break; case ITEM_EFFECT_SPATK_EV: - StringCopy(gStringVar2, gText_SpAtk3); + StringCopy(gStringVar2, gText_SpAtk); StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased); break; case ITEM_EFFECT_SPDEF_EV: - StringCopy(gStringVar2, gText_SpDef3); + StringCopy(gStringVar2, gText_SpDef); StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased); break; case ITEM_EFFECT_PP_UP: @@ -5099,22 +5092,22 @@ static void ItemEffectToStatString(u8 effectType, u8 *dest) switch (effectType) { case ITEM_EFFECT_HP_EV: - StringCopy(dest, gText_HP3); + StringCopy(dest, gText_HP); break; case ITEM_EFFECT_ATK_EV: - StringCopy(dest, gText_Attack3); + StringCopy(dest, gText_Attack); break; case ITEM_EFFECT_DEF_EV: - StringCopy(dest, gText_Defense3); + StringCopy(dest, gText_Defense); break; case ITEM_EFFECT_SPEED_EV: - StringCopy(dest, gText_Speed2); + StringCopy(dest, gText_Speed); break; case ITEM_EFFECT_SPATK_EV: - StringCopy(dest, gText_SpAtk3); + StringCopy(dest, gText_SpAtk); break; case ITEM_EFFECT_SPDEF_EV: - StringCopy(dest, gText_SpDef3); + StringCopy(dest, gText_SpDef); break; } } @@ -5347,7 +5340,7 @@ static void Task_LearnedMove(u8 taskId) } GetMonNickname(mon, gStringVar1); StringCopy(gStringVar2, GetMoveName(move[0])); - StringExpandPlaceholders(gStringVar4, gText_PkmnLearnedMove3); + StringExpandPlaceholders(gStringVar4, gText_PkmnLearnedMove); DisplayPartyMenuMessage(gStringVar4, TRUE); ScheduleBgCopyTilemapToVram(2); gTasks[taskId].func = Task_DoLearnedMoveFanfareAfterText; @@ -5467,7 +5460,7 @@ static void Task_PartyMenuReplaceMove(u8 taskId) static void StopLearningMovePrompt(u8 taskId) { StringCopy(gStringVar2, GetMoveName(gPartyMenu.data1)); - StringExpandPlaceholders(gStringVar4, gText_StopLearningMove2); + StringExpandPlaceholders(gStringVar4, gText_StopLearningMove); DisplayPartyMenuMessage(gStringVar4, TRUE); ScheduleBgCopyTilemapToVram(2); gTasks[taskId].func = Task_StopLearningMoveYesNo; @@ -5799,7 +5792,7 @@ static void DisplayMonLearnedMove(u8 taskId, u16 move) { GetMonNickname(&gPlayerParty[gPartyMenu.slotId], gStringVar1); StringCopy(gStringVar2, GetMoveName(move)); - StringExpandPlaceholders(gStringVar4, gText_PkmnLearnedMove3); + StringExpandPlaceholders(gStringVar4, gText_PkmnLearnedMove); DisplayPartyMenuMessage(gStringVar4, TRUE); ScheduleBgCopyTilemapToVram(2); gPartyMenu.data1 = move; diff --git a/src/player_pc.c b/src/player_pc.c index b44799223c87..fbcd98fa8fb9 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -203,7 +203,7 @@ static const struct MenuAction sPlayerPCMenuActions[] = { [MENU_ITEMSTORAGE] = { COMPOUND_STRING("ITEM STORAGE"), {PlayerPC_ItemStorage} }, [MENU_MAILBOX] = { sText_Mailbox, {PlayerPC_Mailbox} }, - [MENU_DECORATION] = { COMPOUND_STRING("DECORATION"), {PlayerPC_Decoration} }, + [MENU_DECORATION] = { gText_Decoration, {PlayerPC_Decoration} }, [MENU_TURNOFF] = { COMPOUND_STRING("TURN OFF"), {PlayerPC_TurnOff} } }; @@ -242,8 +242,8 @@ const struct MenuAction gMailboxMailOptions[] = { { COMPOUND_STRING("READ"), {Mailbox_DoMailRead} }, { COMPOUND_STRING("MOVE TO BAG"), {Mailbox_MoveToBag} }, - { COMPOUND_STRING("GIVE"), {Mailbox_Give} }, - { gText_Cancel2, {Mailbox_Cancel} } + { gMenuText_Give, {Mailbox_Give} }, + { gText_Cancel, {Mailbox_Cancel} } }; static const struct WindowTemplate sWindowTemplates_MainMenus[] = @@ -1004,7 +1004,7 @@ void ItemStorage_RefreshListMenu(void) } // Set up Cancel entry - StringCopy(&sItemStorageMenu->itemNames[i][0], gText_Cancel2); + StringCopy(&sItemStorageMenu->itemNames[i][0], gText_Cancel); sItemStorageMenu->listItems[i].name = &sItemStorageMenu->itemNames[i][0]; sItemStorageMenu->listItems[i].id = LIST_CANCEL; @@ -1098,7 +1098,7 @@ static void ItemStorage_DrawSwapArrow(u8 y, u8 b, u8 speed) if (b == 0xFF) FillWindowPixelRect(windowId, PIXEL_FILL(1), 0, y, GetMenuCursorDimensionByFont(FONT_NORMAL, 0), GetMenuCursorDimensionByFont(FONT_NORMAL, 1)); else - AddTextPrinterParameterized4(windowId, FONT_NORMAL, 0, y, 0, 0, sSwapArrowTextColors, speed, gText_SelectorArrow2); + AddTextPrinterParameterized4(windowId, FONT_NORMAL, 0, y, 0, 0, sSwapArrowTextColors, speed, gText_SelectorArrow); } static void ItemStorage_DrawItemIcon(u16 itemId) diff --git a/src/pokeblock.c b/src/pokeblock.c index b68fe16ce36e..81f92c69c140 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -132,7 +132,6 @@ static void TossPokeblock(u8); static const u8 sText_StowCase[] = _("Stow CASE."); static const u8 sText_LvVar1[] = _("{LV}{STR_VAR_1}"); -static const u8 sText_ThrowAwayVar1[] = _("Throw away this\n{STR_VAR_1}?"); static const u8 sText_Var1ThrownAway[] = _("The {STR_VAR_1}\nwas thrown away."); EWRAM_DATA static struct PokeblockSavedData sSavedPokeblockData = {0}; @@ -222,10 +221,10 @@ static const struct MenuAction sPokeblockMenuActions[] = { [PKBL_USE_ON_FIELD] = {gMenuText_Use, {PokeblockAction_UseOnField}}, [PKBL_TOSS] = {gMenuText_Toss, {PokeblockAction_Toss}}, - [PKBL_CANCEL] = {gText_Cancel2, {PokeblockAction_Cancel}}, + [PKBL_CANCEL] = {gText_Cancel, {PokeblockAction_Cancel}}, [PKBL_USE_IN_BATTLE] = {gMenuText_Use, {PokeblockAction_UseInBattle}}, [PKBL_USE_ON_FEEDER] = {gMenuText_Use, {PokeblockAction_UseOnPokeblockFeeder}}, - [PKBL_GIVE_TO_LADY] = {gMenuText_Give2, {PokeblockAction_GiveToContestLady}}, + [PKBL_GIVE_TO_LADY] = {gMenuText_Give, {PokeblockAction_GiveToContestLady}}, }; static const u8 sActionsOnField[] = {PKBL_USE_ON_FIELD, PKBL_TOSS, PKBL_CANCEL}; @@ -1208,7 +1207,7 @@ static void PokeblockAction_Toss(u8 taskId) ClearStdWindowAndFrameToTransparent(tWindowId, FALSE); StringCopy(gStringVar1, gPokeblockNames[gSaveBlock1Ptr->pokeblocks[gSpecialVar_ItemId].color]); - StringExpandPlaceholders(gStringVar4, sText_ThrowAwayVar1); + StringExpandPlaceholders(gStringVar4, gText_ThrowAwayItem); DisplayMessageAndContinueTask(taskId, WIN_TOSS_MSG, 10, 13, FONT_NORMAL, GetPlayerTextSpeedDelay(), gStringVar4, CreateTossPokeblockYesNoMenu); } diff --git a/src/pokedex.c b/src/pokedex.c index 87702d337151..b9cbe1812f2c 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -1358,56 +1358,56 @@ static const struct SearchOptionText sDexOrderOptions[] = static const struct SearchOptionText sDexSearchNameOptions[] = { - {gText_DexEmptyString, gText_DexSearchDontSpecify}, - [NAME_ABC] = {gText_DexEmptyString, gText_DexSearchAlphaABC}, - [NAME_DEF] = {gText_DexEmptyString, gText_DexSearchAlphaDEF}, - [NAME_GHI] = {gText_DexEmptyString, gText_DexSearchAlphaGHI}, - [NAME_JKL] = {gText_DexEmptyString, gText_DexSearchAlphaJKL}, - [NAME_MNO] = {gText_DexEmptyString, gText_DexSearchAlphaMNO}, - [NAME_PQR] = {gText_DexEmptyString, gText_DexSearchAlphaPQR}, - [NAME_STU] = {gText_DexEmptyString, gText_DexSearchAlphaSTU}, - [NAME_VWX] = {gText_DexEmptyString, gText_DexSearchAlphaVWX}, - [NAME_YZ] = {gText_DexEmptyString, gText_DexSearchAlphaYZ}, + {gText_EmptyString, gText_DexSearchDontSpecify}, + [NAME_ABC] = {gText_EmptyString, gText_DexSearchAlphaABC}, + [NAME_DEF] = {gText_EmptyString, gText_DexSearchAlphaDEF}, + [NAME_GHI] = {gText_EmptyString, gText_DexSearchAlphaGHI}, + [NAME_JKL] = {gText_EmptyString, gText_DexSearchAlphaJKL}, + [NAME_MNO] = {gText_EmptyString, gText_DexSearchAlphaMNO}, + [NAME_PQR] = {gText_EmptyString, gText_DexSearchAlphaPQR}, + [NAME_STU] = {gText_EmptyString, gText_DexSearchAlphaSTU}, + [NAME_VWX] = {gText_EmptyString, gText_DexSearchAlphaVWX}, + [NAME_YZ] = {gText_EmptyString, gText_DexSearchAlphaYZ}, {}, }; static const struct SearchOptionText sDexSearchColorOptions[] = { - {gText_DexEmptyString, gText_DexSearchDontSpecify}, - [BODY_COLOR_RED + 1] = {gText_DexEmptyString, gText_DexSearchColorRed}, - [BODY_COLOR_BLUE + 1] = {gText_DexEmptyString, gText_DexSearchColorBlue}, - [BODY_COLOR_YELLOW + 1] = {gText_DexEmptyString, gText_DexSearchColorYellow}, - [BODY_COLOR_GREEN + 1] = {gText_DexEmptyString, gText_DexSearchColorGreen}, - [BODY_COLOR_BLACK + 1] = {gText_DexEmptyString, gText_DexSearchColorBlack}, - [BODY_COLOR_BROWN + 1] = {gText_DexEmptyString, gText_DexSearchColorBrown}, - [BODY_COLOR_PURPLE + 1] = {gText_DexEmptyString, gText_DexSearchColorPurple}, - [BODY_COLOR_GRAY + 1] = {gText_DexEmptyString, gText_DexSearchColorGray}, - [BODY_COLOR_WHITE + 1] = {gText_DexEmptyString, gText_DexSearchColorWhite}, - [BODY_COLOR_PINK + 1] = {gText_DexEmptyString, gText_DexSearchColorPink}, + {gText_EmptyString, gText_DexSearchDontSpecify}, + [BODY_COLOR_RED + 1] = {gText_EmptyString, gText_DexSearchColorRed}, + [BODY_COLOR_BLUE + 1] = {gText_EmptyString, gText_DexSearchColorBlue}, + [BODY_COLOR_YELLOW + 1] = {gText_EmptyString, gText_DexSearchColorYellow}, + [BODY_COLOR_GREEN + 1] = {gText_EmptyString, gText_DexSearchColorGreen}, + [BODY_COLOR_BLACK + 1] = {gText_EmptyString, gText_DexSearchColorBlack}, + [BODY_COLOR_BROWN + 1] = {gText_EmptyString, gText_DexSearchColorBrown}, + [BODY_COLOR_PURPLE + 1] = {gText_EmptyString, gText_DexSearchColorPurple}, + [BODY_COLOR_GRAY + 1] = {gText_EmptyString, gText_DexSearchColorGray}, + [BODY_COLOR_WHITE + 1] = {gText_EmptyString, gText_DexSearchColorWhite}, + [BODY_COLOR_PINK + 1] = {gText_EmptyString, gText_DexSearchColorPink}, {}, }; static const struct SearchOptionText sDexSearchTypeOptions[] = { - {gText_DexEmptyString, gTypesInfo[TYPE_NONE].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_NORMAL].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_FIGHTING].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_FLYING].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_POISON].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_GROUND].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_ROCK].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_BUG].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_GHOST].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_STEEL].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_FIRE].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_WATER].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_GRASS].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_ELECTRIC].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_PSYCHIC].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_ICE].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_DRAGON].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_DARK].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_FAIRY].name}, + {gText_EmptyString, gTypesInfo[TYPE_NONE].name}, + {gText_EmptyString, gTypesInfo[TYPE_NORMAL].name}, + {gText_EmptyString, gTypesInfo[TYPE_FIGHTING].name}, + {gText_EmptyString, gTypesInfo[TYPE_FLYING].name}, + {gText_EmptyString, gTypesInfo[TYPE_POISON].name}, + {gText_EmptyString, gTypesInfo[TYPE_GROUND].name}, + {gText_EmptyString, gTypesInfo[TYPE_ROCK].name}, + {gText_EmptyString, gTypesInfo[TYPE_BUG].name}, + {gText_EmptyString, gTypesInfo[TYPE_GHOST].name}, + {gText_EmptyString, gTypesInfo[TYPE_STEEL].name}, + {gText_EmptyString, gTypesInfo[TYPE_FIRE].name}, + {gText_EmptyString, gTypesInfo[TYPE_WATER].name}, + {gText_EmptyString, gTypesInfo[TYPE_GRASS].name}, + {gText_EmptyString, gTypesInfo[TYPE_ELECTRIC].name}, + {gText_EmptyString, gTypesInfo[TYPE_PSYCHIC].name}, + {gText_EmptyString, gTypesInfo[TYPE_ICE].name}, + {gText_EmptyString, gTypesInfo[TYPE_DRAGON].name}, + {gText_EmptyString, gTypesInfo[TYPE_DARK].name}, + {gText_EmptyString, gTypesInfo[TYPE_FAIRY].name}, {}, }; diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c index 74b57fa3a50b..161f19094d59 100644 --- a/src/pokedex_plus_hgss.c +++ b/src/pokedex_plus_hgss.c @@ -130,7 +130,6 @@ static const u16 sSizeScreenSilhouette_Pal[] = INCBIN_U16("graphics/pokedex/size static const u8 sText_Stats_Buttons[] = _("{A_BUTTON}TOGGLE {DPAD_UPDOWN}MOVES"); static const u8 sText_Stats_Buttons_Decapped[] = _("{A_BUTTON}Toggle {DPAD_UPDOWN}Moves"); -static const u8 sText_Stats_HP[] = _("HP"); static const u8 sText_Stats_Attack[] = _("ATK"); static const u8 sText_Stats_Defense[] = _("DEF"); static const u8 sText_Stats_Speed[] = _("SPE"); @@ -142,13 +141,11 @@ static const u8 sText_Stats_EV_Plus3[] = _("{UP_ARROW_2}{UP_ARROW_2}{UP_ARROW_2} static const u8 sText_Stats_EvStr1Str2[] = _("{STR_VAR_1}{STR_VAR_2}"); static const u8 sText_Stats_MoveSelectedMax[] = _("{STR_VAR_1} / {STR_VAR_2}"); static const u8 sText_Stats_MoveLevel[] = _("LVL"); -static const u8 sText_Stats_Gender_0[] = _("♂"); static const u8 sText_Stats_Gender_12_5[] = _("♀ 1/7 ♂"); //_("♀ 12.5 / 87.5 ♂"); static const u8 sText_Stats_Gender_25[] = _("♀ 1/3 ♂"); //_("♀ 25 / 75 ♂"); static const u8 sText_Stats_Gender_50[] = _("♀ 1/1 ♂"); //_("♀ 50 / 50 ♂"); static const u8 sText_Stats_Gender_75[] = _("♀ 3/1 ♂"); //_("♀ 75 / 25 ♂"); static const u8 sText_Stats_Gender_87_5[] = _("♀ 7/1 ♂"); -static const u8 sText_Stats_Gender_100[] = _("♀"); static const u8 sText_Stats_CatchRate[] = _("CATCH{0x5B}: "); static const u8 sText_Stats_CatchRate_Legend[] = _("LEGENDARY"); static const u8 sText_Stats_CatchRate_VeryHard[] = _("VERY HARD"); @@ -175,7 +172,6 @@ static const u8 sText_Stats_MEDIUM_SLOW[] = _("MED. SLOW"); static const u8 sText_Stats_FAST[] = _("FAST"); static const u8 sText_Stats_SLOW[] = _("SLOW"); static const u8 sText_Stats_ContestHeart[] = _("H"); -static const u8 sText_Stats_Minus[] = _("-"); static const u8 sText_Stats_eggGroup[] = _("EGG G1:"); static const u8 sText_Stats_eggGroup_Groups[] = _("{STR_VAR_1}/{STR_VAR_2}"); static const u8 sText_Stats_eggGroup_MONSTER[] = _("MONSTER"); @@ -192,8 +188,6 @@ static const u8 sText_Stats_eggGroup_AMORPHOUS[] = _("AMORPHOUS"); static const u8 sText_Stats_eggGroup_WATER_2[] = _("WATER {CIRCLE_2}"); static const u8 sText_Stats_eggGroup_DITTO[] = _("DITTO"); static const u8 sText_Stats_eggGroup_DRAGON[] = _("DRAGON"); -static const u8 sText_Stats_eggGroup_NO_EGGS_DISCOVERED[] = _("---"); -static const u8 sText_Stats_eggGroup_UNKNOWN[] = _("???"); static const u8 sText_Dex_SEEN[] = _("SEEN"); static const u8 sText_Dex_OWN[] = _("OWN"); @@ -217,7 +211,6 @@ static const u8 sText_EVO_LEVEL_ATK_EQ_DEF[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, static const u8 sText_EVO_LEVEL_ATK_LT_DEF[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, Atk < Def"); static const u8 sText_EVO_LEVEL_SILCOON[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, Silcoon persona"); static const u8 sText_EVO_LEVEL_CASCOON[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, Cascoon persona"); -static const u8 sText_EVO_LEVEL_NINJASK[] = _("{LV}{UP_ARROW} to {STR_VAR_2}"); static const u8 sText_EVO_LEVEL_SHEDINJA[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, party<6, 1x POKéBALL"); static const u8 sText_EVO_BEAUTY[] = _("{LV}{UP_ARROW}, high beauty"); static const u8 sText_EVO_LEVEL_FEMALE[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, is female"); @@ -235,7 +228,6 @@ static const u8 sText_EVO_LEVEL_RAIN[] = _("{LV}{UP_ARROW} to {STR_VAR_2} while static const u8 sText_EVO_SPECIFIC_MON_IN_PARTY[] = _("{LV}{UP_ARROW} with {STR_VAR_2} in party"); static const u8 sText_EVO_LEVEL_DARK_TYPE_MON_IN_PARTY[] = _("{LV}{UP_ARROW} with dark type in party"); static const u8 sText_EVO_TRADE_SPECIFIC_MON[] = _("Traded for {STR_VAR_2}"); -static const u8 sText_EVO_SPECIFIC_MAP[] = _("{LV}{UP_ARROW} on {STR_VAR_2}"); static const u8 sText_EVO_LEVEL_NATURE_AMPED[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, Amped natures"); static const u8 sText_EVO_LEVEL_NATURE_LOW_KEY[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, Low Key natures"); static const u8 sText_EVO_CRITICAL_HITS[] = _("Land {STR_VAR_2} critical hits in\nsingle battle"); @@ -257,7 +249,6 @@ static const u8 sText_EVO_NONE[] = _("{STR_VAR_1} has no evolution."); static const u8 sText_FORMS_Buttons_PE[] = _("{A_BUTTON}FORM MODE {START_BUTTON}EVOs"); static const u8 sText_FORMS_Buttons_Decapped_PE[] = _("{START_BUTTON}Evos"); static const u8 sText_FORMS_Buttons_Submenu_PE[] = _("{DPAD_NONE}FORMs {A_BUTTON}CHECK {START_BUTTON}EVOs"); -static const u8 sText_FORMS_Buttons_Submenu_Decapped_PE[] = _("{START_BUTTON}Evos"); static const u8 sText_FORMS_NONE[] = _("{STR_VAR_1} has no alternate forms."); static const u8 sText_PlusSymbol[] = _("+"); @@ -1873,56 +1864,56 @@ static const struct SearchOptionText sDexOrderOptions[] = static const struct SearchOptionText sDexSearchNameOptions[] = { - {gText_DexEmptyString, gText_DexSearchDontSpecify}, - [NAME_ABC] = {gText_DexEmptyString, gText_DexSearchAlphaABC}, - [NAME_DEF] = {gText_DexEmptyString, gText_DexSearchAlphaDEF}, - [NAME_GHI] = {gText_DexEmptyString, gText_DexSearchAlphaGHI}, - [NAME_JKL] = {gText_DexEmptyString, gText_DexSearchAlphaJKL}, - [NAME_MNO] = {gText_DexEmptyString, gText_DexSearchAlphaMNO}, - [NAME_PQR] = {gText_DexEmptyString, gText_DexSearchAlphaPQR}, - [NAME_STU] = {gText_DexEmptyString, gText_DexSearchAlphaSTU}, - [NAME_VWX] = {gText_DexEmptyString, gText_DexSearchAlphaVWX}, - [NAME_YZ] = {gText_DexEmptyString, gText_DexSearchAlphaYZ}, + {gText_EmptyString, gText_DexSearchDontSpecify}, + [NAME_ABC] = {gText_EmptyString, gText_DexSearchAlphaABC}, + [NAME_DEF] = {gText_EmptyString, gText_DexSearchAlphaDEF}, + [NAME_GHI] = {gText_EmptyString, gText_DexSearchAlphaGHI}, + [NAME_JKL] = {gText_EmptyString, gText_DexSearchAlphaJKL}, + [NAME_MNO] = {gText_EmptyString, gText_DexSearchAlphaMNO}, + [NAME_PQR] = {gText_EmptyString, gText_DexSearchAlphaPQR}, + [NAME_STU] = {gText_EmptyString, gText_DexSearchAlphaSTU}, + [NAME_VWX] = {gText_EmptyString, gText_DexSearchAlphaVWX}, + [NAME_YZ] = {gText_EmptyString, gText_DexSearchAlphaYZ}, {}, }; static const struct SearchOptionText sDexSearchColorOptions[] = { - {gText_DexEmptyString, gText_DexSearchDontSpecify}, - [BODY_COLOR_RED + 1] = {gText_DexEmptyString, gText_DexSearchColorRed}, - [BODY_COLOR_BLUE + 1] = {gText_DexEmptyString, gText_DexSearchColorBlue}, - [BODY_COLOR_YELLOW + 1] = {gText_DexEmptyString, gText_DexSearchColorYellow}, - [BODY_COLOR_GREEN + 1] = {gText_DexEmptyString, gText_DexSearchColorGreen}, - [BODY_COLOR_BLACK + 1] = {gText_DexEmptyString, gText_DexSearchColorBlack}, - [BODY_COLOR_BROWN + 1] = {gText_DexEmptyString, gText_DexSearchColorBrown}, - [BODY_COLOR_PURPLE + 1] = {gText_DexEmptyString, gText_DexSearchColorPurple}, - [BODY_COLOR_GRAY + 1] = {gText_DexEmptyString, gText_DexSearchColorGray}, - [BODY_COLOR_WHITE + 1] = {gText_DexEmptyString, gText_DexSearchColorWhite}, - [BODY_COLOR_PINK + 1] = {gText_DexEmptyString, gText_DexSearchColorPink}, + {gText_EmptyString, gText_DexSearchDontSpecify}, + [BODY_COLOR_RED + 1] = {gText_EmptyString, gText_DexSearchColorRed}, + [BODY_COLOR_BLUE + 1] = {gText_EmptyString, gText_DexSearchColorBlue}, + [BODY_COLOR_YELLOW + 1] = {gText_EmptyString, gText_DexSearchColorYellow}, + [BODY_COLOR_GREEN + 1] = {gText_EmptyString, gText_DexSearchColorGreen}, + [BODY_COLOR_BLACK + 1] = {gText_EmptyString, gText_DexSearchColorBlack}, + [BODY_COLOR_BROWN + 1] = {gText_EmptyString, gText_DexSearchColorBrown}, + [BODY_COLOR_PURPLE + 1] = {gText_EmptyString, gText_DexSearchColorPurple}, + [BODY_COLOR_GRAY + 1] = {gText_EmptyString, gText_DexSearchColorGray}, + [BODY_COLOR_WHITE + 1] = {gText_EmptyString, gText_DexSearchColorWhite}, + [BODY_COLOR_PINK + 1] = {gText_EmptyString, gText_DexSearchColorPink}, {}, }; static const struct SearchOptionText sDexSearchTypeOptions[] = { - {gText_DexEmptyString, gTypesInfo[TYPE_NONE].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_NORMAL].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_FIGHTING].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_FLYING].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_POISON].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_GROUND].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_ROCK].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_BUG].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_GHOST].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_STEEL].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_FIRE].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_WATER].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_GRASS].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_ELECTRIC].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_PSYCHIC].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_ICE].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_DRAGON].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_DARK].name}, - {gText_DexEmptyString, gTypesInfo[TYPE_FAIRY].name}, + {gText_EmptyString, gTypesInfo[TYPE_NONE].name}, + {gText_EmptyString, gTypesInfo[TYPE_NORMAL].name}, + {gText_EmptyString, gTypesInfo[TYPE_FIGHTING].name}, + {gText_EmptyString, gTypesInfo[TYPE_FLYING].name}, + {gText_EmptyString, gTypesInfo[TYPE_POISON].name}, + {gText_EmptyString, gTypesInfo[TYPE_GROUND].name}, + {gText_EmptyString, gTypesInfo[TYPE_ROCK].name}, + {gText_EmptyString, gTypesInfo[TYPE_BUG].name}, + {gText_EmptyString, gTypesInfo[TYPE_GHOST].name}, + {gText_EmptyString, gTypesInfo[TYPE_STEEL].name}, + {gText_EmptyString, gTypesInfo[TYPE_FIRE].name}, + {gText_EmptyString, gTypesInfo[TYPE_WATER].name}, + {gText_EmptyString, gTypesInfo[TYPE_GRASS].name}, + {gText_EmptyString, gTypesInfo[TYPE_ELECTRIC].name}, + {gText_EmptyString, gTypesInfo[TYPE_PSYCHIC].name}, + {gText_EmptyString, gTypesInfo[TYPE_ICE].name}, + {gText_EmptyString, gTypesInfo[TYPE_DRAGON].name}, + {gText_EmptyString, gTypesInfo[TYPE_DARK].name}, + {gText_EmptyString, gTypesInfo[TYPE_FAIRY].name}, {}, }; @@ -5320,7 +5311,7 @@ static void PrintStatsScreen_Moves_Bottom(u8 taskId) if (contest_effectValue != 0xFF) contest_jam = contest_effectValue / 10; ConvertIntToDecimalStringN(gStringVar1, contest_jam, STR_CONV_MODE_RIGHT_ALIGN, 1); - StringCopy(gStringVar2, sText_Stats_Minus); + StringCopy(gStringVar2, gText_OneDash); StringAppend(gStringVar2, gStringVar1); PrintStatsScreenTextSmall(WIN_STATS_MOVES_BOTTOM, gStringVar2, moves_x + 119, moves_y); } @@ -5352,7 +5343,7 @@ static void PrintStatsScreen_NameGender(u8 taskId, u32 num, u32 value) switch (sPokedexView->sPokemonStats.genderRatio) { case 0: - PrintStatsScreenTextSmall(WIN_STATS_NAME_GENDER, sText_Stats_Gender_0, gender_x, gender_y); + PrintStatsScreenTextSmall(WIN_STATS_NAME_GENDER, gText_MaleSymbol, gender_x, gender_y); break; case 31: PrintStatsScreenTextSmall(WIN_STATS_NAME_GENDER, sText_Stats_Gender_12_5, gender_x, gender_y); @@ -5370,7 +5361,7 @@ static void PrintStatsScreen_NameGender(u8 taskId, u32 num, u32 value) PrintStatsScreenTextSmall(WIN_STATS_NAME_GENDER, sText_Stats_Gender_87_5, gender_x, gender_y); break; case 254: - PrintStatsScreenTextSmall(WIN_STATS_NAME_GENDER, sText_Stats_Gender_100, gender_x, gender_y); + PrintStatsScreenTextSmall(WIN_STATS_NAME_GENDER, gText_FemaleSymbol, gender_x, gender_y); break; default: PrintStatsScreenTextSmall(WIN_STATS_NAME_GENDER, gText_ThreeDashes, gender_x, gender_y); @@ -5432,7 +5423,7 @@ static void PrintStatsScreen_Left(u8 taskId) //Base stats if (gTasks[taskId].data[5] == 0) { - PrintStatsScreenTextSmall(WIN_STATS_LEFT, sText_Stats_HP, base_x, base_y + base_y_offset*base_i); + PrintStatsScreenTextSmall(WIN_STATS_LEFT, gText_HP, base_x, base_y + base_y_offset*base_i); ConvertIntToDecimalStringN(strBase, sPokedexView->sPokemonStats.baseHP, STR_CONV_MODE_RIGHT_ALIGN, 3); PrintStatsScreenTextSmall(WIN_STATS_LEFT, strBase, base_x+base_x_first_row, base_y + base_y_offset*base_i); @@ -5471,7 +5462,7 @@ static void PrintStatsScreen_Left(u8 taskId) differentEVs++; column = PrintMonStatsToggle_DifferentEVsColumn(differentEVs); base_i = PrintMonStatsToggle_DifferentEVsRow(differentEVs); - StringCopy(gStringVar1, sText_Stats_HP); + StringCopy(gStringVar1, gText_HP); PrintMonStatsToggle_EV_Arrows(gStringVar2, EVs[0]); StringExpandPlaceholders(gStringVar3, sText_Stats_EvStr1Str2); PrintStatsScreenTextSmall(WIN_STATS_LEFT, gStringVar3, base_x + x_offset_column*column, base_y + base_y_offset*base_i); @@ -5538,7 +5529,7 @@ static void PrintStatsScreen_Left(u8 taskId) //HP if (EVs[0] > 0) { - StringCopy(gStringVar1, sText_Stats_HP); + StringCopy(gStringVar1, gText_HP); PrintMonStatsToggle_EV_Arrows(gStringVar2, EVs[0]); StringExpandPlaceholders(gStringVar3, sText_Stats_EvStr1Str2); PrintStatsScreenTextSmall(WIN_STATS_LEFT, gStringVar3, base_x + 29*column, base_y + base_y_offset*base_i); @@ -5757,10 +5748,10 @@ static void PrintStatsScreen_Left(u8 taskId) StringCopy(gStringVar1, sText_Stats_eggGroup_DRAGON); break; case EGG_GROUP_NO_EGGS_DISCOVERED: - StringCopy(gStringVar1, sText_Stats_eggGroup_NO_EGGS_DISCOVERED); + StringCopy(gStringVar1, gText_ThreeDashes); break; default: - StringCopy(gStringVar1, sText_Stats_eggGroup_UNKNOWN); + StringCopy(gStringVar1, gText_ThreeQuestionMarks); break; } //Egg group 2 @@ -5811,10 +5802,10 @@ static void PrintStatsScreen_Left(u8 taskId) StringCopy(gStringVar2, sText_Stats_eggGroup_DRAGON); break; case EGG_GROUP_NO_EGGS_DISCOVERED: - StringCopy(gStringVar2, sText_Stats_eggGroup_NO_EGGS_DISCOVERED); + StringCopy(gStringVar2, gText_ThreeDashes); break; default: - StringCopy(gStringVar2, sText_Stats_eggGroup_UNKNOWN); + StringCopy(gStringVar2, gText_ThreeQuestionMarks); break; } StringExpandPlaceholders(gStringVar3, sText_Stats_eggGroup_Groups); @@ -5941,7 +5932,7 @@ static void EvoFormsPage_PrintNavigationButtons(void) if (!HGSS_DECAPPED) AddTextPrinterParameterized3(WIN_NAVIGATION_BUTTONS, 0, x, y, sStatsPageNavigationTextColor, 0, sText_FORMS_Buttons_Submenu_PE); else - AddTextPrinterParameterized3(WIN_NAVIGATION_BUTTONS, 0, x, y, sStatsPageNavigationTextColor, 0, sText_FORMS_Buttons_Submenu_Decapped_PE); + AddTextPrinterParameterized3(WIN_NAVIGATION_BUTTONS, 0, x, y, sStatsPageNavigationTextColor, 0, sText_FORMS_Buttons_Decapped_PE); } else { @@ -6501,7 +6492,7 @@ static void PrintEvolutionTargetSpeciesAndMethod(u8 taskId, u16 species, u8 dept break; case EVO_LEVEL_NINJASK: ConvertIntToDecimalStringN(gStringVar2, evolutions[i].param, STR_CONV_MODE_LEADING_ZEROS, EVO_SCREEN_LVL_DIGITS); //level - StringExpandPlaceholders(gStringVar4, sText_EVO_LEVEL_NINJASK ); + StringExpandPlaceholders(gStringVar4, sText_EVO_LEVEL ); break; case EVO_LEVEL_SHEDINJA: ConvertIntToDecimalStringN(gStringVar2, evolutions[i].param, STR_CONV_MODE_LEADING_ZEROS, EVO_SCREEN_LVL_DIGITS); //level @@ -6581,7 +6572,7 @@ static void PrintEvolutionTargetSpeciesAndMethod(u8 taskId, u16 species, u8 dept case EVO_SPECIFIC_MAP: mapHeader = Overworld_GetMapHeaderByGroupAndId(evolutions[i].param >> 8, evolutions[i].param & 0xFF); GetMapName(gStringVar2, mapHeader->regionMapSectionId, 0); - StringExpandPlaceholders(gStringVar4, sText_EVO_SPECIFIC_MAP ); + StringExpandPlaceholders(gStringVar4, sText_EVO_MAPSEC ); break; case EVO_LEVEL_NATURE_AMPED: ConvertIntToDecimalStringN(gStringVar2, evolutions[i].param, STR_CONV_MODE_LEADING_ZEROS, EVO_SCREEN_LVL_DIGITS); //level diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index 9492a4a9f8c5..e42599ae5158 100755 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -3589,7 +3589,7 @@ static void Msg_WantToPlayAgain(void) { case 0: sPokemonJumpGfx->msgWindowId = AddMessageWindow(1, 8, 20, 2); - AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_NORMAL, gText_WantToPlayAgain2, 0, 1, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_NORMAL, gText_WantToPlayAgain, 0, 1, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); sPokemonJumpGfx->mainState++; break; @@ -3659,7 +3659,7 @@ static void Msg_SomeoneDroppedOut(void) { case 0: sPokemonJumpGfx->msgWindowId = AddMessageWindow(2, 8, 22, 4); - AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_NORMAL, gText_SomeoneDroppedOut2, 0, 1, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_NORMAL, gText_SomeoneDroppedOut, 0, 1, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); sPokemonJumpGfx->mainState++; break; @@ -3685,7 +3685,7 @@ static void Msg_CommunicationStandby(void) { case 0: sPokemonJumpGfx->msgWindowId = AddMessageWindow(7, 10, 16, 2); - AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_NORMAL, gText_CommunicationStandby4, 0, 1, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_NORMAL, gText_CommunicationStandby, 0, 1, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); sPokemonJumpGfx->mainState++; break; @@ -3774,7 +3774,7 @@ static void PrintPrizeFilledBagMessage(u16 itemId) CopyItemName(itemId, sPokemonJumpGfx->itemName); DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sPokemonJumpGfx->itemName); - DynamicPlaceholderTextUtil_ExpandPlaceholders(sPokemonJumpGfx->prizeMsg, gText_FilledStorageSpace2); + DynamicPlaceholderTextUtil_ExpandPlaceholders(sPokemonJumpGfx->prizeMsg, gText_FilledStorageSpace); sPokemonJumpGfx->msgWindowId = AddMessageWindow(4, 8, 22, 4); AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_NORMAL, sPokemonJumpGfx->prizeMsg, 0, 1, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); @@ -3787,7 +3787,7 @@ static void PrintNoRoomForPrizeMessage(u16 itemId) CopyItemName(itemId, sPokemonJumpGfx->itemName); DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sPokemonJumpGfx->itemName); - DynamicPlaceholderTextUtil_ExpandPlaceholders(sPokemonJumpGfx->prizeMsg, gText_CantHoldMore); + DynamicPlaceholderTextUtil_ExpandPlaceholders(sPokemonJumpGfx->prizeMsg, gText_CantHoldAnyMore); sPokemonJumpGfx->msgWindowId = AddMessageWindow(4, 9, 22, 2); AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_NORMAL, sPokemonJumpGfx->prizeMsg, 0, 1, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); @@ -3909,8 +3909,8 @@ static void PrintScoreSuffixes(void) PutWindowTilemap(WIN_TIMES); FillWindowPixelBuffer(WIN_POINTS, 0); FillWindowPixelBuffer(WIN_TIMES, 0); - AddTextPrinterParameterized3(WIN_POINTS, FONT_SMALL, 0, 1, color, 0, gText_SpacePoints2); - AddTextPrinterParameterized3(WIN_TIMES, FONT_SMALL, 0, 1, color, 0, gText_SpaceTimes3); + AddTextPrinterParameterized3(WIN_POINTS, FONT_SMALL, 0, 1, color, 0, gText_SpacePoints); + AddTextPrinterParameterized3(WIN_TIMES, FONT_SMALL, 0, 1, color, 0, gText_SpaceTimes); } // The venusaurs in the background are actually an empty 256x512 bg with 3 pairs of venusaurs on it. @@ -4435,7 +4435,7 @@ static const struct WindowTemplate sWindowTemplate_Records = .baseBlock = 0x1, }; -static const u8 *const sRecordsTexts[] = {gText_JumpsInARow, gText_BestScore2, gText_ExcellentsInARow}; +static const u8 *const sRecordsTexts[] = {gText_JumpsInARow, gText_BestScore, gText_ExcellentsInARow}; #define tState data[0] #define tWindowId data[1] diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index e34c4d8e375b..c0b8935594af 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -8051,28 +8051,26 @@ static void InitMenu(void) sStorage->menuWindow.baseBlock = 92; } -static const u8 gPCText_Give[] = _("GIVE"); - static const u8 *const sMenuTexts[] = { - [MENU_CANCEL] = COMPOUND_STRING("CANCEL"), + [MENU_CANCEL] = gText_Cancel, [MENU_STORE] = COMPOUND_STRING("STORE"), [MENU_WITHDRAW] = COMPOUND_STRING("WITHDRAW"), [MENU_MOVE] = COMPOUND_STRING("MOVE"), [MENU_SHIFT] = COMPOUND_STRING("SHIFT"), [MENU_PLACE] = COMPOUND_STRING("PLACE"), - [MENU_SUMMARY] = COMPOUND_STRING("SUMMARY"), + [MENU_SUMMARY] = gText_Summary, [MENU_RELEASE] = COMPOUND_STRING("RELEASE"), [MENU_MARK] = COMPOUND_STRING("MARK"), [MENU_JUMP] = COMPOUND_STRING("JUMP"), [MENU_WALLPAPER] = COMPOUND_STRING("WALLPAPER"), - [MENU_NAME] = COMPOUND_STRING("NAME"), + [MENU_NAME] = gText_Name, [MENU_TAKE] = COMPOUND_STRING("TAKE"), - [MENU_GIVE] = gPCText_Give, - [MENU_GIVE_2] = gPCText_Give, - [MENU_SWITCH] = COMPOUND_STRING("SWITCH"), - [MENU_BAG] = COMPOUND_STRING("BAG"), - [MENU_INFO] = COMPOUND_STRING("INFO"), + [MENU_GIVE] = gMenuText_Give, + [MENU_GIVE_2] = gMenuText_Give, + [MENU_SWITCH] = gText_Switch, + [MENU_BAG] = gText_Bag, + [MENU_INFO] = gText_Info, [MENU_SCENERY_1] = COMPOUND_STRING("SCENERY 1"), [MENU_SCENERY_2] = COMPOUND_STRING("SCENERY 2"), [MENU_SCENERY_3] = COMPOUND_STRING("SCENERY 3"), diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 4cfc17c707ea..d346c29f2514 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -2948,7 +2948,7 @@ static void PrintNotEggInfo(void) else SetMonPicBackgroundPalette(TRUE); } - StringCopy(gStringVar1, gText_LevelSymbol); + StringCopy(gStringVar1, gText_Lv); ConvertIntToDecimalStringN(gStringVar2, summary->level, STR_CONV_MODE_LEFT_ALIGN, 3); StringAppend(gStringVar1, gStringVar2); PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_SPECIES, gStringVar1, 24, 17, 0, 1); @@ -3026,18 +3026,18 @@ static void PrintPageNamesAndStats(void) PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_INFO_RENTAL, gText_RentalPkmn, 0, 1, 0, 1); PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_INFO_TYPE, gText_TypeSlash, 0, 1, 0, 0); - statsXPos = 6 + GetStringCenterAlignXOffset(FONT_NORMAL, gText_HP4, 42); - PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT, gText_HP4, statsXPos, 1, 0, 1); - statsXPos = 6 + GetStringCenterAlignXOffset(FONT_NORMAL, gText_Attack3, 42); - PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT, gText_Attack3, statsXPos, 17, 0, 1); - statsXPos = 6 + GetStringCenterAlignXOffset(FONT_NORMAL, gText_Defense3, 42); - PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT, gText_Defense3, statsXPos, 33, 0, 1); - statsXPos = 2 + GetStringCenterAlignXOffset(FONT_NORMAL, gText_SpAtk4, 36); - PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT, gText_SpAtk4, statsXPos, 1, 0, 1); - statsXPos = 2 + GetStringCenterAlignXOffset(FONT_NORMAL, gText_SpDef4, 36); - PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT, gText_SpDef4, statsXPos, 17, 0, 1); - statsXPos = 2 + GetStringCenterAlignXOffset(FONT_NORMAL, gText_Speed2, 36); - PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT, gText_Speed2, statsXPos, 33, 0, 1); + statsXPos = 6 + GetStringCenterAlignXOffset(FONT_NORMAL, gText_HP, 42); + PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT, gText_HP, statsXPos, 1, 0, 1); + statsXPos = 6 + GetStringCenterAlignXOffset(FONT_NORMAL, gText_Attack, 42); + PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT, gText_Attack, statsXPos, 17, 0, 1); + statsXPos = 6 + GetStringCenterAlignXOffset(FONT_NORMAL, gText_Defense, 42); + PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT, gText_Defense, statsXPos, 33, 0, 1); + statsXPos = 2 + GetStringCenterAlignXOffset(FONT_NORMAL, gText_SpAtk, 36); + PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT, gText_SpAtk, statsXPos, 1, 0, 1); + statsXPos = 2 + GetStringCenterAlignXOffset(FONT_NORMAL, gText_SpDef, 36); + PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT, gText_SpDef, statsXPos, 17, 0, 1); + statsXPos = 2 + GetStringCenterAlignXOffset(FONT_NORMAL, gText_Speed, 36); + PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT, gText_Speed, statsXPos, 33, 0, 1); PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_EXP, gText_ExpPoints, 6, 1, 0, 1); PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_EXP, gText_NextLv, 6, 17, 0, 1); PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS, gText_Status, 2, 1, 0, 1); @@ -3349,7 +3349,7 @@ static void BufferNatureString(void) { struct PokemonSummaryScreenData *sumStruct = sMonSummaryScreen; DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gNaturesInfo[sumStruct->summary.nature].name); - DynamicPlaceholderTextUtil_SetPlaceholderPtr(5, gText_EmptyString5); + DynamicPlaceholderTextUtil_SetPlaceholderPtr(5, gText_EmptyString); } static void GetMetLevelString(u8 *output) @@ -4410,7 +4410,7 @@ static inline bool32 ShouldShowRename(void) static void ShowCancelOrRenamePrompt(void) { - const u8 *promptText = ShouldShowRename() ? gText_Rename : gText_Cancel2; + const u8 *promptText = ShouldShowRename() ? gText_Rename : gText_Cancel; int stringXPos = GetStringRightAlignXOffset(FONT_NORMAL, promptText, 62); int iconXPos = stringXPos - 16; diff --git a/src/pokenav_conditions_gfx.c b/src/pokenav_conditions_gfx.c index 8845307c0e6b..7e2db6d48179 100644 --- a/src/pokenav_conditions_gfx.c +++ b/src/pokenav_conditions_gfx.c @@ -30,8 +30,6 @@ 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] = { { @@ -553,7 +551,7 @@ static u32 LoopedTask_CloseMonMarkingsWindow(s32 state) static u8 UNUSED *UnusedPrintNumberString(u8 *dst, u16 num) { u8 *txtPtr = ConvertIntToDecimalStringN(dst, num, STR_CONV_MODE_RIGHT_ALIGN, 4); - txtPtr = StringCopy(txtPtr, gText_Number2); + txtPtr = StringCopy(txtPtr, gText_Number); return txtPtr; } @@ -588,7 +586,7 @@ static bool32 UpdateConditionGraphMenuWindows(u8 mode, u16 bufferIndex, bool8 wi text[2] = TEXT_COLOR_BLUE; text[3] = TEXT_COLOR_TRANSPARENT; text[4] = TEXT_COLOR_LIGHT_BLUE; - StringCopy(&text[5], gText_Number2); + StringCopy(&text[5], gText_Number); AddTextPrinterParameterized(menu->listIndexWindowId, FONT_NORMAL, text, 4, 1, 0, NULL); ConvertIntToDecimalStringN(&text[5], GetConditionMonDataBuffer(), STR_CONV_MODE_RIGHT_ALIGN, 4); AddTextPrinterParameterized(menu->listIndexWindowId, FONT_NORMAL, text, 28, 1, 0, NULL); diff --git a/src/pokenav_match_call_data.c b/src/pokenav_match_call_data.c index 65f3e5578089..3fbe7512be65 100644 --- a/src/pokenav_match_call_data.c +++ b/src/pokenav_match_call_data.c @@ -204,7 +204,7 @@ static const struct MatchCallStructTrainer sNormanMatchCallHeader = .flag = FLAG_ENABLE_NORMAN_MATCH_CALL, .rematchTableIdx = REMATCH_NORMAN, .desc = COMPOUND_STRING("RELIABLE ONE"), - .name = COMPOUND_STRING("DAD"), + .name = gText_Dad, .textData = sNormanTextScripts }; @@ -230,7 +230,7 @@ static const struct MatchCallStructNPC sMomMatchCallHeader = .mapSec = MAPSEC_LITTLEROOT_TOWN, .flag = FLAG_ENABLE_MOM_MATCH_CALL, .desc = COMPOUND_STRING("CALM & KIND"), - .name = COMPOUND_STRING("MOM"), + .name = gText_Mom, .textData = sMomTextScripts }; @@ -251,7 +251,7 @@ static const struct MatchCallStructNPC sStevenMatchCallHeader = .mapSec = MAPSEC_NONE, .flag = FLAG_REGISTERED_STEVEN_POKENAV, .desc = COMPOUND_STRING("HARD AS ROCK"), - .name = COMPOUND_STRING("STEVEN"), + .name = gText_Steven, .textData = sStevenTextScripts }; diff --git a/src/pokenav_match_call_gfx.c b/src/pokenav_match_call_gfx.c index 80e2709cf0da..81c4fa9a8b12 100755 --- a/src/pokenav_match_call_gfx.c +++ b/src/pokenav_match_call_gfx.c @@ -206,7 +206,7 @@ static const u8 *const sMatchCallOptionTexts[MATCH_CALL_OPTION_COUNT] = { [MATCH_CALL_OPTION_CALL] = COMPOUND_STRING("CALL"), [MATCH_CALL_OPTION_CHECK] = COMPOUND_STRING("CHECK"), - [MATCH_CALL_OPTION_CANCEL] = COMPOUND_STRING("CANCEL") + [MATCH_CALL_OPTION_CANCEL] = gText_Cancel, }; // The series of 5 dots that appear when someone is called with Match Call diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index 98ccb71b640d..bd64bd517688 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -375,12 +375,12 @@ static void PrintTime(u8 windowId, u8 x, u8 y, u16 days, u8 hours, u8 minutes, u // Print hours ConvertIntToDecimalStringN(gStringVar1, hours, STR_CONV_MODE_RIGHT_ALIGN, 3); dest = StringCopy(dest, gStringVar1); - dest = StringCopy(dest, gText_Colon3); + dest = StringCopy(dest, gText_Colon); // Print minutes ConvertIntToDecimalStringN(gStringVar1, minutes, STR_CONV_MODE_LEADING_ZEROS, 2); dest = StringCopy(dest, gStringVar1); - dest = StringCopy(dest, gText_Colon3); + dest = StringCopy(dest, gText_Colon); // Print seconds ConvertIntToDecimalStringN(gStringVar1, seconds, STR_CONV_MODE_LEADING_ZEROS, 2); @@ -393,7 +393,7 @@ static void ShowChooseTimeWindow(u8 windowId, u16 days, u8 hours, u8 minutes, u8 { DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, 0x214, 0xE); PrintTime(windowId, 0, 1, days, hours, minutes, seconds); - AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_Confirm2, 126, 1, 0, NULL); + AddTextPrinterParameterized(windowId, FONT_NORMAL, gMenuText_Confirm, 126, 1, 0, NULL); ScheduleBgCopyTilemapToVram(0); } diff --git a/src/script_menu.c b/src/script_menu.c index 706c4ac71517..26ce7d600a10 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -1071,14 +1071,14 @@ static void CreateStartMenuForPokenavTutorial(void) { u8 windowId = CreateWindowFromRect(21, 0, 7, 18); SetStandardWindowBorderStyle(windowId, FALSE); - AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_MenuOptionPokedex, 8, 9, TEXT_SKIP_DRAW, NULL); - AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_MenuOptionPokemon, 8, 25, TEXT_SKIP_DRAW, NULL); - AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_MenuOptionBag, 8, 41, TEXT_SKIP_DRAW, NULL); - AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_MenuOptionPokenav, 8, 57, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_Pokedex, 8, 9, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_Pokemon, 8, 25, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_Bag, 8, 41, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_Pokenav, 8, 57, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, gSaveBlock2Ptr->playerName, 8, 73, TEXT_SKIP_DRAW, NULL); - AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_MenuOptionSave, 8, 89, TEXT_SKIP_DRAW, NULL); - AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_MenuOptionOption, 8, 105, TEXT_SKIP_DRAW, NULL); - AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_MenuOptionExit, 8, 121, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_Save, 8, 89, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_Option, 8, 105, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_Exit, 8, 121, TEXT_SKIP_DRAW, NULL); InitMenuNormal(windowId, FONT_NORMAL, 0, 9, 16, ARRAY_COUNT(MultichoiceList_ForcedStartMenu), 0); InitMultichoiceNoWrap(FALSE, ARRAY_COUNT(MultichoiceList_ForcedStartMenu), windowId, MULTI_FORCED_START_MENU); CopyWindowToVram(windowId, COPYWIN_FULL); diff --git a/src/shop.c b/src/shop.c index a343bab0d3ee..19ae7508db13 100644 --- a/src/shop.c +++ b/src/shop.c @@ -563,7 +563,7 @@ static void BuyMenuBuildListMenuTemplate(void) for (i = 0; i < sMartInfo.itemCount; i++) BuyMenuSetListEntry(&sListMenuItems[i], sMartInfo.itemList[i], sItemNames[i]); - StringCopy(sItemNames[i], gText_Cancel2); + StringCopy(sItemNames[i], gText_Cancel); sListMenuItems[i].name = sItemNames[i]; sListMenuItems[i].id = LIST_CANCEL; @@ -678,7 +678,7 @@ static void BuyMenuRemoveScrollIndicatorArrows(void) static void BuyMenuPrintCursor(u8 scrollIndicatorsTaskId, u8 colorSet) { u8 y = ListMenuGetYCoordForPrintingArrowCursor(scrollIndicatorsTaskId); - BuyMenuPrint(WIN_ITEM_LIST, gText_SelectorArrow2, 0, y, 0, colorSet); + BuyMenuPrint(WIN_ITEM_LIST, gText_SelectorArrow, 0, y, 0, colorSet); } static void BuyMenuAddItemIcon(u16 item, u8 iconSlot) @@ -1025,7 +1025,7 @@ static void Task_BuyMenu(u8 taskId) else if (ItemId_GetPocket(itemId) == POCKET_TM_HM) { StringCopy(gStringVar2, GetMoveName(ItemIdToBattleMoveId(itemId))); - BuyMenuDisplayMessage(taskId, gText_Var1CertainlyHowMany2, Task_BuyHowManyDialogueInit); + BuyMenuDisplayMessage(taskId, gText_Var1CertainlyHowMany, Task_BuyHowManyDialogueInit); } else { diff --git a/src/sprays.c b/src/sprays.c index b553d125ac24..abc2ae241ae2 100644 --- a/src/sprays.c +++ b/src/sprays.c @@ -97,7 +97,7 @@ void DrawSprayMenu(void) } gSpecialVar_0x8003 = count; - menuItems[count].text = gText_Cancel2; + menuItems[count].text = gText_Cancel; DrawMultichoiceMenuInternal(18, yCoord, 0, FALSE, menuPos, menuItems, count+1); } diff --git a/src/start_menu.c b/src/start_menu.c index 0c364bb07dea..67ae09e9956c 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -186,19 +186,19 @@ static const u8 sText_MenuDebug[] = _("DEBUG"); static const struct MenuAction sStartMenuItems[] = { - [MENU_ACTION_POKEDEX] = {gText_MenuPokedex, {.u8_void = StartMenuPokedexCallback}}, - [MENU_ACTION_POKEMON] = {gText_MenuPokemon, {.u8_void = StartMenuPokemonCallback}}, - [MENU_ACTION_BAG] = {gText_MenuBag, {.u8_void = StartMenuBagCallback}}, - [MENU_ACTION_POKENAV] = {gText_MenuPokenav, {.u8_void = StartMenuPokeNavCallback}}, + [MENU_ACTION_POKEDEX] = {gText_Pokedex, {.u8_void = StartMenuPokedexCallback}}, + [MENU_ACTION_POKEMON] = {gText_Pokemon, {.u8_void = StartMenuPokemonCallback}}, + [MENU_ACTION_BAG] = {gText_Bag, {.u8_void = StartMenuBagCallback}}, + [MENU_ACTION_POKENAV] = {gText_Pokenav, {.u8_void = StartMenuPokeNavCallback}}, [MENU_ACTION_PLAYER] = {gText_MenuPlayer, {.u8_void = StartMenuPlayerNameCallback}}, - [MENU_ACTION_SAVE] = {gText_MenuSave, {.u8_void = StartMenuSaveCallback}}, - [MENU_ACTION_OPTION] = {gText_MenuOption, {.u8_void = StartMenuOptionCallback}}, - [MENU_ACTION_EXIT] = {gText_MenuExit, {.u8_void = StartMenuExitCallback}}, - [MENU_ACTION_RETIRE_SAFARI] = {gText_MenuRetire, {.u8_void = StartMenuSafariZoneRetireCallback}}, + [MENU_ACTION_SAVE] = {gText_Save, {.u8_void = StartMenuSaveCallback}}, + [MENU_ACTION_OPTION] = {gText_Option, {.u8_void = StartMenuOptionCallback}}, + [MENU_ACTION_EXIT] = {gText_Exit, {.u8_void = StartMenuExitCallback}}, + [MENU_ACTION_RETIRE_SAFARI] = {gText_Retire, {.u8_void = StartMenuSafariZoneRetireCallback}}, [MENU_ACTION_PLAYER_LINK] = {gText_MenuPlayer, {.u8_void = StartMenuLinkModePlayerNameCallback}}, - [MENU_ACTION_REST_FRONTIER] = {gText_MenuRest, {.u8_void = StartMenuSaveCallback}}, - [MENU_ACTION_RETIRE_FRONTIER] = {gText_MenuRetire, {.u8_void = StartMenuBattlePyramidRetireCallback}}, - [MENU_ACTION_PYRAMID_BAG] = {gText_MenuBag, {.u8_void = StartMenuBattlePyramidBagCallback}}, + [MENU_ACTION_REST_FRONTIER] = {gText_Rest, {.u8_void = StartMenuSaveCallback}}, + [MENU_ACTION_RETIRE_FRONTIER] = {gText_Retire, {.u8_void = StartMenuBattlePyramidRetireCallback}}, + [MENU_ACTION_PYRAMID_BAG] = {gText_Bag, {.u8_void = StartMenuBattlePyramidBagCallback}}, [MENU_ACTION_DEBUG] = {sText_MenuDebug, {.u8_void = StartMenuDebugCallback}}, }; @@ -1408,14 +1408,14 @@ static void ShowSaveInfoWindow(void) // Print player name yOffset += 16; - AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gText_SavingPlayer, 0, yOffset, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gText_Player, 0, yOffset, TEXT_SKIP_DRAW, NULL); BufferSaveMenuText(SAVE_MENU_NAME, gStringVar4, color); xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 0x70); PrintPlayerNameOnWindow(sSaveInfoWindowId, gStringVar4, xOffset, yOffset); // Print badge count yOffset += 16; - AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gText_SavingBadges, 0, yOffset, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gText_Badges, 0, yOffset, TEXT_SKIP_DRAW, NULL); BufferSaveMenuText(SAVE_MENU_BADGES, gStringVar4, color); xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 0x70); AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gStringVar4, xOffset, yOffset, TEXT_SKIP_DRAW, NULL); @@ -1424,7 +1424,7 @@ static void ShowSaveInfoWindow(void) { // Print Pokédex count yOffset += 16; - AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gText_SavingPokedex, 0, yOffset, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gText_Pokedex, 0, yOffset, TEXT_SKIP_DRAW, NULL); BufferSaveMenuText(SAVE_MENU_CAUGHT, gStringVar4, color); xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 0x70); AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gStringVar4, xOffset, yOffset, TEXT_SKIP_DRAW, NULL); @@ -1432,7 +1432,7 @@ static void ShowSaveInfoWindow(void) // Print play time yOffset += 16; - AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gText_SavingTime, 0, yOffset, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gText_Time, 0, yOffset, TEXT_SKIP_DRAW, NULL); BufferSaveMenuText(SAVE_MENU_PLAY_TIME, gStringVar4, color); xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 0x70); AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gStringVar4, xOffset, yOffset, TEXT_SKIP_DRAW, NULL); diff --git a/src/strings.c b/src/strings.c index fb3c96eb9db8..359b9c4e165a 100644 --- a/src/strings.c +++ b/src/strings.c @@ -7,8 +7,6 @@ ALIGNED(4) const u8 gText_ExpandedPlaceholder_Empty[] = _(""); const u8 gText_ExpandedPlaceholder_Kun[] = _(""); const u8 gText_ExpandedPlaceholder_Chan[] = _(""); -const u8 gText_ExpandedPlaceholder_Sapphire[] = _("SAPPHIRE"); -const u8 gText_ExpandedPlaceholder_Ruby[] = _("RUBY"); const u8 gText_ExpandedPlaceholder_Emerald[] = _("EMERALD"); const u8 gText_ExpandedPlaceholder_Aqua[] = _("AQUA"); const u8 gText_ExpandedPlaceholder_Magma[] = _("MAGMA"); @@ -20,22 +18,7 @@ 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_Player[] = _("PLAYER"); // Unused -const u8 gText_Pokedex[] = _("POKéDEX"); // Unused const u8 gText_Time[] = _("TIME"); -const u8 gText_Badges[] = _("BADGES"); // Unused -const u8 gText_AButton[] = _("A Button"); // Unused -const u8 gText_BButton[] = _("B Button"); // Unused -const u8 gText_RButton[] = _("R Button"); // Unused -const u8 gText_LButton[] = _("L Button"); // Unused -const u8 gText_Start[] = _("START"); // Unused -const u8 gText_Select[] = _("SELECT"); // Unused -const u8 gText_ControlPad[] = _("+ Control Pad"); // Unused -const u8 gText_LButtonRButton[] = _("L Button R Button"); // Unused -const u8 gText_Controls[] = _("CONTROLS"); // Unused -ALIGNED(4) const u8 gText_PickOk[] = _("{DPAD_UPDOWN}PICK {A_BUTTON}OK"); // Unused -ALIGNED(4) const u8 gText_Next[] = _("{A_BUTTON}NEXT"); // Unused -ALIGNED(4) const u8 gText_NextBack[] = _("{A_BUTTON}NEXT {B_BUTTON}BACK"); // Unused ALIGNED(4) const u8 gText_PickNextCancel[] = _("{DPAD_UPDOWN}PICK {A_BUTTON}NEXT {B_BUTTON}CANCEL"); ALIGNED(4) const u8 gText_PickCancel[] = _("{DPAD_UPDOWN}PICK {A_BUTTON}{B_BUTTON}CANCEL"); ALIGNED(4) const u8 gText_AButtonExit[] = _("{A_BUTTON}EXIT"); @@ -45,12 +28,7 @@ const u8 gText_UnkHeight[] = _("{CLEAR_TO 0x0C}??'??”"); const u8 gText_UnkHeightMetric[] = _("???.? m"); const u8 gText_UnkWeight[] = _("????.? lbs."); const u8 gText_UnkWeightMetric[] = _("???.? kg."); -const u8 gText_EmptyPkmnCategory[] = _(" POKéMON"); // Unused -const u8 gText_EmptyHeight[] = _("{CLEAR_TO 0x0C} ' ”"); // Unused -const u8 gText_EmptyWeight[] = _(" . lbs."); // Unused -const u8 gText_EmptyPokedexInfo1[] = _(""); // Unused const u8 gText_CryOf[] = _("CRY OF"); -const u8 gText_EmptyPokedexInfo2[] = _(""); // Unused const u8 gText_SizeComparedTo[] = _("SIZE COMPARED TO "); const u8 gText_PokedexRegistration[] = _("POKéDEX registration completed."); const u8 gText_HTHeight[] = _("HT"); @@ -102,34 +80,26 @@ const u8 gText_DexSortHeaviestDescription[] = _("Owned POKéMON are listed from const u8 gText_DexSortLightestDescription[] = _("Owned POKéMON are listed from the\nlightest to the heaviest."); const u8 gText_DexSortTallestDescription[] = _("Owned POKéMON are listed from the\ntallest to the smallest."); const u8 gText_DexSortSmallestDescription[] = _("Owned POKéMON are listed from the\nsmallest to the tallest."); -const u8 gText_DexEmptyString[] = _(""); const u8 gText_DexSearchDontSpecify[] = _("DON'T SPECIFY."); -const u8 gText_DexSearchTypeNone[] = _("NONE"); const u8 gText_SelectorArrow[] = _("▶"); -const u8 gText_EmptySpace[] = _(" "); // Unused const u8 gText_WelcomeToHOF[] = _("Welcome to the HALL OF FAME!"); const u8 gText_HOFDexRating[] = _("Spotted POKéMON: {STR_VAR_1}!\nOwned POKéMON: {STR_VAR_2}!\pPROF. BIRCH's POKéDEX rating!\pPROF. BIRCH: Let's see…\p"); -const u8 gText_HOFDexSaving[] = _("SAVING…\nDON'T TURN OFF THE POWER."); const u8 gText_HOFCorrupted[] = _("The HALL OF FAME data is corrupted."); const u8 gText_HOFNumber[] = _("HALL OF FAME No. {STR_VAR_1}"); const u8 gText_LeagueChamp[] = _("LEAGUE CHAMPION!\nCONGRATULATIONS!"); const u8 gText_Number[] = _("No. "); const u8 gText_Level[] = _("Lv. "); -const u8 gText_IdNumberSlash[] = _("IDNo. /"); // Unused const u8 gText_Name[] = _("NAME"); const u8 gText_IDNumber[] = _("IDNo."); const u8 gText_BirchInTrouble[] = _("PROF. BIRCH is in trouble!\nRelease a POKéMON and rescue him!"); const u8 gText_ConfirmStarterChoice[] = _("Do you choose this POKéMON?"); -const u8 gText_Pokemon4[] = _("POKéMON"); // Unused const u8 gText_FlyToWhere[] = _("FLY to where?"); const u8 gMenuText_Use[] = _("USE"); const u8 gMenuText_Toss[] = _("TOSS"); -const u8 gMenuText_Register[] = _("REGISTER"); const u8 gMenuText_Give[] = _("GIVE"); const u8 gMenuText_Confirm[] = _("CONFIRM"); const u8 gText_Cancel[] = _("CANCEL"); -const u8 gText_Cancel2[] = _("CANCEL"); -const u8 gText_EmptyString2[] = _(""); +const u8 gText_EmptyString[] = _(""); const u8 gText_None[] = _("NONE"); const u8 gText_FiveMarks[] = _("?????"); const u8 gText_Slash[] = _("/"); @@ -138,17 +108,12 @@ const u8 gText_TwoDashes[] = _("--"); const u8 gText_ThreeDashes[] = _("---"); const u8 gText_MaleSymbol[] = _("♂"); const u8 gText_FemaleSymbol[] = _("♀"); -const u8 gText_LevelSymbol[] = _("{LV}"); const u8 gText_NumberClear01[] = _("{NO}{CLEAR 0x01}"); -const u8 gText_RightArrow[] = _("{RIGHT_ARROW}"); // Unused const u8 gText_IDNumber2[] = _("{ID}{NO}"); const u8 gText_Space[] = _(" "); -const u8 gText_SelectorArrow2[] = _("▶"); const u8 gText_GoBackPrevMenu[] = _("Go back to the\nprevious menu."); const u8 gText_WhatWouldYouLike[] = _("What would you like to do?"); -const u8 gMenuText_Give2[] = _("GIVE"); const u8 gText_xVar1[] = _("×{STR_VAR_1}"); -const u8 gText_Berry2[] = _(" BERRY"); // Unused const u8 gText_Coins[] = _("{STR_VAR_1} COINS"); const u8 gText_CloseBag[] = _("CLOSE BAG"); const u8 gText_Var1IsSelected[] = _("{STR_VAR_1}\nis selected."); @@ -199,11 +164,11 @@ const u8 gText_ReturnToVar1[] = _("Return to\n{STR_VAR_1}."); const u8 *const gPocketNamesStringsTable[] = { - [ITEMS_POCKET] = COMPOUND_STRING("ITEMS"), - [BALLS_POCKET] = COMPOUND_STRING("POKé BALLS"), - [TMHM_POCKET] = COMPOUND_STRING("TMs & HMs"), - [BERRIES_POCKET] = COMPOUND_STRING("BERRIES"), - [KEYITEMS_POCKET] = COMPOUND_STRING("KEY ITEMS") + [ITEMS_POCKET] = gText_Items, + [BALLS_POCKET] = gText_Poke_Balls, + [TMHM_POCKET] = gText_TMs_HMs, + [BERRIES_POCKET] = gText_Berries, + [KEYITEMS_POCKET] = gText_Key_Items }; const u8 gText_NumberItem_TMBerry[] = _("{NO}{STR_VAR_1}{CLEAR 0x07}{STR_VAR_2}"); @@ -217,7 +182,6 @@ const u8 gText_SoldOut[] = _("SOLD OUT"); const u8 gText_InBagVar1[] = _("IN BAG: {STR_VAR_1}"); const u8 gText_QuitShopping[] = _("Quit shopping."); const u8 gText_Var1CertainlyHowMany[] = _("{STR_VAR_1}? Certainly.\nHow many would you like?"); -const u8 gText_Var1CertainlyHowMany2[] = _("{STR_VAR_1}? Certainly.\nHow many would you like?"); const u8 gText_Var1AndYouWantedVar2[] = _("{STR_VAR_1}? And you wanted {STR_VAR_2}?\nThat will be ¥{STR_VAR_3}."); const u8 gText_Var1IsItThatllBeVar2[] = _("{STR_VAR_1}, is it?\nThat'll be ¥{STR_VAR_2}. Do you want it?"); const u8 gText_YouWantedVar1ThatllBeVar2[] = _("You wanted {STR_VAR_1}?\nThat'll be ¥{STR_VAR_2}. Will that be okay?"); @@ -236,9 +200,7 @@ const u8 gText_HowManyToSell[] = _("{STR_VAR_2}?\nHow many would you like to sel const u8 gText_ICanPayVar1[] = _("I can pay ¥{STR_VAR_1}.\nWould that be okay?"); const u8 gText_TurnedOverVar1ForVar2[] = _("Turned over the {STR_VAR_2}\nand received ¥{STR_VAR_1}."); const u8 gText_PokedollarVar1[] = _("¥{STR_VAR_1}"); -const u8 gText_HP3[] = _("HP"); -const u8 gText_SpAtk3[] = _("SP. ATK"); -const u8 gText_SpDef3[] = _("SP. DEF"); +const u8 gText_HP[] = _("HP"); const u8 gText_WontHaveEffect[] = _("It won't have any effect.{PAUSE_UNTIL_PRESS}"); const u8 gText_NextFusionMon[] = _("Choose {PKMN} to fuse with."); const u8 gText_CantBeUsedOnPkmn[] = _("This can't be used on\nthat POKéMON.{PAUSE_UNTIL_PRESS}"); @@ -264,10 +226,10 @@ const u8 gText_SwitchedPkmnItem[] = _("The {STR_VAR_2} was taken and\nreplaced w const u8 gText_PkmnHoldingItemCantHoldMail[] = _("This POKéMON is holding an\nitem. It cannot hold MAIL.{PAUSE_UNTIL_PRESS}"); const u8 gText_MailTransferredFromMailbox[] = _("MAIL was transferred from\nthe MAILBOX.{PAUSE_UNTIL_PRESS}"); const u8 gText_BagFullCouldNotRemoveItem[] = _("The BAG is full. The POKéMON's\nitem could not be removed.{PAUSE_UNTIL_PRESS}"); -const u8 gText_PkmnLearnedMove3[] = _("{STR_VAR_1} learned\n{STR_VAR_2}!"); +const u8 gText_PkmnLearnedMove[] = _("{STR_VAR_1} learned\n{STR_VAR_2}!"); const u8 gText_PkmnCantLearnMove[] = _("{STR_VAR_1} and {STR_VAR_2}\nare not compatible.\p{STR_VAR_2} can't be\nlearned.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnNeedsToReplaceMove[] = _("{STR_VAR_1} wants to learn the\nmove {STR_VAR_2}.\pHowever, {STR_VAR_1} already\nknows four moves.\pShould a move be deleted and\nreplaced with {STR_VAR_2}?"); -const u8 gText_StopLearningMove2[] = _("Stop trying to teach\n{STR_VAR_2}?"); +const u8 gText_StopLearningMove[] = _("Stop trying to teach\n{STR_VAR_2}?"); const u8 gText_MoveNotLearned[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}.{PAUSE_UNTIL_PRESS}"); const u8 gText_WhichMoveToForget[] = _("Which move should be forgotten?{PAUSE_UNTIL_PRESS}"); const u8 gText_12PoofForgotMove[] = _("1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_BALL_BOUNCE_1}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd…{PAUSE_UNTIL_PRESS}"); @@ -280,7 +242,6 @@ const u8 gText_PkmnBurnHealed[] = _("{STR_VAR_1}'s burn was healed.{PAUSE_UNTIL_ const u8 gText_PkmnFrostbiteHealed[] = _("{STR_VAR_1}'s frostbite was healed.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnThawedOut[] = _("{STR_VAR_1} was thawed out.{PAUSE_UNTIL_PRESS}"); const u8 gText_PPWasRestored[] = _("PP was restored.{PAUSE_UNTIL_PRESS}"); -const u8 gText_PkmnRegainhedHealth[] = _("{STR_VAR_1} regained health.{PAUSE_UNTIL_PRESS}"); // Unused const u8 gText_PkmnBecameHealthy[] = _("{STR_VAR_1} became healthy.{PAUSE_UNTIL_PRESS}"); const u8 gText_MovesPPIncreased[] = _("{STR_VAR_1}'s PP increased.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnElevatedToLvVar2[] = _("{STR_VAR_1} was elevated to\nLv. {STR_VAR_2}."); @@ -295,7 +256,6 @@ const u8 gText_PkmnGotOverInfatuation[] = _("{STR_VAR_1} got over its\ninfatuati const u8 gText_PkmnTransformed[] = _("{STR_VAR_1} transformed!{PAUSE_UNTIL_PRESS}"); const u8 gText_ThrowAwayItem[] = _("Throw away this\n{STR_VAR_1}?"); const u8 gText_ItemThrownAway[] = _("The {STR_VAR_1}\nwas thrown away.{PAUSE_UNTIL_PRESS}"); -const u8 gText_TeachWhichPokemon2[] = _("Teach which POKéMON?"); // Unused const u8 gText_ChoosePokemon[] = _("Choose a POKéMON."); const u8 gText_MoveToWhere[] = _("Move to where?"); const u8 gText_TeachWhichPokemon[] = _("Teach which POKéMON?"); @@ -310,7 +270,6 @@ const u8 gText_RestoreWhichMove[] = _("Restore which move?"); const u8 gText_BoostPp[] = _("Boost PP of which move?"); const u8 gText_DoWhatWithItem[] = _("Do what with an item?"); const u8 gText_NoPokemonForBattle[] = _("No POKéMON for battle!"); -const u8 gText_ChoosePokemon2[] = _("Choose a POKéMON."); const u8 gText_NotEnoughHp[] = _("Not enough HP…"); const u8 gText_PokemonAreNeeded[] = _("{STR_VAR_1} POKéMON are needed."); const u8 gText_PokemonCantBeSame[] = _("POKéMON can't be the same."); @@ -320,7 +279,6 @@ const u8 gText_DoWhatWithMail[] = _("Do what with the MAIL?"); const u8 gText_ChoosePokemonCancel[] = _("Choose POKéMON or CANCEL."); const u8 gText_ChoosePokemonConfirm[] = _("Choose POKéMON and confirm."); const u8 gText_EnjoyCycling[] = _("Let's enjoy cycling!"); -const u8 gText_InUseAlready_PM[] = _("This is in use already."); const u8 gText_AlreadyHoldingOne[] = _("{STR_VAR_1} is already holding\none {STR_VAR_2}."); const u8 gText_WhichAppliance[] = _("Order which\nappliance?"); const u8 gText_NoUse[] = _("No use."); @@ -328,7 +286,6 @@ const u8 gText_Able[] = _("ABLE"); const u8 gText_First_PM[] = _("FIRST"); const u8 gText_Second_PM[] = _("SECOND"); const u8 gText_Third_PM[] = _("THIRD"); -const u8 gText_Able2[] = _("ABLE"); const u8 gText_NotAble[] = _("NOT ABLE"); const u8 gText_Able3[] = _("ABLE!"); const u8 gText_NotAble2[] = _("NOT ABLE!"); @@ -355,13 +312,6 @@ ALIGNED(4) const u8 gText_CantTradeWithTrainer[] = _("You can't trade with that\ ALIGNED(4) const u8 gText_NotPkmnOtherTrainerWants[] = _("That isn't the type of POKéMON\nthat the other TRAINER wants."); ALIGNED(4) const u8 gText_ThatIsntAnEgg[] = _("That isn't an EGG."); const u8 gText_Register[] = _("REGISTER"); -const u8 gText_Attack3[] = _("ATTACK"); -const u8 gText_Defense3[] = _("DEFENSE"); -const u8 gText_SpAtk4[] = _("SP. ATK"); -const u8 gText_SpDef4[] = _("SP. DEF"); -const u8 gText_Speed2[] = _("SPEED"); -const u8 gText_HP4[] = _("HP"); -const u8 gText_EmptyString8[] = _(""); // Unused const u8 gText_OTSlash[] = _("OT/"); const u8 gText_RentalPkmn[] = _("RENTAL POKéMON"); const u8 gText_TypeSlash[] = _("TYPE/"); @@ -373,8 +323,6 @@ const u8 gText_Status[] = _("STATUS"); const u8 gText_ExpPoints[] = _("EXP. POINTS"); const u8 gText_NextLv[] = _("NEXT LV."); const u8 gText_RibbonsVar1[] = _("RIBBONS: {STR_VAR_1}"); -const u8 gText_EmptyString5[] = _(""); -const u8 gText_Events[] = _("EVENTS"); // Unused const u8 gText_Switch[] = _("SWITCH"); const u8 gText_PkmnInfo[] = _("POKéMON INFO"); const u8 gText_PkmnSkills[] = _("POKéMON SKILLS"); @@ -404,10 +352,8 @@ const u8 gText_OkayToDeleteFromRegistry[] = _("Is it okay to delete {STR_VAR_1}\ const u8 gText_RegisteredDataDeleted[] = _("The registered data was deleted.{PAUSE_UNTIL_PRESS}"); const u8 gText_NoRegistry[] = _("There is no REGISTRY.{PAUSE_UNTIL_PRESS}"); const u8 gText_DelRegist[] = _("DEL REGIST."); -const u8 gText_Var3Var1SlashVar2[] = _("{STR_VAR_3}{STR_VAR_1}/{STR_VAR_2}"); // Unused const u8 gText_Decorate[] = _("DECORATE"); const u8 gText_PutAway[] = _("PUT AWAY"); -const u8 gText_Toss2[] = _("TOSS"); const u8 gText_Color161Shadow161[] = _("{COLOR 161}{SHADOW 161}"); const u8 gText_PutOutSelectedDecorItem[] = _("Put out the selected decoration item."); const u8 gText_StoreChosenDecorInPC[] = _("Store the chosen decoration in the PC."); @@ -428,8 +374,6 @@ const u8 gText_CantBePlacedHere[] = _("It can't be placed here."); const u8 gText_CancelDecorating[] = _("Cancel decorating?"); const u8 gText_InUseAlready[] = _("This is in use already."); const u8 gText_NoMoreDecorations[] = _("No more decorations can be placed.\nThe most that can be placed are {STR_VAR_1}."); -const u8 gText_NoMoreDecorations2[] = _("No more decorations can be placed.\nThe most that can be placed are {STR_VAR_1}."); -const u8 gText_MustBePlacedOnDesk[] = _("This can't be placed here.\nIt must be on a DESK, etc."); // Unused const u8 gText_CantPlaceInRoom[] = _("This decoration can't be placed in\nyour own room."); const u8 gText_CantThrowAwayInUse[] = _("This decoration is in use.\nIt can't be thrown away."); const u8 gText_DecorationWillBeDiscarded[] = _("This {STR_VAR_1} will be discarded.\nIs that okay?"); @@ -457,13 +401,12 @@ const u8 gText_Brawly[] = _("BRAWLY"); const u8 gText_Winona[] = _("WINONA"); const u8 gText_Phoebe[] = _("PHOEBE"); const u8 gText_Glacia[] = _("GLACIA"); -const u8 gText_Info2[] = _("INFO"); const u8 gText_CoolnessContest[] = _("COOLNESS CONTEST"); const u8 gText_BeautyContest[] = _("BEAUTY CONTEST"); const u8 gText_CutenessContest[] = _("CUTENESS CONTEST"); const u8 gText_SmartnessContest[] = _("SMARTNESS CONTEST"); const u8 gText_ToughnessContest[] = _("TOUGHNESS CONTEST"); -const u8 gText_Decoration2[] = _("DECORATION"); +const u8 gText_Decoration[] = _("DECORATION"); const u8 gText_PackUp[] = _("PACK UP"); const u8 gText_Registry[] = _("REGISTRY"); const u8 gText_Information[] = _("INFORMATION"); @@ -485,16 +428,10 @@ const u8 gText_Normal[] = _("NORMAL"); const u8 gText_Super[] = _("SUPER"); const u8 gText_Hyper[] = _("HYPER"); const u8 gText_Master[] = _("MASTER"); -const u8 gText_Cool2[] = _("COOL"); -const u8 gText_Beauty2[] = _("BEAUTY"); -const u8 gText_Cute2[] = _("CUTE"); -const u8 gText_Smart2[] = _("SMART"); -const u8 gText_Tough2[] = _("TOUGH"); const u8 gText_Items[] = _("ITEMS"); const u8 gText_Key_Items[] = _("KEY ITEMS"); const u8 gText_Poke_Balls[] = _("POKé BALLS"); -const u8 gText_TMs_Hms[] = _("TMs & HMs"); -const u8 gText_Berries2[] = _("BERRIES"); +const u8 gText_TMs_HMs[] = _("TMs & HMs"); const u8 gText_SomeonesPC[] = _("SOMEONE'S PC"); const u8 gText_LanettesPC[] = _("LANETTE'S PC"); const u8 gText_PlayersPC[] = _("{PLAYER}'s PC"); @@ -503,18 +440,12 @@ const u8 gText_LogOff[] = _("LOG OFF"); const u8 gText_Opponent[] = _("OPPONENT"); const u8 gText_Tourney_Tree[] = _("TOURNEY TREE"); const u8 gText_ReadyToStart[] = _("READY TO START"); -const u8 gText_Single2[] = _("SINGLE"); -const u8 gText_Double2[] = _("DOUBLE"); const u8 gText_Multi[] = _("MULTI"); const u8 gText_MultiLink[] = _("MULTI-LINK"); -const u8 gText_MenuOptionPokedex[] = _("POKéDEX"); -const u8 gText_MenuOptionPokemon[] = _("POKéMON"); -const u8 gText_MenuOptionBag[] = _("BAG"); -const u8 gText_MenuOptionPokenav[] = _("POKéNAV"); -const u8 gText_Blank[] = _(""); -const u8 gText_MenuOptionSave[] = _("SAVE"); -const u8 gText_MenuOptionOption[] = _("OPTION"); -const u8 gText_MenuOptionExit[] = _("EXIT"); +const u8 gText_Pokedex[] = _("POKéDEX"); +const u8 gText_Bag[] = _("BAG"); +const u8 gText_Pokenav[] = _("POKéNAV"); +const u8 gText_Save[] = _("SAVE"); const u8 gText_SouthernIsland[] = _("SOUTHERN ISLAND"); const u8 gText_BirthIsland[] = _("BIRTH ISLAND"); const u8 gText_FarawayIsland[] = _("FARAWAY ISLAND"); @@ -526,7 +457,6 @@ const u8 gText_ExpertTagMatch[] = _("EXPERT TAG MATCH"); const u8 gText_TradeCenter[] = _("TRADE CENTER"); const u8 gText_Colosseum[] = _("COLOSSEUM"); const u8 gText_RecordCorner[] = _("RECORD CORNER"); -const u8 gText_BerryCrush3[] = _("BERRY CRUSH"); const u8 gText_BattleRules[] = _("BATTLE RULES"); const u8 gText_JudgeMind[] = _("JUDGE: MIND"); const u8 gText_JudgeSkill[] = _("JUDGE: SKILL"); @@ -543,7 +473,6 @@ const u8 gText_WhenInDanger[] = _("WHEN IN DANGER"); const u8 gText_BattlePokemon[] = _("BATTLE POKéMON"); const u8 gText_BattleTrainers[] = _("BATTLE TRAINERS"); const u8 gText_GoOn[] = _("GO ON"); -const u8 gText_Record2[] = _("RECORD"); const u8 gText_Rest[] = _("REST"); const u8 gText_Retire[] = _("RETIRE"); const u8 gText_1F[] = _("1F"); @@ -572,21 +501,13 @@ const u8 gText_Exit[] = _("EXIT"); const u8 gText_YourPartysFull[] = _("Your party's full!{PAUSE_UNTIL_PRESS}"); const u8 gText_NatureSlash[] = _("NATURE/"); const u8 gText_InParty[] = _("IN PARTY"); -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_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 const u8 gText_CombineFourWordsOrPhrases[] = _("Combine four words or phrases"); const u8 gText_AndMakeYourProfile[] = _("and make your profile."); const u8 gText_CombineSixWordsOrPhrases[] = _("Combine six words or phrases"); const u8 gText_AndMakeAMessage[] = _("and make a message."); const u8 gText_FindWordsThatDescribeYour[] = _("Find words that describe your"); const u8 gText_FeelingsRightNow[] = _("feelings right now."); -const u8 gText_WithFourPhrases[] = _("With four phrases,"); // Unused const u8 gText_CombineNineWordsOrPhrases[] = _("Combine nine words or phrases"); -const u8 gText_AndMakeAMessage2[] = _("and make a message."); const u8 gText_ChangeJustOneWordOrPhrase[] = _("Change just one word or phrase"); const u8 gText_AndImproveTheBardsSong[] = _("and improve the BARD's song."); const u8 gText_YourProfile[] = _("Your profile"); @@ -595,13 +516,11 @@ const u8 gText_WhatYouSayIfYouWin[] = _("What you say if you win a battle"); const u8 gText_WhatYouSayIfYouLose[] = _("What you say if you lose a battle"); const u8 gText_TheAnswer[] = _("The answer"); const u8 gText_TheMailMessage[] = _("The MAIL message"); -const u8 gText_TheMailSalutation[] = _("The MAIL salutation"); // Unused const u8 gText_TheBardsSong2[] = _("The new song"); const u8 gText_CombineTwoWordsOrPhrases[] = _("Combine two words or phrases"); const u8 gText_AndMakeATrendySaying[] = _("and make a trendy saying."); const u8 gText_TheTrendySaying[] = _("The trendy saying"); const u8 gText_IsAsShownOkay[] = _("is as shown. Okay?"); -const u8 gText_CombineTwoWordsOrPhrases2[] = _("Combine two words or phrases"); const u8 gText_ToTeachHerAGoodSaying[] = _("to teach her a good saying."); const u8 gText_FindWordsWhichFit[] = _("Find words which fit"); const u8 gText_TheTrainersImage[] = _("the TRAINER's image."); @@ -612,7 +531,6 @@ const u8 gText_AndCreateAQuiz[] = _("and create a quiz!"); const u8 gText_PickAWordOrPhraseAnd[] = _("Pick a word or phrase and"); const u8 gText_SetTheQuizAnswer[] = _("set the quiz answer."); const u8 gText_TheAnswerColon[] = _("The answer:"); -const u8 gText_TheQuizColon[] = _("The quiz:"); // Unused const u8 gText_ApprenticePhrase[] = _("Apprentice's phrase:"); const u8 gText_QuitEditing[] = _("Quit editing?"); const u8 gText_StopGivingPkmnMail[] = _("Stop giving the POKéMON MAIL?"); @@ -620,20 +538,10 @@ const u8 gText_AndFillOutTheQuestionnaire[] = _("and fill out the questionnaire. const u8 gText_LetsReplyToTheInterview[] = _("Let's reply to the interview!"); const u8 gText_AllTextBeingEditedWill[] = _("All the text being edited will"); const u8 gText_BeDeletedThatOkay[] = _("be deleted. Is that okay?"); -const u8 gText_QuitEditing2[] = _("Quit editing?"); // Unused -const u8 gText_EditedTextWillNotBeSaved[] = _("The edited text will not be saved."); // Unused -const u8 gText_IsThatOkay[] = _("Is that okay?"); // Unused -const u8 gText_PleaseEnterPhraseOrWord[] = _("Please enter a phrase or word."); // Unused const u8 gText_EntireTextCantBeDeleted[] = _("The entire text can't be deleted."); const u8 gText_OnlyOnePhrase[] = _("Only one phrase may be changed."); const u8 gText_OriginalSongWillBeUsed[] = _("The original song will be used."); -const u8 gText_ThatsTrendyAlready[] = _("That's trendy already!"); // Unused const u8 gText_CombineTwoWordsOrPhrases3[] = _("Combine two words or phrases."); -const u8 gText_QuitGivingInfo[] = _("Quit giving information?"); // Unused -const u8 gText_StopGivingPkmnMail2[] = _("Stop giving the POKéMON MAIL?"); // Unused -const u8 gText_CreateAQuiz2[] = _("Create a quiz!"); // Unused -const u8 gText_SetTheAnswer[] = _("Set the answer!"); // Unused -const u8 gText_CancelSelection[] = _("Cancel the selection?"); // Unused const u8 gText_Profile[] = _("PROFILE"); const u8 gText_AtTheBattlesStart[] = _("At the battle's start:"); const u8 gText_UponWinningABattle[] = _("Upon winning a battle:"); @@ -643,7 +551,6 @@ const u8 gText_WhatsHipAndHappening[] = _("What's hip and happening?"); const u8 gText_Interview[] = _("Interview"); const u8 gText_GoodSaying[] = _("Good saying"); const u8 gText_FansQuestion[] = _("Fan's question"); -const u8 gJPText_WhatIsTheQuizAnswer[] = _("クイズの こたえは?"); // Unused const u8 gText_ApprenticesPhrase[] = _("Apprentice's phrase"); const u8 gText_Questionnaire[] = _("QUESTIONNAIRE"); const u8 gText_YouCannotQuitHere[] = _("You cannot quit here."); @@ -714,15 +621,8 @@ const u8 gText_PkmnFainted_FldPsn[] = _("{STR_VAR_1} survived the poisoning.\nTh #endif const u8 gText_Marco[] = _("MARCO"); const u8 gText_TrainerCardName[] = _("NAME: "); -const u8 gText_TrainerCardIDNo[] = _("IDNo."); const u8 gText_TrainerCardMoney[] = _("MONEY"); -const u8 gText_PokeDollar[] = _("¥"); // Unused -const u8 gText_TrainerCardPokedex[] = _("POKéDEX"); -const u8 gText_EmptyString6[] = _(""); -const u8 gText_Colon2[] = _(":"); -const u8 gText_Points[] = _(" points"); // Unused -const u8 gText_TrainerCardTime[] = _("TIME"); -const u8 gJPText_BattlePoints[] = _("ゲ-ムポイント"); // Unused. Name presumed, translation is Game Points +const u8 gText_Colon[] = _(":"); const u8 gText_Var1sTrainerCard[] = _("{STR_VAR_1}'s TRAINER CARD"); const u8 gText_HallOfFameDebut[] = _("HALL OF FAME DEBUT "); const u8 gText_LinkBattles[] = _("LINK BATTLES"); @@ -739,7 +639,6 @@ const u8 gText_BattlePtsWon[] = _("BATTLE POINTS WON"); const u8 gText_NumBP[] = _("{STR_VAR_1}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BP"); const u8 gText_BattleTower[] = _("BATTLE TOWER"); const u8 gText_WinsStraight[] = _("W/{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_1}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY} STRAIGHT/{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_2}"); -const u8 gText_BattleTower2[] = _("BATTLE TOWER"); const u8 gText_BattleDome[] = _("BATTLE DOME"); const u8 gText_BattlePalace[] = _("BATTLE PALACE"); const u8 gText_BattleFactory[] = _("BATTLE FACTORY"); @@ -751,7 +650,6 @@ ALIGNED(4) const u8 gText_FacilitySingle[] = _("{STR_VAR_1} SINGLE"); ALIGNED(4) const u8 gText_FacilityDouble[] = _("{STR_VAR_1} DOUBLE"); ALIGNED(4) const u8 gText_FacilityMulti[] = _("{STR_VAR_1} MULTI"); ALIGNED(4) const u8 gText_FacilityLink[] = _("{STR_VAR_1} LINK"); -ALIGNED(4) const u8 gText_Facility[] = _("{STR_VAR_1}"); const u8 gText_Give[] = _("Give"); const u8 gText_NoNeed[] = _("No need"); @@ -766,9 +664,7 @@ const u8 gText_Round2Results[] = _("Round 2 results!"); const u8 gText_ContestantsMonWon[] = _("{STR_VAR_1}'s {STR_VAR_2} won!"); const u8 gText_CommunicationStandby[] = _("Communication standby…"); const u8 gText_ColorDarkGray[] = _("{COLOR DARK_GRAY}"); -const u8 gText_ColorDynamic6WhiteDynamic5[] = _("{COLOR_HIGHLIGHT_SHADOW DYNAMIC_COLOR6 WHITE DYNAMIC_COLOR5}"); // Unused const u8 gText_HealthboxNickname[] = _("{HIGHLIGHT DARK_GRAY}"); -const u8 gText_EmptySpace2[] = _(" "); // Unused const u8 gText_HealthboxGender_Male[] = _("{COLOR DYNAMIC_COLOR2}♂"); const u8 gText_HealthboxGender_Female[] = _("{COLOR DYNAMIC_COLOR1}♀"); const u8 gText_HealthboxGender_None[] = _("{COLOR DYNAMIC_COLOR2}"); @@ -776,25 +672,19 @@ const u8 gText_Upper[] = _("UPPER"); const u8 gText_Lower[] = _("lower"); const u8 gText_Others[] = _("OTHERS"); const u8 gText_Symbols[] = _("SYMBOLS"); -const u8 gText_Register2[] = _("REGISTER"); -const u8 gText_Exit2[] = _("EXIT"); const u8 gText_QuitChatting[] = _("Quit chatting?"); const u8 gText_RegisterTextWhere[] = _("Register text where?"); const u8 gText_RegisterTextHere[] = _("Register text here?"); const u8 gText_InputText[] = _("Input text."); const u8 gText_F700JoinedChat[] = _("{DYNAMIC 0} joined the chat!"); const u8 gText_F700LeftChat[] = _("{DYNAMIC 0} left the chat."); -const u8 gJPText_PlayersXPokemon[] = _("{DYNAMIC 0}の{DYNAMIC 1}ひきめ:"); // Unused -const u8 gJPText_PlayersXPokmonDoesNotExist[] = _("{DYNAMIC 0}の{DYNAMIC 1}ひきめは いません"); // Unused const u8 gText_ExitingChat[] = _("Exiting the chat…"); const u8 gText_LeaderLeftEndingChat[] = _("The LEADER, {DYNAMIC 0}, has\nleft, ending the chat."); const u8 gText_RegisteredTextChangedOKToSave[] = _("The registered text has been changed.\nIs it okay to save the game?"); const u8 gText_AlreadySavedFile_Chat[] = _("There is already a saved file.\nIs it okay to overwrite it?"); -const u8 gText_SavingDontTurnOff_Chat[] = _("SAVING…\nDON'T TURN OFF THE POWER."); const u8 gText_PlayerSavedGame_Chat[] = _("{DYNAMIC 0} saved the game."); const u8 gText_IfLeaderLeavesChatEnds[] = _("If the LEADER leaves, the chat\nwill end. Is that okay?"); const u8 gText_Hello[] = _("HELLO"); -const u8 gText_Pokemon2[] = _("POKéMON"); const u8 gText_Trade[] = _("TRADE"); const u8 gText_Battle[] = _("BATTLE"); const u8 gText_Lets[] = _("LET'S"); @@ -815,10 +705,8 @@ ALIGNED(4) const u8 gText_PlayBerryCrushAgain[] = _("Want to play BERRY CRUSH ag ALIGNED(4) const u8 gText_YouHaveNoBerries[] = _("You have no BERRIES.\nThe game will be canceled."); ALIGNED(4) const u8 gText_MemberDroppedOut[] = _("A member dropped out.\nThe game will be canceled."); ALIGNED(4) const u8 gText_TimesUpNoGoodPowder[] = _("Time's up.\pGood BERRY POWDER could not be\nmade…\p"); -ALIGNED(4) const u8 gText_CommunicationStandby2[] = _("Communication standby…"); ALIGNED(4) const u8 gText_1DotBlueF700[] = _("1. {COLOR BLUE}{SHADOW LIGHT_BLUE}{DYNAMIC 0}"); ALIGNED(4) const u8 gText_1DotF700[] = _("1. {DYNAMIC 0}"); -ALIGNED(4) const u8 gText_SpaceTimes2[] = _(" time(s)"); ALIGNED(4) const u8 gText_XDotY[] = _("{STR_VAR_1}.{STR_VAR_2}"); ALIGNED(4) const u8 gText_Var1Berry[] = _("{STR_VAR_1} BERRY"); ALIGNED(4) const u8 gText_TimeColon[] = _("Time:"); @@ -826,9 +714,7 @@ ALIGNED(4) const u8 gText_PressingSpeed[] = _("Pressing Speed:"); ALIGNED(4) const u8 gText_Silkiness[] = _("Silkiness:"); ALIGNED(4) const u8 gText_StrVar1[] = _("{STR_VAR_1}"); ALIGNED(4) const u8 gText_SpaceMin[] = _(" min. "); -ALIGNED(4) const u8 gText_XDotY2[] = _("{STR_VAR_1}.{STR_VAR_2}"); ALIGNED(4) const u8 gText_SpaceSec[] = _(" sec."); -ALIGNED(4) const u8 gText_XDotY3[] = _("{STR_VAR_1}.{STR_VAR_2}"); ALIGNED(4) const u8 gText_TimesPerSec[] = _(" Times/sec."); ALIGNED(4) const u8 gText_Var1Percent[] = _("{STR_VAR_1}%"); ALIGNED(4) const u8 gText_PressesRankings[] = _("No. of Presses Rankings"); @@ -836,14 +722,11 @@ ALIGNED(4) const u8 gText_CrushingResults[] = _("Crushing Results"); ALIGNED(4) const u8 gText_NeatnessRankings[] = _("Neatness Rankings"); ALIGNED(4) const u8 gText_CoopRankings[] = _("Cooperative Rankings"); ALIGNED(4) const u8 gText_PressingPowerRankings[] = _("Pressing-Power Rankings"); -const u8 gText_BerryCrush2[] = _("BERRY CRUSH"); const u8 gText_PressingSpeedRankings[] = _("Pressing-Speed Rankings"); const u8 gText_Var1Players[] = _("{STR_VAR_1} PLAYERS"); const u8 gText_SymbolsEarned[] = _("Symbols Earned"); const u8 gText_BattleRecord[] = _("Battle Record"); const u8 gText_BattlePoints[] = _("Battle Points"); -const u8 gText_UnusedCancel[] = _("CANCEL"); // Unused -const u8 gText_EmptyString7[] = _(""); const u8 gText_CheckFrontierMap[] = _("Check BATTLE FRONTIER MAP."); const u8 gText_CheckTrainerCard[] = _("Check TRAINER CARD."); const u8 gText_ViewRecordedBattle[] = _("View recorded battle."); @@ -858,13 +741,6 @@ const u8 gText_BattleFactoryKnowledgeSymbol[] = _("Battle Factory - Knowledge Sy const u8 gText_BattlePikeLuckSymbol[] = _("Battle Pike - Luck Symbol"); const u8 gText_BattlePyramidBraveSymbol[] = _("Battle Pyramid - Brave Symbol"); const u8 gText_ThereIsNoBattleRecord[] = _("There is no Battle Record."); -const u8 gText_BattleTower3[] = _("BATTLE TOWER"); -const u8 gText_BattleDome2[] = _("BATTLE DOME"); -const u8 gText_BattlePalace2[] = _("BATTLE PALACE"); -const u8 gText_BattleArena2[] = _("BATTLE ARENA"); -const u8 gText_BattleFactory2[] = _("BATTLE FACTORY"); -const u8 gText_BattlePike2[] = _("BATTLE PIKE"); -const u8 gText_BattlePyramid2[] = _("BATTLE PYRAMID"); const u8 gText_BattleTowerDesc[] = _("KO opponents and aim for the top!\nYour ability will be tested."); const u8 gText_BattleDomeDesc[] = _("Keep winning at the tournament!\nYour tactics will be tested."); const u8 gText_BattlePalaceDesc[] = _("Watch your POKéMON battle!\nYour spirit will be tested."); @@ -892,35 +768,24 @@ const u8 gText_FilledStorageSpace[] = _("It filled its storage space."); const u8 gText_WantToPlayAgain[] = _("Want to play again?"); const u8 gText_SomeoneDroppedOut[] = _("Somebody dropped out.\nThe link will be canceled."); const u8 gText_SpacePoints[] = _(" points"); -const u8 gText_CommunicationStandby3[] = _("Communication standby…"); -const u8 gText_SpacePoints2[] = _(" points"); -const u8 gText_SpaceTimes3[] = _(" time(s)"); +const u8 gText_SpaceTimes[] = _(" time(s)"); const u8 gText_PkmnJumpRecords[] = _("POKéMON JUMP RECORDS"); const u8 gText_JumpsInARow[] = _("Jumps in a row:"); -const u8 gText_BestScore2[] = _("Best score:"); const u8 gText_ExcellentsInARow[] = _("EXCELLENTS in a row:"); const u8 gText_AwesomeWonF701F700[] = _("Awesome score! You've\nwon {DYNAMIC 1} {DYNAMIC 0}!"); -const u8 gText_FilledStorageSpace2[] = _("It filled its storage space."); -const u8 gText_CantHoldMore[] = _("You can't hold any more!"); -const u8 gText_WantToPlayAgain2[] = _("Want to play again?"); -const u8 gText_SomeoneDroppedOut2[] = _("Somebody dropped out.\nThe link will be canceled."); -const u8 gText_CommunicationStandby4[] = _("Communication standby…"); const u8 gText_LinkContestResults[] = _("{PLAYER}'s Link Contest Results"); const u8 gText_1st[] = _("1st"); const u8 gText_2nd[] = _("2nd"); const u8 gText_3rd[] = _("3rd"); const u8 gText_4th[] = _("4th"); const u8 gText_Friend[] = _("Friend"); -const u8 gText_Pokemon3[] = _("POKeMON"); // Unused const u8 gJPText_MysteryGift[] = _("ふしぎなもらいもの"); const u8 gJPText_DecideStop[] = _("{A_BUTTON}けってい {B_BUTTON}やめる"); const u8 gJPText_ReceiveMysteryGiftWithEReader[] = _("カードeリーダー{PLUS} で\nふしぎなもらいものを よみこみます"); const u8 gJPText_SelectConnectFromEReaderMenu[] = _("カードeリーダー{PLUS}の メニューから\n‘つうしん'を えらび"); const u8 gJPText_SelectConnectWithGBA[] = _("‘ゲームボーイアドバンスとつうしん'\nを せんたく してください"); -const u8 gJPText_SelectConnectAndPressA[] = _("カードeリーダー{PLUS}の ‘つうしん'を\nえらんで Aボタンを おしてください"); // Unused const u8 gJPText_LinkIsIncorrect[] = _("せつぞくが まちがっています"); const u8 gJPText_CardReadingHasBeenHalted[] = _("カードの よみこみを\nちゅうし しました"); -const u8 gJPText_UnableConnectWithEReader[] = _("カードeリーダー{PLUS}と\nつうしん できません"); // Unused const u8 gJPText_Connecting[] = _("つうしん ちゅう です"); const u8 gJPText_ConnectionErrorCheckLink[] = _("つうしん エラーです\nせつぞくを たしかめて ください"); const u8 gJPText_ConnectionErrorTryAgain[] = _("つうしん エラーです\nはじめから やりなおして ください"); // Link error @@ -942,7 +807,6 @@ const u8 gText_SetKOTourneyResults[] = _("{PLAYER}'s Set KO Tourney Results"); const u8 gText_BattleSwapSingleResults[] = _("{PLAYER}'s Battle Swap Single Results"); const u8 gText_BattleSwapDoubleResults[] = _("{PLAYER}'s Battle Swap Double Results"); const u8 gText_BattleQuestResults[] = _("{PLAYER}'s Battle Quest Results"); -const u8 gText_Lv502[] = _("LV. 50"); const u8 gText_OpenLv[] = _("OPEN LV."); const u8 gText_WinStreak[] = _("Win streak: {STR_VAR_1}"); const u8 gText_Current[] = _("CURRENT"); @@ -958,8 +822,6 @@ const u8 gText_KOsInARow[] = _("KOs in a row: {STR_VAR_1}"); const u8 gText_TimesVar1[] = _("Times: {STR_VAR_1}"); const u8 gText_FloorsCleared[] = _("Floors cleared: {STR_VAR_1}"); -ALIGNED(4) const u8 gText_RecordsLv50[] = _("LV. 50"); -ALIGNED(4) const u8 gText_RecordsOpenLevel[] = _("OPEN LEVEL"); ALIGNED(4) const u8 gText_FrontierFacilityWinStreak[] = _("Win streak: {STR_VAR_2}"); ALIGNED(4) const u8 gText_FrontierFacilityClearStreak[] = _("Clear streak: {STR_VAR_2}"); ALIGNED(4) const u8 gText_FrontierFacilityRoomsCleared[] = _("Rooms cleared: {STR_VAR_2}"); @@ -971,7 +833,6 @@ const u8 gText_SavingDontTurnOff2[] = _("SAVING…\nDON'T TURN OFF THE POWER."); const u8 gText_BlenderMaxSpeedRecord[] = _("BERRY BLENDER\nMAXIMUM SPEED RECORD!"); const u8 gText_234Players[] = _("2 PLAYERS\n3 PLAYERS\n4 PLAYERS"); const u8 gText_YesNo[] = _("YES\nNO"); -const u8 gText_SelectorArrow3[] = _("▶"); const u8 gText_Peekaboo[] = _("PEEKABOO!"); const u8 gText_CommErrorCheckConnections[] = _("Communication error…\nPlease check all connections,\nthen turn the power OFF and ON."); const u8 gText_CommErrorEllipsis[] = _("Communication error…"); @@ -984,7 +845,6 @@ const u8 gText_BattleScene[] = _("BATTLE SCENE"); const u8 gText_BattleStyle[] = _("BATTLE STYLE"); const u8 gText_Sound[] = _("SOUND"); const u8 gText_Frame[] = _("FRAME"); -const u8 gText_OptionMenuCancel[] = _("CANCEL"); const u8 gText_ButtonMode[] = _("BUTTON MODE"); const u8 gText_TextSpeedSlow[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}SLOW"); const u8 gText_TextSpeedMid[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}MID"); @@ -1003,26 +863,8 @@ const u8 gText_ButtonTypeLEqualsA[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}L=A"); const u8 gText_NumPlayerLink[] = _("{STR_VAR_1}P LINK"); const u8 gText_BronzeCard[] = _("BRONZE"); const u8 gText_CopperCard[] = _("COPPER"); -const u8 gText_SilverCard[] = _("SILVER"); -const u8 gText_GoldCard[] = _("GOLD"); const u8 gText_Day[] = _("DAY"); -const u8 gText_Colon3[] = _(":"); -const u8 gText_Confirm2[] = _("CONFIRM"); -const u8 gText_Days[] = _("Days"); // Unused -const u8 gText_TimeColon2[] = _("Time:"); // Unused -const u8 gText_GameTime[] = _("Game time"); // Unused -const u8 gText_RTCTime[] = _("RTC time"); // Unused -const u8 gText_UpdatedTime[] = _("Updated time"); // Unused -const u8 gText_MenuPokedex[] = _("POKéDEX"); -const u8 gText_MenuPokemon[] = _("POKéMON"); -const u8 gText_MenuBag[] = _("BAG"); -const u8 gText_MenuPokenav[] = _("POKéNAV"); const u8 gText_MenuPlayer[] = _("{PLAYER}"); -const u8 gText_MenuSave[] = _("SAVE"); -const u8 gText_MenuOption[] = _("OPTION"); -const u8 gText_MenuExit[] = _("EXIT"); -const u8 gText_MenuRetire[] = _("RETIRE"); -const u8 gText_MenuRest[] = _("REST"); const u8 gText_SafariBallStock[] = _("SAFARI BALLS\nStock: {STR_VAR_1}"); const u8 gText_BattlePyramidFloor[] = _("Battle Pyramid\n{STR_VAR_1}"); const u8 gText_Floor1[] = _("Floor 1"); @@ -1039,13 +881,9 @@ const u8 gText_LoadingEvent[] = _("Loading event…"); const u8 gText_DontRemoveCableTurnOff[] = _("Don't remove the Game Link cable.\nDon't turn off the power."); const u8 gText_EventSafelyLoaded[] = _("The event was safely loaded."); const u8 gText_LoadErrorEndingSession[] = _("Loading error.\nEnding session."); -const u8 gJPText_Player[] = _("プレイヤー"); // Unused -const u8 gJPText_Sama[] = _("さま"); // Unused const u8 gText_DexHoenn[] = _("HOENN"); const u8 gText_DexNational[] = _("NATIONAL"); const u8 gText_PokedexDiploma[] = _("PLAYER: {CLEAR 0x10}{COLOR RED}{SHADOW LIGHT_RED}{PLAYER}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}\n\nThis document certifies\nthat you have successfully\ncompleted your\n{STR_VAR_1} POKéDEX.\n\n{CLEAR_TO 0x42}{COLOR RED}{SHADOW LIGHT_RED}GAME FREAK"); -const u8 gJPText_GameFreak[] = _("{COLOR RED}{SHADOW LIGHT_RED}ゲ-ムフリ-ク"); // Unused -const u8 gText_DiplomaEmpty[] = _("{COLOR RED}{SHADOW LIGHT_RED}"); // Unused const u8 gText_Hoenn[] = _("HOENN"); const u8 gText_OhABite[] = _("Oh! A bite!"); const u8 gText_PokemonOnHook[] = _("A POKéMON's on the hook!{PAUSE_UNTIL_PRESS}"); @@ -1088,7 +926,6 @@ const u8 gText_Speed[] = _("SPEED"); const u8 gText_SpAtk[] = _("SP. ATK"); const u8 gText_SpDef[] = _("SP. DEF"); const u8 gText_Plus[] = _("{PLUS}"); -const u8 gText_Dash[] = _("-"); const u8 gText_FromSpace[] = _("From "); const u8 gText_MixingRecords[] = _("Mixing records…"); const u8 gText_RecordMixingComplete[] = _("Record mixing completed.\nThank you for waiting."); @@ -1097,39 +934,26 @@ 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_RentalPkmn2[] = _("RENTAL POKéMON"); const u8 gText_SelectFirstPkmn[] = _("Select the first POKéMON."); const u8 gText_SelectSecondPkmn[] = _("Select the second POKéMON."); const u8 gText_SelectThirdPkmn[] = _("Select the third POKéMON."); const u8 gText_Rent[] = _("RENT"); const u8 gText_Summary[] = _("SUMMARY"); -const u8 gText_Others2[] = _("OTHERS"); const u8 gText_Deselect[] = _("DESELECT"); const u8 gText_TheseThreePkmnOkay[] = _("Are these three POKéMON OK?"); -const u8 gText_Yes2[] = _("YES"); -const u8 gText_No2[] = _("NO"); const u8 gText_CantSelectSamePkmn[] = _("Can't select same {PKMN}."); const u8 gText_PkmnSwap[] = _("POKéMON SWAP"); const u8 gText_SelectPkmnToSwap[] = _("Select POKéMON to swap."); const u8 gText_SelectPkmnToAccept[] = _("Select POKéMON to accept."); const u8 gText_Swap[] = _("SWAP"); -const u8 gText_Summary2[] = _("SUMMARY"); const u8 gText_Rechoose[] = _("RECHOOSE"); const u8 gText_QuitSwapping[] = _("Quit swapping?"); -const u8 gText_Yes3[] = _("YES"); -const u8 gText_No3[] = _("NO"); const u8 gText_PkmnForSwap[] = _("{PKMN} FOR SWAP"); -const u8 gText_Cancel3[] = _("CANCEL"); -const u8 gText_Swap2[] = _("SWAP"); // Unused -const u8 gText_Accept[] = _("ACCEPT"); // Unused const u8 gText_AcceptThisPkmn[] = _("Accept this POKéMON?"); -const u8 gText_4Spaces[] = _(" "); // Unused const u8 gText_SamePkmnInPartyAlready[] = _("Same {PKMN} in party already."); const u8 gText_DecimalPoint[] = _("."); -const u8 gText_SavingPlayer[] = _("PLAYER"); -const u8 gText_SavingBadges[] = _("BADGES"); -const u8 gText_SavingPokedex[] = _("POKéDEX"); -const u8 gText_SavingTime[] = _("TIME"); +const u8 gText_Player[] = _("PLAYER"); +const u8 gText_Badges[] = _("BADGES"); const u8 gText_WirelessCommStatus[] = _("Wireless Communication Status"); const u8 gText_PeopleTrading[] = _("People trading:"); const u8 gText_PeopleBattling[] = _("People battling:"); @@ -1151,7 +975,6 @@ ALIGNED(4) const u8 gText_WonderCards[] = _("WONDER CARDS"); ALIGNED(4) const u8 gText_WonderNews[] = _("WONDER NEWS"); ALIGNED(4) const u8 gText_WirelessCommunication[] = _("WIRELESS COMMUNICATION"); ALIGNED(4) const u8 gText_Friend2[] = _("FRIEND"); -ALIGNED(4) const u8 gText_Exit3[] = _("EXIT"); ALIGNED(4) const u8 gText_Receive[] = _("RECEIVE"); ALIGNED(4) const u8 gText_Send[] = _("SEND"); ALIGNED(4) const u8 gText_Toss[] = _("TOSS"); @@ -1163,7 +986,6 @@ ALIGNED(4) const u8 gText_DontHaveCardNewOneInput[] = _("You don't have a WONDER ALIGNED(4) const u8 gText_DontHaveNewsNewOneInput[] = _("You don't have any WONDER NEWS,\nso new NEWS will be input."); ALIGNED(4) const u8 gText_WhereShouldCardBeAccessed[] = _("Where should the WONDER CARD\nbe accessed?"); ALIGNED(4) const u8 gText_WhereShouldNewsBeAccessed[] = _("Where should the WONDER NEWS\nbe accessed?"); -ALIGNED(4) const u8 gText_CommunicationStandbyBButtonCancel[] = _("Communication standby…\nB Button: Cancel"); // Unused ALIGNED(4) const u8 gText_Communicating[] = _("Communicating…"); ALIGNED(4) const u8 gText_CommunicationCompleted[] = _("Communication completed."); ALIGNED(4) const u8 gText_CommunicationError[] = _("Communication error."); @@ -1210,7 +1032,6 @@ ALIGNED(4) const u8 gText_PickOKCancel[] = _("{DPAD_UPDOWN}PICK {A_BUTTON}OK {B_ const u8 gText_PlayersBattleResults[] = _("{PLAYER}'s BATTLE RESULTS"); const u8 gText_TotalRecordWLD[] = _("TOTAL RECORD W:{STR_VAR_1} L:{STR_VAR_2} D:{STR_VAR_3}"); const u8 gText_WinLoseDraw[] = _("{CLEAR_TO 0x53}WIN{CLEAR_TO 0x80}LOSE{CLEAR_TO 0xB0}DRAW"); -const u8 gText_CommunicationStandby5[] = _("Communication standby…"); const u8 gText_QuitTheGame[] = _("Quit the game?"); const u8 gText_YouveGot9999Coins[] = _("You've got 9,999 COINS."); const u8 gText_YouveRunOutOfCoins[] = _("You've run out of COINS.\nGame over!"); @@ -1220,34 +1041,20 @@ const u8 gDaycareText_GetAlongVeryWell[] = _("The two seem to get along\nvery we const u8 gDaycareText_GetAlong[] = _("The two seem to get along."); const u8 gDaycareText_DontLikeOther[] = _("The two don't seem to like\neach other much."); const u8 gDaycareText_PlayOther[] = _("The two prefer to play with other\nPOKéMON than each other."); -const u8 gText_NewLine2[] = _("\n"); -const u8 gText_Exit4[] = _("EXIT"); const u8 gText_Lv[] = _("{LV}"); const u8 gText_TimeBoard[] = _("TIME BOARD"); const u8 gText_TimeCleared[] = _("TIME CLEARED "); const u8 gText_XMinYDotZSec[] = _("{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec."); -const u8 gText_TrainerHill1F[] = _("1F"); -const u8 gText_TrainerHill2F[] = _("2F"); -const u8 gText_TrainerHill3F[] = _("3F"); -const u8 gText_TrainerHill4F[] = _("4F"); const u8 gText_TeachWhichMoveToPkmn[] = _("Teach which move to\n{STR_VAR_1}?"); const u8 gText_MoveRelearnerTeachMoveConfirm[] = _("Teach {STR_VAR_2}?"); -const u8 gText_MoveRelearnerPkmnLearnedMove[] = _("{STR_VAR_1} learned\n{STR_VAR_2}!"); const u8 gText_MoveRelearnerPkmnTryingToLearnMove[] = _("{STR_VAR_1} is trying to learn\n{STR_VAR_2}.\pBut {STR_VAR_1} can't learn more\nthan four moves.\pDelete an older move to make\nroom for {STR_VAR_2}?"); -const u8 gText_MoveRelearnerStopTryingToTeachMove[] = _("Stop trying to teach\n{STR_VAR_2}?"); const u8 gText_MoveRelearnerAndPoof[] = _("{PAUSE 32}1, {PAUSE 15}2, and {PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_BALL_BOUNCE_1}Poof!\p"); const u8 gText_MoveRelearnerPkmnForgotMoveAndLearnedNew[] = _("{STR_VAR_1} forgot {STR_VAR_3}.\pAnd…\p{STR_VAR_1} learned {STR_VAR_2}."); -const u8 gText_MoveRelearnedPkmnDidNotLearnMove[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}."); // Unused const u8 gText_MoveRelearnerGiveUp[] = _("Give up trying to teach a new\nmove to {STR_VAR_1}?"); const u8 gText_MoveRelearnerWhichMoveToForget[] = _("Which move should be\nforgotten?\p"); -const u8 gText_MoveRelearnerBattleMoves[] = _("BATTLE MOVES"); -const u8 gText_MoveRelearnerContestMovesTitle[] = _("CONTEST MOVES"); -const u8 gText_MoveRelearnerType[] = _("TYPE/"); // Unused const u8 gText_MoveRelearnerPP[] = _("PP/"); const u8 gText_MoveRelearnerPower[] = _("POWER/"); const u8 gText_MoveRelearnerAccuracy[] = _("ACCURACY/"); -const u8 gText_MoveRelearnerAppeal[] = _("APPEAL"); -const u8 gText_MoveRelearnerJam[] = _("JAM"); const u8 gText_Kira[] = _("KIRA"); const u8 gText_Amy[] = _("AMY"); const u8 gText_John[] = _("JOHN"); @@ -1257,32 +1064,13 @@ const u8 gText_Anna[] = _("ANNA"); const u8 gText_ClearAllSaveData[] = _("Clear all save data areas?"); 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_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}"); -const u8 gText_NoWeather[] = _("NO WEATHER"); // Below are unused debug names for weather types -const u8 gText_Sunny[] = _("SUNNY"); // Unused -const u8 gText_Sunny2[] = _("SUNNY2"); // Unused -const u8 gText_Rain[] = _("RAIN"); // Unused -const u8 gText_Snow[] = _("SNOW"); // Unused -const u8 gText_Lightning[] = _("LIGHTNING"); // Unused -const u8 gText_Fog[] = _("FOG"); // Unused -const u8 gText_VolcanoAsh[] = _("VOLCANO ASH"); // Unused -const u8 gText_Sandstorm[] = _("SANDSTORM"); // Unused -const u8 gText_Fog2[] = _("FOG2"); // Unused -const u8 gText_Seafloor[] = _("SEAFLOOR"); // Unused -const u8 gText_Cloudy[] = _("CLOUDY"); // Unused -const u8 gText_Sunny3[] = _("SUNNY3"); // Unused -const u8 gText_HeavyRain[] = _("HEAVY RAIN"); // Unused -const u8 gText_Seafloor2[] = _("SEAFLOOR2"); // Unused const u8 gText_DelAll[] = _("DEL. ALL"); -const u8 gText_Cancel5[] = _("CANCEL"); const u8 gText_Ok2[] = _("OK"); const u8 gText_Quiz[] = _("QUIZ"); const u8 gText_Answer[] = _("ANSWER"); -const u8 gText_PokeBalls[] = _("POKé BALLS"); const u8 gText_Berry[] = _("BERRY"); const u8 gText_Berries[] = _("BERRIES"); const u8 gText_ExpShareOn[] = _("The Exp. Share has been turned on.{PAUSE_UNTIL_PRESS}"); diff --git a/src/text.c b/src/text.c index acb2871a8694..03ed322d0940 100644 --- a/src/text.c +++ b/src/text.c @@ -5,6 +5,7 @@ #include "palette.h" #include "sound.h" #include "constants/songs.h" +#include "strings.h" #include "string_util.h" #include "window.h" #include "text.h" @@ -1620,7 +1621,7 @@ s32 GetStringLineWidth(u8 fontId, const u8 *str, s16 letterSpacing, u32 lineNum, StringCopyN(strCopy, str, strLen); strWidth = GetStringWidth(fontId, strCopy, letterSpacing); strLen = StringLineLength(strCopy); - StringAppend(strCopy, gText_EmptyString3); + StringAppend(strCopy, gText_EmptyString); } str += strLen + 1; } diff --git a/src/text_input_strings.c b/src/text_input_strings.c index 0fdaa875e6ab..eae2097e40aa 100644 --- a/src/text_input_strings.c +++ b/src/text_input_strings.c @@ -27,29 +27,16 @@ const u8 gText_UnionRoomChatKeyboard_KLMNO[] = _("KLMNO"); const u8 gText_UnionRoomChatKeyboard_PQRST[] = _("PQRST"); const u8 gText_UnionRoomChatKeyboard_UVWXY[] = _("UVWXY"); const u8 gText_UnionRoomChatKeyboard_Z[] = _("Z "); -const u8 gText_UnionRoomChatKeyboard_01234Upper[] = _("01234"); -const u8 gText_UnionRoomChatKeyboard_56789Upper[] = _("56789"); -const u8 gText_UnionRoomChatKeyboard_PunctuationUpper[] = _(".,!? "); -const u8 gText_UnionRoomChatKeyboard_SymbolsUpper[] = _("-/&… "); +const u8 gText_UnionRoomChatKeyboard_01234[] = _("01234"); +const u8 gText_UnionRoomChatKeyboard_56789[] = _("56789"); +const u8 gText_UnionRoomChatKeyboard_Punctuation[] = _(".,!? "); +const u8 gText_UnionRoomChatKeyboard_Symbols[] = _("-/&… "); const u8 gText_UnionRoomChatKeyboard_abcde[] = _("abcde"); const u8 gText_UnionRoomChatKeyboard_fghij[] = _("fghij"); const u8 gText_UnionRoomChatKeyboard_klmno[] = _("klmno"); const u8 gText_UnionRoomChatKeyboard_pqrst[] = _("pqrst"); const u8 gText_UnionRoomChatKeyboard_uvwxy[] = _("uvwxy"); const u8 gText_UnionRoomChatKeyboard_z[] = _("z "); -const u8 gText_UnionRoomChatKeyboard_01234Lower[] = _("01234"); -const u8 gText_UnionRoomChatKeyboard_56789Lower[] = _("56789"); -const u8 gText_UnionRoomChatKeyboard_PunctuationLower[] = _(".,!? "); -const u8 gText_UnionRoomChatKeyboard_SymbolsLower[] = _("-/&… "); - -const u8 gText_EmptyTextInput1[] = _(""); -const u8 gText_EmptyTextInput2[] = _(""); -const u8 gText_EmptyTextInput3[] = _(""); -const u8 gText_EmptyTextInput4[] = _(""); -const u8 gText_EmptyTextInput5[] = _(""); -const u8 gText_EmptyTextInput6[] = _(""); -const u8 gText_EmptyTextInput7[] = _(""); -const u8 gText_EmptyTextInput8[] = _(""); // Union Room Chat keyboard emojis const u8 gText_UnionRoomChatKeyboard_Emoji1[] = _("{EMOJI_MISCHIEVOUS}{EMOJI_HAPPY}{EMOJI_ANGRY}{EMOJI_SURPRISED}{EMOJI_BIGANGER}"); diff --git a/src/trade.c b/src/trade.c index 04b1977c17b0..16312485a367 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1969,19 +1969,19 @@ static void BufferMovesString(u8 *str, u8 whichParty, u8 partyIdx) moves[i] = GetMonData(&gEnemyParty[partyIdx], i + MON_DATA_MOVE1, NULL); } - StringCopy(str, sText_EmptyString); + StringCopy(str, gText_EmptyString); for (i = 0; i < MAX_MON_MOVES; i++) { if (moves[i] != MOVE_NONE) StringAppend(str, GetMoveName(moves[i])); - StringAppend(str, sText_NewLine); + StringAppend(str, gText_NewLine); } } else { - StringCopy(str, sText_EmptyString); + StringCopy(str, gText_EmptyString); StringAppend(str, sText_FourQuestionMarks); } } @@ -4658,7 +4658,7 @@ static void CB2_SaveAndEndTrade(void) { case 0: gMain.state++; - StringExpandPlaceholders(gStringVar4, gText_CommunicationStandby5); + StringExpandPlaceholders(gStringVar4, gText_CommunicationStandby); DrawTextOnTradeWindow(0, gStringVar4, 0); break; case 1: @@ -4973,7 +4973,7 @@ static void CB2_SaveAndEndWirelessTrade(void) { case 0: gMain.state = 1; - StringExpandPlaceholders(gStringVar4, gText_CommunicationStandby5); + StringExpandPlaceholders(gStringVar4, gText_CommunicationStandby); DrawTextOnTradeWindow(0, gStringVar4, 0); break; case 1: diff --git a/src/trainer_card.c b/src/trainer_card.c index 29e94bfe9f19..e47e4fa1f072 100755 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -1019,7 +1019,7 @@ static void PrintIdOnCard(void) u8 *txtPtr; s32 xPos; u32 top; - txtPtr = StringCopy(buffer, gText_TrainerCardIDNo); + txtPtr = StringCopy(buffer, gText_IDNumber); ConvertIntToDecimalStringN(txtPtr, sData->trainerCard.trainerId, STR_CONV_MODE_LEADING_ZEROS, 5); if (sData->cardType == CARD_TYPE_FRLG) { @@ -1075,10 +1075,10 @@ static void PrintPokedexOnCard(void) if (FlagGet(FLAG_SYS_POKEDEX_GET)) { if (!sData->isHoenn) - AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, 20, 72, sTrainerCardTextColors, TEXT_SKIP_DRAW, gText_TrainerCardPokedex); + AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, 20, 72, sTrainerCardTextColors, TEXT_SKIP_DRAW, gText_Pokedex); else - AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, 16, 73, sTrainerCardTextColors, TEXT_SKIP_DRAW, gText_TrainerCardPokedex); - StringCopy(ConvertIntToDecimalStringN(gStringVar4, sData->trainerCard.caughtMonsCount, STR_CONV_MODE_LEFT_ALIGN, 4), gText_EmptyString6); + AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, 16, 73, sTrainerCardTextColors, TEXT_SKIP_DRAW, gText_Pokedex); + StringCopy(ConvertIntToDecimalStringN(gStringVar4, sData->trainerCard.caughtMonsCount, STR_CONV_MODE_LEFT_ALIGN, 4), gText_EmptyString); if (!sData->isHoenn) { xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 144); @@ -1103,9 +1103,9 @@ static void PrintTimeOnCard(void) u32 x, y, totalWidth; if (!sData->isHoenn) - AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, 20, 88, sTrainerCardTextColors, TEXT_SKIP_DRAW, gText_TrainerCardTime); + AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, 20, 88, sTrainerCardTextColors, TEXT_SKIP_DRAW, gText_Time); else - AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, 16, 89, sTrainerCardTextColors, TEXT_SKIP_DRAW, gText_TrainerCardTime); + AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, 16, 89, sTrainerCardTextColors, TEXT_SKIP_DRAW, gText_Time); if (sData->isLink) { @@ -1122,7 +1122,7 @@ static void PrintTimeOnCard(void) hours = 999; if (minutes > 59) minutes = 59; - width = GetStringWidth(FONT_NORMAL, gText_Colon2, 0); + width = GetStringWidth(FONT_NORMAL, gText_Colon, 0); if (!sData->isHoenn) { @@ -1141,7 +1141,7 @@ static void PrintTimeOnCard(void) ConvertIntToDecimalStringN(gStringVar4, hours, STR_CONV_MODE_RIGHT_ALIGN, 3); AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, x, y, sTrainerCardTextColors, TEXT_SKIP_DRAW, gStringVar4); x += 18; - AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, x, y, sTimeColonTextColors[sData->timeColonInvisible], TEXT_SKIP_DRAW, gText_Colon2); + AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, x, y, sTimeColonTextColors[sData->timeColonInvisible], TEXT_SKIP_DRAW, gText_Colon); x += width; ConvertIntToDecimalStringN(gStringVar4, minutes, STR_CONV_MODE_LEADING_ZEROS, 2); AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, x, y, sTrainerCardTextColors, TEXT_SKIP_DRAW, gStringVar4); diff --git a/src/trainer_hill.c b/src/trainer_hill.c index c89803ffb25a..2662d355220e 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -215,10 +215,10 @@ static const struct TrainerHillChallenge *const sChallengeData[NUM_TRAINER_HILL_ // Unused. static const u8 *const sFloorStrings[] = { - gText_TrainerHill1F, - gText_TrainerHill2F, - gText_TrainerHill3F, - gText_TrainerHill4F, + gText_1F, + gText_2F, + gText_3F, + gText_4F, }; static void (* const sHillFunctions[])(void) = diff --git a/src/union_room.c b/src/union_room.c index ac4c61035a2e..03865e8fe061 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -3975,7 +3975,7 @@ static void PrintGroupMemberOnWindow(u8 windowId, u8 x, u8 y, struct RfuPlayer * u8 trainerId[6]; ConvertIntToDecimalStringN(gStringVar4, id + 1, STR_CONV_MODE_LEADING_ZEROS, 2); - StringAppend(gStringVar4, sText_Colon); + StringAppend(gStringVar4, gText_Colon); PrintUnionRoomText(windowId, FONT_NORMAL, gStringVar4, x, y, UR_COLOR_DEFAULT); x += 18; activity = player->rfu.data.activity; diff --git a/src/union_room_chat.c b/src/union_room_chat.c index 6c2aa047e68b..d6c0d8e414b6 100644 --- a/src/union_room_chat.c +++ b/src/union_room_chat.c @@ -493,10 +493,10 @@ static const u8 *const sUnionRoomKeyboardText[UNION_ROOM_KB_PAGE_COUNT - 1][UNIO gText_UnionRoomChatKeyboard_PQRST, gText_UnionRoomChatKeyboard_UVWXY, gText_UnionRoomChatKeyboard_Z, - gText_UnionRoomChatKeyboard_01234Upper, - gText_UnionRoomChatKeyboard_56789Upper, - gText_UnionRoomChatKeyboard_PunctuationUpper, - gText_UnionRoomChatKeyboard_SymbolsUpper + gText_UnionRoomChatKeyboard_01234, + gText_UnionRoomChatKeyboard_56789, + gText_UnionRoomChatKeyboard_Punctuation, + gText_UnionRoomChatKeyboard_Symbols }, [UNION_ROOM_KB_PAGE_LOWER] = { @@ -506,10 +506,10 @@ static const u8 *const sUnionRoomKeyboardText[UNION_ROOM_KB_PAGE_COUNT - 1][UNIO gText_UnionRoomChatKeyboard_pqrst, gText_UnionRoomChatKeyboard_uvwxy, gText_UnionRoomChatKeyboard_z, - gText_UnionRoomChatKeyboard_01234Lower, - gText_UnionRoomChatKeyboard_56789Lower, - gText_UnionRoomChatKeyboard_PunctuationLower, - gText_UnionRoomChatKeyboard_SymbolsLower + gText_UnionRoomChatKeyboard_01234, + gText_UnionRoomChatKeyboard_56789, + gText_UnionRoomChatKeyboard_Punctuation, + gText_UnionRoomChatKeyboard_Symbols }, [UNION_ROOM_KB_PAGE_EMOJI] = { @@ -710,7 +710,7 @@ static const struct MessageWindowInfo sDisplayStdMessages[] = { .useWiderBox = TRUE }, [STDMESSAGE_SAVING_NO_OFF] = { - .text = gText_SavingDontTurnOff_Chat, + .text = gText_SavingDontTurnOff2, .boxType = 2, .x = 0, .y = 1, @@ -747,8 +747,8 @@ static const struct MenuAction sKeyboardPageTitleTexts[UNION_ROOM_KB_PAGE_COUNT [UNION_ROOM_KB_PAGE_UPPER] = {gText_Upper, {NULL}}, [UNION_ROOM_KB_PAGE_LOWER] = {gText_Lower, {NULL}}, [UNION_ROOM_KB_PAGE_EMOJI] = {gText_Symbols, {NULL}}, - [UNION_ROOM_KB_PAGE_REGISTER] = {gText_Register2, {NULL}}, - [UNION_ROOM_KB_PAGE_COUNT] = {gText_Exit2, {NULL}}, + [UNION_ROOM_KB_PAGE_REGISTER] = {gText_Register, {NULL}}, + [UNION_ROOM_KB_PAGE_COUNT] = {gText_Exit, {NULL}}, }; static const u16 sUnionRoomChatInterfacePal[] = INCBIN_U16("graphics/union_room_chat/interface.gbapal"); @@ -2018,7 +2018,7 @@ void InitUnionRoomChatRegisteredTexts(void) { #if FREE_UNION_ROOM_CHAT == FALSE StringCopy(gSaveBlock1Ptr->registeredTexts[0], gText_Hello); - StringCopy(gSaveBlock1Ptr->registeredTexts[1], gText_Pokemon2); + StringCopy(gSaveBlock1Ptr->registeredTexts[1], gText_Pokemon); StringCopy(gSaveBlock1Ptr->registeredTexts[2], gText_Trade); StringCopy(gSaveBlock1Ptr->registeredTexts[3], gText_Battle); StringCopy(gSaveBlock1Ptr->registeredTexts[4], gText_Lets); diff --git a/src/wallclock.c b/src/wallclock.c index ab1add25a0b5..7dbf9269c076 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -720,7 +720,7 @@ void CB2_StartWallClock(void) WallClockInit(); - AddTextPrinterParameterized(WIN_BUTTON_LABEL, FONT_NORMAL, gText_Confirm3, 0, 1, 0, NULL); + AddTextPrinterParameterized(WIN_BUTTON_LABEL, FONT_NORMAL, gMenuText_Confirm, 0, 1, 0, NULL); PutWindowTilemap(WIN_BUTTON_LABEL); ScheduleBgCopyTilemapToVram(2); } @@ -768,7 +768,7 @@ void CB2_ViewWallClock(void) WallClockInit(); - AddTextPrinterParameterized(WIN_BUTTON_LABEL, FONT_NORMAL, gText_Cancel4, 0, 1, 0, NULL); + AddTextPrinterParameterized(WIN_BUTTON_LABEL, FONT_NORMAL, gText_Cancel, 0, 1, 0, NULL); PutWindowTilemap(WIN_BUTTON_LABEL); ScheduleBgCopyTilemapToVram(2); }