From 7b2da8e4025354320b4cd80c5c6c4724431d28ce Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 13 Sep 2022 14:14:36 -0400 Subject: [PATCH] Sync/document the rest of strings.c --- data/text/save.inc | 2 +- include/strings.h | 170 +++++----- src/berry_crush.c | 2 +- src/berry_pouch.c | 2 +- src/clear_save_data_screen.c | 4 +- src/diploma.c | 10 +- src/item.c | 2 +- src/item_use.c | 29 +- src/main_menu.c | 6 +- src/menu.c | 2 +- src/mystery_event_script.c | 2 +- src/option_menu.c | 2 +- src/party_menu.c | 22 +- src/pokemon_special_anim_scene.c | 54 +-- src/script_menu.c | 12 +- src/shop.c | 4 +- src/start_menu.c | 20 +- src/strings.c | 362 ++++++++++----------- src/tm_case.c | 4 +- src/trade.c | 24 +- src/wireless_communication_status_screen.c | 11 +- 21 files changed, 372 insertions(+), 374 deletions(-) diff --git a/data/text/save.inc b/data/text/save.inc index d71e03f1e..bbaebf72c 100644 --- a/data/text/save.inc +++ b/data/text/save.inc @@ -12,7 +12,7 @@ gText_SavingDontTurnOffThePower:: gText_PlayerSavedTheGame:: .string "{PLAYER} saved the game.$" -gText_SaveFailed:: +gText_SaveFailed2:: .string "セーブに　しっぱい　しました‥$" gText_DifferentGameFile:: diff --git a/include/strings.h b/include/strings.h index 3c527b58a..222ed935d 100644 --- a/include/strings.h +++ b/include/strings.h @@ -76,8 +76,6 @@ extern const u8 gText_Ferry[]; extern const u8 gText_SecretBase[]; extern const u8 gText_Hideout[]; extern const u8 gText_FlyToWhere[]; -extern const u8 gStartMenuText_PokemonLeague[]; -extern const u8 gStartMenuText_PokemonCenter[]; extern const u8 gText_ApostropheSBase[]; extern const u8 gText_NoRegistry[]; extern const u8 gText_OkayToDeleteFromRegistry[]; @@ -89,7 +87,7 @@ extern const u8 gText_IsThisTheCorrectTime[]; extern const u8 gText_PkmnFainted3[]; extern const u8 gText_Coins[]; extern const u8 gText_EggNickname[]; -extern const u8 gStartMenuText_Pokemon[]; +extern const u8 gText_MenuPokemon[]; extern const u8 gOtherText_Use[]; extern const u8 gOtherText_Toss[]; @@ -97,7 +95,7 @@ extern const u8 gOtherText_Give[]; extern const u8 gOtherText_Exit[]; extern const u8 gText_ThreeHyphens[]; extern const u8 gText_SevenHyphens[]; -extern const u8 gOtherText_UnkF9_08_Clear_01[]; +extern const u8 gText_NumberClear01[]; extern const u8 gText_TimesStrVar1[]; extern const u8 gText_IsSelected[]; extern const u8 gText_ThereIsNoPokemon[]; @@ -170,20 +168,20 @@ extern const u8 gText_Withdraw[]; extern const u8 gText_ReturnToPC[]; extern const u8 gText_OakForbidsUseOfItemHere[]; -extern const u8 gUnknown_8416451[]; -extern const u8 gUnknown_8416537[]; -extern const u8 gUnknown_841658C[]; -extern const u8 gUnknown_841659E[]; -extern const u8 gUnknown_84165D2[]; -extern const u8 gUnknown_8416600[]; -extern const u8 gUnknown_8416631[]; -extern const u8 gUnknown_8416644[]; -extern const u8 gUnknown_841665C[]; -extern const u8 gUnknown_8416690[]; -extern const u8 gUnknown_84166A7[]; +extern const u8 gText_CantDismountBike[]; +extern const u8 gText_CoinCase[]; +extern const u8 gText_PlayerUsedVar2[]; +extern const u8 gText_RepelEffectsLingered[]; +extern const u8 gText_UsedVar2WildLured[]; +extern const u8 gText_UsedVar2WildRepelled[]; +extern const u8 gText_BoxFull[]; +extern const u8 gText_PowderQty[]; +extern const u8 gText_PlayedPokeFluteCatchy[]; +extern const u8 gText_PlayedPokeFlute[]; +extern const u8 gText_PokeFluteAwakenedMon[]; extern const u8 gText_WontHaveEffect[]; -extern const u8 gUnknown_841623D[]; -extern const u8 gUnknown_84162BD[]; +extern const u8 gText_YesNo[]; +extern const u8 gText_Berry[]; extern const u8 gText_Ghost[]; // pokemon @@ -196,11 +194,11 @@ extern const u8 gText_PkmnsXPreventsSwitching[]; extern const u8 *const gStatNamesTable[]; // diploma -extern const u8 gUnknown_841B60E[]; -extern const u8 gUnknown_841B619[]; -extern const u8 gUnknown_841B684[]; -extern const u8 gUnknown_841B68F[]; -extern const u8 gUnknown_841B698[]; +extern const u8 gText_Diploma_Player[]; +extern const u8 gText_Diploma_ThisDocument[]; +extern const u8 gText_Diploma_GameFreak[]; +extern const u8 gText_Diploma_National[]; +extern const u8 gText_Diploma_Kanto[]; // battle_records extern const u8 gString_BattleRecords_PlayersBattleResults[]; @@ -330,7 +328,7 @@ extern const u8 gText_NotPkmnOtherTrainerWants[]; extern const u8 gText_ThatIsntAnEgg[]; extern const u8 gText_OtherTrainerCantAcceptPkmn[]; extern const u8 gText_CantTradeWithTrainer[]; -extern const u8 gUnknown_84176CF[]; +extern const u8 gText_CancelBattle[]; extern const u8 gText_PkmnWasGivenItem[]; extern const u8 gText_ReceivedItemFromPkmn[]; extern const u8 gText_PkmnAlreadyHoldingItemSwitch[]; @@ -339,7 +337,7 @@ extern const u8 gText_BagFullCouldNotRemoveItem[]; extern const u8 gText_PkmnCantParticipate[]; extern const u8 gText_CancelParticipation[]; extern const u8 gText_OakThisIsListOfPokemon[]; -extern const u8 gMenuText_Confirm[]; +extern const u8 gText_PartyMenu_OK[]; extern const u8 gText_MaleSymbol[]; extern const u8 gText_FemaleSymbol[]; extern const u8 gText_Slash[]; @@ -350,8 +348,8 @@ extern const u8 gText_MailSentToPC[]; extern const u8 gText_MailMessageWillBeLost[]; extern const u8 gText_SendMailToPC[]; extern const u8 gText_MailTakenFromPkmn[]; -extern const u8 gUnknown_8416B3E[]; -extern const u8 gUnknown_8416B16[]; +extern const u8 gText_NoMoreThanTwoMayEnter[]; +extern const u8 gText_NoMoreThanThreeMayEnter[]; extern const u8 gText_PauseUntilPress[]; extern const u8 gText_CantUseUntilNewBadge[]; extern const u8 gText_ReturnToHealingSpot[]; @@ -364,12 +362,12 @@ extern const u8 gText_PkmnCuredOfParalysis[]; extern const u8 gText_PkmnSnappedOutOfConfusion[]; extern const u8 gText_PkmnGotOverInfatuation[]; extern const u8 gText_PkmnBecameHealthy[]; -extern const u8 gText_HP3[]; -extern const u8 gText_Attack3[]; -extern const u8 gText_Defense3[]; -extern const u8 gText_Speed2[]; -extern const u8 gText_SpAtk3[]; -extern const u8 gText_SpDef3[]; +extern const u8 gText_ItemEffect_HP[]; +extern const u8 gText_ItemEffect_Attack[]; +extern const u8 gText_ItemEffect_Defense[]; +extern const u8 gText_ItemEffect_Speed[]; +extern const u8 gText_ItemEffect_SpAtk[]; +extern const u8 gText_ItemEffect_SpDef[]; extern const u8 gText_PkmnBaseVar2StatIncreased[]; extern const u8 gText_MovesPPIncreased[]; extern const u8 gText_PPWasRestored[]; @@ -503,14 +501,14 @@ extern const u8 gText_ABtnTitleScreen[]; extern const u8 gText_ABtnRegistrationCounter[]; // main_menu -extern const u8 gText_SaveFileCorruptedPrevWillBeLoaded[]; +extern const u8 gText_SaveFileCorrupted[]; extern const u8 gText_SaveFileHasBeenDeleted[]; extern const u8 gText_1MSubCircuitBoardNotInstalled[]; extern const u8 gText_NewGame[]; extern const u8 gText_Continue[]; extern const u8 gText_MysteryGift[]; -extern const u8 gText_WirelessAdapterIsNotConnected[]; -extern const u8 gText_MysteryGiftCantBeUsedWhileWirelessAdapterIsAttached[]; +extern const u8 gText_WirelessNotConnected[]; +extern const u8 gText_MysteryGiftCantUse[]; extern const u8 gText_Player[]; extern const u8 gText_Time[]; extern const u8 gText_Colon[]; @@ -626,14 +624,14 @@ extern const u8 gText_BagIsFull[]; extern const u8 gText_MailReturnedToBagMessageErased[]; // start_menu -extern const u8 gStartMenuText_Pokedex[]; -extern const u8 gStartMenuText_Bag[]; -extern const u8 gStartMenuText_Player[]; -extern const u8 gStartMenuText_Save[]; -extern const u8 gStartMenuText_Option[]; -extern const u8 gStartMenuText_Exit[]; -extern const u8 gStartMenuText_Retire[]; -extern const u8 gUnknown_84162A9[]; +extern const u8 gText_MenuPokedex[]; +extern const u8 gText_MenuBag[]; +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_MenuSafariStats[]; extern const u8 gStartMenuDesc_Pokedex[]; extern const u8 gStartMenuDesc_Pokemon[]; extern const u8 gStartMenuDesc_Bag[]; @@ -789,9 +787,9 @@ extern const u8 gText_ThreeIsland[]; extern const u8 gText_Vermilion[]; extern const u8 gText_Colosseum_2[]; extern const u8 gText_BerryCrush[]; -extern const u8 gText_Dummy_8417E66[]; -extern const u8 gText_Dummy_8417E67[]; -extern const u8 gText_Dummy_8417E71[]; +extern const u8 gText_EmptyLinkService1[]; +extern const u8 gText_EmptyLinkService2[]; +extern const u8 gText_RecordCorner[]; extern const u8 gText_PokemonJump[]; extern const u8 gText_DodrioBerryPicking[]; extern const u8 gText_2Tinymushrooms[]; @@ -804,8 +802,8 @@ extern const u8 gText_Charcoal_1000Coins[]; extern const u8 gText_MysticWater_1000Coins[]; extern const u8 gText_YellowFlute_1600Coins[]; extern const u8 gText_SmokeBall_800Coins[]; -extern const u8 gText_Dummy_8417F67[]; -extern const u8 gText_Dummy_8417F68[]; +extern const u8 gText_Multichoice_Empty1[]; +extern const u8 gText_Multichoice_Empty2[]; extern const u8 gText_BecomeLeader[]; extern const u8 gText_JoinGroup[]; extern const u8 gText_Cool_2[]; @@ -848,16 +846,16 @@ extern const u8 gTradeText_Cancel[]; extern const u8 gTradeText_ChooseAPokemon[]; extern const u8 gTradeText_Summary[]; extern const u8 gTradeText_Trade[]; -extern const u8 gTradeText_CancelTrade[]; +extern const u8 gText_CancelTrade[]; extern const u8 gTradeText_PressBButtonToExit[]; -extern const u8 gUnknown_841E10A[]; -extern const u8 gUnknown_841E112[]; -extern const u8 gUnknown_841E118[]; -extern const u8 gUnknown_841E145[]; -extern const u8 gUnknown_841E16B[]; -extern const u8 gUnknown_8417094[]; -extern const u8 gUnknown_841E199[]; -extern const u8 gUnknown_841E1C5[]; +extern const u8 gText_TradeAction_Summary[]; +extern const u8 gText_TradeAction_Trade[]; +extern const u8 gText_Trade_CommunicationStandby[]; +extern const u8 gText_TradeHasBeenCanceled[]; +extern const u8 gText_Trade_OnlyPkmnForBattle[]; +extern const u8 gText_OnlyPkmnForBattle[]; +extern const u8 gText_WaitingForFriendToFinish[]; +extern const u8 gText_FriendWantsToTrade[]; extern const u8 gText_PkmnCantBeTradedNow[]; extern const u8 gText_EggCantBeTradedNow[]; extern const u8 gText_OtherTrainersPkmnCantBeTraded[]; @@ -938,7 +936,7 @@ extern const u8 gText_SoundStereo[]; extern const u8 gText_ButtonTypeHelp[]; extern const u8 gText_ButtonTypeLR[]; extern const u8 gText_ButtonTypeLEqualsA[]; -extern const u8 gText_MenuOption[]; +extern const u8 gText_Option[]; extern const u8 gText_FrameType[]; extern const u8 gTextJP_Type[]; extern const u8 gText_PickSwitchCancel[]; @@ -953,7 +951,7 @@ extern const u8 gText_PkmnStoppedEvolving[]; extern const u8 gText_ShopBuy[]; extern const u8 gText_ShopSell[]; extern const u8 gText_ShopQuit[]; -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[]; @@ -1133,10 +1131,10 @@ extern const u8 gText_Register2[]; extern const u8 gText_Exit[]; // wireless_communication_status_screen -extern const u8 gUnknown_841E2B4[]; -extern const u8 gUnknown_841E2BF[]; -extern const u8 gUnknown_841E2C9[]; -extern const u8 gUnknown_841E2D4[]; +extern const u8 gText_Dynamic0Players[]; +extern const u8 gText_Dynamic1Players[]; +extern const u8 gText_Dynamic2Players[]; +extern const u8 gText_Dynamic3Players[]; extern const u8 gText_WirelessCommunicationStatus[]; extern const u8 gText_PeopleTrading[]; extern const u8 gText_PeopleBattling[]; @@ -1192,7 +1190,7 @@ extern const u8 gText_BerryCrush_TimeUp[]; extern const u8 gText_BerryCrush_CommunicationStandby[]; extern const u8 gText_1_ClrBluShdwLtBlu_Dynamic0[]; extern const u8 gText_1_Dynamic0[]; -extern const u8 gText_SpaceTimes[]; +extern const u8 gText_SpaceTimes2[]; extern const u8 gText_XDotY[]; extern const u8 gText_StrVar1Berry[]; extern const u8 gText_TimeColon[]; @@ -1342,8 +1340,8 @@ extern const u8 gText_QuestLog_PokemonLeague[]; extern const u8 gText_QuestLog_CeruleanCave[]; // clear_save_data_screen -extern const u8 gUnknown_841B69E[]; -extern const u8 gUnknown_841B6B9[]; +extern const u8 gText_ClearAllSaveData[]; +extern const u8 gText_ClearingData[]; // easy_chat_2 extern const u8 gText_CombineFourWordsOrPhrases[]; @@ -1474,26 +1472,26 @@ extern const u8 gPCText_Machine[]; extern const u8 gPCText_Simple[]; // pokemon_special_anim -extern const u8 gUnknown_841B2ED[]; -extern const u8 gUnknown_841B2F1[]; -extern const u8 gUnknown_841B2FF[]; -extern const u8 gUnknown_841B285[]; -extern const u8 gUnknown_841B293[]; -extern const u8 gUnknown_841B295[]; -extern const u8 gUnknown_841B2A7[]; -extern const u8 gUnknown_841B32E[]; -extern const u8 gUnknown_841B306[]; -extern const u8 gUnknown_841B315[]; -extern const u8 gUnknown_841B31B[]; -extern const u8 gUnknown_841B329[]; -extern const u8 gUnknown_841B2A9[]; -extern const u8 gUnknown_841B2B7[]; -extern const u8 gUnknown_841B2BE[]; -extern const u8 gUnknown_841B2CC[]; -extern const u8 gUnknown_841B2D4[]; -extern const u8 gUnknown_841B2C6[]; -extern const u8 gUnknown_841B2E5[]; -extern const u8 gUnknown_841B2DC[]; +extern const u8 gText_Counting_1[]; +extern const u8 gText_Counting_2And[]; +extern const u8 gText_Poof[]; +extern const u8 gText_WasUsedOn[]; +extern const u8 gText_Period[]; +extern const u8 gText_LevelRoseTo[]; +extern const u8 gText_Period2[]; +extern const u8 gText_MonLearnedTMHM[]; +extern const u8 gText_MonForgotMove[]; +extern const u8 gText_And[]; +extern const u8 gText_MachineSet[]; +extern const u8 gText_Huh[]; +extern const u8 gText_LevelUp_MaxHP[]; +extern const u8 gText_LevelUp_Attack[]; +extern const u8 gText_LevelUp_Defense[]; +extern const u8 gText_LevelUp_SpAtk[]; +extern const u8 gText_LevelUp_SpDef[]; +extern const u8 gText_LevelUp_Speed[]; +extern const u8 gText_LevelUp_Minus[]; +extern const u8 gText_LevelUp_Plus[]; // field_player_avatar extern const u8 gText_PokemonOnHook[]; diff --git a/src/berry_crush.c b/src/berry_crush.c index 464e629c5..9c470146a 100644 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -932,7 +932,7 @@ static const struct DigitObjUtilTemplate sDigitObjTemplates[] = { }; static const u8 *const sBCRankingHeaders[] = { - [RESULTS_PAGE_PRESSES] = gText_SpaceTimes, + [RESULTS_PAGE_PRESSES] = gText_SpaceTimes2, [RESULTS_PAGE_RANDOM] = gText_XDotY, [RESULTS_PAGE_CRUSHING] = gText_StrVar1Berry, diff --git a/src/berry_pouch.c b/src/berry_pouch.c index 576bc8d4f..5e5c95067 100644 --- a/src/berry_pouch.c +++ b/src/berry_pouch.c @@ -685,7 +685,7 @@ static void SetUpListMenuTemplate(void) static void GetBerryNameAndIndexForMenu(u8 * dest, u16 itemId) { StringCopy(gStringVar4, gText_FontSize0); - StringAppend(gStringVar4, gOtherText_UnkF9_08_Clear_01); + StringAppend(gStringVar4, gText_NumberClear01); ConvertIntToDecimalStringN(gStringVar1, itemId - FIRST_BERRY_INDEX + 1, STR_CONV_MODE_LEADING_ZEROS, 2); StringAppend(gStringVar4, gStringVar1); CopyItemName(itemId, gStringVar1); diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c index 6a09328ce..460f9c4d6 100644 --- a/src/clear_save_data_screen.c +++ b/src/clear_save_data_screen.c @@ -106,7 +106,7 @@ static void Task_DrawClearSaveDataScreen(u8 taskId) break; case 4: DrawStdFrameWithCustomTileAndPalette(1, TRUE, 0x001, 0xF); - AddTextPrinterParameterized4(1, FONT_2, 0, 3, 1, 1, sTextColor, 0, gUnknown_841B69E); + AddTextPrinterParameterized4(1, FONT_2, 0, 3, 1, 1, sTextColor, 0, gText_ClearAllSaveData); CopyWindowToVram(1, COPYWIN_GFX); break; case 5: @@ -138,7 +138,7 @@ static void Task_HandleYesNoMenu(u8 taskId) case 0: PlaySE(SE_SELECT); FillWindowPixelBuffer(1, PIXEL_FILL(1)); - AddTextPrinterParameterized4(1, FONT_2, 0, 3, 1, 1, sTextColor, 0, gUnknown_841B6B9); + AddTextPrinterParameterized4(1, FONT_2, 0, 3, 1, 1, sTextColor, 0, gText_ClearingData); CopyWindowToVram(1, COPYWIN_FULL); ClearSaveData(); break; diff --git a/src/diploma.c b/src/diploma.c index 21125d257..160540ccd 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -256,19 +256,19 @@ static void DiplomaPrintText(void) DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gSaveBlock2Ptr->playerName); if (HasAllMons()) { - DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gUnknown_841B68F); + DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gText_Diploma_National); } else { - DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gUnknown_841B698); + DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gText_Diploma_Kanto); } FillWindowPixelBuffer(0, 0); - DynamicPlaceholderTextUtil_ExpandPlaceholders(arr, gUnknown_841B60E); + DynamicPlaceholderTextUtil_ExpandPlaceholders(arr, gText_Diploma_Player); width = GetStringWidth(FONT_2, arr, -1); AddTextPrinterParameterized3(0, FONT_2, 120 - (width / 2), 4, gUnknown_8415A04, -1, arr); - DynamicPlaceholderTextUtil_ExpandPlaceholders(arr, gUnknown_841B619); + DynamicPlaceholderTextUtil_ExpandPlaceholders(arr, gText_Diploma_ThisDocument); width = GetStringWidth(FONT_2, arr, -1); AddTextPrinterParameterized3(0, FONT_2, 120 - (width / 2), 0x1E, gUnknown_8415A04, -1, arr); - AddTextPrinterParameterized3(0, FONT_2, 120, 105, gUnknown_8415A04, 0, gUnknown_841B684); + AddTextPrinterParameterized3(0, FONT_2, 120, 105, gUnknown_8415A04, 0, gText_Diploma_GameFreak); PutWindowTilemap(0); } diff --git a/src/item.c b/src/item.c index 0df45cbd3..037993e1b 100644 --- a/src/item.c +++ b/src/item.c @@ -75,7 +75,7 @@ void CopyItemName(u16 itemId, u8 * dest) if (itemId == ITEM_ENIGMA_BERRY) { StringCopy(dest, GetBerryInfo(ITEM_TO_BERRY(ITEM_ENIGMA_BERRY))->name); - StringAppend(dest, gUnknown_84162BD); + StringAppend(dest, gText_Berry); } else { diff --git a/src/item_use.c b/src/item_use.c index 2ce7de755..1b9d0146a 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -262,7 +262,7 @@ void FieldUseFunc_MachBike(u8 taskId) || MetatileBehavior_IsHorizontalRail(behavior) == TRUE || MetatileBehavior_IsIsolatedVerticalRail(behavior) == TRUE || MetatileBehavior_IsIsolatedHorizontalRail(behavior) == TRUE) - DisplayItemMessageInCurrentContext(taskId, gTasks[taskId].data[3], FONT_2, gUnknown_8416451); + DisplayItemMessageInCurrentContext(taskId, gTasks[taskId].data[3], FONT_2, gText_CantDismountBike); else if (Overworld_IsBikingAllowed() == TRUE && !IsBikingDisallowedByPlayer()) { sItemUseOnFieldCB = ItemUseOnFieldCB_Bicycle; @@ -336,7 +336,7 @@ void ItemUseOutOfBattle_Itemfinder(u8 taskId) void FieldUseFunc_CoinCase(u8 taskId) { ConvertIntToDecimalStringN(gStringVar1, GetCoins(), STR_CONV_MODE_LEFT_ALIGN, 4); - StringExpandPlaceholders(gStringVar4, gUnknown_8416537); + StringExpandPlaceholders(gStringVar4, gText_CoinCase); ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, NULL, gSpecialVar_ItemId, 0xFFFF); if (gTasks[taskId].data[3] == 0) DisplayItemMessageInBag(taskId, FONT_2, gStringVar4, Task_ReturnToBagFromContextMenu); @@ -347,7 +347,7 @@ void FieldUseFunc_CoinCase(u8 taskId) void FieldUseFunc_PowderJar(u8 taskId) { ConvertIntToDecimalStringN(gStringVar1, GetBerryPowder(), STR_CONV_MODE_LEFT_ALIGN, 5); - StringExpandPlaceholders(gStringVar4, gUnknown_8416644); + StringExpandPlaceholders(gStringVar4, gText_PowderQty); ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, NULL, gSpecialVar_ItemId, 0xFFFF); if (gTasks[taskId].data[3] == 0) DisplayItemMessageInBag(taskId, FONT_2, gStringVar4, Task_ReturnToBagFromContextMenu); @@ -370,17 +370,16 @@ void FieldUseFunc_PokeFlute(u8 taskId) { ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, NULL, gSpecialVar_ItemId, 0xFFFF); if (gTasks[taskId].data[3] == 0) - DisplayItemMessageInBag(taskId, FONT_2, gUnknown_8416690, sub_80A1648); + DisplayItemMessageInBag(taskId, FONT_2, gText_PlayedPokeFlute, sub_80A1648); else - DisplayItemMessageOnField(taskId, FONT_2, gUnknown_8416690, sub_80A1648); + DisplayItemMessageOnField(taskId, FONT_2, gText_PlayedPokeFlute, sub_80A1648); } else { - // Now that's a catchy tune! if (gTasks[taskId].data[3] == 0) - DisplayItemMessageInBag(taskId, FONT_2, gUnknown_841665C, Task_ReturnToBagFromContextMenu); + DisplayItemMessageInBag(taskId, FONT_2, gText_PlayedPokeFluteCatchy, Task_ReturnToBagFromContextMenu); else - DisplayItemMessageOnField(taskId, FONT_2, gUnknown_841665C, Task_ItemUse_CloseMessageBoxAndReturnToField); + DisplayItemMessageOnField(taskId, FONT_2, gText_PlayedPokeFluteCatchy, Task_ItemUse_CloseMessageBoxAndReturnToField); } } @@ -395,9 +394,9 @@ static void sub_80A1674(u8 taskId) if (WaitFanfare(FALSE)) { if (gTasks[taskId].data[3] == 0) - DisplayItemMessageInBag(taskId, FONT_2, gUnknown_84166A7, Task_ReturnToBagFromContextMenu); + DisplayItemMessageInBag(taskId, FONT_2, gText_PokeFluteAwakenedMon, Task_ReturnToBagFromContextMenu); else - DisplayItemMessageOnField(taskId, FONT_2, gUnknown_84166A7, Task_ItemUse_CloseMessageBoxAndReturnToField); + DisplayItemMessageOnField(taskId, FONT_2, gText_PokeFluteAwakenedMon, Task_ItemUse_CloseMessageBoxAndReturnToField); } } @@ -556,7 +555,7 @@ void FieldUseFunc_SuperRepel(u8 taskId) } else // An earlier repel is still in effect - DisplayItemMessageInBag(taskId, FONT_2, gUnknown_841659E, Task_ReturnToBagFromContextMenu); + DisplayItemMessageInBag(taskId, FONT_2, gText_RepelEffectsLingered, Task_ReturnToBagFromContextMenu); } static void sub_80A19E8(u8 taskId) @@ -576,7 +575,7 @@ static void sub_80A1A44(void) Pocket_CalculateNItemsAndMaxShowed(ItemId_GetPocket(gSpecialVar_ItemId)); PocketCalculateInitialCursorPosAndItemsAbove(ItemId_GetPocket(gSpecialVar_ItemId)); CopyItemName(gSpecialVar_ItemId, gStringVar2); - StringExpandPlaceholders(gStringVar4, gUnknown_841658C); + StringExpandPlaceholders(gStringVar4, gText_PlayerUsedVar2); } void FieldUseFunc_BlackFlute(u8 taskId) @@ -587,7 +586,7 @@ void FieldUseFunc_BlackFlute(u8 taskId) FlagSet(FLAG_SYS_WHITE_FLUTE_ACTIVE); FlagClear(FLAG_SYS_BLACK_FLUTE_ACTIVE); CopyItemName(gSpecialVar_ItemId, gStringVar2); - StringExpandPlaceholders(gStringVar4, gUnknown_84165D2); + StringExpandPlaceholders(gStringVar4, gText_UsedVar2WildLured); gTasks[taskId].func = sub_80A1B48; gTasks[taskId].data[8] = 0; } @@ -596,7 +595,7 @@ void FieldUseFunc_BlackFlute(u8 taskId) FlagSet(FLAG_SYS_BLACK_FLUTE_ACTIVE); FlagClear(FLAG_SYS_WHITE_FLUTE_ACTIVE); CopyItemName(gSpecialVar_ItemId, gStringVar2); - StringExpandPlaceholders(gStringVar4, gUnknown_8416600); + StringExpandPlaceholders(gStringVar4, gText_UsedVar2WildRepelled); gTasks[taskId].func = sub_80A1B48; gTasks[taskId].data[8] = 0; } @@ -744,7 +743,7 @@ void BattleUseFunc_PokeBallEtc(u8 taskId) } else { - DisplayItemMessageInBag(taskId, FONT_2, gUnknown_8416631, Task_ReturnToBagFromContextMenu); + DisplayItemMessageInBag(taskId, FONT_2, gText_BoxFull, Task_ReturnToBagFromContextMenu); } } diff --git a/src/main_menu.c b/src/main_menu.c index 67ad7546e..bfec4a7ad 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -251,7 +251,7 @@ static void Task_SetWin0BldRegsAndCheckSaveFile(u8 taskId) case SAVE_STATUS_ERROR: SetStdFrame0OnBg(0); gTasks[taskId].tMenuType = MAIN_MENU_CONTINUE; - PrintSaveErrorStatus(taskId, gText_SaveFileCorruptedPrevWillBeLoaded); + PrintSaveErrorStatus(taskId, gText_SaveFileCorrupted); if (IsMysteryGiftEnabled() == TRUE) { gTasks[taskId].tMenuType = MAIN_MENU_MYSTERYGIFT; @@ -497,9 +497,9 @@ static void Task_MysteryGiftError(u8 taskId) case 0: FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20); if (gTasks[taskId].tMGErrorType == 1) - PrintMessageOnWindow4(gText_WirelessAdapterIsNotConnected); + PrintMessageOnWindow4(gText_WirelessNotConnected); else - PrintMessageOnWindow4(gText_MysteryGiftCantBeUsedWhileWirelessAdapterIsAttached); + PrintMessageOnWindow4(gText_MysteryGiftCantUse); gTasks[taskId].tMGErrorMsgState++; break; case 1: diff --git a/src/menu.c b/src/menu.c index 3aedd0574..23f047ea1 100644 --- a/src/menu.c +++ b/src/menu.c @@ -534,7 +534,7 @@ void CreateYesNoMenu(const struct WindowTemplate *window, u8 fontId, u8 left, u8 sYesNoWindowId = AddWindow(window); DrawStdFrameWithCustomTileAndPalette(sYesNoWindowId, 1, baseTileNum, paletteNum); - textSubPrinter.currentChar = gUnknown_841623D; + textSubPrinter.currentChar = gText_YesNo; textSubPrinter.windowId = sYesNoWindowId; textSubPrinter.fontId = fontId; textSubPrinter.x = GetMenuCursorDimensionByFont(fontId, 0) + left; diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c index ab2e4fa9e..edcbdb722 100644 --- a/src/mystery_event_script.c +++ b/src/mystery_event_script.c @@ -247,7 +247,7 @@ bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx) if (species == SPECIES_EGG) StringCopyN(gStringVar1, gText_EggNickname, POKEMON_NAME_LENGTH + 1); else - StringCopyN(gStringVar1, gStartMenuText_Pokemon, POKEMON_NAME_LENGTH + 1); + StringCopyN(gStringVar1, gText_MenuPokemon, POKEMON_NAME_LENGTH + 1); if (gPlayerPartyCount == PARTY_SIZE) { diff --git a/src/option_menu.c b/src/option_menu.c index 477178ada..6cbf9e18a 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -524,7 +524,7 @@ static void CloseAndSaveOptionMenu(u8 taskId) static void PrintOptionMenuHeader(void) { FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized(WIN_TEXT_OPTION, FONT_2, gText_MenuOption, 8, 1, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(WIN_TEXT_OPTION, FONT_2, gText_Option, 8, 1, TEXT_SKIP_DRAW, NULL); PutWindowTilemap(0); CopyWindowToVram(0, COPYWIN_FULL); } diff --git a/src/party_menu.c b/src/party_menu.c index 8cc148d48..912c5184e 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -1256,7 +1256,7 @@ static void HandleChooseMonCancel(u8 taskId, s8 *slotPtr) static void DisplayCancelChooseMonYesNo(u8 taskId) { PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]); - StringExpandPlaceholders(gStringVar4, gUnknown_84176CF); + StringExpandPlaceholders(gStringVar4, gText_CancelBattle); DisplayPartyMenuMessage(gStringVar4, TRUE); gTasks[taskId].func = Task_CancelChooseMonYesNo; } @@ -1670,7 +1670,7 @@ static void BufferBagFullCantTakeItemMessage(u16 itemId) switch (ItemId_GetPocket(itemId)) { default: - string = gStartMenuText_Bag; + string = gText_MenuBag; break; case POCKET_TM_CASE: string = ItemId_GetName(ITEM_TM_CASE); @@ -2160,7 +2160,7 @@ static void CreateCancelConfirmWindows(bool8 chooseHalf) { confirmWindowId = AddWindow(&sConfirmButtonWindowTemplate); FillWindowPixelBuffer(confirmWindowId, PIXEL_FILL(0)); - AddTextPrinterParameterized4(confirmWindowId, FONT_0, (48 - GetStringWidth(FONT_0, gMenuText_Confirm, 0)) / 2u, 1, 0, 0, sFontColorTable[0], -1, gMenuText_Confirm); + AddTextPrinterParameterized4(confirmWindowId, FONT_0, (48 - GetStringWidth(FONT_0, gText_PartyMenu_OK, 0)) / 2u, 1, 0, 0, sFontColorTable[0], -1, gText_PartyMenu_OK); PutWindowTilemap(confirmWindowId); CopyWindowToVram(confirmWindowId, COPYWIN_GFX); cancelWindowId = AddWindow(&sMultiCancelButtonWindowTemplate); @@ -3789,12 +3789,12 @@ static void CursorCB_Enter(u8 taskId) if (gPartyMenu.unk_8_6 == 2) { maxBattlers = 2; - str = gUnknown_8416B3E; + str = gText_NoMoreThanTwoMayEnter; } else { maxBattlers = 3; - str = gUnknown_8416B16; + str = gText_NoMoreThanThreeMayEnter; } PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]); PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]); @@ -4402,27 +4402,27 @@ static void GetMedicineItemEffectMessage(u16 item) StringExpandPlaceholders(gStringVar4, gText_PkmnBecameHealthy); break; case ITEM_EFFECT_HP_EV: - StringCopy(gStringVar2, gText_HP3); + StringCopy(gStringVar2, gText_ItemEffect_HP); StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased); break; case ITEM_EFFECT_ATK_EV: - StringCopy(gStringVar2, gText_Attack3); + StringCopy(gStringVar2, gText_ItemEffect_Attack); StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased); break; case ITEM_EFFECT_DEF_EV: - StringCopy(gStringVar2, gText_Defense3); + StringCopy(gStringVar2, gText_ItemEffect_Defense); StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased); break; case ITEM_EFFECT_SPEED_EV: - StringCopy(gStringVar2, gText_Speed2); + StringCopy(gStringVar2, gText_ItemEffect_Speed); StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased); break; case ITEM_EFFECT_SPATK_EV: - StringCopy(gStringVar2, gText_SpAtk3); + StringCopy(gStringVar2, gText_ItemEffect_SpAtk); StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased); break; case ITEM_EFFECT_SPDEF_EV: - StringCopy(gStringVar2, gText_SpDef3); + StringCopy(gStringVar2, gText_ItemEffect_SpDef); StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased); break; case ITEM_EFFECT_PP_UP: diff --git a/src/pokemon_special_anim_scene.c b/src/pokemon_special_anim_scene.c index 65d362e26..536f79bc9 100644 --- a/src/pokemon_special_anim_scene.c +++ b/src/pokemon_special_anim_scene.c @@ -92,9 +92,9 @@ static const struct WindowTemplate sWindowTemplates[] = { }; static const u8 *const s1_2_and_Poof_textPtrs[] = { - gUnknown_841B2ED, // 1, - gUnknown_841B2F1, // 2, and ‥ ‥ ‥ - gUnknown_841B2FF, // Poof! + gText_Counting_1, + gText_Counting_2And, + gText_Poof, }; static const u16 sUnref_84599A4[] = { @@ -394,49 +394,49 @@ void PSA_PrintMessage(u8 messageId) { case 0: // Item was used on Mon str = StringCopy(scene->textBuf, ItemId_GetName(itemId)); - str = StringCopy(str, gUnknown_841B285); + str = StringCopy(str, gText_WasUsedOn); GetMonData(pokemon, MON_DATA_NICKNAME, str); - StringAppend(scene->textBuf, gUnknown_841B293); + StringAppend(scene->textBuf, gText_Period); break; case 1: // Mon's level was elevated to level level = GetMonData(pokemon, MON_DATA_LEVEL); GetMonData(pokemon, MON_DATA_NICKNAME, scene->textBuf); - str = StringAppend(scene->textBuf, gUnknown_841B295); + str = StringAppend(scene->textBuf, gText_LevelRoseTo); if (level < MAX_LEVEL) level++; str = ConvertIntToDecimalStringN(str, level, STR_CONV_MODE_LEFT_ALIGN, level < MAX_LEVEL ? 2 : 3); - StringAppend(str, gUnknown_841B2A7); + StringAppend(str, gText_Period2); break; case 9: // Mon learned move DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, PSA_GetMonNickname()); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, PSA_GetNameOfMoveToTeach()); - DynamicPlaceholderTextUtil_ExpandPlaceholders(scene->textBuf, gUnknown_841B32E); + DynamicPlaceholderTextUtil_ExpandPlaceholders(scene->textBuf, gText_MonLearnedTMHM); break; - case 4: // poof! - strWidth += GetStringWidth(FONT_2, gUnknown_841B2F1, -1); + case 4: + strWidth += GetStringWidth(FONT_2, gText_Counting_2And, -1); // fallthrough - case 3: // 2 and... - strWidth += GetStringWidth(FONT_2, gUnknown_841B2ED, -1); + case 3: + strWidth += GetStringWidth(FONT_2, gText_Counting_1, -1); // fallthrough case 2: // 1 StringCopy(scene->textBuf, s1_2_and_Poof_textPtrs[messageId - 2]); textSpeed = 1; break; - case 5: // Mon forgot move + case 5: DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, PSA_GetMonNickname()); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, PSA_GetNameOfMoveForgotten()); - DynamicPlaceholderTextUtil_ExpandPlaceholders(scene->textBuf, gUnknown_841B306); + DynamicPlaceholderTextUtil_ExpandPlaceholders(scene->textBuf, gText_MonForgotMove); break; - case 6: // And... - StringCopy(scene->textBuf, gUnknown_841B315); + case 6: + StringCopy(scene->textBuf, gText_And); break; - case 7: // Machine set! - StringCopy(scene->textBuf, gUnknown_841B31B); + case 7: + StringCopy(scene->textBuf, gText_MachineSet); break; - case 8: // Huh? - StringCopy(scene->textBuf, gUnknown_841B329); + case 8: + StringCopy(scene->textBuf, gText_Huh); break; default: return; @@ -1482,12 +1482,12 @@ static void SpriteCB_LevelUpVertical(struct Sprite *sprite) // ======================================================== static const u8 *const sLevelUpWindowStatNames[] = { - gUnknown_841B2A9, - gUnknown_841B2B7, - gUnknown_841B2BE, - gUnknown_841B2CC, - gUnknown_841B2D4, - gUnknown_841B2C6 + gText_LevelUp_MaxHP, + gText_LevelUp_Attack, + gText_LevelUp_Defense, + gText_LevelUp_SpAtk, + gText_LevelUp_SpDef, + gText_LevelUp_Speed }; void DrawLevelUpWindowPg1(u16 windowId, u16 *beforeStats, u16 *afterStats, u8 bgColor, u8 fgColor, u8 shadowColor) @@ -1514,7 +1514,7 @@ void DrawLevelUpWindowPg1(u16 windowId, u16 *beforeStats, u16 *afterStats, u8 bg for (i = 0; i < 6; i++) { AddTextPrinterParameterized3(windowId, FONT_2, 0, i * 15, textColor, TEXT_SKIP_DRAW, sLevelUpWindowStatNames[i]); - StringCopy(textbuf, diffStats[i] >= 0 ? gUnknown_841B2DC : gUnknown_841B2E5); + StringCopy(textbuf, diffStats[i] >= 0 ? gText_LevelUp_Plus : gText_LevelUp_Minus); AddTextPrinterParameterized3(windowId, FONT_2, 56, i * 15, textColor, TEXT_SKIP_DRAW, textbuf); textbuf[0] = CHAR_SPACE; x = abs(diffStats[i]) < 10 ? 12 : 6; diff --git a/src/script_menu.c b/src/script_menu.c index f7f466f5b..2739ffc91 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -379,8 +379,8 @@ static const struct MenuAction sScriptMultiChoiceMenu_TradeColosseumCrush[] = { }; static const struct MenuAction sScriptMultiChoiceMenu_48[] = { - { gText_Dummy_8417E66 }, - { gText_Dummy_8417E67 }, + { gText_EmptyLinkService1 }, + { gText_EmptyLinkService2 }, { gOtherText_Exit } }; @@ -404,7 +404,7 @@ static const struct MenuAction sScriptMultiChoiceMenu_Mushrooms[] = { static const struct MenuAction sScriptMultiChoiceMenu_TradeColosseumBlankCrush[] = { { gText_TradeCenter }, { gText_Colosseum_2 }, - { gText_Dummy_8417E71 }, + { gText_RecordCorner }, { gText_BerryCrush }, { gOtherText_Exit } }; @@ -412,7 +412,7 @@ static const struct MenuAction sScriptMultiChoiceMenu_TradeColosseumBlankCrush[] static const struct MenuAction sScriptMultiChoiceMenu_TradeColosseumBlank[] = { { gText_TradeCenter }, { gText_Colosseum_2 }, - { gText_Dummy_8417E71 }, + { gText_RecordCorner }, { gOtherText_Exit } }; @@ -469,8 +469,8 @@ static const struct MenuAction sScriptMultiChoiceMenu_SeagallopVermilion[] = { }; static const struct MenuAction sScriptMultiChoiceMenu_62[] = { - { gText_Dummy_8417F68 }, - { gText_Dummy_8417F67 }, + { gText_Multichoice_Empty1 }, + { gText_Multichoice_Empty2 }, { gOtherText_Exit } }; diff --git a/src/shop.c b/src/shop.c index 1517080d3..51ee68ebe 100644 --- a/src/shop.c +++ b/src/shop.c @@ -338,7 +338,7 @@ static void Task_ReturnToShopMenu(u8 taskId) if (IsWeatherNotFadingIn() != TRUE) return; - DisplayItemMessageOnField(taskId, GetMartFontId(), gText_CanIHelpWithAnythingElse, ShowShopMenuAfterExitingBuyOrSellMenu); + DisplayItemMessageOnField(taskId, GetMartFontId(), gText_AnythingElseICanHelp, ShowShopMenuAfterExitingBuyOrSellMenu); } static void ShowShopMenuAfterExitingBuyOrSellMenu(u8 taskId) @@ -629,7 +629,7 @@ static void LoadTmHmNameInMart(s32 item) if (item != INDEX_CANCEL) { ConvertIntToDecimalStringN(gStringVar1, item - ITEM_DEVON_SCOPE, 2, 2); - StringCopy(gStringVar4, gOtherText_UnkF9_08_Clear_01); + StringCopy(gStringVar4, gText_NumberClear01); StringAppend(gStringVar4, gStringVar1); BuyMenuPrint(6, FONT_0, gStringVar4, 0, 0, 0, 0, TEXT_SKIP_DRAW, 1); StringCopy(gStringVar4, gMoveNames[ItemIdToBattleMoveId(item)]); diff --git a/src/start_menu.c b/src/start_menu.c index f81399cb3..0dc1fce93 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -113,15 +113,15 @@ static void CloseSaveStatsWindow(void); static void CloseStartMenu(void); static const struct MenuAction sStartMenuActionTable[] = { - { gStartMenuText_Pokedex, {.u8_void = StartMenuPokedexCallback} }, - { gStartMenuText_Pokemon, {.u8_void = StartMenuPokemonCallback} }, - { gStartMenuText_Bag, {.u8_void = StartMenuBagCallback} }, - { gStartMenuText_Player, {.u8_void = StartMenuPlayerCallback} }, - { gStartMenuText_Save, {.u8_void = StartMenuSaveCallback} }, - { gStartMenuText_Option, {.u8_void = StartMenuOptionCallback} }, - { gStartMenuText_Exit, {.u8_void = StartMenuExitCallback} }, - { gStartMenuText_Retire, {.u8_void = StartMenuSafariZoneRetireCallback} }, - { gStartMenuText_Player, {.u8_void = StartMenuLinkPlayerCallback} } + { gText_MenuPokedex, {.u8_void = StartMenuPokedexCallback} }, + { gText_MenuPokemon, {.u8_void = StartMenuPokemonCallback} }, + { gText_MenuBag, {.u8_void = StartMenuBagCallback} }, + { gText_MenuPlayer, {.u8_void = StartMenuPlayerCallback} }, + { gText_MenuSave, {.u8_void = StartMenuSaveCallback} }, + { gText_MenuOption, {.u8_void = StartMenuOptionCallback} }, + { gText_MenuExit, {.u8_void = StartMenuExitCallback} }, + { gText_MenuRetire, {.u8_void = StartMenuSafariZoneRetireCallback} }, + { gText_MenuPlayer, {.u8_void = StartMenuLinkPlayerCallback} } }; static const struct WindowTemplate sSafariZoneStatsWindowTemplate = { @@ -252,7 +252,7 @@ static void DrawSafariZoneStatsWindow(void) ConvertIntToDecimalStringN(gStringVar1, gSafariZoneStepCounter, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar2, 600, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar3, gNumSafariBalls, STR_CONV_MODE_RIGHT_ALIGN, 2); - StringExpandPlaceholders(gStringVar4, gUnknown_84162A9); + StringExpandPlaceholders(gStringVar4, gText_MenuSafariStats); AddTextPrinterParameterized(sSafariZoneStatsWindowId, FONT_2, gStringVar4, 4, 3, 0xFF, NULL); CopyWindowToVram(sSafariZoneStatsWindowId, COPYWIN_GFX); } diff --git a/src/strings.c b/src/strings.c index a9651340a..9ce0e031c 100644 --- a/src/strings.c +++ b/src/strings.c @@ -15,36 +15,36 @@ const u8 gExpandedPlaceholder_Groudon[] = _("GROUDON"); const u8 gExpandedPlaceholder_Red[] = _("RED"); const u8 gExpandedPlaceholder_Green[] = _("GREEN"); const u8 gText_EggNickname[] = _("EGG"); -const u8 gStartMenuText_Pokemon[] = _("POKéMON"); +const u8 gText_MenuPokemon[] = _("POKéMON"); const u8 gText_NewGame[] = _("NEW GAME"); const u8 gText_Continue[] = _("CONTINUE"); const u8 gTextJP_Options[] = _("せっていを かえる"); const u8 gUnusedText_MysteryGift[] = _("MYSTERY GIFT"); const u8 gText_MysteryGift[] = _("MYSTERY GIFT"); -const u8 gText_WirelessAdapterIsNotConnected[] = _("The Wireless Adapter is not\nconnected."); -const u8 gText_MysteryGiftCantBeUsedWhileWirelessAdapterIsAttached[] = _("MYSTERY GIFT can't be used while\nthe Wireless Adapter is attached."); -const u8 gUnknown_8415B0E[] = _("がいぶデ-タにより レポ-トを こうしんします\nしばらく おまちください"); -const u8 gUnknown_8415B33[] = _("レポ-トが こうしんされました!"); -const u8 gUnknown_8415B44[] = _("レポ-トが こうしんされました!\pこれいじょう\nレポ-トが かききれないので\lバックアップカ-トリッジを\lこうかんしてください!\pくわしくは\nにんてんどう サ-ビスセンタ- まで\lおといあわせ ください"); -const u8 gUnknown_8415BAA[] = _("レポ-トの こうしんは\nしっぱいしました!\pバックアップカ-トリッジを\nこうかんしてください!\pくわしくは\nにんてんどう サ-ビスセンタ- まで\lおといあわせ ください"); -const u8 gText_SaveFileCorruptedPrevWillBeLoaded[] = _("The save file is corrupted.\pThe previous save file will be\nloaded."); +const u8 gText_WirelessNotConnected[] = _("The Wireless Adapter is not\nconnected."); +const u8 gText_MysteryGiftCantUse[] = _("MYSTERY GIFT can't be used while\nthe Wireless Adapter is attached."); +const u8 gText_UpdatingSaveExternalData[] = _("がいぶデ-タにより レポ-トを こうしんします\nしばらく おまちください"); +const u8 gText_SaveFileUpdated[] = _("レポ-トが こうしんされました!"); +const u8 gText_SaveFileUpdatedSwapBackup[] = _("レポ-トが こうしんされました!\pこれいじょう\nレポ-トが かききれないので\lバックアップカ-トリッジを\lこうかんしてください!\pくわしくは\nにんてんどう サ-ビスセンタ- まで\lおといあわせ ください"); +const u8 gText_FailedUpdateSwapBackup[] = _("レポ-トの こうしんは\nしっぱいしました!\pバックアップカ-トリッジを\nこうかんしてください!\pくわしくは\nにんてんどう サ-ビスセンタ- まで\lおといあわせ ください"); +const u8 gText_SaveFileCorrupted[] = _("The save file is corrupted.\pThe previous save file will be\nloaded."); const u8 gText_SaveFileHasBeenDeleted[] = _("The save file has been\ndeleted..."); const u8 gText_1MSubCircuitBoardNotInstalled[] = _("The 1M sub-circuit board is\nnot installed."); const u8 gTextJP_InternalBatteryHasRunDry[] = _("でんちぎれの ために\nとけいが うごかなくなりました\pとけいに かんけいする できごとは おきませんが\nゲ-ムを つづけて あそぶことは できます"); -const u8 gUnknown_8415CD9[] = _("しゅじんこう"); -const u8 gUnknown_8415CE0[] = _("ポケモンずかん"); +const u8 gText_PlayerUnused[] = _("しゅじんこう"); +const u8 gText_PokedexUnused[] = _("ポケモンずかん"); const u8 gText_MainMenuTime[] = _("TIME"); -const u8 gUnknown_8415CED[] = _("もっているバッジ"); -const u8 gUnknown_8415CF6[] = _("Aボタン"); -const u8 gUnknown_8415CFB[] = _("Bボタン"); -const u8 gUnknown_8415D00[] = _("Rボタン"); -const u8 gUnknown_8415D05[] = _("Lボタン"); -const u8 gUnknown_8415D0A[] = _("スタ-トボタン"); -const u8 gUnknown_8415D12[] = _("セレクトボタン"); -const u8 gUnknown_8415D1A[] = _("じゅうじボタン"); -const u8 gUnknown_8415D22[] = _("Lボタン Rボタン"); +const u8 gText_BadgesUnused[] = _("もっているバッジ"); +const u8 gText_AButton[] = _("Aボタン"); +const u8 gText_BButton[] = _("Bボタン"); +const u8 gText_RButton[] = _("Rボタン"); +const u8 gText_LButton[] = _("Lボタン"); +const u8 gText_Start[] = _("スタ-トボタン"); +const u8 gText_Select[] = _("セレクトボタン"); +const u8 gText_ControlPad[] = _("じゅうじボタン"); +const u8 gText_LButtonRButton[] = _("Lボタン Rボタン"); const u8 gText_Controls[] = _("CONTROLS"); -ALIGNED(4) const u8 gUnknown_8415D38[] = _("{DPAD_UPDOWN}えらぶ {A_BUTTON}けってい"); +ALIGNED(4) const u8 gText_PickOk[] = _("{DPAD_UPDOWN}えらぶ {A_BUTTON}けってい"); ALIGNED(4) const u8 gText_ABUTTONNext[] = _("{A_BUTTON}NEXT"); ALIGNED(4) const u8 gText_ABUTTONNext_BBUTTONBack[] = _("{A_BUTTON}NEXT {B_BUTTON}BACK"); ALIGNED(4) const u8 gText_UPDOWNPick_ABUTTONNext_BBUTTONBack[] = _("{DPAD_UPDOWN}PICK {A_BUTTON}NEXT {B_BUTTON}CANCEL"); @@ -101,8 +101,8 @@ const u8 gText_AreaUnknown[] = _("AREA UNKNOWN"); const u8 gText_PokedexNo[] = _("{NO}"); const u8 gText_Page[] = _("PAGE"); ALIGNED(4) const u8 gText_WelcomeToHOF[] = _("Welcome to the HALL OF FAME!"); -ALIGNED(4) const u8 gUnknown_8416028[] = _("みつけた ポケモン {STR_VAR_1}!\nつかまえた ポケモン {STR_VAR_2}!\pオダマキはかせの\nポケモンずかん ひょうか!\pオダマキ“どれどれ\p"); -ALIGNED(4) const u8 gUnknown_8416068[] = _("ここまでの レポ-トを かきしるしています!\nでんげんを きらないでください"); +ALIGNED(4) const u8 gText_HOFDexRating[] = _("みつけた ポケモン {STR_VAR_1}!\nつかまえた ポケモン {STR_VAR_2}!\pオダマキはかせの\nポケモンずかん ひょうか!\pオダマキ“どれどれ\p"); +ALIGNED(4) const u8 gText_HOFDexSaving[] = _("ここまでの レポ-トを かきしるしています!\nでんげんを きらないでください"); ALIGNED(4) const u8 gText_HOFCorrupted[] = _("The HALL OF FAME data is\ncorrupted."); const u8 gText_HOFNumber[] = _("HALL OF FAME No. {STR_VAR_1}"); const u8 gText_LeagueChamp[] = _("LEAGUE CHAMPION!\nCONGRATULATIONS!"); @@ -110,25 +110,25 @@ ALIGNED(4) const u8 gText_Number[] = _("No. "); ALIGNED(4) const u8 gText_Level[] = _("Lv. "); ALIGNED(4) const u8 gText_Name[] = _("NAME"); ALIGNED(4) const u8 gText_IDNumber[] = _("IDNo."); -const u8 gUnknown_841610A[] = _("{HIGHLIGHT DYNAMIC_COLOR6}{COLOR WHITE}オダマキはかせが ピンチだ!\nポケモンを だして たすけてあげよう!"); -const u8 gUnknown_8416133[] = _("{HIGHLIGHT DYNAMIC_COLOR6}{COLOR WHITE}このポケモンにしますか?"); -const u8 gUnknown_8416146[] = _("ポケモン"); +const u8 gText_BirchInTrouble[] = _("{HIGHLIGHT DYNAMIC_COLOR6}{COLOR WHITE}オダマキはかせが ピンチだ!\nポケモンを だして たすけてあげよう!"); +const u8 gText_ConfirmStarterChoice[] = _("{HIGHLIGHT DYNAMIC_COLOR6}{COLOR WHITE}このポケモンにしますか?"); +const u8 gText_Pokemon4[] = _("ポケモン"); const u8 gText_SaveError_PleaseExchangeBackupMemory[] = _("Save error.\pPlease exchange the\nbackup memory."); const u8 gSaveStatName_Player[] = _("PLAYER"); const u8 gSaveStatName_Badges[] = _("BADGES"); const u8 gSaveStatName_Pokedex[] = _("POKéDEX"); const u8 gSaveStatName_Time[] = _("TIME"); -const u8 gUnknown_8416195[] = _("どこへ とびますか?"); +const u8 gText_FlyToWhere[] = _("どこへ とびますか?"); const u8 gOtherText_Use[] = _("USE"); const u8 gOtherText_Toss[] = _("TOSS"); const u8 gOtherText_Register[] = _("REGISTER"); const u8 gOtherText_Give[] = _("GIVE"); -const u8 gUnknown_84161B7[] = _("けってい"); +const u8 gMenuText_Confirm[] = _("けってい"); const u8 gOtherText_Walk[] = _("WALK"); const u8 gFameCheckerText_Cancel[] = _("CANCEL"); const u8 gOtherText_Exit[] = _("EXIT"); const u8 gString_Dummy[] = _(""); -const u8 gUnknown_84161CE[] = _("キャンセル"); +const u8 gText_Cancel7[] = _("キャンセル"); const u8 gText_Item[] = _("ITEM"); const u8 gText_Mail[] = _("MAIL"); const u8 gText_Take[] = _("TAKE"); @@ -138,7 +138,7 @@ const u8 gText_PokeSum_Item_None[] = _("NONE"); const u8 gOtherText_Open[] = _("OPEN"); const u8 gOtherText_Deselect[] = _("DESELECT"); const u8 gText_PokeSum_DexNoUnknown[] = _("???"); -const u8 gUnknown_8416206[] = _("?????"); +const u8 gText_FiveMarks[] = _("?????"); const u8 gText_Slash[] = _("/"); const u8 gText_PokeSum_OneHyphen[] = _("-"); const u8 gText_PokeSum_TwoHyphens[] = _("--"); @@ -147,26 +147,26 @@ const u8 gText_SevenHyphens[] = _("-------"); const u8 gText_MaleSymbol[] = _("♂"); const u8 gText_FemaleSymbol[] = _("♀"); const u8 gText_Lv[] = _("{LV_2}"); -const u8 gOtherText_UnkF9_08_Clear_01[] = _("{NO}{CLEAR 0x01}"); -const u8 gUnknown_841622C[] = _("{PLUS}"); -const u8 gUnknown_841622F[] = _("{ESCAPE 0x03}"); -const u8 gUnknown_8416233[] = _("{ID}{NO}"); +const u8 gText_NumberClear01[] = _("{NO}{CLEAR 0x01}"); +const u8 gText_Plus[] = _("{PLUS}"); +const u8 gText_Escape3[] = _("{ESCAPE 0x03}"); // Unused, RIGHT_ARROW in pokeemerald +const u8 gText_IDNumber2[] = _("{ID}{NO}"); const u8 gText_PokeSum_PP[] = _("{PP}"); const u8 gText_SelectorArrow2[] = _("▶"); -const u8 gUnknown_841623D[] = _("YES\nNO"); +const u8 gText_YesNo[] = _("YES\nNO"); const u8 gText_GoBackToThePreviousMenu[] = _("Go back to the\nprevious menu."); const u8 gText_WhatWouldYouLikeToDo[] = _("What would you like to do?"); -const u8 gStartMenuText_Pokedex[] = _("POKéDEX"); -const u8 gStartMenuText_Bag[] = _("BAG"); -const u8 gUnknown_8416289[] = _("ポケナビ"); -const u8 gStartMenuText_Player[] = _("{PLAYER}"); -const u8 gStartMenuText_Save[] = _("SAVE"); -const u8 gStartMenuText_Option[] = _("OPTION"); -const u8 gStartMenuText_Exit[] = _("EXIT"); -const u8 gStartMenuText_Retire[] = _("RETIRE"); -const u8 gUnknown_84162A9[] = _("{STR_VAR_1}/{STR_VAR_2}\nBALLS {STR_VAR_3}"); +const u8 gText_MenuPokedex[] = _("POKéDEX"); +const u8 gText_MenuBag[] = _("BAG"); +const u8 gText_MenuPokenav[] = _("ポケナビ"); +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_MenuSafariStats[] = _("{STR_VAR_1}/{STR_VAR_2}\nBALLS {STR_VAR_3}"); const u8 gText_TimesStrVar1[] = _("×{STR_VAR_1}"); -const u8 gUnknown_84162BD[] = _(" BERRY"); +const u8 gText_Berry[] = _(" BERRY"); const u8 gText_Coins[] = _("{STR_VAR_1} COINS"); const u8 gText_Items2[] = _("ITEMS"); const u8 gText_PokeBalls2[] = _("POKé BALLS"); @@ -186,30 +186,30 @@ const u8 gText_TossOutHowManyStrVar1s[] = _("Toss out how many\n{STR_VAR_1}(s)?" const u8 gText_ThrewAwayStrVar2StrVar1s[] = _("Threw away {STR_VAR_2}\n{STR_VAR_1}(s)."); const u8 gText_ThrowAwayStrVar2OfThisItemQM[] = _("Throw away {STR_VAR_2} of\nthis item?"); const u8 gText_OakForbidsUseOfItemHere[] = _("OAK: {PLAYER}!\nThis isn't the time to use that!{PAUSE_UNTIL_PRESS}"); -const u8 gUnknown_8416451[] = _("You can't dismount your BIKE here.{PAUSE_UNTIL_PRESS}"); +const u8 gText_CantDismountBike[] = _("You can't dismount your BIKE here.{PAUSE_UNTIL_PRESS}"); const u8 gText_ItemfinderResponding[] = _("Huh?\nThe ITEMFINDER's responding!\pThere's an item buried around here!{PAUSE_UNTIL_PRESS}"); const u8 gText_ItemfinderShakingWildly[] = _("Oh!\nThe ITEMFINDER's shaking wildly!\pThere's an item buried underfoot!\p‥ ‥ ‥ ‥ ‥ ‥{PAUSE_UNTIL_PRESS}"); const u8 gText_NopeTheresNoResponse[] = _("‥ ‥ ‥ ‥Nope!\nThere's no response.{PAUSE_UNTIL_PRESS}"); -const u8 gUnknown_8416537[] = _("Your COINS:\n{STR_VAR_1}{PAUSE_UNTIL_PRESS}"); -const u8 gUnknown_8416548[] = _("わざマシンを きどうした!"); -const u8 gUnknown_8416556[] = _("ひでんマシンを きどうした!"); -const u8 gUnknown_8416565[] = _("なかには {STR_VAR_1}が\nきろくされていた!\p{STR_VAR_1}を\nポケモンに おぼえさせますか?"); -const u8 gUnknown_841658C[] = _("{PLAYER} used the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}"); -const u8 gUnknown_841659E[] = _("But the effects of a REPEL\nlingered from earlier.{PAUSE_UNTIL_PRESS}"); -const u8 gUnknown_84165D2[] = _("{PLAYER} used the\n{STR_VAR_2}.\pWild POKéMON will be lured.{PAUSE_UNTIL_PRESS}"); -const u8 gUnknown_8416600[] = _("{PLAYER} used the\n{STR_VAR_2}.\pWild POKéMON will be repelled.{PAUSE_UNTIL_PRESS}"); -const u8 gUnknown_8416631[] = _("The BOX is full.{PAUSE_UNTIL_PRESS}"); -const u8 gUnknown_8416644[] = _("POWDER QTY: {STR_VAR_1}{PAUSE_UNTIL_PRESS}"); +const u8 gText_CoinCase[] = _("Your COINS:\n{STR_VAR_1}{PAUSE_UNTIL_PRESS}"); +const u8 gText_BootedUpTM[] = _("わざマシンを きどうした!"); +const u8 gText_BootedUpHM[] = _("ひでんマシンを きどうした!"); +const u8 gText_TMHMContainedVar1[] = _("なかには {STR_VAR_1}が\nきろくされていた!\p{STR_VAR_1}を\nポケモンに おぼえさせますか?"); +const u8 gText_PlayerUsedVar2[] = _("{PLAYER} used the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}"); +const u8 gText_RepelEffectsLingered[] = _("But the effects of a REPEL\nlingered from earlier.{PAUSE_UNTIL_PRESS}"); +const u8 gText_UsedVar2WildLured[] = _("{PLAYER} used the\n{STR_VAR_2}.\pWild POKéMON will be lured.{PAUSE_UNTIL_PRESS}"); +const u8 gText_UsedVar2WildRepelled[] = _("{PLAYER} used the\n{STR_VAR_2}.\pWild POKéMON will be repelled.{PAUSE_UNTIL_PRESS}"); +const u8 gText_BoxFull[] = _("The BOX is full.{PAUSE_UNTIL_PRESS}"); +const u8 gText_PowderQty[] = _("POWDER QTY: {STR_VAR_1}{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_Powder[] = _("POWDER"); -const u8 gUnknown_841665C[] = _("Played the POKé FLUTE.\pNow, that's a catchy tune!{PAUSE_UNTIL_PRESS}"); -const u8 gUnknown_8416690[] = _("Played the POKé FLUTE."); -const u8 gUnknown_84166A7[] = _("The POKé FLUTE awakened sleeping\nPOKéMON.{PAUSE_UNTIL_PRESS}"); +const u8 gText_PlayedPokeFluteCatchy[] = _("Played the POKé FLUTE.\pNow, that's a catchy tune!{PAUSE_UNTIL_PRESS}"); +const u8 gText_PlayedPokeFlute[] = _("Played the POKé FLUTE."); +const u8 gText_PokeFluteAwakenedMon[] = _("The POKé FLUTE awakened sleeping\nPOKéMON.{PAUSE_UNTIL_PRESS}"); const u8 gText_TMCase[] = _("TM CASE"); const u8 gText_Close[] = _("CLOSE"); const u8 gText_TMCaseWillBePutAway[] = _("The TM CASE will be\nput away."); const u8 gText_FontSize0[] = _("{FONT_0}"); const u8 gText_FontSize2[] = _("{FONT_2}"); -const u8 gUnknown_8416707[] = _(" "); +const u8 gText_EmptySpace[] = _(" "); const u8 gText_BerryPouch[] = _("BERRY POUCH"); const u8 gText_TheBerryPouchWillBePutAway[] = _("The BERRY POUCH will be\nput away."); const u8 gText_ShopBuy[] = _("BUY"); @@ -219,17 +219,17 @@ const u8 gText_InBagVar1[] = _("IN BAG:{FONT_0} {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_Var1AndYouWantedVar2[] = _("{STR_VAR_1}, and you want {STR_VAR_2}.\nThat will be ¥{STR_VAR_3}. Okay?"); -const u8 gUnknown_84167BB[] = _("{STR_VAR_1} だね!\n{STR_VAR_2}¥ だけど かうかい?"); -const u8 gUnknown_84167D0[] = _("{STR_VAR_1} ですね!\n{STR_VAR_2}¥ だけど かいますか?"); +const u8 gText_Var1IsItThatllBeVar2[] = _("{STR_VAR_1} だね!\n{STR_VAR_2}¥ だけど かうかい?"); +const u8 gText_YouWantedVar1ThatllBeVar2[] = _("{STR_VAR_1} ですね!\n{STR_VAR_2}¥ だけど かいますか?"); const u8 gText_HereYouGoThankYou[] = _("Here you are!\nThank you!"); -const u8 gUnknown_8416800[] = _("どうも ありがとう!\nじたくの パソコンに おくって おきますね!"); -const u8 gUnknown_8416822[] = _("どうも ありがとう!\nじたくの パソコンに おくって おくね!"); +const u8 gText_ThankYouIllSendItHome[] = _("どうも ありがとう!\nじたくの パソコンに おくって おきますね!"); +const u8 gText_ThanksIllSendItHome[] = _("どうも ありがとう!\nじたくの パソコンに おくって おくね!"); const u8 gText_YouDontHaveMoney[] = _("You don't have enough money.{PAUSE_UNTIL_PRESS}"); const u8 gText_NoMoreRoomForThis[] = _("You have no more room for this\nitem.{PAUSE_UNTIL_PRESS}"); -const u8 gUnknown_8416888[] = _("{STR_VAR_1}を\nいれる ばしょが いっぱいです{PAUSE_UNTIL_PRESS}"); -const u8 gText_CanIHelpWithAnythingElse[] = _("Is there anything else I can do?"); -const u8 gUnknown_84168BF[] = _("その ほかに\nなにか ちからに なれることは?"); -const u8 gUnknown_84168D7[] = _("プレミアボ-ル 1コ\nおまけ しておきますね!{PAUSE_UNTIL_PRESS}"); +const u8 gText_SpaceForVar1Full[] = _("{STR_VAR_1}を\nいれる ばしょが いっぱいです{PAUSE_UNTIL_PRESS}"); +const u8 gText_AnythingElseICanHelp[] = _("Is there anything else I can do?"); +const u8 gText_CanIHelpWithAnythingElse[] = _("その ほかに\nなにか ちからに なれることは?"); +const u8 gText_ThrowInPremierBall[] = _("プレミアボ-ル 1コ\nおまけ しておきますね!{PAUSE_UNTIL_PRESS}"); const u8 gText_OhNoICantBuyThat[] = _("{STR_VAR_1}? Oh, no.\nI can't buy that.{PAUSE_UNTIL_PRESS}"); const u8 gText_HowManyWouldYouLikeToSell[] = _("{STR_VAR_1}?\nHow many would you like to sell?"); const u8 gText_ICanPayThisMuch_WouldThatBeOkay[] = _("I can pay ¥{STR_VAR_3}.\nWould that be okay?"); @@ -239,17 +239,17 @@ const u8 gText_Shift[] = _("SHIFT"); const u8 gText_SendOut[] = _("SEND OUT"); const u8 gText_Switch2[] = _("SWITCH"); const u8 gText_Summary5[] = _("SUMMARY"); -const u8 gUnknown_841699C[] = _("つかえるわざ"); +const u8 gText_Moves[] = _("つかえるわざ"); const u8 gText_Enter[] = _("ENTER"); const u8 gText_NoEntry[] = _("NO ENTRY"); const u8 gText_Take2[] = _("TAKE"); const u8 gText_Read2[] = _("READ"); const u8 gText_Trade4[] = _("TRADE"); -const u8 gText_HP3[] = _("HP"); -const u8 gText_SpAtk3[] = _("SP. ATK"); -const u8 gText_SpDef3[] = _("SP. DEF"); -const u8 gMenuText_Confirm[] = _("OK"); -const u8 gUnknown_84169D8[] = _(""); +const u8 gText_ItemEffect_HP[] = _("HP"); +const u8 gText_ItemEffect_SpAtk[] = _("SP. ATK"); +const u8 gText_ItemEffect_SpDef[] = _("SP. DEF"); +const u8 gText_PartyMenu_OK[] = _("OK"); +const u8 gText_Empty[] = _(""); const u8 gText_PauseUntilPress[] = _("{PAUSE_UNTIL_PRESS}"); const u8 gText_WontHaveEffect[] = _("It won't have any effect.{PAUSE_UNTIL_PRESS}"); const u8 gText_CantBeUsedOnPkmn[] = _("This can't be used on\nthat POKéMON.{PAUSE_UNTIL_PRESS}"); @@ -260,8 +260,8 @@ const u8 gText_PkmnHasNoEnergy[] = _("{STR_VAR_1} has no energy\nleft to battle! const u8 gText_CantSwitchWithAlly[] = _("You can't switch {STR_VAR_1}'s\nPOKéMON with one of yours!{PAUSE_UNTIL_PRESS}"); const u8 gText_EggCantBattle[] = _("An EGG can't battle!{PAUSE_UNTIL_PRESS}"); const u8 gText_CantUseUntilNewBadge[] = _("This can't be used until a new\nBADGE is obtained.{PAUSE_UNTIL_PRESS}"); -const u8 gUnknown_8416B16[] = _("No more than three POKéMON\nmay enter.{PAUSE_UNTIL_PRESS}"); -const u8 gUnknown_8416B3E[] = _("No more than two POKéMON\nmay enter.{PAUSE_UNTIL_PRESS}"); +const u8 gText_NoMoreThanThreeMayEnter[] = _("No more than three POKéMON\nmay enter.{PAUSE_UNTIL_PRESS}"); +const u8 gText_NoMoreThanTwoMayEnter[] = _("No more than two POKéMON\nmay enter.{PAUSE_UNTIL_PRESS}"); const u8 gText_SendMailToPC[] = _("Send the removed MAIL to\nyour PC?"); const u8 gText_MailSentToPC[] = _("The MAIL was sent to your PC.{PAUSE_UNTIL_PRESS}"); const u8 gText_PCMailboxFull[] = _("Your PC's MAILBOX is full.{PAUSE_UNTIL_PRESS}"); @@ -291,14 +291,14 @@ const u8 gText_PkmnWokeUp2[] = _("{STR_VAR_1} woke up.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnBurnHealed[] = _("{STR_VAR_1}'s burn 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 gUnknown_8416FDA[] = _("{STR_VAR_1}は\nげんきを とりもどした!{PAUSE_UNTIL_PRESS}"); +const u8 gText_PkmnRegainhedHealth[] = _("{STR_VAR_1}は\nげんきを とりもどした!{PAUSE_UNTIL_PRESS}"); 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}."); const u8 gText_PkmnBaseVar2StatIncreased[] = _("{STR_VAR_1}'s base {STR_VAR_2}\nstat was raised.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnSnappedOutOfConfusion[] = _("{STR_VAR_1} snapped out of its\nconfusion.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnGotOverInfatuation[] = _("{STR_VAR_1} got over its\ninfatuation.{PAUSE_UNTIL_PRESS}"); -const u8 gUnknown_8417094[] = _("That's your only\nPOKéMON for battle."); +const u8 gText_OnlyPkmnForBattle[] = _("That's your only\nPOKéMON for battle."); ALIGNED(4) const u8 gText_PkmnCantBeTradedNow[] = _("That POKéMON can't be traded\nnow."); ALIGNED(4) const u8 gText_EggCantBeTradedNow[] = _("An EGG can't be traded now."); ALIGNED(4) const u8 gText_OtherTrainersPkmnCantBeTraded[] = _("The other TRAINER's POKéMON\ncan't be traded now."); @@ -351,33 +351,33 @@ const u8 gText_MoveHeavyBoulders[] = _("Move heavy boulders."); const u8 gText_LightUpDarkness[] = _("Light up darkness."); const u8 gText_ShatterACrackedRock[] = _("Shatter a cracked rock."); const u8 gText_ClimbAWaterfall[] = _("Climb a waterfall."); -const u8 gUnknown_84175C1[] = _("すいちゅうに もぐる"); +const u8 gText_DiveUnderwater[] = _("すいちゅうに もぐる"); const u8 gText_EscapeFromHere[] = _("Escape from here."); const u8 gText_LureWildPokemon[] = _("Lure wild POKéMON."); const u8 gText_ShareHp[] = _("Share HP."); const u8 gText_ReturnToAHealingSpot[] = _("Return to a healing spot."); const u8 gText_EscapeFromHereAndReturnTo[] = _("Want to escape from here and return\nto {STR_VAR_1}?"); const u8 gText_ReturnToHealingSpot[] = _("Want to return to the healing spot\nused last in {STR_VAR_1}?"); -const u8 gText_Attack3[] = _("ATTACK"); -const u8 gText_Defense3[] = _("DEFENSE"); -const u8 gUnknown_8417683[] = _("とくこう"); -const u8 gUnknown_8417688[] = _("とくぼう"); -const u8 gText_Speed2[] = _("SPEED"); -const u8 gUnknown_8417693[] = _("HP"); +const u8 gText_ItemEffect_Attack[] = _("ATTACK"); +const u8 gText_ItemEffect_Defense[] = _("DEFENSE"); +const u8 gText_ItemEffect_SpAtk_Unused[] = _("とくこう"); // A different SpAtk is used instead +const u8 gText_ItemEffect_SpDef_Unused[] = _("とくぼう"); // A different SpDef is used instead +const u8 gText_ItemEffect_Speed[] = _("SPEED"); +const u8 gText_ItemEffect_HP_Unused[] = _("HP"); // A different HP is used instead const u8 gText_PkmnCantParticipate[] = _("That POKéMON can't participate.{PAUSE_UNTIL_PRESS}"); const u8 gText_CancelParticipation[] = _("Cancel participation?"); -const u8 gUnknown_84176CE[] = _(""); -const u8 gUnknown_84176CF[] = _("Cancel the battle?"); +const u8 gText_Empty12[] = _(""); +const u8 gText_CancelBattle[] = _("Cancel the battle?"); const u8 gText_TurnOff[] = _("TURN OFF"); -const u8 gUnknown_84176EB[] = _("もようがえ"); +const u8 gText_Decoration[] = _("もようがえ"); const u8 gText_ItemStorage[] = _("ITEM STORAGE"); const u8 gText_Mailbox[] = _("MAILBOX"); const u8 gText_DepositItem2[] = _("DEPOSIT ITEM"); const u8 gText_WithdrawItem2[] = _("WITHDRAW ITEM"); -const u8 gUnknown_8417721[] = _("どうぐを すてる"); +const u8 gText_TossItem[] = _("どうぐを すてる"); const u8 gText_StoreItemsInThePC[] = _("Store items in the PC."); const u8 gText_TakeOutItemsFromThePC[] = _("Take out items from the PC."); -const u8 gUnknown_841775D[] = _("パソコンに あずけている\nどうぐを すてます"); +const u8 gText_ThrowAwayItemsInPC[] = _("パソコンに あずけている\nどうぐを すてます"); const u8 gText_ThereAreNoItems[] = _("There are no items.{PAUSE_UNTIL_PRESS}"); const u8 gText_NoMoreRoomInBag[] = _("There is no more\nroom in the BAG."); const u8 gText_WithdrawHowMany[] = _("Withdraw how many\n{STR_VAR_1}(s)?"); @@ -395,7 +395,7 @@ const u8 gText_Withdraw[] = _("WITHDRAW"); const u8 gText_ReturnToPC[] = _("Return to the PC."); const u8 gText_LtSurge[] = _("LT. SURGE"); const u8 gText_Koga[] = _("KOGA"); -const u8 gUnknown_84178DF[] = _("さんか する"); +const u8 gText_Participate[] = _("さんか する"); const u8 gText_Info[] = _("INFO"); const u8 gText_Eggs[] = _("EGGS"); const u8 gText_HallOfFame[] = _("HALL OF FAME"); @@ -406,14 +406,14 @@ const u8 gText_Par[] = _("PAR"); const u8 gText_Slp[] = _("SLP"); const u8 gText_Brn[] = _("BRN"); const u8 gText_Frz[] = _("FRZ"); -const u8 gUnknown_8417920[] = _("TOXIC"); -const u8 gUnknown_8417926[] = _("OK"); +const u8 gText_Toxic[] = _("TOXIC"); +const u8 gText_OK[] = _("OK"); const u8 gOtherText_Quit[] = _("QUIT"); -const u8 gUnknown_841792E[] = _("みました"); -const u8 gUnknown_8417933[] = _("これから"); +const u8 gText_SawIt[] = _("みました"); +const u8 gText_NotYet[] = _("これから"); const u8 gText_Yes[] = _("YES"); const u8 gText_No[] = _("NO"); -const u8 gUnknown_841793F[] = _("せつめい"); +const u8 gText_Info4[] = _("せつめい"); const u8 gText_SingleBattle[] = _("SINGLE BATTLE"); const u8 gText_DoubleBattle[] = _("DOUBLE BATTLE"); const u8 gText_MultiBattle[] = _("MULTI BATTLE"); @@ -430,7 +430,7 @@ 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 gUnknown_8417A30[] = _("バトルタワ-"); +const u8 gText_BattleTower[] = _("バトルタワ-"); const u8 gText_Right[] = _("Right"); const u8 gText_Left[] = _("Left"); const u8 gText_Tm13_4000Coins[] = _("TM13{CLEAR_TO 0x48}{FONT_0}4,000 COINS"); @@ -521,10 +521,10 @@ const u8 gText_SevenIsland[] = _("SEVEN ISLAND"); const u8 gText_Vermilion[] = _("VERMILION"); const u8 gText_Colosseum_2[] = _("COLOSSEUM"); const u8 gText_BerryCrush[] = _("BERRY CRUSH"); -const u8 gText_Dummy_8417E66[] = _(""); -const u8 gText_Dummy_8417E67[] = _(""); -const u8 gUnknown_8417E68[] = _("せつめいを きく"); -const u8 gText_Dummy_8417E71[] = _(""); +const u8 gText_EmptyLinkService1[] = _(""); +const u8 gText_EmptyLinkService2[] = _(""); +const u8 gText_ListenToExplanation[] = _("せつめいを きく"); +const u8 gText_RecordCorner[] = _(""); // Dummied const u8 gText_PokemonJump[] = _("POKéMON JUMP"); const u8 gText_DodrioBerryPicking[] = _("DODRIO BERRY-PICKING"); const u8 gText_2Tinymushrooms[] = _("2 TINYMUSHROOMS"); @@ -537,18 +537,18 @@ const u8 gText_Charcoal_1000Coins[] = _("CHARCOAL{CLEAR_TO 0x50}{FONT_0}1,000 CO const u8 gText_MysticWater_1000Coins[] = _("MYSTIC WATER{CLEAR_TO 0x50}{FONT_0}1,000 COINS"); const u8 gText_YellowFlute_1600Coins[] = _("YELLOW FLUTE{CLEAR_TO 0x50}{FONT_0}1,600 COINS"); const u8 gText_SmokeBall_800Coins[] = _("SMOKE BALL{CLEAR_TO 0x5A}{FONT_0}800 COINS"); -const u8 gText_Dummy_8417F67[] = _(""); -const u8 gText_Dummy_8417F68[] = _(""); +const u8 gText_Multichoice_Empty2[] = _(""); +const u8 gText_Multichoice_Empty1[] = _(""); const u8 gText_BecomeLeader[] = _("BECOME LEADER"); const u8 gText_JoinGroup[] = _("JOIN GROUP"); const u8 gOtherText_Single[] = _("SINGLE"); const u8 gOtherText_Double[] = _("DOUBLE"); const u8 gOtherText_Knockout[] = _("KNOCKOUT"); const u8 gOtherText_Mixed[] = _("MIXED"); -const u8 gUnknown_8417F9F[] = _("99かい いじょう"); -const u8 gUnknown_8417FA9[] = _("1ぷん いじょう"); -const u8 gUnknown_8417FB2[] = _("びょう"); -const u8 gUnknown_8417FB6[] = _("かい"); +const u8 gText_99TimesPlus[] = _("99かい いじょう"); +const u8 gText_1MinutePlus[] = _("1ぷん いじょう"); +const u8 gText_SpaceSeconds[] = _("びょう"); +const u8 gText_SpaceTimes[] = _("かい"); const u8 gText_DecimalPoint[] = _("."); const u8 gText_BigGuy[] = _("Big guy"); const u8 gText_BigGirl[] = _("Big girl"); @@ -600,7 +600,7 @@ const u8 gString_BattleRecords_7Dashes[] = _("-------"); const u8 gString_BattleRecords_4Dashes[] = _("----"); const u8 gFameCheckerText_FameCheckerWillBeClosed[] = _("The FAME CHECKER will be closed."); const u8 gFameCheckerText_ClearTextbox[] = _("\n "); -const u8 gUnknown_8418204[] = _("やめる"); +const u8 gText_ExitUnused[] = _("やめる"); const u8 gText_ExitFromBox[] = _("Exit from the BOX."); const u8 gText_WhatDoYouWantToDo[] = _("What do you want to do?"); const u8 gText_PleasePickATheme[] = _("Please pick a theme."); @@ -668,7 +668,7 @@ const u8 gPCText_PolkaDot[] = _("STARS"); const u8 gPCText_Pokecenter[] = _("POKéCENTER"); const u8 gPCText_Machine[] = _("TILES"); const u8 gPCText_Simple[] = _("SIMPLE"); -const u8 gUnknown_8418562[] = _("なにを しますか?"); +const u8 gText_PC_WhatWouldYouLikeToDo[] = _("なにを しますか?"); const u8 gText_WithdrawPokemon[] = _("WITHDRAW POKéMON"); const u8 gText_DepositPokemon[] = _("DEPOSIT POKéMON"); const u8 gText_MovePokemon[] = _("MOVE POKéMON"); @@ -849,9 +849,9 @@ const u8 gText_TrainerCardYen[] = _("¥"); const u8 gText_TrainerCardPokedex[] = _("POKéDEX"); const u8 gText_TrainerCardNull[] = _(""); const u8 gText_Colon2[] = _(":"); -const u8 gUnknown_8419CFA[] = _("てん"); +const u8 gText_Points[] = _("てん"); const u8 gText_TrainerCardTime[] = _("TIME"); -const u8 gUnknown_8419D02[] = _("ゲ-ムポイント"); +const u8 gText_BattlePoints[] = _("ゲ-ムポイント"); // Unused. Name presumed, translation is Game Points const u8 gText_Var1sTrainerCard[] = _("'s TRAINER CARD"); const u8 gText_HallOfFameDebut[] = _("HALL OF FAME DEBUT "); const u8 gText_LinkBattles[] = _("LINK BATTLES"); @@ -861,7 +861,7 @@ const u8 gText_PokemonTrades[] = _("POKéMON TRADES"); const u8 gText_UnionRoomTradesBattles[] = _("UNION TRADES & BATTLES"); const u8 gText_BerryCrushes[] = _("BERRY CRUSH"); const u8 gText_WaitingTrainerFinishReading[] = _("Waiting for the other TRAINER to\nfinish reading your TRAINER CARD."); -const u8 gText_MenuOption[] = _("OPTION"); +const u8 gText_Option[] = _("OPTION"); const u8 gText_TextSpeed[] = _("TEXT SPEED"); const u8 gText_BattleScene[] = _("BATTLE SCENE"); const u8 gText_BattleStyle[] = _("BATTLE STYLE"); @@ -884,15 +884,15 @@ const u8 gText_ButtonTypeLEqualsA[] = _("L=A"); const u8 gText_ButtonTypeLR[] = _("LR"); const u8 gText_FrameType[] = _("TYPE"); const u8 gText_PickSwitchCancel[] = _("{DPAD_UPDOWN}PICK {DPAD_LEFTRIGHT}SWITCH {A_BUTTON}{B_BUTTON}CANCEL"); -const u8 gUnknown_8419E72[] = _("RTCを リセットします\nAで けってい Bで キャンセル"); -const u8 gUnknown_8419E90[] = _("げんざいの ゲ-ムない じかん"); -const u8 gUnknown_8419EA0[] = _("ぜんかいの ゲ-ムない じかん"); -const u8 gUnknown_8419EB0[] = _("じかんを さいせってい してください"); -const u8 gUnknown_8419EC3[] = _("じかんを さいせってい しました!\nレポ-トを かいています おまちください"); -const u8 gUnknown_8419EEA[] = _("レポ-トを かきこみました!"); -const u8 gUnknown_8419EF9[] = _("レポ-トの かきこみに\nしっぱい しました‥"); -const u8 gUnknown_8419F10[] = _("レポ-トが ないので\nじかんの せっていは できません!"); -const u8 gUnknown_8419F2D[] = _("ゲ-ムない じかんの しゅうせい システムが\nつかえる ように なりました!"); +const u8 gText_ResetRTCConfirmCancel[] = _("RTCを リセットします\nAで けってい Bで キャンセル"); +const u8 gText_PresentTime[] = _("げんざいの ゲ-ムない じかん"); +const u8 gText_PreviousTime[] = _("ぜんかいの ゲ-ムない じかん"); +const u8 gText_PleaseResetTime[] = _("じかんを さいせってい してください"); +const u8 gText_ClockHasBeenReset[] = _("じかんを さいせってい しました!\nレポ-トを かいています おまちください"); +const u8 gText_SaveCompleted[] = _("レポ-トを かきこみました!"); +const u8 gText_SaveFailed[] = _("レポ-トの かきこみに\nしっぱい しました‥"); +const u8 gText_NoSaveFileCantSetTime[] = _("レポ-トが ないので\nじかんの せっていは できません!"); +const u8 gText_InGameClockUsable[] = _("ゲ-ムない じかんの しゅうせい システムが\nつかえる ように なりました!"); const u8 gText_SavingDontTurnOffThePower2[] = _("SAVING…\nDON'T TURN OFF THE POWER."); // Start menu option descriptions @@ -907,26 +907,26 @@ const u8 gStartMenuDesc_Retire[] = _("Retire from the SAFARI GAME and return to\ #include "data/text/quest_log.h" -const u8 gUnknown_841B285[] = _(" was used on\n"); -const u8 gUnknown_841B293[] = _("."); -const u8 gUnknown_841B295[] = _("'s level rose to\n"); -const u8 gUnknown_841B2A7[] = _("."); -const u8 gUnknown_841B2A9[] = _("{FONT_0}MAX.{FONT_2} HP"); -const u8 gUnknown_841B2B7[] = _("ATTACK"); -const u8 gUnknown_841B2BE[] = _("DEFENSE"); -const u8 gUnknown_841B2C6[] = _("SPEED"); -const u8 gUnknown_841B2CC[] = _("SP. ATK"); -const u8 gUnknown_841B2D4[] = _("SP. DEF"); -const u8 gUnknown_841B2DC[] = _("{FONT_0}{PLUS}{FONT_2}"); -const u8 gUnknown_841B2E5[] = _("{FONT_0}-{FONT_2}"); -const u8 gUnknown_841B2ED[] = _("1, "); -const u8 gUnknown_841B2F1[] = _("2, and ‥ ‥ ‥ "); -const u8 gUnknown_841B2FF[] = _("Poof!\p"); -const u8 gUnknown_841B306[] = _("{DYNAMIC 0x00} forgot\n{DYNAMIC 0x01}.\p"); -const u8 gUnknown_841B315[] = _("And‥\p"); -const u8 gUnknown_841B31B[] = _("Machine set!\p"); -const u8 gUnknown_841B329[] = _("Huh?"); -const u8 gUnknown_841B32E[] = _("{DYNAMIC 0x00} learned\n{DYNAMIC 0x01}!"); +const u8 gText_WasUsedOn[] = _(" was used on\n"); +const u8 gText_Period[] = _("."); +const u8 gText_LevelRoseTo[] = _("'s level rose to\n"); +const u8 gText_Period2[] = _("."); +const u8 gText_LevelUp_MaxHP[] = _("{FONT_0}MAX.{FONT_2} HP"); +const u8 gText_LevelUp_Attack[] = _("ATTACK"); +const u8 gText_LevelUp_Defense[] = _("DEFENSE"); +const u8 gText_LevelUp_Speed[] = _("SPEED"); +const u8 gText_LevelUp_SpAtk[] = _("SP. ATK"); +const u8 gText_LevelUp_SpDef[] = _("SP. DEF"); +const u8 gText_LevelUp_Plus[] = _("{FONT_0}{PLUS}{FONT_2}"); +const u8 gText_LevelUp_Minus[] = _("{FONT_0}-{FONT_2}"); +const u8 gText_Counting_1[] = _("1, "); +const u8 gText_Counting_2And[] = _("2, and ‥ ‥ ‥ "); +const u8 gText_Poof[] = _("Poof!\p"); +const u8 gText_MonForgotMove[] = _("{DYNAMIC 0x00} forgot\n{DYNAMIC 0x01}.\p"); +const u8 gText_And[] = _("And‥\p"); +const u8 gText_MachineSet[] = _("Machine set!\p"); +const u8 gText_Huh[] = _("Huh?"); +const u8 gText_MonLearnedTMHM[] = _("{DYNAMIC 0x00} learned\n{DYNAMIC 0x01}!"); const u8 gText_Upper[] = _("UPPER"); const u8 gText_Lower[] = _("lower"); const u8 gText_Others[] = _("OTHERS"); @@ -939,8 +939,8 @@ const u8 gText_RegisterTextHere[] = _("Register text here?"); const u8 gText_InputText[] = _("Input text."); const u8 gText_F700JoinedChat[] = _("{DYNAMIC 0x00} joined the chat!"); const u8 gText_F700LeftChat[] = _("{DYNAMIC 0x00} left the chat."); -const u8 gUnknown_841B3D0[] = _("{DYNAMIC 0x00}の{DYNAMIC 0x01}ひきめ:"); -const u8 gUnknown_841B3DA[] = _("{DYNAMIC 0x00}の{DYNAMIC 0x01}ひきめは いません"); +const u8 gText_PlayersXPokemon[] = _("{DYNAMIC 0x00}の{DYNAMIC 0x01}ひきめ:"); +const u8 gText_PlayersXPokmonDoesNotExist[] = _("{DYNAMIC 0x00}の{DYNAMIC 0x01}ひきめは いません"); const u8 gText_ExitingTheChat[] = _("Exiting the chat‥"); const u8 gText_LeaderHasLeftEndingChat[] = _("The LEADER, {DYNAMIC 0x00}, has\nleft, ending the chat."); const u8 gText_RegisteredTextChanged_OKtoSave[] = _("The registered text has been changed.\nIs it okay to save the game?"); @@ -960,13 +960,13 @@ const u8 gText_ThankYou[] = _("THANK YOU"); const u8 gText_ByeBye[] = _("BYE-BYE!"); const u8 gText_PlayerScurriedToCenter[] = _("{PLAYER} scurried to a POKéMON CENTER,\nprotecting the exhausted and fainted\nPOKéMON from further harm‥\p"); const u8 gText_PlayerScurriedBackHome[] = _("{PLAYER} scurried back home, protecting\nthe exhausted and fainted POKéMON from\nfurther harm‥\p"); -const u8 gUnknown_841B60E[] = _("PLAYER: {DYNAMIC 0x00}"); -const u8 gUnknown_841B619[] = _("This document is issued in\nrecognition of your magnificent\nachievement - the completion of\nthe {DYNAMIC 0x01} POKéDEX."); -const u8 gUnknown_841B684[] = _("GAME FREAK"); -const u8 gUnknown_841B68F[] = _("NATIONAL"); -const u8 gUnknown_841B698[] = _("KANTO"); -const u8 gUnknown_841B69E[] = _("Clear all save data areas?"); -const u8 gUnknown_841B6B9[] = _("Clearing data‥\nPlease wait."); +const u8 gText_Diploma_Player[] = _("PLAYER: {DYNAMIC 0x00}"); +const u8 gText_Diploma_ThisDocument[] = _("This document is issued in\nrecognition of your magnificent\nachievement - the completion of\nthe {DYNAMIC 0x01} POKéDEX."); +const u8 gText_Diploma_GameFreak[] = _("GAME FREAK"); +const u8 gText_Diploma_National[] = _("NATIONAL"); +const u8 gText_Diploma_Kanto[] = _("KANTO"); +const u8 gText_ClearAllSaveData[] = _("Clear all save data areas?"); +const u8 gText_ClearingData[] = _("Clearing data‥\nPlease wait."); const u8 gText_Player[] = _("PLAYER"); const u8 gText_Time[] = _("TIME"); const u8 gText_Colon[] = _(":"); @@ -980,8 +980,8 @@ const u8 gText_NickHatchPrompt[] = _("Would you like to nickname the newly\nhatc const u8 gString_OutOfCoins[] = _("You've run out of COINS.\nGame over!"); const u8 gString_QuitPlaying[] = _("Quit playing?"); const u8 gString_SlotMachineControls[] = _("{DPAD_LEFTRIGHT}COMBOS {DPAD_DOWN}WAGER {A_BUTTON}STOP {B_BUTTON}EXIT"); -const u8 gUnknown_841B798[] = _("おしえテレビ"); -const u8 gUnknown_841B79F[] = _("おしまい"); +const u8 gText_TeachyTV[] = _("おしえテレビ"); +const u8 gText_End[] = _("おしまい"); #include "data/text/teachy_tv.h" @@ -1034,7 +1034,7 @@ ALIGNED(4) const u8 gText_BerryCrush_TimeUp[] = _("Time's up.\pGood BERRY POWDER ALIGNED(4) const u8 gText_BerryCrush_CommunicationStandby[] = _("Communication standby…"); ALIGNED(4) const u8 gText_1_ClrBluShdwLtBlu_Dynamic0[] = _("1. {COLOR BLUE}{SHADOW LIGHT_BLUE}{DYNAMIC 0x00}"); const u8 gText_1_Dynamic0[] = _("1. {DYNAMIC 0x00}"); -ALIGNED(4) const u8 gText_SpaceTimes[] = _(" times"); +ALIGNED(4) const u8 gText_SpaceTimes2[] = _(" times"); ALIGNED(4) const u8 gText_XDotY[] = _("{STR_VAR_1}.{STR_VAR_2}"); ALIGNED(4) const u8 gText_StrVar1Berry[] = _("{STR_VAR_1} BERRY"); ALIGNED(4) const u8 gText_TimeColon[] = _("Time:"); @@ -1210,44 +1210,44 @@ const u8 gTradeText_Cancel[] = _("CANCEL"); const u8 gTradeText_ChooseAPokemon[] = _("Choose a POKéMON."); const u8 gTradeText_Summary[] = _("SUMMARY"); const u8 gTradeText_Trade[] = _("TRADE"); -const u8 gTradeText_CancelTrade[] = _("Cancel trade?"); +const u8 gText_CancelTrade[] = _("Cancel trade?"); const u8 gTradeText_PressBButtonToExit[] = _("Press the B Button to exit."); -const u8 gUnknown_841E10A[] = _("SUMMARY"); -const u8 gUnknown_841E112[] = _("TRADE"); -const u8 gUnknown_841E118[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}Communication standby…\nPlease wait."); -const u8 gUnknown_841E145[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}The trade has been canceled."); -const u8 gUnknown_841E16B[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}That's your only POKéMON\nfor battle."); -const u8 gUnknown_841E199[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}Waiting for your friend\nto finish…"); -const u8 gUnknown_841E1C5[] = _("Your friend wants\nto trade POKéMON."); +const u8 gText_TradeAction_Summary[] = _("SUMMARY"); +const u8 gText_TradeAction_Trade[] = _("TRADE"); +const u8 gText_Trade_CommunicationStandby[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}Communication standby…\nPlease wait."); +const u8 gText_TradeHasBeenCanceled[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}The trade has been canceled."); +const u8 gText_Trade_OnlyPkmnForBattle[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}That's your only POKéMON\nfor battle."); +const u8 gText_WaitingForFriendToFinish[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}Waiting for your friend\nto finish…"); +const u8 gText_FriendWantsToTrade[] = _("Your friend wants\nto trade POKéMON."); const u8 gText_XWillBeSentToY[] = _("{STR_VAR_2} will be\nsent to {STR_VAR_1}."); const u8 gText_ByeByeVar1[] = _("Bye-bye, {STR_VAR_2}!"); const u8 gText_XSentOverY[] = _("{STR_VAR_1} sent over {STR_VAR_3}."); const u8 gText_TakeGoodCareOfX[] = _("Take good care of {STR_VAR_3}!"); const u8 gText_From[] = _("From "); -const u8 gUnknown_841E23A[] = _(""); -const u8 gUnknown_841E23B[] = _(""); -const u8 gUnknown_841E23C[] = _(""); -const u8 gUnknown_841E23D[] = _(""); -const u8 gUnknown_841E23E[] = _(""); -const u8 gUnknown_841E23F[] = _(""); -const u8 gUnknown_841E240[] = _(""); -const u8 gUnknown_841E241[] = _(""); -const u8 gUnknown_841E242[] = _(""); -const u8 gUnknown_841E243[] = _(""); -const u8 gUnknown_841E244[] = _(""); +const u8 gText_Empty1[] = _(""); +const u8 gText_Empty2[] = _(""); +const u8 gText_Empty3[] = _(""); +const u8 gText_Empty4[] = _(""); +const u8 gText_Empty5[] = _(""); +const u8 gText_Empty6[] = _(""); +const u8 gText_Empty7[] = _(""); +const u8 gText_Empty8[] = _(""); +const u8 gText_Empty9[] = _(""); +const u8 gText_Empty10[] = _(""); +const u8 gText_Empty11[] = _(""); const u8 gText_WirelessCommunicationStatus[] = _("Wireless Communication Status"); const u8 gText_PeopleTrading[] = _("People trading:"); const u8 gText_PeopleBattling[] = _("People battling:"); const u8 gText_PeopleInUnionRoom[] = _("People in the UNION ROOM:"); const u8 gText_PeopleCommunicating[] = _("People communicating:"); -const u8 gUnknown_841E2B4[] = _("{DYNAMIC 0x00} players"); -const u8 gUnknown_841E2BF[] = _("{DYNAMIC 0x01} player"); -const u8 gUnknown_841E2C9[] = _("{DYNAMIC 0x02} players"); -const u8 gUnknown_841E2D4[] = _("{DYNAMIC 0x03} players"); -const u8 gUnknown_841E2DF[] = _("{DPAD_ANY}えらぶ:{A_BUTTON}けってい"); -const u8 gUnknown_841E2EC[] = _("{B_BUTTON}CANCEL"); -const u8 gUnknown_841E2F5[] = _("{COLOR RED}{SHADOW LIGHT_RED} たいせんの くみあわせ\n{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}じぶんの ばしょをきめて ください"); -const u8 gUnknown_841E322[] = _("{ID}"); +const u8 gText_Dynamic0Players[] = _("{DYNAMIC 0x00} players"); +const u8 gText_Dynamic1Players[] = _("{DYNAMIC 0x01} player"); // Typo? This is "players" in Emerald +const u8 gText_Dynamic2Players[] = _("{DYNAMIC 0x02} players"); +const u8 gText_Dynamic3Players[] = _("{DYNAMIC 0x03} players"); +const u8 gText_DPadChooseAButtonConfirm[] = _("{DPAD_ANY}えらぶ:{A_BUTTON}けってい"); +const u8 gText_BButtonCancel[] = _("{B_BUTTON}CANCEL"); +const u8 gText_ChooseBattleLineup[] = _("{COLOR RED}{SHADOW LIGHT_RED} たいせんの くみあわせ\n{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}じぶんの ばしょをきめて ください"); +const u8 gText_UnusedId[] = _("{ID}"); const u8 gText_CommunicationStandby5[] = _("Communication standby…"); const u8 gDaycareText_GetAlongVeryWell[] = _("The two seem to get along\nvery well."); const u8 gDaycareText_GetAlong[] = _("The two seem to get along."); @@ -1262,7 +1262,7 @@ const u8 gText_1_2_and_Poof[] = _("{PAUSE 0x20}1, {PAUSE 0x0F}2, and {PAUSE 0x0F const u8 gText_MonForgotOldMoveAndMonLearnedNewMove[] = _("{STR_VAR_1} forgot {STR_VAR_3}.\pAnd‥\p{STR_VAR_1}\nlearned {STR_VAR_2}."); const u8 gText_GiveUpTryingToTeachNewMove[] = _("Give up trying to teach a new\nmove to {STR_VAR_1}?"); const u8 gText_WhichMoveShouldBeForgotten[] = _("Which move should be forgotten?\p"); -const u8 gUnknown_841E52D[] = _("----------"); +const u8 gText_TenDashes[] = _("----------"); const u8 gText_CommStandbyAwaitingOtherPlayer[] = _("Communication standby‥\nAwaiting another player to choose."); const u8 gText_BattleWasRefused[] = _("The battle was refused.{PAUSE 0x3C}"); const u8 gText_RefusedBattle[] = _("Refused the battle.{PAUSE 0x3C}"); @@ -1281,7 +1281,7 @@ const u8 gText_DontHaveCardNewOneInput[] = _("You don't have a WONDER CARD,\nso const u8 gText_DontHaveNewsNewOneInput[] = _("You don't have any WONDER NEWS,\nso new NEWS will be input."); const u8 gText_WhereShouldCardBeAccessed[] = _("Where should the WONDER CARD\nbe accessed?"); const u8 gText_WhereShouldNewsBeAccessed[] = _("Where should the WONDER NEWS\nbe accessed?"); -const u8 gUnknown_841E76B[] = _("Link standby...\n... ... B Button: Cancel"); +const u8 gText_LinkStandyBButtonCancel[] = _("Link standby...\n... ... B Button: Cancel"); const u8 gText_Communicating[] = _("Communicating…"); const u8 gText_CommunicationCompleted[] = _("Communication completed."); const u8 gText_CommunicationError[] = _("Communication error."); diff --git a/src/tm_case.c b/src/tm_case.c index 8b77972ab..73807c670 100644 --- a/src/tm_case.c +++ b/src/tm_case.c @@ -520,13 +520,13 @@ static void GetTMNumberAndMoveString(u8 * dest, u16 itemId) if (itemId >= ITEM_HM01) { StringAppend(gStringVar4, sText_ClearTo18); - StringAppend(gStringVar4, gOtherText_UnkF9_08_Clear_01); + StringAppend(gStringVar4, gText_NumberClear01); ConvertIntToDecimalStringN(gStringVar1, itemId - ITEM_HM01 + 1, STR_CONV_MODE_LEADING_ZEROS, 1); StringAppend(gStringVar4, gStringVar1); } else { - StringAppend(gStringVar4, gOtherText_UnkF9_08_Clear_01); + StringAppend(gStringVar4, gText_NumberClear01); ConvertIntToDecimalStringN(gStringVar1, itemId - ITEM_TM01 + 1, STR_CONV_MODE_LEADING_ZEROS, 2); StringAppend(gStringVar4, gStringVar1); } diff --git a/src/trade.c b/src/trade.c index 014b447e3..c974ca9fc 100644 --- a/src/trade.c +++ b/src/trade.c @@ -434,25 +434,25 @@ static const u8 *const sTradeUITextPtrs[] = { gTradeText_ChooseAPokemon, gTradeText_Summary, gTradeText_Trade, - gTradeText_CancelTrade, + gText_CancelTrade, gTradeText_PressBButtonToExit }; static const struct MenuAction sMenuAction_SummaryTrade[] = { - {gUnknown_841E10A, { .void_u8 = TradeMenuAction_Summary }}, - {gUnknown_841E112, { .void_u8 = TradeMenuAction_Trade }} + {gText_TradeAction_Summary, { .void_u8 = TradeMenuAction_Summary }}, + {gText_TradeAction_Trade, { .void_u8 = TradeMenuAction_Trade }} }; static const u8 *const sTradeErrorOrStatusMessagePtrs[] = { - gUnknown_841E118, // Communication standby - gUnknown_841E145, // The trade has been canceled. - gUnknown_841E16B, // That's your only POKéMON for battle - gUnknown_8417094, // That's your only POKéMON for battle - gUnknown_841E199, // Waiting for your friend to finish - gUnknown_841E1C5, // Your friend wants to trade POKéMON - gText_PkmnCantBeTradedNow, // That POKéMON can't be traded now - gText_EggCantBeTradedNow, // An EGG can't be traded now - gText_OtherTrainersPkmnCantBeTraded // The other TRAINER's POKéMON can't be traded now + gText_Trade_CommunicationStandby, + gText_TradeHasBeenCanceled, + gText_Trade_OnlyPkmnForBattle, + gText_OnlyPkmnForBattle, // Same as above but without color formatting + gText_WaitingForFriendToFinish, + gText_FriendWantsToTrade, + gText_PkmnCantBeTradedNow, + gText_EggCantBeTradedNow, + gText_OtherTrainersPkmnCantBeTraded }; static const u8 sTextColor_PartyMonNickname[] = { TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY }; diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c index ec70c5dfe..c9ebe676d 100644 --- a/src/wireless_communication_status_screen.c +++ b/src/wireless_communication_status_screen.c @@ -101,11 +101,12 @@ static const struct WindowTemplate sWindowTemplates[] = { }, DUMMY_WIN_TEMPLATE }; -static const u8 *const gUnknown_846FA9C[] = { - gUnknown_841E2B4, - gUnknown_841E2BF, - gUnknown_841E2C9, - gUnknown_841E2D4 +// Unused +static const u8 *const sPlayersTextPtrs[] = { + gText_Dynamic0Players, + gText_Dynamic1Players, + gText_Dynamic2Players, + gText_Dynamic3Players }; static const u8 *const sHeaderTextPtrs[] = {