diff --git a/include/strings.h b/include/strings.h index 45bbeb9707..ec5d36041e 100644 --- a/include/strings.h +++ b/include/strings.h @@ -509,16 +509,6 @@ extern const u8 gText_HealthboxGender_None[]; extern const u8 gText_HealthboxGender_Male[]; extern const u8 gText_HealthboxGender_Female[]; -extern const u8 gText_99TimesPlus[]; -extern const u8 gText_1MinutePlus[]; -extern const u8 gText_SpaceSeconds[]; -extern const u8 gText_SpaceTimes[]; - -extern const u8 gText_BigGuy[]; -extern const u8 gText_BigGirl[]; -extern const u8 gText_Son[]; -extern const u8 gText_Daughter[]; - // Multichoice strings extern const u8 gText_Exit[]; extern const u8 gText_1F[]; @@ -539,73 +529,6 @@ extern const u8 gText_B4F[]; extern const u8 gText_Rooftop[]; extern const u8 gText_ElevatorNowOn[]; -extern const u8 gText_BlueFlute[]; -extern const u8 gText_YellowFlute[]; -extern const u8 gText_RedFlute[]; -extern const u8 gText_WhiteFlute[]; -extern const u8 gText_BlackFlute[]; -extern const u8 gText_PrettyChair[]; -extern const u8 gText_PrettyDesk[]; - -extern const u8 gText_0Pts[]; -extern const u8 gText_10Pts[]; -extern const u8 gText_20Pts[]; -extern const u8 gText_30Pts[]; -extern const u8 gText_40Pts[]; -extern const u8 gText_50Pts[]; -extern const u8 gText_60Pts[]; -extern const u8 gText_70Pts[]; -extern const u8 gText_80Pts[]; -extern const u8 gText_90Pts[]; -extern const u8 gText_100Pts[]; -extern const u8 gText_QuestionMark[]; - -extern const u8 gText_KissPoster16BP[]; -extern const u8 gText_KissCushion32BP[]; -extern const u8 gText_SmoochumDoll32BP[]; -extern const u8 gText_TogepiDoll48BP[]; -extern const u8 gText_MeowthDoll48BP[]; -extern const u8 gText_ClefairyDoll48BP[]; -extern const u8 gText_DittoDoll48BP[]; -extern const u8 gText_CyndaquilDoll80BP[]; -extern const u8 gText_ChikoritaDoll80BP[]; -extern const u8 gText_TotodileDoll80BP[]; - -extern const u8 gText_LaprasDoll128BP[]; -extern const u8 gText_SnorlaxDoll128BP[]; -extern const u8 gText_VenusaurDoll256BP[]; -extern const u8 gText_CharizardDoll256BP[]; -extern const u8 gText_BlastoiseDoll256BP[]; - -extern const u8 gText_Protein1BP[]; -extern const u8 gText_Calcium1BP[]; -extern const u8 gText_Iron1BP[]; -extern const u8 gText_Zinc1BP[]; -extern const u8 gText_Carbos1BP[]; -extern const u8 gText_HpUp1BP[]; - -extern const u8 gText_Leftovers48BP[]; -extern const u8 gText_WhiteHerb48BP[]; -extern const u8 gText_QuickClaw48BP[]; -extern const u8 gText_MentalHerb48BP[]; -extern const u8 gText_BrightPowder64BP[]; -extern const u8 gText_ChoiceBand64BP[]; -extern const u8 gText_KingsRock64BP[]; -extern const u8 gText_FocusBand64BP[]; -extern const u8 gText_ScopeLens64BP[]; - -extern const u8 gText_EnergyPowder50[]; -extern const u8 gText_EnergyRoot80[]; -extern const u8 gText_HealPowder50[]; -extern const u8 gText_RevivalHerb300[]; -extern const u8 gText_Protein1000[]; -extern const u8 gText_Iron1000[]; -extern const u8 gText_Carbos1000[]; -extern const u8 gText_Calcium1000[]; -extern const u8 gText_Zinc1000[]; -extern const u8 gText_HPUp1000[]; -extern const u8 gText_PPUp3000[]; - extern const u8 gText_BattleTower2[]; extern const u8 gText_BattleDome[]; extern const u8 gText_BattlePalace[]; @@ -616,28 +539,6 @@ extern const u8 gText_BattlePyramid[]; extern const u8 gText_RankingHall[]; extern const u8 gText_ExchangeService[]; -// Battle Frontier Move Tutors -extern const u8 gText_Softboiled16BP[]; -extern const u8 gText_SeismicToss24BP[]; -extern const u8 gText_DreamEater24BP[]; -extern const u8 gText_MegaPunch24BP[]; -extern const u8 gText_MegaKick48BP[]; -extern const u8 gText_BodySlam48BP[]; -extern const u8 gText_RockSlide48BP[]; -extern const u8 gText_Counter48BP[]; -extern const u8 gText_ThunderWave48BP[]; -extern const u8 gText_SwordsDance48BP[]; -extern const u8 gText_DefenseCurl16BP[]; -extern const u8 gText_Snore24BP[]; -extern const u8 gText_MudSlap24BP[]; -extern const u8 gText_Swift24BP[]; -extern const u8 gText_IcyWind24BP[]; -extern const u8 gText_Endure48BP[]; -extern const u8 gText_PsychUp48BP[]; -extern const u8 gText_IcePunch48BP[]; -extern const u8 gText_ThunderPunch48BP[]; -extern const u8 gText_FirePunch48BP[]; - extern const u8 gText_SlateportCity[]; extern const u8 gText_BattleFrontier[]; extern const u8 gText_SouthernIsland[]; @@ -934,31 +835,13 @@ extern const u8 gText_SomeonesPC[]; extern const u8 gText_PlayersPC[]; extern const u8 gText_WhichPCShouldBeAccessed[]; -extern const u8 gText_Petalburg[]; -extern const u8 gText_Slateport[]; -extern const u8 gText_Enter2[]; extern const u8 gText_Info2[]; -extern const u8 gText_WhatsAContest[]; -extern const u8 gText_TypesOfContests[]; -extern const u8 gText_Ranks[]; extern const u8 gText_Decoration2[]; extern const u8 gText_PackUp[]; extern const u8 gText_Registry[]; extern const u8 gText_Information[]; -extern const u8 gText_Mach[]; -extern const u8 gText_Acro[]; -extern const u8 gText_Psn[]; -extern const u8 gText_Par[]; -extern const u8 gText_Slp[]; -extern const u8 gText_Brn[]; -extern const u8 gText_Frz[]; -extern const u8 gText_Dewford[]; -extern const u8 gText_SawIt[]; -extern const u8 gText_NotYet[]; extern const u8 gText_Yes[]; extern const u8 gText_No[]; -extern const u8 gText_Challenge[]; -extern const u8 gText_Info3[]; // Pokédex strings extern const u8 gText_SearchForPkmnBasedOnParameters[]; @@ -1009,41 +892,7 @@ extern const u8 gText_DexEmptyString[]; extern const u8 gText_DexSearchDontSpecify[]; extern const u8 gText_DexSearchTypeNone[]; -extern const u8 gText_FreshWaterAndPrice[]; -extern const u8 gText_SodaPopAndPrice[]; -extern const u8 gText_LemonadeAndPrice[]; -extern const u8 gText_HowToRide[]; -extern const u8 gText_HowToTurn[]; -extern const u8 gText_SandySlopes[]; -extern const u8 gText_Wheelies[]; -extern const u8 gText_BunnyHops[]; -extern const u8 gText_Jump[]; -extern const u8 gText_Satisfied[]; -extern const u8 gText_Dissatisfied[]; -extern const u8 gText_DeepSeaTooth[]; -extern const u8 gText_DeepSeaScale[]; -extern const u8 gText_BlueFlute2[]; -extern const u8 gText_YellowFlute2[]; -extern const u8 gText_RedFlute2[]; -extern const u8 gText_WhiteFlute2[]; -extern const u8 gText_BlackFlute2[]; -extern const u8 gText_GlassChair[]; -extern const u8 gText_GlassDesk[]; -extern const u8 gText_TreeckoDollAndPrice[]; -extern const u8 gText_TorchicDollAndPrice[]; -extern const u8 gText_MudkipDollAndPrice[]; -extern const u8 gText_TM32AndPrice[]; -extern const u8 gText_TM29AndPrice[]; -extern const u8 gText_TM35AndPrice[]; -extern const u8 gText_TM24AndPrice[]; -extern const u8 gText_TM13AndPrice[]; -extern const u8 gText_50CoinsAndPrice[]; -extern const u8 gText_500CoinsAndPrice[]; -extern const u8 gText_Excellent2[]; -extern const u8 gText_NotSoGood[]; extern const u8 gText_LilycoveCity[]; -extern const u8 gText_Right[]; -extern const u8 gText_Left[]; extern const u8 gText_RedShard[]; extern const u8 gText_YellowShard[]; extern const u8 gText_BlueShard[]; @@ -1054,79 +903,20 @@ extern const u8 gText_ReadyToStart[]; extern const u8 gText_Record2[]; extern const u8 gText_Rest[]; extern const u8 gText_Retire[]; -extern const u8 gText_RedTent[]; -extern const u8 gText_BlueTent[]; extern const u8 gText_TradeCenter[]; extern const u8 gText_Colosseum[]; extern const u8 gText_RecordCorner[]; -extern const u8 gText_SingleBattle[]; -extern const u8 gText_DoubleBattle[]; -extern const u8 gText_MultiBattle[]; extern const u8 gText_BerryCrush3[]; -extern const u8 gText_PokemonJump[]; -extern const u8 gText_DodrioBerryPicking[]; -extern const u8 gText_JoinGroup[]; -extern const u8 gText_BecomeLeader[]; -extern const u8 gText_NormalRank[]; -extern const u8 gText_SuperRank[]; -extern const u8 gText_HyperRank[]; -extern const u8 gText_MasterRank[]; -extern const u8 gText_BattleBag[]; -extern const u8 gText_HeldItem[]; -extern const u8 gText_LinkContest[]; -extern const u8 gText_AboutE_Mode[]; -extern const u8 gText_AboutG_Mode[]; -extern const u8 gText_E_Mode[]; -extern const u8 gText_G_Mode[]; extern const u8 gText_Blank[]; -extern const u8 gText_5BP[]; -extern const u8 gText_10BP[]; -extern const u8 gText_15BP[]; -extern const u8 gText_ClawFossil[]; -extern const u8 gText_RootFossil[]; -extern const u8 gText_No4[]; -extern const u8 gText_TwoStyles[]; -extern const u8 gText_Lv50_3[]; -extern const u8 gText_OpenLevel2[]; -extern const u8 gText_MonTypeAndNo[]; -extern const u8 gText_HoldItems[]; -extern const u8 gText_Symbols2[]; -extern const u8 gText_Record3[]; -extern const u8 gText_BattlePts[]; extern const u8 gText_BattleRules[]; extern const u8 gText_JudgeMind[]; extern const u8 gText_JudgeSkill[]; extern const u8 gText_JudgeBody[]; -extern const u8 gText_TowerInfo[]; -extern const u8 gText_BattleMon[]; -extern const u8 gText_BattleSalon[]; -extern const u8 gText_MultiLink2[]; -extern const u8 gText_Matchup[]; -extern const u8 gText_TourneyTree[]; -extern const u8 gText_DoubleKO[]; extern const u8 gText_BasicRules[]; extern const u8 gText_SwapPartners[]; extern const u8 gText_SwapNumber[]; extern const u8 gText_SwapNotes[]; -extern const u8 gText_OpenLevel3[]; -extern const u8 gText_PyramidPokemon[]; -extern const u8 gText_PyramidTrainers[]; -extern const u8 gText_PyramidMaze[]; -extern const u8 gText_BattleBag2[]; -extern const u8 gText_PokenavAndBag[]; -extern const u8 gText_HeldItems[]; -extern const u8 gText_PokemonOrder[]; extern const u8 gText_GoOn[]; -extern const u8 gText_Red[]; -extern const u8 gText_Blue[]; -extern const u8 gText_IllBattleNow[]; -extern const u8 gText_IWon[]; -extern const u8 gText_ILost[]; -extern const u8 gText_IWontTell[]; -extern const u8 gText_CaveOfOrigin[]; -extern const u8 gText_MtPyre[]; -extern const u8 gText_SkyPillar[]; -extern const u8 gText_DontRemember[]; extern const u8 gText_BattlePokemon[]; extern const u8 gText_NormalTagMatch[]; extern const u8 gText_VarietyTagMatch[]; @@ -2697,9 +2487,6 @@ extern const u8 gText_ExpShareOff[]; extern const u8 gText_BasePointsResetToZero[]; -extern const u8 gText_Fertilize[]; -extern const u8 gText_PlantBerry[]; - // Map name pop-up extern const u8 gText_AM[]; extern const u8 gText_PM[]; diff --git a/src/data/script_menu.h b/src/data/script_menu.h index 3b29171327..fc0b574a2f 100644 --- a/src/data/script_menu.h +++ b/src/data/script_menu.h @@ -1,23 +1,23 @@ // multichoice lists static const struct MenuAction MultichoiceList_BrineyOnDewford[] = { - {gText_Petalburg}, - {gText_Slateport}, + {COMPOUND_STRING("PETALBURG")}, + {COMPOUND_STRING("SLATEPORT")}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_EnterInfo[] = { - {gText_Enter2}, + {COMPOUND_STRING("ENTER")}, {gText_Info2}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_ContestInfo[] = { - {gText_WhatsAContest}, - {gText_TypesOfContests}, - {gText_Ranks}, + {COMPOUND_STRING("What's a CONTEST?")}, + {COMPOUND_STRING("Types of CONTESTS")}, + {COMPOUND_STRING("Ranks")}, {gText_Cancel2}, }; @@ -56,30 +56,30 @@ static const struct MenuAction MultichoiceList_RegisterMenu[] = static const struct MenuAction MultichoiceList_Bike[] = { - {gText_Mach}, - {gText_Acro}, + {COMPOUND_STRING("MACH")}, + {COMPOUND_STRING("ACRO")}, }; static const struct MenuAction MultichoiceList_StatusInfo[] = { - {gText_Psn}, - {gText_Par}, - {gText_Slp}, - {gText_Brn}, - {gText_Frz}, + {COMPOUND_STRING("PSN")}, + {COMPOUND_STRING("PAR")}, + {COMPOUND_STRING("SLP")}, + {COMPOUND_STRING("BRN")}, + {COMPOUND_STRING("FRZ")}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_BrineyOffDewford[] = { - {gText_Dewford}, + {COMPOUND_STRING("DEWFORD")}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_ViewedPaintings[] = { - {gText_SawIt}, - {gText_NotYet}, + {COMPOUND_STRING("Saw it")}, + {COMPOUND_STRING("Not yet")}, }; static const struct MenuAction MultichoiceList_YesNoInfo2[] = @@ -91,8 +91,8 @@ static const struct MenuAction MultichoiceList_YesNoInfo2[] = static const struct MenuAction MultichoiceList_ChallengeInfo[] = { - {gText_Challenge}, - {gText_Info3}, + {COMPOUND_STRING("CHALLENGE")}, + {COMPOUND_STRING("INFO")}, {gText_Exit}, }; @@ -210,82 +210,82 @@ static const struct MenuAction MultichoiceList_Mechadoll5_Q3[] = static const struct MenuAction MultichoiceList_VendingMachine[] = { - {gText_FreshWaterAndPrice}, - {gText_SodaPopAndPrice}, - {gText_LemonadeAndPrice}, + {COMPOUND_STRING("FRESH WATER{CLEAR_TO 0x48}¥200")}, + {COMPOUND_STRING("SODA POP{CLEAR_TO 0x48}¥300")}, + {COMPOUND_STRING("LEMONADE{CLEAR_TO 0x48}¥350")}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_MachBikeInfo[] = { - {gText_HowToRide}, - {gText_HowToTurn}, - {gText_SandySlopes}, + {COMPOUND_STRING("HOW TO RIDE")}, + {COMPOUND_STRING("HOW TO TURN")}, + {COMPOUND_STRING("SANDY SLOPES")}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_AcroBikeInfo[] = { - {gText_Wheelies}, - {gText_BunnyHops}, - {gText_Jump}, + {COMPOUND_STRING("WHEELIES")}, + {COMPOUND_STRING("BUNNY-HOPS")}, + {COMPOUND_STRING("JUMP")}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_Satisfaction[] = { - {gText_Satisfied}, - {gText_Dissatisfied}, + {COMPOUND_STRING("Satisfied")}, + {COMPOUND_STRING("Dissatisfied")}, }; static const struct MenuAction MultichoiceList_SternDeepSea[] = { - {gText_DeepSeaTooth}, - {gText_DeepSeaScale}, + {COMPOUND_STRING("DEEPSEATOOTH")}, + {COMPOUND_STRING("DEEPSEASCALE")}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_UnusedAshVendor[] = { - {gText_BlueFlute2}, - {gText_YellowFlute2}, - {gText_RedFlute2}, - {gText_WhiteFlute2}, - {gText_BlackFlute2}, - {gText_GlassChair}, - {gText_GlassDesk}, + {COMPOUND_STRING("BLUE FLUTE")}, + {COMPOUND_STRING("YELLOW FLUTE")}, + {COMPOUND_STRING("RED FLUTE")}, + {COMPOUND_STRING("WHITE FLUTE")}, + {COMPOUND_STRING("BLACK FLUTE")}, + {COMPOUND_STRING("GLASS CHAIR")}, + {COMPOUND_STRING("GLASS DESK")}, {gText_Cancel2}, }; static const struct MenuAction MultichoiceList_GameCornerDolls[] = { - {gText_TreeckoDollAndPrice}, - {gText_TorchicDollAndPrice}, - {gText_MudkipDollAndPrice}, + {COMPOUND_STRING("TREECKO DOLL 1,000 COINS")}, + {COMPOUND_STRING("TORCHIC DOLL 1,000 COINS")}, + {COMPOUND_STRING("MUDKIP DOLL 1,000 COINS")}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_GameCornerTMs[] = { - {gText_TM32AndPrice}, - {gText_TM29AndPrice}, - {gText_TM35AndPrice}, - {gText_TM24AndPrice}, - {gText_TM13AndPrice}, + {COMPOUND_STRING("TM32{CLEAR_TO 0x48}1,500 COINS")}, + {COMPOUND_STRING("TM29{CLEAR_TO 0x48}3,500 COINS")}, + {COMPOUND_STRING("TM35{CLEAR_TO 0x48}4,000 COINS")}, + {COMPOUND_STRING("TM24{CLEAR_TO 0x48}4,000 COINS")}, + {COMPOUND_STRING("TM13{CLEAR_TO 0x48}4,000 COINS")}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_GameCornerCoins[] = { - {gText_50CoinsAndPrice}, - {gText_500CoinsAndPrice}, + {COMPOUND_STRING(" 50 COINS ¥1,000")}, + {COMPOUND_STRING("500 COINS ¥10,000")}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_HowsFishing[] = { - {gText_Excellent2}, - {gText_NotSoGood}, + {COMPOUND_STRING("Excellent")}, + {COMPOUND_STRING("Not so good")}, }; static const struct MenuAction MultichoiceList_SSTidalSlateportWithBF[] = @@ -304,8 +304,8 @@ static const struct MenuAction MultichoiceList_SSTidalBattleFrontier[] = static const struct MenuAction MultichoiceList_RightLeft[] = { - {gText_Right}, - {gText_Left}, + {COMPOUND_STRING("Right")}, + {COMPOUND_STRING("Left")}, }; static const struct MenuAction MultichoiceList_SSTidalSlateportNoBF[] = @@ -452,8 +452,8 @@ static const struct MenuAction MultichoiceList_TourneyNoRecord[] = static const struct MenuAction MultichoiceList_Tent[] = { - {gText_RedTent}, - {gText_BlueTent}, + {COMPOUND_STRING("RED TENT")}, + {COMPOUND_STRING("BLUE TENT")}, }; static const struct MenuAction MultichoiceList_LinkServicesNoBerry[] = @@ -473,9 +473,9 @@ static const struct MenuAction MultichoiceList_YesNoInfo[] = static const struct MenuAction MultichoiceList_BattleMode[] = { - {gText_SingleBattle}, - {gText_DoubleBattle}, - {gText_MultiBattle}, + {COMPOUND_STRING("SINGLE BATTLE")}, + {COMPOUND_STRING("DOUBLE BATTLE")}, + {COMPOUND_STRING("MULTI BATTLE")}, {gText_Info2}, {gText_Exit}, }; @@ -506,46 +506,46 @@ static const struct MenuAction MultichoiceList_LinkServicesNoRecordBerry[] = static const struct MenuAction MultichoiceList_WirelessMinigame[] = { - {gText_PokemonJump}, - {gText_DodrioBerryPicking}, + {COMPOUND_STRING("POKéMON JUMP")}, + {COMPOUND_STRING("DODRIO BERRY-PICKING")}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_LinkLeader[] = { - {gText_JoinGroup}, - {gText_BecomeLeader}, + {COMPOUND_STRING("JOIN GROUP")}, + {COMPOUND_STRING("BECOME LEADER")}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_ContestRank[] = { - {gText_NormalRank}, - {gText_SuperRank}, - {gText_HyperRank}, - {gText_MasterRank}, + {COMPOUND_STRING("NORMAL RANK")}, + {COMPOUND_STRING("SUPER RANK")}, + {COMPOUND_STRING("HYPER RANK")}, + {COMPOUND_STRING("MASTER RANK")}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_FrontierItemChoose[] = { - {gText_BattleBag}, - {gText_HeldItem}, + {COMPOUND_STRING("BATTLE BAG")}, + {COMPOUND_STRING("HELD ITEM")}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_LinkContestInfo[] = { - {gText_LinkContest}, - {gText_AboutE_Mode}, - {gText_AboutG_Mode}, + {COMPOUND_STRING("LINK CONTEST")}, + {COMPOUND_STRING("ABOUT E-MODE")}, + {COMPOUND_STRING("ABOUT G-MODE")}, {gText_Cancel2}, }; static const struct MenuAction MultichoiceList_LinkContestMode[] = { - {gText_E_Mode}, - {gText_G_Mode}, + {COMPOUND_STRING("E-MODE")}, + {COMPOUND_STRING("G-MODE")}, {gText_Exit}, }; @@ -563,9 +563,9 @@ static const struct MenuAction MultichoiceList_ForcedStartMenu[] = static const struct MenuAction MultichoiceList_FrontierGamblerBet[] = { - {gText_5BP}, - {gText_10BP}, - {gText_15BP}, + {COMPOUND_STRING(" 5BP")}, + {COMPOUND_STRING("10BP")}, + {COMPOUND_STRING("15BP")}, {gText_Exit}, }; @@ -600,32 +600,32 @@ static const struct MenuAction MultichoiceList_UnusedSSTidal4[] = static const struct MenuAction MultichoiceList_Fossil[] = { - {gText_ClawFossil}, - {gText_RootFossil}, + {COMPOUND_STRING("CLAW FOSSIL")}, + {COMPOUND_STRING("ROOT FOSSIL")}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_YesNo[] = { {gText_Yes}, - {gText_No4}, + {COMPOUND_STRING("NO")}, }; static const struct MenuAction MultichoiceList_FrontierRules[] = { - {gText_TwoStyles}, - {gText_Lv50_3}, - {gText_OpenLevel2}, - {gText_MonTypeAndNo}, - {gText_HoldItems}, + {COMPOUND_STRING("TWO STYLES")}, + {COMPOUND_STRING("LV. 50")}, + {COMPOUND_STRING("OPEN LEVEL")}, + {COMPOUND_STRING("{PKMN} TYPE & NO.")}, + {COMPOUND_STRING("HOLD ITEMS")}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_FrontierPassInfo[] = { - {gText_Symbols2}, - {gText_Record3}, - {gText_BattlePts}, + {COMPOUND_STRING("SYMBOLS")}, + {COMPOUND_STRING("RECORD")}, + {COMPOUND_STRING("BATTLE PTS")}, {gText_Exit}, }; @@ -640,18 +640,18 @@ static const struct MenuAction MultichoiceList_BattleArenaRules[] = static const struct MenuAction MultichoiceList_BattleTowerRules[] = { - {gText_TowerInfo}, - {gText_BattleMon}, - {gText_BattleSalon}, - {gText_MultiLink2}, + {COMPOUND_STRING("TOWER INFO")}, + {COMPOUND_STRING("BATTLE {PKMN}")}, + {COMPOUND_STRING("BATTLE SALON")}, + {COMPOUND_STRING("MULTI-LINK")}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_BattleDomeRules[] = { - {gText_Matchup}, - {gText_TourneyTree}, - {gText_DoubleKO}, + {COMPOUND_STRING("MATCHUP")}, + {COMPOUND_STRING("TOURNEY TREE")}, + {COMPOUND_STRING("DOUBLE KO")}, {gText_Exit}, }; @@ -661,7 +661,7 @@ static const struct MenuAction MultichoiceList_BattleFactoryRules[] = {gText_SwapPartners}, {gText_SwapNumber}, {gText_SwapNotes}, - {gText_OpenLevel3}, + {COMPOUND_STRING("OPEN LEVEL")}, {gText_Exit}, }; @@ -677,18 +677,18 @@ static const struct MenuAction MultichoiceList_BattlePalaceRules[] = static const struct MenuAction MultichoiceList_BattlePyramidRules[] = { - {gText_PyramidPokemon}, - {gText_PyramidTrainers}, - {gText_PyramidMaze}, - {gText_BattleBag2}, + {COMPOUND_STRING("PYRAMID: POKéMON")}, + {COMPOUND_STRING("PYRAMID: TRAINERS")}, + {COMPOUND_STRING("PYRAMID: MAZE")}, + {COMPOUND_STRING("BATTLE BAG")}, {gText_Exit}, }; static const struct MenuAction MultichoiceList_BattlePikeRules[] = { - {gText_PokenavAndBag}, - {gText_HeldItems}, - {gText_PokemonOrder}, + {COMPOUND_STRING("POKéNAV AND BAG")}, + {COMPOUND_STRING("HELD ITEMS")}, + {COMPOUND_STRING("POKéMON ORDER")}, {gText_Exit}, }; @@ -722,24 +722,24 @@ static const struct MenuAction MultichoiceList_GoOnRetire[] = static const struct MenuAction MultichoiceList_TVLati[] = { - {gText_Red}, - {gText_Blue}, + {COMPOUND_STRING("RED")}, + {COMPOUND_STRING("BLUE")}, }; static const struct MenuAction MultichoiceList_BattleTowerFeelings[] = { - {gText_IllBattleNow}, - {gText_IWon}, - {gText_ILost}, - {gText_IWontTell}, + {COMPOUND_STRING("I'll battle now!")}, + {COMPOUND_STRING("I won!")}, + {COMPOUND_STRING("I lost!")}, + {COMPOUND_STRING("I won't tell.")}, }; static const struct MenuAction MultichoiceList_WheresRayquaza[] = { - {gText_CaveOfOrigin}, - {gText_MtPyre}, - {gText_SkyPillar}, - {gText_DontRemember}, + {COMPOUND_STRING("CAVE OF ORIGIN")}, + {COMPOUND_STRING("MT. PYRE")}, + {COMPOUND_STRING("SKY PILLAR")}, + {COMPOUND_STRING("Don't remember")}, }; static const struct MenuAction MultichoiceList_SlateportTentRules[] = @@ -773,8 +773,8 @@ static const struct MenuAction MultichoiceList_TagMatchType[] = static const struct MenuAction MultichoiceList_BerryPlot[] = { - {gText_Fertilize}, - {gText_PlantBerry}, + {COMPOUND_STRING("FERTILIZE")}, + {COMPOUND_STRING("PLANT BERRY")}, {gText_Exit}, }; diff --git a/src/field_specials.c b/src/field_specials.c index f5154f8424..680b527dc7 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -148,6 +148,15 @@ static void BufferFanClubTrainerName_(struct LinkBattleRecords *, u8, u8); static void BufferFanClubTrainerName_(u8 whichLinkTrainer, u8 whichNPCTrainer); #endif //FREE_LINK_BATTLE_RECORDS +static const u8 sText_BigGuy[] = _("Big guy"); +static const u8 sText_BigGirl[] = _("Big girl"); +static const u8 sText_Son[] = _("son"); +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) { SetMainCallback2(CB2_ShowDiploma); @@ -191,11 +200,11 @@ static void DetermineCyclingRoadResults(u32 numFrames, u8 numBikeCollisions) if (numBikeCollisions < 100) { ConvertIntToDecimalStringN(gStringVar1, numBikeCollisions, STR_CONV_MODE_LEFT_ALIGN, 2); - StringAppend(gStringVar1, gText_SpaceTimes); + StringAppend(gStringVar1, sText_SpaceTimes); } else { - StringCopy(gStringVar1, gText_99TimesPlus); + StringCopy(gStringVar1, sText_99TimesPlus); } if (numFrames < 3600) @@ -203,11 +212,11 @@ static void DetermineCyclingRoadResults(u32 numFrames, u8 numBikeCollisions) ConvertIntToDecimalStringN(gStringVar2, numFrames / 60, STR_CONV_MODE_RIGHT_ALIGN, 2); gStringVar2[2] = CHAR_DEC_SEPARATOR; ConvertIntToDecimalStringN(&gStringVar2[3], ((numFrames % 60) * 100) / 60, STR_CONV_MODE_LEADING_ZEROS, 2); - StringAppend(gStringVar2, gText_SpaceSeconds); + StringAppend(gStringVar2, sText_SpaceSeconds); } else { - StringCopy(gStringVar2, gText_1MinutePlus); + StringCopy(gStringVar2, sText_1MinutePlus); } result = 0; @@ -916,17 +925,17 @@ u8 GetPlayerTrainerIdOnesDigit(void) void GetPlayerBigGuyGirlString(void) { if (gSaveBlock2Ptr->playerGender == MALE) - StringCopy(gStringVar1, gText_BigGuy); + StringCopy(gStringVar1, sText_BigGuy); else - StringCopy(gStringVar1, gText_BigGirl); + StringCopy(gStringVar1, sText_BigGirl); } void GetRivalSonDaughterString(void) { if (gSaveBlock2Ptr->playerGender == MALE) - StringCopy(gStringVar1, gText_Daughter); + StringCopy(gStringVar1, sText_Daughter); else - StringCopy(gStringVar1, gText_Son); + StringCopy(gStringVar1, sText_Son); } u8 GetBattleOutcome(void) @@ -2421,89 +2430,89 @@ static const u8 *const sScrollableMultichoiceOptions[][MAX_SCROLL_MULTI_LENGTH] }, [SCROLL_MULTI_GLASS_WORKSHOP_VENDOR] = { - gText_BlueFlute, - gText_YellowFlute, - gText_RedFlute, - gText_WhiteFlute, - gText_BlackFlute, - gText_PrettyChair, - gText_PrettyDesk, + COMPOUND_STRING("BLUE FLUTE"), + COMPOUND_STRING("YELLOW FLUTE"), + COMPOUND_STRING("RED FLUTE"), + COMPOUND_STRING("WHITE FLUTE"), + COMPOUND_STRING("BLACK FLUTE"), + COMPOUND_STRING("PRETTY CHAIR"), + COMPOUND_STRING("PRETTY DESK"), gText_Exit }, [SCROLL_MULTI_POKEMON_FAN_CLUB_RATER] = { - gText_0Pts, - gText_10Pts, - gText_20Pts, - gText_30Pts, - gText_40Pts, - gText_50Pts, - gText_60Pts, - gText_70Pts, - gText_80Pts, - gText_90Pts, - gText_100Pts, - gText_QuestionMark + COMPOUND_STRING("0 pts"), + COMPOUND_STRING("10 pts"), + COMPOUND_STRING("20 pts"), + COMPOUND_STRING("30 pts"), + COMPOUND_STRING("40 pts"), + COMPOUND_STRING("50 pts"), + COMPOUND_STRING("60 pts"), + COMPOUND_STRING("70 pts"), + COMPOUND_STRING("80 pts"), + COMPOUND_STRING("90 pts"), + COMPOUND_STRING("100 pts"), + COMPOUND_STRING("?") }, [SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1] = { - gText_KissPoster16BP, - gText_KissCushion32BP, - gText_SmoochumDoll32BP, - gText_TogepiDoll48BP, - gText_MeowthDoll48BP, - gText_ClefairyDoll48BP, - gText_DittoDoll48BP, - gText_CyndaquilDoll80BP, - gText_ChikoritaDoll80BP, - gText_TotodileDoll80BP, + COMPOUND_STRING("KISS POSTER{CLEAR_TO 0x5E}16BP"), + COMPOUND_STRING("KISS CUSHION{CLEAR_TO 0x5E}32BP"), + COMPOUND_STRING("SMOOCHUM DOLL{CLEAR_TO 0x5E}32BP"), + COMPOUND_STRING("TOGEPI DOLL{CLEAR_TO 0x5E}48BP"), + COMPOUND_STRING("MEOWTH DOLL{CLEAR_TO 0x5E}48BP"), + COMPOUND_STRING("CLEFAIRY DOLL{CLEAR_TO 0x5E}48BP"), + COMPOUND_STRING("DITTO DOLL{CLEAR_TO 0x5E}48BP"), + COMPOUND_STRING("CYNDAQUIL DOLL{CLEAR_TO 0x5E}80BP"), + COMPOUND_STRING("CHIKORITA DOLL{CLEAR_TO 0x5E}80BP"), + COMPOUND_STRING("TOTODILE DOLL{CLEAR_TO 0x5E}80BP"), gText_Exit }, [SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2] = { - gText_LaprasDoll128BP, - gText_SnorlaxDoll128BP, - gText_VenusaurDoll256BP, - gText_CharizardDoll256BP, - gText_BlastoiseDoll256BP, + COMPOUND_STRING("LAPRAS DOLL{CLEAR_TO 0x58}128BP"), + COMPOUND_STRING("SNORLAX DOLL{CLEAR_TO 0x58}128BP"), + COMPOUND_STRING("VENUSAUR DOLL{CLEAR_TO 0x58}256BP"), + COMPOUND_STRING("CHARIZARD DOLL{CLEAR_TO 0x58}256BP"), + COMPOUND_STRING("BLASTOISE DOLL{CLEAR_TO 0x58}256BP"), gText_Exit }, [SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR] = { - gText_Protein1BP, - gText_Calcium1BP, - gText_Iron1BP, - gText_Zinc1BP, - gText_Carbos1BP, - gText_HpUp1BP, + COMPOUND_STRING("PROTEIN{CLEAR_TO 0x64}1BP"), + COMPOUND_STRING("CALCIUM{CLEAR_TO 0x64}1BP"), + COMPOUND_STRING("IRON{CLEAR_TO 0x64}1BP"), + COMPOUND_STRING("ZINC{CLEAR_TO 0x64}1BP"), + COMPOUND_STRING("CARBOS{CLEAR_TO 0x64}1BP"), + COMPOUND_STRING("HP UP{CLEAR_TO 0x64}1BP"), gText_Exit }, [SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR] = { - gText_Leftovers48BP, - gText_WhiteHerb48BP, - gText_QuickClaw48BP, - gText_MentalHerb48BP, - gText_BrightPowder64BP, - gText_ChoiceBand64BP, - gText_KingsRock64BP, - gText_FocusBand64BP, - gText_ScopeLens64BP, + COMPOUND_STRING("LEFTOVERS{CLEAR_TO 0x5E}48BP"), + COMPOUND_STRING("WHITE HERB{CLEAR_TO 0x5E}48BP"), + COMPOUND_STRING("QUICK CLAW{CLEAR_TO 0x5E}48BP"), + COMPOUND_STRING("MENTAL HERB{CLEAR_TO 0x5E}48BP"), + COMPOUND_STRING("BRIGHTPOWDER{CLEAR_TO 0x5E}64BP"), + COMPOUND_STRING("CHOICE BAND{CLEAR_TO 0x5E}64BP"), + COMPOUND_STRING("KING'S ROCK{CLEAR_TO 0x5E}64BP"), + COMPOUND_STRING("FOCUS BAND{CLEAR_TO 0x5E}64BP"), + COMPOUND_STRING("SCOPE LENS{CLEAR_TO 0x5E}64BP"), gText_Exit }, [SCROLL_MULTI_BERRY_POWDER_VENDOR] = { - gText_EnergyPowder50, - gText_EnergyRoot80, - gText_HealPowder50, - gText_RevivalHerb300, - gText_Protein1000, - gText_Iron1000, - gText_Carbos1000, - gText_Calcium1000, - gText_Zinc1000, - gText_HPUp1000, - gText_PPUp3000, + COMPOUND_STRING("ENERGYPOWDER{CLEAR_TO 114}{FONT_SMALL}50"), + COMPOUND_STRING("ENERGY ROOT{CLEAR_TO 114}{FONT_SMALL}80"), + COMPOUND_STRING("HEAL POWDER{CLEAR_TO 114}{FONT_SMALL}50"), + COMPOUND_STRING("REVIVAL HERB{CLEAR_TO 108}{FONT_SMALL}300"), + COMPOUND_STRING("PROTEIN{CLEAR_TO 99}{FONT_SMALL}1,000"), + COMPOUND_STRING("IRON{CLEAR_TO 99}{FONT_SMALL}1,000"), + COMPOUND_STRING("CARBOS{CLEAR_TO 99}{FONT_SMALL}1,000"), + COMPOUND_STRING("CALCIUM{CLEAR_TO 99}{FONT_SMALL}1,000"), + COMPOUND_STRING("ZINC{CLEAR_TO 99}{FONT_SMALL}1,000"), + COMPOUND_STRING("HP UP{CLEAR_TO 99}{FONT_SMALL}1,000"), + COMPOUND_STRING("PP UP{CLEAR_TO 99}{FONT_SMALL}3,000"), gText_Exit }, [SCROLL_MULTI_BF_RECEPTIONIST] = @@ -2521,30 +2530,30 @@ static const u8 *const sScrollableMultichoiceOptions[][MAX_SCROLL_MULTI_LENGTH] }, [SCROLL_MULTI_BF_MOVE_TUTOR_1] = { - gText_Softboiled16BP, - gText_SeismicToss24BP, - gText_DreamEater24BP, - gText_MegaPunch24BP, - gText_MegaKick48BP, - gText_BodySlam48BP, - gText_RockSlide48BP, - gText_Counter48BP, - gText_ThunderWave48BP, - gText_SwordsDance48BP, + COMPOUND_STRING("SOFTBOILED{CLEAR_TO 0x4E}16BP"), + COMPOUND_STRING("SEISMIC TOSS{CLEAR_TO 0x4E}24BP"), + COMPOUND_STRING("DREAM EATER{CLEAR_TO 0x4E}24BP"), + COMPOUND_STRING("MEGA PUNCH{CLEAR_TO 0x4E}24BP"), + COMPOUND_STRING("MEGA KICK{CLEAR_TO 0x4E}48BP"), + COMPOUND_STRING("BODY SLAM{CLEAR_TO 0x4E}48BP"), + COMPOUND_STRING("ROCK SLIDE{CLEAR_TO 0x4E}48BP"), + COMPOUND_STRING("COUNTER{CLEAR_TO 0x4E}48BP"), + COMPOUND_STRING("THUNDER WAVE{CLEAR_TO 0x4E}48BP"), + COMPOUND_STRING("SWORDS DANCE{CLEAR_TO 0x4E}48BP"), gText_Exit }, [SCROLL_MULTI_BF_MOVE_TUTOR_2] = { - gText_DefenseCurl16BP, - gText_Snore24BP, - gText_MudSlap24BP, - gText_Swift24BP, - gText_IcyWind24BP, - gText_Endure48BP, - gText_PsychUp48BP, - gText_IcePunch48BP, - gText_ThunderPunch48BP, - gText_FirePunch48BP, + COMPOUND_STRING("DEFENSE CURL{CLEAR_TO 0x4E}16BP"), + COMPOUND_STRING("SNORE{CLEAR_TO 0x4E}24BP"), + COMPOUND_STRING("MUD-SLAP{CLEAR_TO 0x4E}24BP"), + COMPOUND_STRING("SWIFT{CLEAR_TO 0x4E}24BP"), + COMPOUND_STRING("ICY WIND{CLEAR_TO 0x4E}24BP"), + COMPOUND_STRING("ENDURE{CLEAR_TO 0x4E}48BP"), + COMPOUND_STRING("PSYCH UP{CLEAR_TO 0x4E}48BP"), + COMPOUND_STRING("ICE PUNCH{CLEAR_TO 0x4E}48BP"), + COMPOUND_STRING("THUNDERPUNCH{CLEAR_TO 0x4E}48BP"), + COMPOUND_STRING("FIRE PUNCH{CLEAR_TO 0x4E}48BP"), gText_Exit }, [SCROLL_MULTI_SS_TIDAL_DESTINATION] = diff --git a/src/strings.c b/src/strings.c index b886ac639f..f5372c96e0 100644 --- a/src/strings.c +++ b/src/strings.c @@ -513,17 +513,7 @@ const u8 gText_Brawly[] = _("BRAWLY"); const u8 gText_Winona[] = _("WINONA"); const u8 gText_Phoebe[] = _("PHOEBE"); const u8 gText_Glacia[] = _("GLACIA"); -const u8 gText_Petalburg[] = _("PETALBURG"); -const u8 gText_Slateport[] = _("SLATEPORT"); -const u8 gText_Littleroot[] = _("LITTLEROOT"); // Unused. Given the context, Briney may at one point have been able to sail the player here -const u8 gText_Lilycove[] = _("LILYCOVE"); // Unused. Given the context, Briney may at one point have been able to sail the player here -const u8 gText_Dewford[] = _("DEWFORD"); -const u8 gText_Enter2[] = _("ENTER"); const u8 gText_Info2[] = _("INFO"); -const u8 gText_WhatsAContest[] = _("What's a CONTEST?"); -const u8 gText_TypesOfContests[] = _("Types of CONTESTS"); -const u8 gText_Ranks[] = _("Ranks"); -const u8 gText_Judging[] = _("Judging"); //unused const u8 gText_CoolnessContest[] = _("COOLNESS CONTEST"); const u8 gText_BeautyContest[] = _("BEAUTY CONTEST"); const u8 gText_CutenessContest[] = _("CUTENESS CONTEST"); @@ -531,71 +521,17 @@ const u8 gText_SmartnessContest[] = _("SMARTNESS CONTEST"); const u8 gText_ToughnessContest[] = _("TOUGHNESS CONTEST"); const u8 gText_Decoration2[] = _("DECORATION"); const u8 gText_PackUp[] = _("PACK UP"); -const u8 gText_Count[] = _("COUNT"); //unused const u8 gText_Registry[] = _("REGISTRY"); const u8 gText_Information[] = _("INFORMATION"); -const u8 gText_Mach[] = _("MACH"); -const u8 gText_Acro[] = _("ACRO"); -const u8 gText_Psn[] = _("PSN"); -const u8 gText_Par[] = _("PAR"); -const u8 gText_Slp[] = _("SLP"); -const u8 gText_Brn[] = _("BRN"); -const u8 gText_Frz[] = _("FRZ"); -const u8 gText_Toxic[] = _("TOXIC"); // Unused -const u8 gText_Ok3[] = _("OK"); // Unused -const u8 gText_Quit[] = _("QUIT"); // Unused -const u8 gText_SawIt[] = _("Saw it"); -const u8 gText_NotYet[] = _("Not yet"); const u8 gText_Yes[] = _("YES"); const u8 gText_No[] = _("NO"); -const u8 gText_Info4[] = _("INFO"); // Unused -const u8 gText_SingleBattle[] = _("SINGLE BATTLE"); -const u8 gText_DoubleBattle[] = _("DOUBLE BATTLE"); -const u8 gText_MultiBattle[] = _("MULTI BATTLE"); -const u8 gText_MrBriney[] = _("MR. BRINEY"); // Unused -const u8 gText_Challenge[] = _("CHALLENGE"); -const u8 gText_Info3[] = _("INFO"); const u8 gText_Lv50[] = _("LV. 50"); const u8 gText_OpenLevel[] = _("OPEN LEVEL"); -const u8 gText_FreshWaterAndPrice[] = _("FRESH WATER{CLEAR_TO 0x48}¥200"); -const u8 gText_SodaPopAndPrice[] = _("SODA POP{CLEAR_TO 0x48}¥300"); -const u8 gText_LemonadeAndPrice[] = _("LEMONADE{CLEAR_TO 0x48}¥350"); -const u8 gText_HowToRide[] = _("HOW TO RIDE"); -const u8 gText_HowToTurn[] = _("HOW TO TURN"); -const u8 gText_SandySlopes[] = _("SANDY SLOPES"); -const u8 gText_Wheelies[] = _("WHEELIES"); -const u8 gText_BunnyHops[] = _("BUNNY-HOPS"); -const u8 gText_Jump[] = _("JUMP"); -const u8 gText_Satisfied[] = _("Satisfied"); -const u8 gText_Dissatisfied[] = _("Dissatisfied"); -const u8 gText_DeepSeaTooth[] = _("DEEPSEATOOTH"); -const u8 gText_DeepSeaScale[] = _("DEEPSEASCALE"); -const u8 gText_BlueFlute2[] = _("BLUE FLUTE"); -const u8 gText_YellowFlute2[] = _("YELLOW FLUTE"); -const u8 gText_RedFlute2[] = _("RED FLUTE"); -const u8 gText_WhiteFlute2[] = _("WHITE FLUTE"); -const u8 gText_BlackFlute2[] = _("BLACK FLUTE"); -const u8 gText_GlassChair[] = _("GLASS CHAIR"); -const u8 gText_GlassDesk[] = _("GLASS DESK"); -const u8 gText_TreeckoDollAndPrice[] = _("TREECKO DOLL 1,000 COINS"); -const u8 gText_TorchicDollAndPrice[] = _("TORCHIC DOLL 1,000 COINS"); -const u8 gText_MudkipDollAndPrice[] = _("MUDKIP DOLL 1,000 COINS"); -const u8 gText_50CoinsAndPrice[] = _(" 50 COINS ¥1,000"); -const u8 gText_500CoinsAndPrice[] = _("500 COINS ¥10,000"); -const u8 gText_Excellent2[] = _("Excellent"); -const u8 gText_NotSoGood[] = _("Not so good"); const u8 gText_RedShard[] = _("RED SHARD"); const u8 gText_YellowShard[] = _("YELLOW SHARD"); const u8 gText_BlueShard[] = _("BLUE SHARD"); const u8 gText_GreenShard[] = _("GREEN SHARD"); const u8 gText_BattleFrontier[] = _("BATTLE FRONTIER"); -const u8 gText_Right[] = _("Right"); -const u8 gText_Left[] = _("Left"); -const u8 gText_TM32AndPrice[] = _("TM32{CLEAR_TO 0x48}1,500 COINS"); -const u8 gText_TM29AndPrice[] = _("TM29{CLEAR_TO 0x48}3,500 COINS"); -const u8 gText_TM35AndPrice[] = _("TM35{CLEAR_TO 0x48}4,000 COINS"); -const u8 gText_TM24AndPrice[] = _("TM24{CLEAR_TO 0x48}4,000 COINS"); -const u8 gText_TM13AndPrice[] = _("TM13{CLEAR_TO 0x48}4,000 COINS"); const u8 gText_Cool[] = _("COOL"); const u8 gText_Beauty[] = _("BEAUTY"); const u8 gText_Cute[] = _("CUTE"); @@ -623,21 +559,10 @@ 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_NormalRank[] = _("NORMAL RANK"); -const u8 gText_SuperRank[] = _("SUPER RANK"); -const u8 gText_HyperRank[] = _("HYPER RANK"); -const u8 gText_MasterRank[] = _("MASTER RANK"); const u8 gText_Single2[] = _("SINGLE"); const u8 gText_Double2[] = _("DOUBLE"); const u8 gText_Multi[] = _("MULTI"); const u8 gText_MultiLink[] = _("MULTI-LINK"); -const u8 gText_BattleBag[] = _("BATTLE BAG"); -const u8 gText_HeldItem[] = _("HELD ITEM"); -const u8 gText_LinkContest[] = _("LINK CONTEST"); -const u8 gText_AboutE_Mode[] = _("ABOUT E-MODE"); -const u8 gText_AboutG_Mode[] = _("ABOUT G-MODE"); -const u8 gText_E_Mode[] = _("E-MODE"); -const u8 gText_G_Mode[] = _("G-MODE"); const u8 gText_MenuOptionPokedex[] = _("POKéDEX"); const u8 gText_MenuOptionPokemon[] = _("POKéMON"); const u8 gText_MenuOptionBag[] = _("BAG"); @@ -646,22 +571,10 @@ const u8 gText_Blank[] = _(""); const u8 gText_MenuOptionSave[] = _("SAVE"); const u8 gText_MenuOptionOption[] = _("OPTION"); const u8 gText_MenuOptionExit[] = _("EXIT"); -const u8 gText_5BP[] = _(" 5BP"); -const u8 gText_10BP[] = _("10BP"); -const u8 gText_15BP[] = _("15BP"); -const u8 gText_RedTent[] = _("RED TENT"); -const u8 gText_BlueTent[] = _("BLUE TENT"); const u8 gText_SouthernIsland[] = _("SOUTHERN ISLAND"); const u8 gText_BirthIsland[] = _("BIRTH ISLAND"); const u8 gText_FarawayIsland[] = _("FARAWAY ISLAND"); const u8 gText_NavelRock[] = _("NAVEL ROCK"); -const u8 gText_ClawFossil[] = _("CLAW FOSSIL"); -const u8 gText_RootFossil[] = _("ROOT FOSSIL"); -const u8 gText_No4[] = _("NO"); -const u8 gText_IllBattleNow[] = _("I'll battle now!"); -const u8 gText_IWon[] = _("I won!"); -const u8 gText_ILost[] = _("I lost!"); -const u8 gText_IWontTell[] = _("I won't tell."); const u8 gText_NormalTagMatch[] = _("NORMAL TAG MATCH"); const u8 gText_VarietyTagMatch[] = _("VARIETY TAG MATCH"); const u8 gText_UniqueTagMatch[] = _("UNIQUE TAG MATCH"); @@ -670,69 +583,25 @@ 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_EmptyLinkService[] = _(""); // Maybe Spin Trade? -const u8 gText_PokemonJump[] = _("POKéMON JUMP"); -const u8 gText_DodrioBerryPicking[] = _("DODRIO BERRY-PICKING"); -const u8 gText_BecomeLeader[] = _("BECOME LEADER"); -const u8 gText_JoinGroup[] = _("JOIN GROUP"); -const u8 gText_TwoStyles[] = _("TWO STYLES"); -const u8 gText_Lv50_3[] = _("LV. 50"); -const u8 gText_OpenLevel2[] = _("OPEN LEVEL"); -const u8 gText_MonTypeAndNo[] = _("{PKMN} TYPE & NO."); -const u8 gText_HoldItems[] = _("HOLD ITEMS"); -const u8 gText_Symbols2[] = _("SYMBOLS"); -const u8 gText_Record3[] = _("RECORD"); -const u8 gText_BattlePts[] = _("BATTLE PTS"); -const u8 gText_TowerInfo[] = _("TOWER INFO"); -const u8 gText_BattleMon[] = _("BATTLE {PKMN}"); -const u8 gText_BattleSalon[] = _("BATTLE SALON"); -const u8 gText_MultiLink2[] = _("MULTI-LINK"); const u8 gText_BattleRules[] = _("BATTLE RULES"); const u8 gText_JudgeMind[] = _("JUDGE: MIND"); const u8 gText_JudgeSkill[] = _("JUDGE: SKILL"); const u8 gText_JudgeBody[] = _("JUDGE: BODY"); -const u8 gText_Matchup[] = _("MATCHUP"); -const u8 gText_TourneyTree[] = _("TOURNEY TREE"); -const u8 gText_DoubleKO[] = _("DOUBLE KO"); const u8 gText_BasicRules[] = _("BASIC RULES"); const u8 gText_SwapPartners[] = _("SWAP: PARTNER"); const u8 gText_SwapNumber[] = _("SWAP: NUMBER"); const u8 gText_SwapNotes[] = _("SWAP: NOTES"); -const u8 gText_OpenLevel3[] = _("OPEN LEVEL"); const u8 gText_BattleBasics[] = _("BATTLE BASICS"); const u8 gText_PokemonNature[] = _("POKéMON NATURE"); const u8 gText_PokemonMoves[] = _("POKéMON MOVES"); const u8 gText_Underpowered[] = _("UNDERPOWERED"); const u8 gText_WhenInDanger[] = _("WHEN IN DANGER"); -const u8 gText_PyramidPokemon[] = _("PYRAMID: POKéMON"); -const u8 gText_PyramidTrainers[] = _("PYRAMID: TRAINERS"); -const u8 gText_PyramidMaze[] = _("PYRAMID: MAZE"); -const u8 gText_BattleBag2[] = _("BATTLE BAG"); -const u8 gText_PokenavAndBag[] = _("POKéNAV AND BAG"); -const u8 gText_HeldItems[] = _("HELD ITEMS"); -const u8 gText_PokemonOrder[] = _("POKéMON ORDER"); 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_99TimesPlus[] = _("99 times +"); -const u8 gText_1MinutePlus[] = _("1 minute +"); -const u8 gText_SpaceSeconds[] = _(" seconds"); -const u8 gText_SpaceTimes[] = _(" time(s)"); -const u8 gText_Dot[] = _("."); // Unused -const u8 gText_BigGuy[] = _("Big guy"); -const u8 gText_BigGirl[] = _("Big girl"); -const u8 gText_Son[] = _("son"); -const u8 gText_Daughter[] = _("daughter"); -const u8 gText_BlueFlute[] = _("BLUE FLUTE"); -const u8 gText_YellowFlute[] = _("YELLOW FLUTE"); -const u8 gText_RedFlute[] = _("RED FLUTE"); -const u8 gText_WhiteFlute[] = _("WHITE FLUTE"); -const u8 gText_BlackFlute[] = _("BLACK FLUTE"); -const u8 gText_PrettyChair[] = _("PRETTY CHAIR"); -const u8 gText_PrettyDesk[] = _("PRETTY DESK"); const u8 gText_1F[] = _("1F"); const u8 gText_2F[] = _("2F"); const u8 gText_3F[] = _("3F"); @@ -751,25 +620,10 @@ const u8 gText_B4F[] = _("B4F"); const u8 gText_Rooftop[] = _("ROOFTOP"); const u8 gText_ElevatorNowOn[] = _("Now on:"); const u8 gText_BP[] = _("BP"); -const u8 gText_EnergyPowder50[] = _("ENERGYPOWDER{CLEAR_TO 114}{FONT_SMALL}50"); -const u8 gText_EnergyRoot80[] = _("ENERGY ROOT{CLEAR_TO 114}{FONT_SMALL}80"); -const u8 gText_HealPowder50[] = _("HEAL POWDER{CLEAR_TO 114}{FONT_SMALL}50"); -const u8 gText_RevivalHerb300[] = _("REVIVAL HERB{CLEAR_TO 108}{FONT_SMALL}300"); -const u8 gText_Protein1000[] = _("PROTEIN{CLEAR_TO 99}{FONT_SMALL}1,000"); -const u8 gText_Iron1000[] = _("IRON{CLEAR_TO 99}{FONT_SMALL}1,000"); -const u8 gText_Carbos1000[] = _("CARBOS{CLEAR_TO 99}{FONT_SMALL}1,000"); -const u8 gText_Calcium1000[] = _("CALCIUM{CLEAR_TO 99}{FONT_SMALL}1,000"); -const u8 gText_Zinc1000[] = _("ZINC{CLEAR_TO 99}{FONT_SMALL}1,000"); -const u8 gText_HPUp1000[] = _("HP UP{CLEAR_TO 99}{FONT_SMALL}1,000"); -const u8 gText_PPUp3000[] = _("PP UP{CLEAR_TO 99}{FONT_SMALL}3,000"); const u8 gText_RankingHall[] = _("RANKING HALL"); const u8 gText_ExchangeService[] = _("EXCHANGE SERVICE"); const u8 gText_LilycoveCity[] = _("LILYCOVE CITY"); const u8 gText_SlateportCity[] = _("SLATEPORT CITY"); -const u8 gText_CaveOfOrigin[] = _("CAVE OF ORIGIN"); -const u8 gText_MtPyre[] = _("MT. PYRE"); -const u8 gText_SkyPillar[] = _("SKY PILLAR"); -const u8 gText_DontRemember[] = _("Don't remember"); const u8 gText_Exit[] = _("EXIT"); const u8 gText_YourPartysFull[] = _("Your party's full!{PAUSE_UNTIL_PRESS}"); const u8 gText_NatureSlash[] = _("NATURE/"); @@ -909,68 +763,6 @@ const u8 gText_Jackpot[] = _("jackpot"); const u8 gText_First[] = _("first"); const u8 gText_Second[] = _("second"); const u8 gText_Third[] = _("third"); -const u8 gText_0Pts[] = _("0 pts"); -const u8 gText_10Pts[] = _("10 pts"); -const u8 gText_20Pts[] = _("20 pts"); -const u8 gText_30Pts[] = _("30 pts"); -const u8 gText_40Pts[] = _("40 pts"); -const u8 gText_50Pts[] = _("50 pts"); -const u8 gText_60Pts[] = _("60 pts"); -const u8 gText_70Pts[] = _("70 pts"); -const u8 gText_80Pts[] = _("80 pts"); -const u8 gText_90Pts[] = _("90 pts"); -const u8 gText_100Pts[] = _("100 pts"); -const u8 gText_QuestionMark[] = _("?"); -const u8 gText_KissPoster16BP[] = _("KISS POSTER{CLEAR_TO 0x5E}16BP"); -const u8 gText_KissCushion32BP[] = _("KISS CUSHION{CLEAR_TO 0x5E}32BP"); -const u8 gText_SmoochumDoll32BP[] = _("SMOOCHUM DOLL{CLEAR_TO 0x5E}32BP"); -const u8 gText_TogepiDoll48BP[] = _("TOGEPI DOLL{CLEAR_TO 0x5E}48BP"); -const u8 gText_MeowthDoll48BP[] = _("MEOWTH DOLL{CLEAR_TO 0x5E}48BP"); -const u8 gText_ClefairyDoll48BP[] = _("CLEFAIRY DOLL{CLEAR_TO 0x5E}48BP"); -const u8 gText_DittoDoll48BP[] = _("DITTO DOLL{CLEAR_TO 0x5E}48BP"); -const u8 gText_CyndaquilDoll80BP[] = _("CYNDAQUIL DOLL{CLEAR_TO 0x5E}80BP"); -const u8 gText_ChikoritaDoll80BP[] = _("CHIKORITA DOLL{CLEAR_TO 0x5E}80BP"); -const u8 gText_TotodileDoll80BP[] = _("TOTODILE DOLL{CLEAR_TO 0x5E}80BP"); -const u8 gText_LaprasDoll128BP[] = _("LAPRAS DOLL{CLEAR_TO 0x58}128BP"); -const u8 gText_SnorlaxDoll128BP[] = _("SNORLAX DOLL{CLEAR_TO 0x58}128BP"); -const u8 gText_VenusaurDoll256BP[] = _("VENUSAUR DOLL{CLEAR_TO 0x58}256BP"); -const u8 gText_CharizardDoll256BP[] = _("CHARIZARD DOLL{CLEAR_TO 0x58}256BP"); -const u8 gText_BlastoiseDoll256BP[] = _("BLASTOISE DOLL{CLEAR_TO 0x58}256BP"); -const u8 gText_Protein1BP[] = _("PROTEIN{CLEAR_TO 0x64}1BP"); -const u8 gText_Calcium1BP[] = _("CALCIUM{CLEAR_TO 0x64}1BP"); -const u8 gText_Iron1BP[] = _("IRON{CLEAR_TO 0x64}1BP"); -const u8 gText_Zinc1BP[] = _("ZINC{CLEAR_TO 0x64}1BP"); -const u8 gText_Carbos1BP[] = _("CARBOS{CLEAR_TO 0x64}1BP"); -const u8 gText_HpUp1BP[] = _("HP UP{CLEAR_TO 0x64}1BP"); -const u8 gText_Leftovers48BP[] = _("LEFTOVERS{CLEAR_TO 0x5E}48BP"); -const u8 gText_WhiteHerb48BP[] = _("WHITE HERB{CLEAR_TO 0x5E}48BP"); -const u8 gText_QuickClaw48BP[] = _("QUICK CLAW{CLEAR_TO 0x5E}48BP"); -const u8 gText_MentalHerb48BP[] = _("MENTAL HERB{CLEAR_TO 0x5E}48BP"); -const u8 gText_BrightPowder64BP[] = _("BRIGHTPOWDER{CLEAR_TO 0x5E}64BP"); -const u8 gText_ChoiceBand64BP[] = _("CHOICE BAND{CLEAR_TO 0x5E}64BP"); -const u8 gText_KingsRock64BP[] = _("KING'S ROCK{CLEAR_TO 0x5E}64BP"); -const u8 gText_FocusBand64BP[] = _("FOCUS BAND{CLEAR_TO 0x5E}64BP"); -const u8 gText_ScopeLens64BP[] = _("SCOPE LENS{CLEAR_TO 0x5E}64BP"); -const u8 gText_Softboiled16BP[] = _("SOFTBOILED{CLEAR_TO 0x4E}16BP"); -const u8 gText_SeismicToss24BP[] = _("SEISMIC TOSS{CLEAR_TO 0x4E}24BP"); -const u8 gText_DreamEater24BP[] = _("DREAM EATER{CLEAR_TO 0x4E}24BP"); -const u8 gText_MegaPunch24BP[] = _("MEGA PUNCH{CLEAR_TO 0x4E}24BP"); -const u8 gText_MegaKick48BP[] = _("MEGA KICK{CLEAR_TO 0x4E}48BP"); -const u8 gText_BodySlam48BP[] = _("BODY SLAM{CLEAR_TO 0x4E}48BP"); -const u8 gText_RockSlide48BP[] = _("ROCK SLIDE{CLEAR_TO 0x4E}48BP"); -const u8 gText_Counter48BP[] = _("COUNTER{CLEAR_TO 0x4E}48BP"); -const u8 gText_ThunderWave48BP[] = _("THUNDER WAVE{CLEAR_TO 0x4E}48BP"); -const u8 gText_SwordsDance48BP[] = _("SWORDS DANCE{CLEAR_TO 0x4E}48BP"); -const u8 gText_DefenseCurl16BP[] = _("DEFENSE CURL{CLEAR_TO 0x4E}16BP"); -const u8 gText_Snore24BP[] = _("SNORE{CLEAR_TO 0x4E}24BP"); -const u8 gText_MudSlap24BP[] = _("MUD-SLAP{CLEAR_TO 0x4E}24BP"); -const u8 gText_Swift24BP[] = _("SWIFT{CLEAR_TO 0x4E}24BP"); -const u8 gText_IcyWind24BP[] = _("ICY WIND{CLEAR_TO 0x4E}24BP"); -const u8 gText_Endure48BP[] = _("ENDURE{CLEAR_TO 0x4E}48BP"); -const u8 gText_PsychUp48BP[] = _("PSYCH UP{CLEAR_TO 0x4E}48BP"); -const u8 gText_IcePunch48BP[] = _("ICE PUNCH{CLEAR_TO 0x4E}48BP"); -const u8 gText_ThunderPunch48BP[] = _("THUNDERPUNCH{CLEAR_TO 0x4E}48BP"); -const u8 gText_FirePunch48BP[] = _("FIRE PUNCH{CLEAR_TO 0x4E}48BP"); #if OW_POISON_DAMAGE < GEN_4 const u8 gText_PkmnFainted_FldPsn[] = _("{STR_VAR_1} fainted…\p\n"); #else @@ -1193,9 +985,6 @@ const u8 gJPText_ConnectionComplete[] = _("つうしん　しゅうりょう！" const u8 gJPText_NewTrainerHasComeToHoenn[] = _("あらたな　トレーナーが\nホウエンに　やってきた！"); const u8 gJPText_PleaseWaitAMoment[] = _("しばらく　おまちください"); const u8 gJPText_WriteErrorUnableToSaveData[] = _("かきこみ　エラー　です\nデータが　ほぞん　できませんでした"); -const u8 gText_Red[] = _("RED"); -const u8 gText_Blue[] = _("BLUE"); -const u8 gText_3Dashes[] = _("---"); // Unused const u8 gText_SingleBattleRoomResults[] = _("{PLAYER}'s Single Battle Room Results"); const u8 gText_DoubleBattleRoomResults[] = _("{PLAYER}'s Double Battle Room Results"); const u8 gText_MultiBattleRoomResults[] = _("{PLAYER}'s Multi Battle Room Results"); @@ -1563,8 +1352,6 @@ const u8 gText_Berries[] = _("BERRIES"); const u8 gText_ExpShareOn[] = _("The Exp. Share has been turned on.{PAUSE_UNTIL_PRESS}"); const u8 gText_ExpShareOff[] = _("The Exp. Share has been turned off.{PAUSE_UNTIL_PRESS}"); const u8 gText_BasePointsResetToZero[] = _("{STR_VAR_1}'s base points\nwere all reset to zero!{PAUSE_UNTIL_PRESS}"); -const u8 gText_Fertilize[] = _("FERTILIZE"); -const u8 gText_PlantBerry[] = _("PLANT BERRY"); const u8 gText_AM[] = _("AM"); const u8 gText_PM[] = _("PM"); const u8 gText_Relearn[] = _("{START_BUTTON} RELEARN"); // future note: don't decap this, because it mimics the summary screen BG graphics which will not get decapped