From 8a7f1cf1ceece006a55fd2b3a4bda5742329dc1f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 5 Sep 2022 23:07:27 -0400 Subject: [PATCH 1/3] Sync static text in ur message --- src/union_room_message.c | 571 ++++++++++++++++++++------------------- 1 file changed, 296 insertions(+), 275 deletions(-) diff --git a/src/union_room_message.c b/src/union_room_message.c index 3aeb40524..ad0737962 100644 --- a/src/union_room_message.c +++ b/src/union_room_message.c @@ -7,76 +7,80 @@ ALIGNED(4) const u8 gUnknown_84571B0[] = _(":"); ALIGNED(4) const u8 gUnknown_84571B4[] = _("{ID}"); ALIGNED(4) const u8 gUnknown_84571B8[] = _("Please start over from the beginning."); ALIGNED(4) const u8 gUnknown_84571E0[] = _("The WIRELESS COMMUNICATION\nSYSTEM search has been canceled."); -ALIGNED(4) const u8 gUnref_845721C[] = _("ともだちからの れんらくを\nまっています"); +ALIGNED(4) static const u8 gUnref_845721C[] = _("ともだちからの れんらくを\nまっています"); ALIGNED(4) const u8 gUnknown_8457234[] = _("{STR_VAR_1}! Awaiting\ncommunication from another player."); ALIGNED(4) const u8 gUnknown_8457264[] = _("{STR_VAR_1}! Awaiting link!\nPress START when everyone's ready."); -ALIGNED(4) const u8 gJPText_SingleBattle[] = _("シングルバトルを かいさいする"); -ALIGNED(4) const u8 gJPText_DoubleBattle[] = _("ダブルバトルを かいさいする"); -ALIGNED(4) const u8 gJPText_MultiBattle[] = _("マルチバトルを かいさいする"); -ALIGNED(4) const u8 gJPText_TradePokemon[] = _("ポケモンこうかんを かいさいする"); -ALIGNED(4) const u8 gJPText_Chat[] = _("チャットを かいさいする"); -ALIGNED(4) const u8 gJPText_DistWonderCard[] = _("ふしぎなカードをくばる"); -ALIGNED(4) const u8 gJPText_DistWonderNews[] = _("ふしぎなニュースをくばる"); -ALIGNED(4) const u8 unref_text_union_room_1[] = _("ふしぎなできごとを かいさいする"); -ALIGNED(4) const u8 gJPText_HoldPokemonJump[] = _("なわとびを かいさいする"); -ALIGNED(4) const u8 gJPText_HoldBerryCrush[] = _("きのみマッシャーを かいさいする"); -ALIGNED(4) const u8 gJPText_HoldBerryPicking[] = _("きのみどりを かいさいする"); -ALIGNED(4) const u8 gJPText_HoldSpinTrade[] = _("ぐるぐるこうかんを かいさいする"); -ALIGNED(4) const u8 gJPText_HoldSpinShop[] = _("ぐるぐるショップを かいさいする"); +ALIGNED(4) static const u8 sJPText_SingleBattle[] = _("シングルバトルを かいさいする"); +ALIGNED(4) static const u8 sJPText_DoubleBattle[] = _("ダブルバトルを かいさいする"); +ALIGNED(4) static const u8 sJPText_MultiBattle[] = _("マルチバトルを かいさいする"); +ALIGNED(4) static const u8 sJPText_TradePokemon[] = _("ポケモンこうかんを かいさいする"); +ALIGNED(4) static const u8 sJPText_Chat[] = _("チャットを かいさいする"); +ALIGNED(4) static const u8 sJPText_DistWonderCard[] = _("ふしぎなカードをくばる"); +ALIGNED(4) static const u8 sJPText_DistWonderNews[] = _("ふしぎなニュースをくばる"); +ALIGNED(4) static const u8 sJPText_DistMysteryEvent[] = _("ふしぎなできごとを かいさいする"); +ALIGNED(4) static const u8 sJPText_HoldPokemonJump[] = _("なわとびを かいさいする"); +ALIGNED(4) static const u8 sJPText_HoldBerryCrush[] = _("きのみマッシャーを かいさいする"); +ALIGNED(4) static const u8 sJPText_HoldBerryPicking[] = _("きのみどりを かいさいする"); +ALIGNED(4) static const u8 sJPText_HoldSpinTrade[] = _("ぐるぐるこうかんを かいさいする"); +ALIGNED(4) static const u8 sJPText_HoldSpinShop[] = _("ぐるぐるショップを かいさいする"); -const u8 *const unref_text_ptrs_union_room_0[] = { - gJPText_SingleBattle, - gJPText_DoubleBattle, - gJPText_MultiBattle, - gJPText_TradePokemon, - gJPText_Chat, - gJPText_DistWonderCard, - gJPText_DistWonderNews, - gJPText_DistWonderCard, - gJPText_HoldPokemonJump, - gJPText_HoldBerryCrush, - gJPText_HoldBerryPicking, - gJPText_HoldBerryPicking, - gJPText_HoldSpinTrade, - gJPText_HoldSpinShop +// Unused +static const u8 *const sJPLinkGroupActionTexts[] = { + sJPText_SingleBattle, + sJPText_DoubleBattle, + sJPText_MultiBattle, + sJPText_TradePokemon, + sJPText_Chat, + sJPText_DistWonderCard, + sJPText_DistWonderNews, + sJPText_DistWonderCard, + sJPText_HoldPokemonJump, + sJPText_HoldBerryCrush, + sJPText_HoldBerryPicking, + sJPText_HoldBerryPicking, + sJPText_HoldSpinTrade, + sJPText_HoldSpinShop }; -const u8 gText_1PlayerNeeded[] = _("1 player\nneeded."); -const u8 gText_2PlayersNeeded[] = _("2 players\nneeded."); -const u8 gText_3PlayersNeeded[] = _("3 players\nneeded."); -const u8 gText_4PlayersNeeded[] = _("あと4にん\nひつよう"); -const u8 gText_2PlayerMode[] = _("2-PLAYER\nMODE"); -const u8 gText_3PlayerMode[] = _("3-PLAYER\nMODE"); -const u8 gText_4PlayerMode[] = _("4-PLAYER\nMODE"); -const u8 gText_5PlayerMode[] = _("5-PLAYER\nMODE"); +static const u8 sText_1PlayerNeeded[] = _("1 player\nneeded."); +static const u8 sText_2PlayersNeeded[] = _("2 players\nneeded."); +static const u8 sText_3PlayersNeeded[] = _("3 players\nneeded."); +static const u8 sText_4PlayersNeeded[] = _("あと4にん\nひつよう"); +static const u8 sText_2PlayerMode[] = _("2-PLAYER\nMODE"); +static const u8 sText_3PlayerMode[] = _("3-PLAYER\nMODE"); +static const u8 sText_4PlayerMode[] = _("4-PLAYER\nMODE"); +static const u8 sText_5PlayerMode[] = _("5-PLAYER\nMODE"); const u8 *const gUnknown_845742C[][5] = { - { - gText_1PlayerNeeded, - gText_2PlayerMode - }, { - gText_3PlayersNeeded, - gText_2PlayersNeeded, - gText_1PlayerNeeded, - gText_4PlayerMode - }, { - gText_1PlayerNeeded, - gText_2PlayerMode, - gText_3PlayerMode, - gText_4PlayerMode, - gText_5PlayerMode - }, { - gText_2PlayersNeeded, - gText_1PlayerNeeded, - gText_3PlayerMode, - gText_4PlayerMode, - gText_5PlayerMode + { // 2 players required + sText_1PlayerNeeded, + sText_2PlayerMode + }, + { // 4 players required + sText_3PlayersNeeded, + sText_2PlayersNeeded, + sText_1PlayerNeeded, + sText_4PlayerMode + }, + { // 2-5 players required + sText_1PlayerNeeded, + sText_2PlayerMode, + sText_3PlayerMode, + sText_4PlayerMode, + sText_5PlayerMode + }, + { // 3-5 players required + sText_2PlayersNeeded, + sText_1PlayerNeeded, + sText_3PlayerMode, + sText_4PlayerMode, + sText_5PlayerMode } }; ALIGNED(4) const u8 gUnknown_845747C[] = _("{B_BUTTON}CANCEL"); -ALIGNED(4) const u8 unref_text_union_room_2[] = _("ため\nさんかしゃ ぼしゅうちゅう です！"); +ALIGNED(4) static const u8 sJPText_SearchingForParticipants[] = _("ため\nさんかしゃ ぼしゅうちゅう です！"); ALIGNED(4) const u8 gUnknown_84574A0[] = _("{STR_VAR_2} contacted you for\n{STR_VAR_1}. Accept?"); ALIGNED(4) const u8 gUnknown_84574C4[] = _("{STR_VAR_2} contacted you.\nWill you share {STR_VAR_1}?"); ALIGNED(4) const u8 gUnknown_84574EC[] = _("{STR_VAR_2} contacted you.\nAdd to the members?"); @@ -84,49 +88,49 @@ ALIGNED(4) const u8 gUnknown_8457514[] = _("{STR_VAR_1}!\nAre these members OK?" ALIGNED(4) const u8 gUnknown_8457530[] = _("Cancel {STR_VAR_1} MODE\nwith these members?"); ALIGNED(4) const u8 gUnknown_8457554[] = _("An “OK” was sent\nto {STR_VAR_1}."); -ALIGNED(4) const u8 gUnknown_845756C[] = _("The other TRAINER doesn't appear\nto be available now…\p"); -ALIGNED(4) const u8 gUnknown_84575A4[] = _("You can't transmit with a TRAINER\nwho is too far away.\p"); -ALIGNED(4) const u8 gUnknown_84575DC[] = _("The other TRAINER(S) is/are not\nready yet.\p"); +ALIGNED(4) static const u8 sText_OtherTrainerUnavailableNow[] = _("The other TRAINER doesn't appear\nto be available now…\p"); +ALIGNED(4) static const u8 sText_CantTransmitTrainerTooFar[] = _("You can't transmit with a TRAINER\nwho is too far away.\p"); +ALIGNED(4) static const u8 sText_TrainersNotReadyYet[] = _("The other TRAINER(S) is/are not\nready yet.\p"); const u8 *const gUnknown_8457608[] = { - gUnknown_84575A4, - gUnknown_84575DC + sText_CantTransmitTrainerTooFar, + sText_TrainersNotReadyYet }; ALIGNED(4) const u8 gUnknown_8457610[] = _("The {STR_VAR_1} MODE with\nthese members will be canceled.{PAUSE 90}"); -ALIGNED(4) const u8 gUnknown_8457644[] = _("There is a member who can no\nlonger remain available.\p"); +ALIGNED(4) static const u8 sText_MemberNoLongerAvailable[] = _("There is a member who can no\nlonger remain available.\p"); const u8 *const gUnknown_845767C[] = { - gUnknown_845756C, - gUnknown_8457644 + sText_OtherTrainerUnavailableNow, + sText_MemberNoLongerAvailable }; -ALIGNED(4) const u8 gUnknown_8457684[] = _("The other TRAINER appears\nunavailable…\p"); +ALIGNED(4) static const u8 sText_TrainerAppearsUnavailable[] = _("The other TRAINER appears\nunavailable…\p"); ALIGNED(4) const u8 gUnknown_84576AC[] = _("{STR_VAR_1} sent back an “OK”!"); ALIGNED(4) const u8 gUnknown_84576C4[] = _("{STR_VAR_1} OK'd your registration as\na member."); -ALIGNED(4) const u8 gUnknown_84576EC[] = _("{STR_VAR_1} replied, “No…”\p"); +ALIGNED(4) static const u8 sText_PlayerRepliedNo[] = _("{STR_VAR_1} replied, “No…”\p"); ALIGNED(4) const u8 gUnknown_8457700[] = _("{STR_VAR_1}!\nAwaiting other members!"); ALIGNED(4) const u8 gUnknown_845771C[] = _("Quit being a member?"); -ALIGNED(4) const u8 gUnknown_8457734[] = _("You stopped being a member.\p"); +ALIGNED(4) static const u8 sText_StoppedBeingMember[] = _("You stopped being a member.\p"); const u8 *const gUnknown_8457754[] = { NULL, - gUnknown_8457644, - gUnknown_8457684, + sText_MemberNoLongerAvailable, + sText_TrainerAppearsUnavailable, NULL, NULL, NULL, - gUnknown_84576EC, + sText_PlayerRepliedNo, NULL, NULL, - gUnknown_8457734 + sText_StoppedBeingMember }; ALIGNED(4) const u8 gUnknown_845777C[] = _("The WIRELESS COMMUNICATION\nSYSTEM link has been established."); ALIGNED(4) const u8 gUnknown_84577BC[] = _("The WIRELESS COMMUNICATION\nSYSTEM link has been dropped…"); ALIGNED(4) const u8 gUnknown_84577F8[] = _("The link with your friend has been\ndropped…"); -ALIGNED(4) const u8 gUnknown_8457824[] = _("{STR_VAR_1} replied, “No…”"); +ALIGNED(4) static const u8 sText_PlayerRepliedNo2[] = _("{STR_VAR_1} replied, “No…”"); const u8 *const gUnknown_8457838[] = { NULL, @@ -135,77 +139,80 @@ const u8 *const gUnknown_8457838[] = { NULL, NULL, NULL, - gUnknown_8457824, + sText_PlayerRepliedNo2, NULL, NULL, NULL }; -ALIGNED(4) const u8 gUnknown_8457860[] = _("Do you want the {STR_VAR_2}\nMODE?"); -ALIGNED(4) const u8 gUnknown_845787C[] = _("Do you want the {STR_VAR_2}\nMODE?"); +ALIGNED(4) static const u8 sText_DoYouWantXMode[] = _("Do you want the {STR_VAR_2}\nMODE?"); +ALIGNED(4) static const u8 sText_DoYouWantXMode2[] = _("Do you want the {STR_VAR_2}\nMODE?"); -const u8 *const gUnknown_8457898[] = { - gUnknown_8457860, - gUnknown_845787C +// Unused +static const u8 *const sDoYouWantModeTexts[] = { + sText_DoYouWantXMode, + sText_DoYouWantXMode2 }; -ALIGNED(4) const u8 gUnknown_84578A0[] = _("はなしかけています…\nしょうしょう おまちください"); +ALIGNED(4) static const u8 sText_CommunicatingPleaseWait[] = _("はなしかけています…\nしょうしょう おまちください"); // Unused ALIGNED(4) const u8 gUnknown_84578BC[] = _("Awaiting {STR_VAR_1}'s response about\nthe trade…"); -ALIGNED(4) const u8 gUnknown_84578E4[] = _("Communicating{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.\n{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}."); -ALIGNED(4) const u8 gUnknown_8457950[] = _("Communicating with {STR_VAR_1}{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.\n{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}."); -ALIGNED(4) const u8 gUnknown_84579BC[] = _("Please wait a while{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.\n{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}."); +ALIGNED(4) static const u8 sText_Communicating[] = _("Communicating{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.\n{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}."); +ALIGNED(4) static const u8 sText_CommunicatingWithPlayer[] = _("Communicating with {STR_VAR_1}{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.\n{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}."); +ALIGNED(4) static const u8 sText_PleaseWaitAWhile[] = _("Please wait a while{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.\n{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}."); const u8 *const gURText_PleaseWaitMsgs[] = { - gUnknown_84578E4, - gUnknown_8457950, - gUnknown_84579BC + sText_Communicating, + sText_CommunicatingWithPlayer, + sText_PleaseWaitAWhile }; -ALIGNED(4) const u8 gUnknown_8457A40[] = _("Hiya! Is there something that you\nwanted to do?"); -ALIGNED(4) const u8 gUnknown_8457A70[] = _("Hello!\nWould you like to do something?"); -ALIGNED(4) const u8 gUnknown_8457A98[] = _("{STR_VAR_1}: Hiya, we meet again!\nWhat are you up for this time?"); -ALIGNED(4) const u8 gUnknown_8457AD0[] = _("{STR_VAR_1}: Oh! {PLAYER}, hello!\nWould you like to do something?"); +ALIGNED(4) static const u8 sText_HiDoSomethingMale[] = _("Hiya! Is there something that you\nwanted to do?"); +ALIGNED(4) static const u8 sText_HiDoSomethingFemale[] = _("Hello!\nWould you like to do something?"); +ALIGNED(4) static const u8 sText_HiDoSomethingAgainMale[] = _("{STR_VAR_1}: Hiya, we meet again!\nWhat are you up for this time?"); +ALIGNED(4) static const u8 sText_HiDoSomethingAgainFemale[] = _("{STR_VAR_1}: Oh! {PLAYER}, hello!\nWould you like to do something?"); const u8 *const gURText_FriendPromptsForActivity[][2] = { { - gUnknown_8457A40, - gUnknown_8457A70 + sText_HiDoSomethingMale, + sText_HiDoSomethingFemale }, { - gUnknown_8457A98, - gUnknown_8457AD0 + sText_HiDoSomethingAgainMale, + sText_HiDoSomethingAgainFemale } }; -ALIGNED(4) const u8 gUnknown_8457B14[] = _("Want to do something?"); -ALIGNED(4) const u8 gUnknown_8457B2C[] = _("Would you like to do something?"); -ALIGNED(4) const u8 gUnknown_8457B4C[] = _("{STR_VAR_1}: What would you like to\ndo now?"); -ALIGNED(4) const u8 gUnknown_8457B70[] = _("{STR_VAR_1}‘また なにかする？"); +ALIGNED(4) static const u8 sText_DoSomethingMale[] = _("Want to do something?"); +ALIGNED(4) static const u8 sText_DoSomethingFemale[] = _("Would you like to do something?"); +ALIGNED(4) static const u8 sText_DoSomethingAgainMale[] = _("{STR_VAR_1}: What would you like to\ndo now?"); +ALIGNED(4) static const u8 sText_DoSomethingAgainFemale[] = _("{STR_VAR_1}‘また なにかする？"); -const u8 *const gUnknown_8457B80[] = { - gUnknown_8457B14, - gUnknown_8457B2C, - gUnknown_8457B4C, - gUnknown_8457B4C +// Unused +static const u8 *const sDoSomethingTexts[] = { + sText_DoSomethingMale, + sText_DoSomethingFemale, + sText_DoSomethingAgainMale, + sText_DoSomethingAgainMale // was probably supposed to be sText_DoSomethingAgainFemale }; -ALIGNED(4) const u8 gUnknown_8457B90[] = _("Somebody has contacted you.{PAUSE 60}"); -ALIGNED(4) const u8 gUnknown_8457BA0[] = _("{STR_VAR_1} has contacted you.{PAUSE 60}"); +ALIGNED(4) static const u8 sText_SomebodyHasContactedYou[] = _("Somebody has contacted you.{PAUSE 60}"); +ALIGNED(4) static const u8 sText_PlayerHasContactedYou[] = _("{STR_VAR_1} has contacted you.{PAUSE 60}"); const u8 *const gUnknown_8457BCC[] = { - gUnknown_8457B90, - gUnknown_8457BA0 + sText_SomebodyHasContactedYou, + sText_PlayerHasContactedYou }; -ALIGNED(4) const u8 gUnknown_8457BD4[] = _("Awaiting a response from\nthe other TRAINER…"); -ALIGNED(4) const u8 gUnknown_8457C00[] = _("Awaiting a response from\n{STR_VAR_1}…"); +ALIGNED(4) static const u8 sText_AwaitingResponseFromTrainer[] = _("Awaiting a response from\nthe other TRAINER…"); +ALIGNED(4) static const u8 sText_AwaitingResponseFromPlayer[] = _("Awaiting a response from\n{STR_VAR_1}…"); const u8 *const gUnknown_8457C20[] = { - gUnknown_8457BD4, - gUnknown_8457C00 + sText_AwaitingResponseFromTrainer, + sText_AwaitingResponseFromPlayer }; -ALIGNED(4) const u8 gUnknown_8457C28[] = _("あいての ていあんを まっています\nビーボタンで キャンセル"); +ALIGNED(4) static const u8 gUnknown_8457C28[] = _("あいての ていあんを まっています\nビーボタンで キャンセル"); + ALIGNED(4) const u8 gUnknown_8457C48[] = _("The other TRAINER showed\nyou their TRAINER CARD.\pWould you like to show your\nTRAINER CARD?"); ALIGNED(4) const u8 gUnknown_8457CA4[] = _("The other TRAINER challenges you\nto battle.\pWill you accept the battle\nchallenge?"); ALIGNED(4) const u8 gUnknown_8457CF8[] = _("The other TRAINER invites you\nto chat.\pWill you accept the chat\ninvitation?"); @@ -216,209 +223,221 @@ ALIGNED(4) const u8 gUnknown_8457E28[] = _("You declined the offer.\p"); ALIGNED(4) const u8 gUnknown_8457E44[] = _("You declined the offer.\p"); ALIGNED(4) const u8 gUnknown_8457E60[] = _("The chat was ended.\p"); -const u8 *const gUnknown_8457E78[] = { +// Unused +static const u8 *const sInvitationTexts[] = { gUnknown_8457C48, gUnknown_8457CA4, gUnknown_8457CF8, gUnknown_8457D44 }; -ALIGNED(4) const u8 gUnknown_8457E88[] = _("Oh, hey! We're in a chat right now.\nWant to join us?"); -ALIGNED(4) const u8 gUnknown_8457EC0[] = _("{STR_VAR_1}: Hey, {PLAYER}!\nWe're having a chat right now.\lWant to join us?"); -ALIGNED(4) const u8 gUnknown_8457F00[] = _("Oh, hi! We're having a chat now.\nWould you like to join us?"); -ALIGNED(4) const u8 gUnknown_8457F3C[] = _("{STR_VAR_1}: Oh, hi, {PLAYER}!\nWe're having a chat now.\lWould you like to join us?"); +ALIGNED(4) static const u8 sText_JoinChatMale[] = _("Oh, hey! We're in a chat right now.\nWant to join us?"); +ALIGNED(4) static const u8 sText_PlayerJoinChatMale[] = _("{STR_VAR_1}: Hey, {PLAYER}!\nWe're having a chat right now.\lWant to join us?"); +ALIGNED(4) static const u8 sText_JoinChatFemale[] = _("Oh, hi! We're having a chat now.\nWould you like to join us?"); +ALIGNED(4) static const u8 sText_PlayerJoinChatFemale[] = _("{STR_VAR_1}: Oh, hi, {PLAYER}!\nWe're having a chat now.\lWould you like to join us?"); const u8 *const gUnknown_8457F80[][2] = { { - gUnknown_8457E88, - gUnknown_8457F00 + sText_JoinChatMale, + sText_JoinChatFemale }, { - gUnknown_8457EC0, - gUnknown_8457F3C + sText_PlayerJoinChatMale, + sText_PlayerJoinChatFemale } }; ALIGNED(4) const u8 gUnknown_8457F90[] = _("……\nThe TRAINER appears to be busy…\p"); - -ALIGNED(4) const u8 gUnknown_8457FB4[] = _("A battle, huh?\nAll right, just give me some time."); -ALIGNED(4) const u8 gUnknown_8457FE8[] = _("You want to chat, huh?\nSure, just wait a little."); -ALIGNED(4) const u8 gUnknown_845801C[] = _("Sure thing! As my “Greetings,”\nhere's my TRAINER CARD."); -ALIGNED(4) const u8 gUnknown_8458054[] = _("A battle? Of course, but I need\ntime to get ready."); -ALIGNED(4) const u8 gUnknown_8458088[] = _("Did you want to chat?\nOkay, but please wait a moment."); -ALIGNED(4) const u8 gUnknown_84580C0[] = _("As my introduction, I'll show you\nmy TRAINER CARD."); +ALIGNED(4) static const u8 sText_WaitForBattleMale[] = _("A battle, huh?\nAll right, just give me some time."); +ALIGNED(4) static const u8 sText_WaitForChatMale[] = _("You want to chat, huh?\nSure, just wait a little."); +ALIGNED(4) static const u8 sText_ShowTrainerCardMale[] = _("Sure thing! As my “Greetings,”\nhere's my TRAINER CARD."); +ALIGNED(4) static const u8 sText_WaitForBattleFemale[] = _("A battle? Of course, but I need\ntime to get ready."); +ALIGNED(4) static const u8 sText_WaitForChatFemale[] = _("Did you want to chat?\nOkay, but please wait a moment."); +ALIGNED(4) static const u8 sText_ShowTrainerCardFemale[] = _("As my introduction, I'll show you\nmy TRAINER CARD."); const u8 *const gResponseToURoomActivityInviteStringPtrs[][4] = { { - gUnknown_8457FB4, - gUnknown_8457FE8, + sText_WaitForBattleMale, + sText_WaitForChatMale, NULL, - gUnknown_845801C + sText_ShowTrainerCardMale }, { - gUnknown_8458054, - gUnknown_8458088, + sText_WaitForBattleFemale, + sText_WaitForChatFemale, NULL, - gUnknown_84580C0 + sText_ShowTrainerCardFemale } }; -ALIGNED(4) const u8 gUnref_8458104[] = _("チャットだね！\nわかった ちょっと まってて！"); -ALIGNED(4) const u8 gUnknown_845812C[] = _("Thanks for waiting!\nLet's get our battle started!{PAUSE 60}"); -ALIGNED(4) const u8 gUnknown_8458164[] = _("All right!\nLet's chat!{PAUSE 60}"); -ALIGNED(4) const u8 gUnknown_8458180[] = _("Sorry I made you wait!\nLet's get started!{PAUSE 60}"); -ALIGNED(4) const u8 gUnknown_84581B0[] = _("Sorry I made you wait!\nLet's chat.{PAUSE 60}"); -ALIGNED(4) const u8 gUnknown_84581D8[] = _("The trade will be started.{PAUSE 60}"); -ALIGNED(4) const u8 gUnknown_84581F8[] = _("The battle will be started.{PAUSE 60}"); -ALIGNED(4) const u8 gUnknown_8458218[] = _("Entering the chat…{PAUSE 60}"); +ALIGNED(4) static const u8 sText_WaitForChatMale2[] = _("チャットだね！\nわかった ちょっと まってて！"); +ALIGNED(4) static const u8 sText_DoneWaitingBattleMale[] = _("Thanks for waiting!\nLet's get our battle started!{PAUSE 60}"); +ALIGNED(4) static const u8 sText_DoneWaitingChatMale[] = _("All right!\nLet's chat!{PAUSE 60}"); +ALIGNED(4) static const u8 sText_DoneWaitingBattleFemale[] = _("Sorry I made you wait!\nLet's get started!{PAUSE 60}"); +ALIGNED(4) static const u8 sText_DoneWaitingChatFemale[] = _("Sorry I made you wait!\nLet's chat.{PAUSE 60}"); +ALIGNED(4) static const u8 sText_TradeWillBeStarted[] = _("The trade will be started.{PAUSE 60}"); +ALIGNED(4) static const u8 sText_BattleWillBeStarted[] = _("The battle will be started.{PAUSE 60}"); +ALIGNED(4) static const u8 sText_EnteringChat[] = _("Entering the chat…{PAUSE 60}"); const u8 *const gUnknown_8458230[][2][3] = { { { - gUnknown_84581F8, - gUnknown_8458218, - gUnknown_84581D8 + sText_BattleWillBeStarted, + sText_EnteringChat, + sText_TradeWillBeStarted }, { - gUnknown_84581F8, - gUnknown_8458218, - gUnknown_84581D8 + sText_BattleWillBeStarted, + sText_EnteringChat, + sText_TradeWillBeStarted } }, { { - gUnknown_845812C, - gUnknown_8458164, - gUnknown_84581D8 + sText_DoneWaitingBattleMale, + sText_DoneWaitingChatMale, + sText_TradeWillBeStarted }, { - gUnknown_8458180, - gUnknown_84581B0, - gUnknown_84581D8 + sText_DoneWaitingBattleFemale, + sText_DoneWaitingChatFemale, + sText_TradeWillBeStarted } } }; -ALIGNED(4) const u8 gUnknown_8458260[] = _("Sorry! My POKéMON don't seem to\nbe feeling too well right now.\lLet me battle you another time.\p"); -ALIGNED(4) const u8 gUnknown_84582C0[] = _("I'm terribly sorry, but my POKéMON\naren't feeling well…\pLet's battle another time.\p"); +ALIGNED(4) static const u8 sText_BattleDeclinedMale[] = _("Sorry! My POKéMON don't seem to\nbe feeling too well right now.\lLet me battle you another time.\p"); +ALIGNED(4) static const u8 sText_BattleDeclinedFemale[] = _("I'm terribly sorry, but my POKéMON\naren't feeling well…\pLet's battle another time.\p"); const u8 *const gUnknown_8458314[] = { - gUnknown_8458260, - gUnknown_84582C0 + sText_BattleDeclinedMale, + sText_BattleDeclinedFemale }; -ALIGNED(4) const u8 gUnknown_845831C[] = _("Huh? My TRAINER CARD…\nWhere'd it go now?\lSorry! I'll show you another time!\p"); -ALIGNED(4) const u8 gUnknown_845836C[] = _("Oh? Now where did I put my\nTRAINER CARD?…\lSorry! I'll show you later!\p"); +ALIGNED(4) static const u8 sText_ShowTrainerCardDeclinedMale[] = _("Huh? My TRAINER CARD…\nWhere'd it go now?\lSorry! I'll show you another time!\p"); +ALIGNED(4) static const u8 sText_ShowTrainerCardDeclinedFemale[] = _("Oh? Now where did I put my\nTRAINER CARD?…\lSorry! I'll show you later!\p"); const u8 *const gUnknown_84583B4[] = { - gUnknown_845831C, - gUnknown_845836C + sText_ShowTrainerCardDeclinedMale, + sText_ShowTrainerCardDeclinedFemale }; -ALIGNED(4) const u8 gUnknown_84583BC[] = _("If you want to do something with\nme, just give me a shout!\p"); -ALIGNED(4) const u8 gUnknown_84583F8[] = _("If you want to do something with\nme, don't be shy.\p"); +ALIGNED(4) static const u8 sText_IfYouWantToDoSomethingMale[] = _("If you want to do something with\nme, just give me a shout!\p"); +ALIGNED(4) static const u8 sText_IfYouWantToDoSomethingFemale[] = _("If you want to do something with\nme, don't be shy.\p"); const u8 *const gUnknown_845842C[] = { - gUnknown_84583BC, - gUnknown_84583F8 + sText_IfYouWantToDoSomethingMale, + sText_IfYouWantToDoSomethingFemale }; ALIGNED(4) const u8 gUnknown_8458434[] = _("Whoops! Sorry, but I have to do\nsomething else.\lAnother time, okay?\p"); ALIGNED(4) const u8 gUnknown_845847C[] = _("If you want to battle, you need\ntwo POKéMON that are below\lLv. 30.\p"); ALIGNED(4) const u8 gUnknown_84584C0[] = _("For a battle, you need two\nPOKéMON that are below Lv. 30.\p"); -ALIGNED(4) const u8 gUnknown_84584FC[] = _("Oh, all right.\nCome see me anytime, okay?\p"); -ALIGNED(4) const u8 gUnknown_8458528[] = _("Oh…\nPlease come by anytime.\p"); +ALIGNED(4) static const u8 sText_DeclineChatMale[] = _("Oh, all right.\nCome see me anytime, okay?\p"); +ALIGNED(4) static const u8 stext_DeclineChatFemale[] = _("Oh…\nPlease come by anytime.\p"); + +// Response from partner when player declines chat const u8 *const gUnknown_8458548[] = { - gUnknown_84584FC, - gUnknown_8458528 + sText_DeclineChatMale, + stext_DeclineChatFemale }; -ALIGNED(4) const u8 gUnknown_8458550[] = _("Oh, sorry!\nI just can't right this instant.\lLet's chat another time.\p"); -ALIGNED(4) const u8 gUnknown_8458598[] = _("Oh, I'm sorry.\nI have too much to do right now.\lLet's chat some other time.\p"); +ALIGNED(4) static const u8 sText_ChatDeclinedMale[] = _("Oh, sorry!\nI just can't right this instant.\lLet's chat another time.\p"); +ALIGNED(4) static const u8 sText_ChatDeclinedFemale[] = _("Oh, I'm sorry.\nI have too much to do right now.\lLet's chat some other time.\p"); +// Response from partner when they decline chat const u8 *const gUnknown_84585E8[] = { - gUnknown_8458550, - gUnknown_8458598 + sText_ChatDeclinedMale, + sText_ChatDeclinedFemale }; -ALIGNED(4) const u8 gUnknown_84585F0[] = _("Whoa!\nI can tell you're pretty tough!\p"); -ALIGNED(4) const u8 gUnknown_8458618[] = _("You used that move?\nThat's good strategy!\p"); -ALIGNED(4) const u8 gUnknown_8458644[] = _("Way to go!\nThat was an eye-opener!\p"); -ALIGNED(4) const u8 gUnknown_8458668[] = _("Oh! How could you use that\nPOKéMON in that situation?\p"); -ALIGNED(4) const u8 gUnknown_84586A0[] = _("That POKéMON…\nIt's been raised really well!\p"); -ALIGNED(4) const u8 gUnknown_84586D0[] = _("That's it!\nThis is the right move now!\p"); -ALIGNED(4) const u8 gUnknown_84586F8[] = _("That's awesome!\nYou can battle that way?\p"); -ALIGNED(4) const u8 gUnknown_8458724[] = _("You have exquisite timing for\nswitching POKéMON!\p"); +ALIGNED(4) static const u8 sText_YoureToughMale[] = _("Whoa!\nI can tell you're pretty tough!\p"); +ALIGNED(4) static const u8 sText_UsedGoodMoveMale[] = _("You used that move?\nThat's good strategy!\p"); +ALIGNED(4) static const u8 sText_BattleSurpriseMale[] = _("Way to go!\nThat was an eye-opener!\p"); +ALIGNED(4) static const u8 sText_SwitchedMonsMale[] = _("Oh! How could you use that\nPOKéMON in that situation?\p"); +ALIGNED(4) static const u8 sText_YoureToughFemale[] = _("That POKéMON…\nIt's been raised really well!\p"); +ALIGNED(4) static const u8 sText_UsedGoodMoveFemale[] = _("That's it!\nThis is the right move now!\p"); +ALIGNED(4) static const u8 sText_BattleSurpriseFemale[] = _("That's awesome!\nYou can battle that way?\p"); +ALIGNED(4) static const u8 sText_SwitchedMonsFemale[] = _("You have exquisite timing for\nswitching POKéMON!\p"); const u8 *const gUnknown_8458758[][4] = { { - gUnknown_84585F0, - gUnknown_8458618, - gUnknown_8458644, - gUnknown_8458668 + sText_YoureToughMale, + sText_UsedGoodMoveMale, + sText_BattleSurpriseMale, + sText_SwitchedMonsMale }, { - gUnknown_84586A0, - gUnknown_84586D0, - gUnknown_84586F8, - gUnknown_8458724 + sText_YoureToughFemale, + sText_UsedGoodMoveFemale, + sText_BattleSurpriseFemale, + sText_SwitchedMonsFemale } }; -ALIGNED(4) const u8 gUnknown_8458778[] = _("Oh, I see!\nThis is educational!\p"); -ALIGNED(4) const u8 gUnknown_845879C[] = _("Don't say anything funny anymore!\nI'm sore from laughing!\p"); -ALIGNED(4) const u8 gUnknown_84587D8[] = _("Oh?\nSomething like that happened.\p"); -ALIGNED(4) const u8 gUnknown_84587FC[] = _("Hmhm… What?\nSo is this what you're saying?\p"); -ALIGNED(4) const u8 gUnknown_8458828[] = _("Is that right?\nI didn't know that.\p"); -ALIGNED(4) const u8 gUnknown_845884C[] = _("Ahaha!\nWhat is that about?\p"); -ALIGNED(4) const u8 gUnknown_8458868[] = _("Yes, that's exactly it!\nThat's what I meant.\p"); -ALIGNED(4) const u8 gUnknown_8458898[] = _("In other words…\nYes! That's right!\p"); +ALIGNED(4) static const u8 sText_LearnedSomethingMale[] = _("Oh, I see!\nThis is educational!\p"); +ALIGNED(4) static const u8 sText_ThatsFunnyMale[] = _("Don't say anything funny anymore!\nI'm sore from laughing!\p"); +ALIGNED(4) static const u8 sText_RandomChatMale1[] = _("Oh?\nSomething like that happened.\p"); +ALIGNED(4) static const u8 sText_RandomChatMale2[] = _("Hmhm… What?\nSo is this what you're saying?\p"); +ALIGNED(4) static const u8 sText_LearnedSomethingFemale[] = _("Is that right?\nI didn't know that.\p"); +ALIGNED(4) static const u8 sText_ThatsFunnyFemale[] = _("Ahaha!\nWhat is that about?\p"); +ALIGNED(4) static const u8 sText_RandomChatFemale1[] = _("Yes, that's exactly it!\nThat's what I meant.\p"); +ALIGNED(4) static const u8 sText_RandomChatFemale2[] = _("In other words…\nYes! That's right!\p"); const u8 *const gUnknown_84588BC[][4] = { { - gUnknown_8458778, - gUnknown_845879C, - gUnknown_84587D8, - gUnknown_84587FC + sText_LearnedSomethingMale, + sText_ThatsFunnyMale, + sText_RandomChatMale1, + sText_RandomChatMale2 }, { - gUnknown_8458828, - gUnknown_845884C, - gUnknown_8458868, - gUnknown_8458898 + sText_LearnedSomethingFemale, + sText_ThatsFunnyFemale, + sText_RandomChatFemale1, + sText_RandomChatFemale2 } }; -ALIGNED(4) const u8 gUnknown_84588DC[] = _("I'm just showing my TRAINER CARD\nas my way of greeting.\p"); -ALIGNED(4) const u8 gUnknown_8458918[] = _("I hope I get to know you better!\p"); -ALIGNED(4) const u8 gUnknown_845893C[] = _("We're showing each other our\nTRAINER CARDS to get acquainted.\p"); -ALIGNED(4) const u8 gUnknown_845897C[] = _("Glad to meet you.\nPlease don't be a stranger!\p"); +ALIGNED(4) static const u8 sText_ShowedTrainerCardMale1[] = _("I'm just showing my TRAINER CARD\nas my way of greeting.\p"); +ALIGNED(4) static const u8 sText_ShowedTrainerCardMale2[] = _("I hope I get to know you better!\p"); +ALIGNED(4) static const u8 sText_ShowedTrainerCardFemale1[] = _("We're showing each other our\nTRAINER CARDS to get acquainted.\p"); +ALIGNED(4) static const u8 sText_ShowedTrainerCardFemale2[] = _("Glad to meet you.\nPlease don't be a stranger!\p"); const u8 *const gUnknown_84589AC[][2] = { { - gUnknown_84588DC, - gUnknown_8458918 + sText_ShowedTrainerCardMale1, + sText_ShowedTrainerCardMale2 }, { - gUnknown_845893C, - gUnknown_845897C + sText_ShowedTrainerCardFemale1, + sText_ShowedTrainerCardFemale2 } }; -ALIGNED(4) const u8 gUnknown_84589BC[] = _("Yeahah!\nI really wanted this POKéMON!\p"); -ALIGNED(4) const u8 gUnknown_84589E4[] = _("Finally, a trade got me that\nPOKéMON I'd wanted a long time.\p"); -ALIGNED(4) const u8 gUnknown_8458A24[] = _("I'm trading POKéMON right now.\p"); -ALIGNED(4) const u8 gUnknown_8458A44[] = _("I finally got that POKéMON I\nwanted in a trade!\p"); +ALIGNED(4) static const u8 sText_MaleTraded1[] = _("Yeahah!\nI really wanted this POKéMON!\p"); +ALIGNED(4) static const u8 sText_MaleTraded2[] = _("Finally, a trade got me that\nPOKéMON I'd wanted a long time.\p"); +ALIGNED(4) static const u8 sText_FemaleTraded1[] = _("I'm trading POKéMON right now.\p"); +ALIGNED(4) static const u8 sText_FemaleTraded2[] = _("I finally got that POKéMON I\nwanted in a trade!\p"); const u8 *const gUnknown_8458A78[][4] = { { - gUnknown_84589BC, - gUnknown_84589E4 + sText_MaleTraded1, + sText_MaleTraded2 }, { - gUnknown_8458A24, - gUnknown_8458A44 + sText_FemaleTraded1, + sText_FemaleTraded2 } }; const u8 gUnknown_8458A98[] = _("{STR_VAR_1} checked the\nTRADING BOARD.\p"); ALIGNED(4) const u8 gUnknown_8458AB8[] = _("Welcome to the TRADING BOARD.\pYou may register your POKéMON\nand offer it up for a trade.\pWould you like to register one of\nyour POKéMON?"); -ALIGNED(4) const u8 gUnknown_8458B44[] = _("This TRADING BOARD is used for\noffering a POKéMON for a trade.\pAll you need to do is register a\nPOKéMON for a trade.\pAnother TRAINER may offer a party\nPOKéMON in return for the trade.\pWe hope you will register POKéMON\nand trade them with many, many\lother TRAINERS.\pWould you like to register one of\nyour POKéMON?"); -ALIGNED(4) const u8 gUnref_ThankYouForComing_JP[] = _("こうかんけいじばん の とうろくが\nかんりょう しました\pごりよう ありがとう\nございました！\p"); -ALIGNED(4) const u8 gUnref_NoOneRegisteredMon[] = _("けいじばんに だれも ポケモンを\nとうろく していません\p\n"); - +ALIGNED(4) const u8 gUnknown_8458B44[] = _("This TRADING BOARD is used for\n" + "offering a POKéMON for a trade.\p" + "All you need to do is register a\n" + "POKéMON for a trade.\p" + "Another TRAINER may offer a party\n" + "POKéMON in return for the trade.\p" + "We hope you will register POKéMON\n" + "and trade them with many, many\l" + "other TRAINERS.\p" + "Would you like to register one of\n" + "your POKéMON?"); +ALIGNED(4) static const u8 sText_ThankYouForRegistering[] = _("こうかんけいじばん の とうろくが\nかんりょう しました\pごりよう ありがとう\nございました！\p"); +ALIGNED(4) static const u8 sText_NobodyHasRegistered[] = _("けいじばんに だれも ポケモンを\nとうろく していません\p\n"); ALIGNED(4) const u8 gURText_PleaseChooseTypeOfMon[] = _("Please choose the type of POKéMON\nthat you would like in the trade.\n"); ALIGNED(4) const u8 gUnknown_8458D1C[] = _("Which of your party POKéMON will\nyou offer in trade?\p"); ALIGNED(4) const u8 gUnknown_8458D54[] = _("Registration has been canceled.\p"); @@ -427,19 +446,21 @@ ALIGNED(4) const u8 gUnknown_8458D9C[] = _("The trade has been canceled.\p"); ALIGNED(4) const u8 gUnknown_8458DBC[] = _("Cancel the registration of your\nLv. {STR_VAR_2} {STR_VAR_1}?"); ALIGNED(4) const u8 gUnknown_8458DE8[] = _("Cancel the registration of your\nEGG?"); ALIGNED(4) const u8 gUnknown_8458E10[] = _("The registration has been canceled.\p"); -ALIGNED(4) const u8 gUnref_ShowPeopleWhoLikeYou_JP[] = _("こうかんを きぼうしているひとを\nひょうじします"); -ALIGNED(4) const u8 gUnref_PleaseChooseTrainerYouWant[] = _("こうかん したい トレーナーを\nえらんで ください"); +ALIGNED(4) static const u8 sText_TradeTrainersWillBeListed[] = _("こうかんを きぼうしているひとを\nひょうじします"); +ALIGNED(4) static const u8 sText_ChooseTrainerToTradeWith2[] = _("こうかん したい トレーナーを\nえらんで ください"); ALIGNED(4) const u8 gUnknown_8458E70[] = _("Would you like to ask {STR_VAR_1} to\nmake a trade?"); -ALIGNED(4) const u8 gUnref_ImWaitingForAnswer[] = _("……\nあいての へんじを まっています"); -ALIGNED(4) const u8 gUnref_MonSentOutIsNotRegistered[] = _("あなたが こうかんにだす\nポケモンが とうろくされていません\p"); +ALIGNED(4) static const u8 sText_AwaitingResponseFromTrainer2[] = _("……\nあいての へんじを まっています"); +ALIGNED(4) static const u8 sText_NotRegisteredAMonForTrade[] = _("あなたが こうかんにだす\nポケモンが とうろくされていません\p"); ALIGNED(4) const u8 gUnknown_8458ED0[] = _("You don't have a {STR_VAR_2}-type\nPOKéMON that {STR_VAR_1} wants.\p"); ALIGNED(4) const u8 gUnknown_8458F04[] = _("You don't have an EGG that\n{STR_VAR_1} wants.\p"); -ALIGNED(4) const u8 gUnknown_8458F2C[] = _("{STR_VAR_1} can't make a trade for\nyour POKéMON right now.\p"); -ALIGNED(4) const u8 gUnknown_8458F60[] = _("You can't make a trade for\n{STR_VAR_1}'s POKéMON right now.\p"); -const u8 *const gUnknown_8458F94[] = { - gUnknown_8458F2C, - gUnknown_8458F60 +ALIGNED(4) static const u8 sText_PlayerCantTradeForYourMon[] = _("{STR_VAR_1} can't make a trade for\nyour POKéMON right now.\p"); +ALIGNED(4) static const u8 sText_CantTradeForPartnersMon[] = _("You can't make a trade for\n{STR_VAR_1}'s POKéMON right now.\p"); + +// Unused +static const u8 *const sCantTradeMonTexts[] = { + sText_PlayerCantTradeForYourMon, + sText_CantTradeForPartnersMon }; ALIGNED(4) const u8 gUnknown_8458F9C[] = _("Your trade offer was rejected.\p"); @@ -447,41 +468,41 @@ ALIGNED(4) const u8 gText_EggTrade[] = _("EGG TRADE"); ALIGNED(4) const u8 gUnknown_8458FC8[] = _("{DPAD_UPDOWN}CHOOSE {A_BUTTON}JOIN {B_BUTTON}CANCEL"); ALIGNED(4) const u8 gUnknown_8458FE4[] = _("Please choose a TRAINER."); -ALIGNED(4) const u8 gUnknown_8459000[] = _("Please choose a TRAINER for\na SINGLE BATTLE."); -ALIGNED(4) const u8 gUnknown_8459030[] = _("Please choose a TRAINER for\na DOUBLE BATTLE."); -ALIGNED(4) const u8 gUnknown_8459060[] = _("Please choose the LEADER\nfor a MULTI BATTLE."); -ALIGNED(4) const u8 gUnknown_8459090[] = _("Please choose the TRAINER to\ntrade with."); -ALIGNED(4) const u8 gUnknown_84590BC[] = _("Please choose the TRAINER who is\nsharing WONDER CARDS."); -ALIGNED(4) const u8 gUnknown_84590F4[] = _("Please choose the TRAINER who is\nsharing WONDER NEWS."); -ALIGNED(4) const u8 gUnknown_845912C[] = _("Jump with mini POKéMON!\nPlease choose the LEADER."); -ALIGNED(4) const u8 gUnknown_8459160[] = _("BERRY CRUSH!\nPlease choose the LEADER."); -ALIGNED(4) const u8 gUnknown_8459188[] = _("DODRIO BERRY-PICKING!\nPlease choose the LEADER."); +ALIGNED(4) static const u8 sText_ChooseTrainerSingleBattle[] = _("Please choose a TRAINER for\na SINGLE BATTLE."); +ALIGNED(4) static const u8 sText_ChooseTrainerDoubleBattle[] = _("Please choose a TRAINER for\na DOUBLE BATTLE."); +ALIGNED(4) static const u8 sText_ChooseLeaderMultiBattle[] = _("Please choose the LEADER\nfor a MULTI BATTLE."); +ALIGNED(4) static const u8 sText_ChooseTrainerToTradeWith[] = _("Please choose the TRAINER to\ntrade with."); +ALIGNED(4) static const u8 sText_ChooseTrainerToShareWonderCards[] = _("Please choose the TRAINER who is\nsharing WONDER CARDS."); +ALIGNED(4) static const u8 sText_ChooseTrainerToShareWonderNews[] = _("Please choose the TRAINER who is\nsharing WONDER NEWS."); +ALIGNED(4) static const u8 sText_ChooseLeaderPokemonJump[] = _("Jump with mini POKéMON!\nPlease choose the LEADER."); +ALIGNED(4) static const u8 sText_ChooseLeaderBerryCrush[] = _("BERRY CRUSH!\nPlease choose the LEADER."); +ALIGNED(4) static const u8 sText_ChooseLeaderBerryPicking[] = _("DODRIO BERRY-PICKING!\nPlease choose the LEADER."); const u8 *const gUnknown_84591B8[] = { - [LINK_GROUP_SINGLE_BATTLE] = gUnknown_8459000, - [LINK_GROUP_DOUBLE_BATTLE] = gUnknown_8459030, - [LINK_GROUP_MULTI_BATTLE] = gUnknown_8459060, - [LINK_GROUP_TRADE] = gUnknown_8459090, - [LINK_GROUP_POKEMON_JUMP] = gUnknown_845912C, - [LINK_GROUP_BERRY_CRUSH] = gUnknown_8459160, - [LINK_GROUP_BERRY_PICKING] = gUnknown_8459188, - [LINK_GROUP_WONDER_CARD] = gUnknown_84590BC, - [LINK_GROUP_WONDER_NEWS] = gUnknown_84590F4 + [LINK_GROUP_SINGLE_BATTLE] = sText_ChooseTrainerSingleBattle, + [LINK_GROUP_DOUBLE_BATTLE] = sText_ChooseTrainerDoubleBattle, + [LINK_GROUP_MULTI_BATTLE] = sText_ChooseLeaderMultiBattle, + [LINK_GROUP_TRADE] = sText_ChooseTrainerToTradeWith, + [LINK_GROUP_POKEMON_JUMP] = sText_ChooseLeaderPokemonJump, + [LINK_GROUP_BERRY_CRUSH] = sText_ChooseLeaderBerryCrush, + [LINK_GROUP_BERRY_PICKING] = sText_ChooseLeaderBerryPicking, + [LINK_GROUP_WONDER_CARD] = sText_ChooseTrainerToShareWonderCards, + [LINK_GROUP_WONDER_NEWS] = sText_ChooseTrainerToShareWonderNews }; ALIGNED(4) const u8 gUnknown_84591DC[] = _("Searching for a WIRELESS\nCOMMUNICATION SYSTEM. Wait..."); -ALIGNED(4) const u8 gUnref_NeedAtLeast2InDblBtl[] = _("ダブルバトルでは 2ひき いじょうの\nポケモンが ひつようです\p"); +ALIGNED(4) static const u8 sText_MustHaveTwoMonsForDoubleBattle[] = _("ダブルバトルでは 2ひき いじょうの\nポケモンが ひつようです\p"); ALIGNED(4) const u8 gUnknown_8459238[] = _("Awaiting {STR_VAR_1}'s response…"); ALIGNED(4) const u8 gUnknown_8459250[] = _("{STR_VAR_1} has been asked to register\nyou as a member. Please wait."); ALIGNED(4) const u8 gUnknown_845928C[] = _("Awaiting a response from the\nWIRELESS COMMUNICATION SYSTEM."); -ALIGNED(4) const u8 gUnref_PlsWaitLittleWHile[] = _("ほかの さんかしゃが そろうまで\nしょうしょう おまちください"); +ALIGNED(4) static const u8 sText_PleaseWaitForOtherTrainersToGather[] = _("ほかの さんかしゃが そろうまで\nしょうしょう おまちください"); -ALIGNED(4) const u8 gUnknown_84592E8[] = _("No CARDS appear to be shared \nright now."); -ALIGNED(4) const u8 gUnknown_8459314[] = _("No NEWS appears to be shared\nright now."); +ALIGNED(4) static const u8 sText_NoCardsSharedRightNow[] = _("No CARDS appear to be shared \nright now."); +ALIGNED(4) static const u8 sText_NoNewsSharedRightNow[] = _("No NEWS appears to be shared\nright now."); const u8 *const gUnknown_845933C[] = { - gUnknown_84592E8, - gUnknown_8459314 + sText_NoCardsSharedRightNow, + sText_NoNewsSharedRightNow }; ALIGNED(4) const u8 gUnknown_8459344[] = _("BATTLE"); @@ -508,33 +529,33 @@ ALIGNED(4) const u8 gUnionRoomActivity_Search[] = _("SEARCH"); ALIGNED(4) const u8 gUnionRoomActivity_SpinTradeJP[] = _("ぐるぐるこうかん"); ALIGNED(4) const u8 gUnionRoomActivity_ItemTradeJP[] = _("アイテムトレード"); -ALIGNED(4) const u8 gUnknown_845944C[] = _("It's a NORMAL CARD."); -ALIGNED(4) const u8 gUnknown_8459460[] = _("It's a BRONZE CARD!"); -ALIGNED(4) const u8 gUnknown_8459474[] = _("It's a COPPER CARD!"); -ALIGNED(4) const u8 gUnknown_8459488[] = _("It's a SILVER CARD!"); -ALIGNED(4) const u8 gUnknown_845949C[] = _("It's a GOLD CARD!"); +ALIGNED(4) static const u8 sText_ItsNormalCard[] = _("It's a NORMAL CARD."); +ALIGNED(4) static const u8 sText_ItsBronzeCard[] = _("It's a BRONZE CARD!"); +ALIGNED(4) static const u8 sText_ItsCopperCard[] = _("It's a COPPER CARD!"); +ALIGNED(4) static const u8 sText_ItsSilverCard[] = _("It's a SILVER CARD!"); +ALIGNED(4) static const u8 sText_ItsGoldCard[] = _("It's a GOLD CARD!"); const u8 *const gUnknown_84594B0[] = { - gUnknown_845944C, - gUnknown_8459460, - gUnknown_8459474, - gUnknown_8459488, - gUnknown_845949C + sText_ItsNormalCard, + sText_ItsBronzeCard, + sText_ItsCopperCard, + sText_ItsSilverCard, + sText_ItsGoldCard }; ALIGNED(4) const u8 gUnknown_84594C4[] = _("This is {SPECIAL_F7 0x00} {SPECIAL_F7 0x01}'s\nTRAINER CARD…\l{SPECIAL_F7 0x02}\pPOKéDEX: {SPECIAL_F7 0x03}\nTIME: {SPECIAL_F7 0x04}:{SPECIAL_F7 0x05}\p"); ALIGNED(4) const u8 gUnknown_8459504[] = _("BATTLES: {SPECIAL_F7 0x00} WINS {SPECIAL_F7 0x02} LOSSES\nTRADES: {SPECIAL_F7 0x03} TIMES\p“{SPECIAL_F7 0x04} {SPECIAL_F7 0x05}\n{SPECIAL_F7 0x06} {SPECIAL_F7 0x07}”\p"); -ALIGNED(4) const u8 gUnknown_8459544[] = _("{SPECIAL_F7 0x01}: Glad to have met you!{PAUSE 60}"); -ALIGNED(4) const u8 gUnknown_8459564[] = _("{SPECIAL_F7 0x01}: Glad to meet you!{PAUSE 60}"); +ALIGNED(4) static const u8 sText_GladToMeetYouMale[] = _("{SPECIAL_F7 0x01}: Glad to have met you!{PAUSE 60}"); +ALIGNED(4) static const u8 sText_GladToMeetYouFemale[] = _("{SPECIAL_F7 0x01}: Glad to meet you!{PAUSE 60}"); const u8 *const gUnknown_8459580[] = { - gUnknown_8459544, - gUnknown_8459564 + sText_GladToMeetYouMale, + sText_GladToMeetYouFemale }; ALIGNED(4) const u8 gUnknown_8459588[] = _("Finished checking {SPECIAL_F7 0x01}'s\nTRAINER CARD.{PAUSE 60}"); -ALIGNED(4) const u8 gUnknown_84595B0[] = _("Canceled reading the Card."); +ALIGNED(4) static const u8 gUnknown_84595B0[] = _("Canceled reading the Card."); const struct mevent_client_cmd gUnknown_84595CC[] = { CLI_RECEIVE(0x15), From 8fd8d2198096a7dcdd90d34c463f54d22a0540ea Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 6 Sep 2022 01:36:11 -0400 Subject: [PATCH 2/3] Document global ur text --- include/union_room_message.h | 214 +++++++++---------- src/union_room.c | 384 +++++++++++++++++------------------ src/union_room_message.c | 352 ++++++++++++++++---------------- 3 files changed, 470 insertions(+), 480 deletions(-) diff --git a/include/union_room_message.h b/include/union_room_message.h index db24aca15..ad0011452 100644 --- a/include/union_room_message.h +++ b/include/union_room_message.h @@ -3,112 +3,112 @@ #include "global.h" -extern const u8 gUnionRoomActivity_Blank[]; -extern const u8 gUnknown_84571B0[]; -extern const u8 gUnknown_84571B4[]; -extern const u8 gUnknown_84571B8[]; -extern const u8 gUnknown_84571E0[]; -extern const u8 gUnknown_8457234[]; -extern const u8 gUnknown_8457264[]; -extern const u8 *const gUnknown_845742C[][5]; -extern const u8 gUnknown_845747C[]; -extern const u8 gUnknown_84574A0[]; -extern const u8 gUnknown_84574C4[]; -extern const u8 gUnknown_84574EC[]; -extern const u8 gUnknown_8457514[]; -extern const u8 gUnknown_8457530[]; -extern const u8 gUnknown_8457554[]; -extern const u8 *const gUnknown_8457608[]; -extern const u8 gUnknown_8457610[]; -extern const u8 *const gUnknown_845767C[]; -extern const u8 gUnknown_84576AC[]; -extern const u8 gUnknown_84576C4[]; -extern const u8 gUnknown_8457700[]; -extern const u8 gUnknown_845771C[]; -extern const u8 *const gUnknown_8457754[]; -extern const u8 gUnknown_845777C[]; -extern const u8 gUnknown_84577BC[]; -extern const u8 gUnknown_84577F8[]; -extern const u8 *const gUnknown_8457838[]; -extern const u8 gUnknown_84578BC[]; -extern const u8 *const gURText_PleaseWaitMsgs[]; -extern const u8 *const gURText_FriendPromptsForActivity[][2]; -extern const u8 *const gUnknown_8457BCC[]; -extern const u8 *const gUnknown_8457C20[]; -extern const u8 gUnknown_8457C48[]; -extern const u8 gUnknown_8457CA4[]; -extern const u8 gUnknown_8457CF8[]; -extern const u8 gUnknown_8457D44[]; -extern const u8 gUnknown_8457DB8[]; -extern const u8 gUnknown_8457E0C[]; -extern const u8 gUnknown_8457E28[]; -extern const u8 gUnknown_8457E44[]; -extern const u8 gUnknown_8457E60[]; -extern const u8 *const gUnknown_8457F80[][2]; -extern const u8 gUnknown_8457F90[]; -extern const u8 *const gResponseToURoomActivityInviteStringPtrs[][4]; -extern const u8 *const gUnknown_8458230[][2][3]; -extern const u8 *const gUnknown_8458314[]; -extern const u8 *const gUnknown_84583B4[]; -extern const u8 *const gUnknown_845842C[]; -extern const u8 gUnknown_8458434[]; -extern const u8 gUnknown_845847C[]; -extern const u8 gUnknown_84584C0[]; -extern const u8 *const gUnknown_8458548[]; -extern const u8 *const gUnknown_84585E8[]; -extern const u8 *const gUnknown_8458758[2][4]; -extern const u8 *const gUnknown_84588BC[2][4]; -extern const u8 *const gUnknown_84589AC[2][2]; -extern const u8 *const gUnknown_8458A78[2][4]; -extern const u8 gUnknown_8458A98[]; -extern const u8 gUnknown_8458AB8[]; -extern const u8 gUnknown_8458B44[]; -extern const u8 gURText_PleaseChooseTypeOfMon[]; -extern const u8 gUnknown_8458D1C[]; -extern const u8 gUnknown_8458D54[]; -extern const u8 gUnknown_8458D78[]; -extern const u8 gUnknown_8458D9C[]; -extern const u8 gUnknown_8458DBC[]; -extern const u8 gUnknown_8458DE8[]; -extern const u8 gUnknown_8458E10[]; -extern const u8 gUnknown_8458E70[]; -extern const u8 gUnknown_8458ED0[]; -extern const u8 gUnknown_8458F04[]; -extern const u8 gUnknown_8458F9C[]; -extern const u8 gText_EggTrade[]; -extern const u8 gUnknown_8458FC8[]; -extern const u8 gUnknown_8458FE4[]; -extern const u8 gUnknown_84591DC[]; -extern const u8 *const gUnknown_84591B8[]; -extern const u8 gUnknown_8459238[]; -extern const u8 gUnknown_8459250[]; -extern const u8 gUnknown_845928C[]; -extern const u8 *const gUnknown_845933C[]; -extern const u8 gUnknown_8459344[]; -extern const u8 gUnknown_845934C[]; -extern const u8 gUnknown_8459354[]; -extern const u8 gUnknown_8459360[]; -extern const u8 gUnknown_8459368[]; -extern const u8 gUnknown_8459370[]; -extern const u8 gUnknown_8459378[]; -extern const u8 gUnionRoomActivity_SingleBattle[]; -extern const u8 gUnionRoomActivity_DoubleBattle[]; -extern const u8 gUnionRoomActivity_MultiBattle[]; -extern const u8 gUnionRoomActivity_PokemonTrades[]; -extern const u8 gUnionRoomActivity_Chat[]; -extern const u8 gUnionRoomActivity_WonderCards[]; -extern const u8 gunionRoomActivity_WonderNews[]; -extern const u8 gUnionRoomActivity_Cards[]; -extern const u8 gUnionRoomActivity_PokemonJump[]; -extern const u8 gUnionRoomActivity_BerryCrush[]; -extern const u8 gUnionRoomActivity_BerryPicking[]; -extern const u8 gUnionRoomActivity_Search[]; -extern const u8 gUnionRoomActivity_SpinTradeJP[]; -extern const u8 gUnionRoomActivity_ItemTradeJP[]; -extern const u8 *const gUnknown_84594B0[]; -extern const u8 gUnknown_84594C4[]; -extern const u8 gUnknown_8459504[]; -extern const u8 *const gUnknown_8459580[]; -extern const u8 gUnknown_8459588[]; +extern const u8 gText_UR_EmptyString[]; +extern const u8 gText_UR_Colon[]; +extern const u8 gText_UR_ID[]; +extern const u8 gText_UR_PleaseStartOver[]; +extern const u8 gText_UR_WirelessSearchCanceled[]; +extern const u8 gText_UR_AwaitingCommunication[]; +extern const u8 gText_UR_AwaitingLinkPressStart[]; +extern const u8 *const gTexts_UR_PlayersNeededOrMode[][5]; +extern const u8 gText_UR_BButtonCancel[]; +extern const u8 gText_UR_PlayerContactedYouForXAccept[]; +extern const u8 gText_UR_PlayerContactedYouShareX[]; +extern const u8 gText_UR_PlayerContactedYouAddToMembers[]; +extern const u8 gText_UR_AreTheseMembersOK[]; +extern const u8 gText_UR_CancelModeWithTheseMembers[]; +extern const u8 gText_UR_AnOKWasSentToPlayer[]; +extern const u8 *const gTexts_UR_CantTransmitToTrainer[]; +extern const u8 gText_UR_ModeWithTheseMembersWillBeCanceled[]; +extern const u8 *const gTexts_UR_PlayerUnavailable[]; +extern const u8 gText_UR_PlayerSentBackOK[]; +extern const u8 gText_UR_PlayerOKdRegistration[]; +extern const u8 gText_UR_AwaitingOtherMembers[]; +extern const u8 gText_UR_QuitBeingMember[]; +extern const u8 *const gTexts_UR_PlayerDisconnected[]; +extern const u8 gText_UR_WirelessLinkEstablished[]; +extern const u8 gText_UR_WirelessLinkDropped[]; +extern const u8 gText_UR_LinkWithFriendDropped[]; +extern const u8 *const gTexts_UR_LinkDropped[]; +extern const u8 gText_UR_AwaitingPlayersResponseAboutTrade[]; +extern const u8 *const gTexts_UR_CommunicatingWait[]; +extern const u8 *const gTexts_UR_HiDoSomething[][2]; +extern const u8 *const gTexts_UR_PlayerContactedYou[]; +extern const u8 *const gTexts_UR_AwaitingResponse[]; +extern const u8 gText_UR_ShowTrainerCard[]; +extern const u8 gText_UR_BattleChallenge[]; +extern const u8 gText_UR_ChatInvitation[]; +extern const u8 gText_UR_OfferToTradeMon[]; +extern const u8 gText_UR_OfferToTradeEgg[]; +extern const u8 gText_UR_ChatDropped[]; +extern const u8 gText_UR_OfferDeclined1[]; +extern const u8 gText_UR_OfferDeclined2[]; +extern const u8 gText_UR_ChatEnded[]; +extern const u8 *const gTexts_UR_JoinChat[GENDER_COUNT][2]; +extern const u8 gText_UR_TrainerAppearsBusy[]; +extern const u8 *const gTexts_UR_WaitOrShowCard[GENDER_COUNT][4]; +extern const u8 *const gTexts_UR_StartActivity[][GENDER_COUNT][3]; +extern const u8 *const gTexts_UR_BattleDeclined[GENDER_COUNT]; +extern const u8 *const gTexts_UR_ShowTrainerCardDeclined[GENDER_COUNT]; +extern const u8 *const gTexts_UR_IfYouWantToDoSomething[GENDER_COUNT]; +extern const u8 gText_UR_TrainerBattleBusy[]; +extern const u8 gText_UR_NeedTwoMonsOfLevel30OrLower1[]; +extern const u8 gText_UR_NeedTwoMonsOfLevel30OrLower2[]; +extern const u8 *const gTexts_UR_DeclineChat[GENDER_COUNT]; +extern const u8 *const gTexts_UR_ChatDeclined[GENDER_COUNT]; +extern const u8 *const gTexts_UR_BattleReaction[GENDER_COUNT][4]; +extern const u8 *const gTexts_UR_ChatReaction[GENDER_COUNT][4]; +extern const u8 *const gTexts_UR_TrainerCardReaction[GENDER_COUNT][2]; +extern const u8 *const gTexts_UR_TradeReaction[GENDER_COUNT][4]; +extern const u8 gText_UR_XCheckedTradingBoard[]; +extern const u8 gText_UR_RegisterMonAtTradingBoard[]; +extern const u8 gText_UR_TradingBoardInfo[]; +extern const u8 gText_UR_ChooseRequestedMonType[]; +extern const u8 gText_UR_WhichMonWillYouOffer[]; +extern const u8 gText_UR_RegistrationCanceled[]; +extern const u8 gText_UR_RegistraionCompleted[]; +extern const u8 gText_UR_TradeCanceled[]; +extern const u8 gText_UR_CancelRegistrationOfMon[]; +extern const u8 gText_UR_CancelRegistrationOfEgg[]; +extern const u8 gText_UR_RegistrationCanceled2[]; +extern const u8 gText_UR_AskTrainerToMakeTrade[]; +extern const u8 gText_UR_DontHaveTypeTrainerWants[]; +extern const u8 gText_UR_DontHaveEggTrainerWants[]; +extern const u8 gText_UR_TradeOfferRejected[]; +extern const u8 gText_UR_EggTrade[]; +extern const u8 gText_UR_ChooseJoinCancel[]; +extern const u8 gText_UR_ChooseTrainer[]; +extern const u8 gText_UR_SearchingForWirelessSystemWait[]; +extern const u8 *const gTexts_UR_ChooseTrainer[]; +extern const u8 gText_UR_AwaitingPlayersResponse[]; +extern const u8 gText_UR_PlayerHasBeenAskedToRegisterYouPleaseWait[]; +extern const u8 gText_UR_AwaitingResponseFromWirelessSystem[]; +extern const u8 *const gTexts_UR_NoWonderShared[]; +extern const u8 gText_UR_Battle[]; +extern const u8 gText_UR_Chat2[]; +extern const u8 gText_UR_Greetings[]; +extern const u8 gText_UR_Exit[]; +extern const u8 gText_UR_Exit2[]; +extern const u8 gText_UR_Info[]; +extern const u8 gText_UR_NameWantedOfferLv[]; +extern const u8 gText_UR_SingleBattle[]; +extern const u8 gText_UR_DoubleBattle[]; +extern const u8 gText_UR_MultiBattle[]; +extern const u8 gText_UR_PokemonTrades[]; +extern const u8 gText_UR_Chat[]; +extern const u8 gText_UR_WonderCards[]; +extern const u8 gText_UR_WonderNews[]; +extern const u8 gText_UR_Cards[]; +extern const u8 gText_UR_PokemonJump[]; +extern const u8 gText_UR_BerryCrush[]; +extern const u8 gText_UR_BerryPicking[]; +extern const u8 gText_UR_Search[]; +extern const u8 gText_UR_SpinTrade[]; +extern const u8 gText_UR_ItemTrade[]; +extern const u8 *const gTexts_UR_CardColor[]; +extern const u8 gText_UR_TrainerCardInfoPage1[]; +extern const u8 gText_UR_TrainerCardInfoPage2[]; +extern const u8 *const gTexts_UR_GladToMeetYou[GENDER_COUNT]; +extern const u8 gText_UR_FinishedCheckingPlayersTrainerCard[]; #endif //GUARD_UNION_ROOM_MESSAGE_H diff --git a/src/union_room.c b/src/union_room.c index 01c89b211..c93360fea 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -133,29 +133,29 @@ static void ViewURoomPartnerTrainerCard(u8 *dest, struct UnkStruct_URoom * uRoom #define _8456CD8(a, b) ((a) | ((b) << 8)) static const u8 *const sUnionRoomActivityStringPtrs[] = { - gUnionRoomActivity_Blank, - gUnionRoomActivity_SingleBattle, - gUnionRoomActivity_DoubleBattle, - gUnionRoomActivity_MultiBattle, - gUnionRoomActivity_PokemonTrades, - gUnionRoomActivity_Chat, - gUnionRoomActivity_WonderCards, - gunionRoomActivity_WonderNews, - gUnionRoomActivity_Cards, - gUnionRoomActivity_PokemonJump, - gUnionRoomActivity_BerryCrush, - gUnionRoomActivity_BerryPicking, - gUnionRoomActivity_Search, - gUnionRoomActivity_SpinTradeJP, - gUnionRoomActivity_ItemTradeJP, - gUnionRoomActivity_Blank, - gUnionRoomActivity_Blank, - gUnionRoomActivity_Blank, - gUnionRoomActivity_Blank, - gUnionRoomActivity_Blank, - gUnionRoomActivity_Blank, - gUnionRoomActivity_WonderCards, - gunionRoomActivity_WonderNews + gText_UR_EmptyString, + gText_UR_SingleBattle, + gText_UR_DoubleBattle, + gText_UR_MultiBattle, + gText_UR_PokemonTrades, + gText_UR_Chat, + gText_UR_WonderCards, + gText_UR_WonderNews, + gText_UR_Cards, + gText_UR_PokemonJump, + gText_UR_BerryCrush, + gText_UR_BerryPicking, + gText_UR_Search, + gText_UR_SpinTrade, + gText_UR_ItemTrade, + gText_UR_EmptyString, + gText_UR_EmptyString, + gText_UR_EmptyString, + gText_UR_EmptyString, + gText_UR_EmptyString, + gText_UR_EmptyString, + gText_UR_WonderCards, + gText_UR_WonderNews }; static const struct WindowTemplate sWindowTemplate_BButtonCancel = { @@ -201,11 +201,11 @@ static const struct WindowTemplate sWindowTemplate_NumPlayerMode = { }; const struct ListMenuItem sListMenuItems_PossibleGroupMembers[] = { - {gUnionRoomActivity_Blank, 0}, - {gUnionRoomActivity_Blank, 1}, - {gUnionRoomActivity_Blank, 2}, - {gUnionRoomActivity_Blank, 3}, - {gUnionRoomActivity_Blank, 4} + {gText_UR_EmptyString, 0}, + {gText_UR_EmptyString, 1}, + {gText_UR_EmptyString, 2}, + {gText_UR_EmptyString, 3}, + {gText_UR_EmptyString, 4} }; static const struct ListMenuTemplate sListMenuTemplate_PossibleGroupMembers = { @@ -250,22 +250,22 @@ static const struct WindowTemplate sWindowTemplate_MysteryGiftPlayerNameAndId = }; static const struct ListMenuItem sListMenuItems_UnionRoomGroups[] = { - {gUnionRoomActivity_Blank, 0}, - {gUnionRoomActivity_Blank, 1}, - {gUnionRoomActivity_Blank, 2}, - {gUnionRoomActivity_Blank, 3}, - {gUnionRoomActivity_Blank, 4}, - {gUnionRoomActivity_Blank, 5}, - {gUnionRoomActivity_Blank, 6}, - {gUnionRoomActivity_Blank, 7}, - {gUnionRoomActivity_Blank, 8}, - {gUnionRoomActivity_Blank, 9}, - {gUnionRoomActivity_Blank, 10}, - {gUnionRoomActivity_Blank, 11}, - {gUnionRoomActivity_Blank, 12}, - {gUnionRoomActivity_Blank, 13}, - {gUnionRoomActivity_Blank, 14}, - {gUnionRoomActivity_Blank, 15} + {gText_UR_EmptyString, 0}, + {gText_UR_EmptyString, 1}, + {gText_UR_EmptyString, 2}, + {gText_UR_EmptyString, 3}, + {gText_UR_EmptyString, 4}, + {gText_UR_EmptyString, 5}, + {gText_UR_EmptyString, 6}, + {gText_UR_EmptyString, 7}, + {gText_UR_EmptyString, 8}, + {gText_UR_EmptyString, 9}, + {gText_UR_EmptyString, 10}, + {gText_UR_EmptyString, 11}, + {gText_UR_EmptyString, 12}, + {gText_UR_EmptyString, 13}, + {gText_UR_EmptyString, 14}, + {gText_UR_EmptyString, 15} }; static const struct ListMenuTemplate sListMenuTemplate_UnionRoomGroups = { @@ -300,10 +300,10 @@ static const struct WindowTemplate sWindowTemplate_InviteToActivity = { }; static const struct ListMenuItem sListMenuItems_InviteToActivity[] = { - {gUnknown_8459354, _8456CD8( ACTIVITY_CARD, 2)}, - {gUnknown_8459344, _8456CD8(ACTIVITY_BATTLE | IN_UNION_ROOM, 2)}, - {gUnknown_845934C, _8456CD8(ACTIVITY_CHAT | IN_UNION_ROOM, 2)}, - {gUnknown_8459360, _8456CD8(ACTIVITY_NONE | IN_UNION_ROOM, 0)} + {gText_UR_Greetings, _8456CD8( ACTIVITY_CARD, 2)}, + {gText_UR_Battle, _8456CD8(ACTIVITY_BATTLE | IN_UNION_ROOM, 2)}, + {gText_UR_Chat2, _8456CD8(ACTIVITY_CHAT | IN_UNION_ROOM, 2)}, + {gText_UR_Exit, _8456CD8(ACTIVITY_NONE | IN_UNION_ROOM, 0)} }; static const struct ListMenuTemplate sListMenuTemplate_InviteToActivity = { @@ -339,8 +339,8 @@ static const struct WindowTemplate sWindowTemplate_TradeBoardRegisterInfoExit = static const struct ListMenuItem gUnknown_8456E3C[] = { {gText_Register, 1}, - {gUnknown_8459370, 2}, - {gUnknown_8459360, 3} + {gText_UR_Info, 2}, + {gText_UR_Exit, 3} }; static const struct ListMenuTemplate sListMenuTemplate_TradeBoardRegisterInfoExit = { @@ -392,7 +392,7 @@ static const struct ListMenuItem sListMenuItems_TypeNames[] = { {gTypeNames[TYPE_DRAGON], TYPE_DRAGON}, {gTypeNames[TYPE_STEEL], TYPE_STEEL}, {gTypeNames[TYPE_DARK], TYPE_DARK}, - {gUnknown_8459360, NUMBER_OF_MON_TYPES} + {gText_UR_Exit, NUMBER_OF_MON_TYPES} }; static const struct ListMenuTemplate sListMenuTemplate_TypeNames = { @@ -437,16 +437,16 @@ static const struct WindowTemplate gUnknown_8456F24 = { }; static const struct ListMenuItem sTradeBoardListMenuItems[] = { - {gUnionRoomActivity_Blank, -3}, - {gUnionRoomActivity_Blank, 0}, - {gUnionRoomActivity_Blank, 1}, - {gUnionRoomActivity_Blank, 2}, - {gUnionRoomActivity_Blank, 3}, - {gUnionRoomActivity_Blank, 4}, - {gUnionRoomActivity_Blank, 5}, - {gUnionRoomActivity_Blank, 6}, - {gUnionRoomActivity_Blank, 7}, - {gUnknown_8459368, 8} + {gText_UR_EmptyString, -3}, + {gText_UR_EmptyString, 0}, + {gText_UR_EmptyString, 1}, + {gText_UR_EmptyString, 2}, + {gText_UR_EmptyString, 3}, + {gText_UR_EmptyString, 4}, + {gText_UR_EmptyString, 5}, + {gText_UR_EmptyString, 6}, + {gText_UR_EmptyString, 7}, + {gText_UR_Exit2, 8} }; static const struct ListMenuTemplate sTradeBoardListMenuTemplate = { @@ -481,22 +481,22 @@ static const struct WindowTemplate gUnknown_8456F94 = { }; static const struct ListMenuItem gUnknown_8456F9C[] = { - {gUnionRoomActivity_Blank, 0}, - {gUnionRoomActivity_Blank, 1}, - {gUnionRoomActivity_Blank, 2}, - {gUnionRoomActivity_Blank, 3}, - {gUnionRoomActivity_Blank, 4}, - {gUnionRoomActivity_Blank, 5}, - {gUnionRoomActivity_Blank, 6}, - {gUnionRoomActivity_Blank, 7}, - {gUnionRoomActivity_Blank, 8}, - {gUnionRoomActivity_Blank, 9}, - {gUnionRoomActivity_Blank, 10}, - {gUnionRoomActivity_Blank, 11}, - {gUnionRoomActivity_Blank, 12}, - {gUnionRoomActivity_Blank, 13}, - {gUnionRoomActivity_Blank, 14}, - {gUnionRoomActivity_Blank, 15} + {gText_UR_EmptyString, 0}, + {gText_UR_EmptyString, 1}, + {gText_UR_EmptyString, 2}, + {gText_UR_EmptyString, 3}, + {gText_UR_EmptyString, 4}, + {gText_UR_EmptyString, 5}, + {gText_UR_EmptyString, 6}, + {gText_UR_EmptyString, 7}, + {gText_UR_EmptyString, 8}, + {gText_UR_EmptyString, 9}, + {gText_UR_EmptyString, 10}, + {gText_UR_EmptyString, 11}, + {gText_UR_EmptyString, 12}, + {gText_UR_EmptyString, 13}, + {gText_UR_EmptyString, 14}, + {gText_UR_EmptyString, 15} }; static const struct ListMenuTemplate gUnknown_845701C = { @@ -673,16 +673,16 @@ static void PrintNumPlayersWaitingForMsg(u8 windowId, u8 capacityCode, u8 count) switch (capacityCode << 8) { case 0x200: - UR_AddTextPrinterParameterized(windowId, 2, gUnknown_845742C[0][count - 1], 0, 2, UR_COLOR_DKE_WHT_LTE); + UR_AddTextPrinterParameterized(windowId, 2, gTexts_UR_PlayersNeededOrMode[0][count - 1], 0, 2, UR_COLOR_DKE_WHT_LTE); break; case 0x400: - UR_AddTextPrinterParameterized(windowId, 2, gUnknown_845742C[1][count - 1], 0, 2, UR_COLOR_DKE_WHT_LTE); + UR_AddTextPrinterParameterized(windowId, 2, gTexts_UR_PlayersNeededOrMode[1][count - 1], 0, 2, UR_COLOR_DKE_WHT_LTE); break; case 0x2500: - UR_AddTextPrinterParameterized(windowId, 2, gUnknown_845742C[2][count - 1], 0, 2, UR_COLOR_DKE_WHT_LTE); + UR_AddTextPrinterParameterized(windowId, 2, gTexts_UR_PlayersNeededOrMode[2][count - 1], 0, 2, UR_COLOR_DKE_WHT_LTE); break; case 0x3500: - UR_AddTextPrinterParameterized(windowId, 2, gUnknown_845742C[3][count - 1], 0, 2, UR_COLOR_DKE_WHT_LTE); + UR_AddTextPrinterParameterized(windowId, 2, gTexts_UR_PlayersNeededOrMode[3][count - 1], 0, 2, UR_COLOR_DKE_WHT_LTE); break; } @@ -695,7 +695,7 @@ static void PrintPlayerNameAndIdOnWindow(u8 windowId) u8 text2[12]; UR_AddTextPrinterParameterized(windowId, 2, gSaveBlock2Ptr->playerName, 0, 2, UR_COLOR_DKE_WHT_LTE); - StringCopy(text2, gUnknown_84571B4); + StringCopy(text2, gText_UR_ID); ConvertIntToDecimalStringN(text, ReadAsU16(gSaveBlock2Ptr->playerTrainerId), STR_CONV_MODE_LEADING_ZEROS, 5); StringAppend(text2, text); UR_AddTextPrinterParameterized(windowId, 0, text2, 0, 0x10, UR_COLOR_DKE_WHT_LTE); @@ -715,7 +715,7 @@ static void StringExpandPlaceholders_AwaitingCommFromAnother(u8 *dst, u8 caseId) case ACTIVITY_WCARD2: case ACTIVITY_WNEWS2: // UB: argument *dst isn't used, instead it always prints to gStringVar4 - StringExpandPlaceholders(gStringVar4, gUnknown_8457234); + StringExpandPlaceholders(gStringVar4, gText_UR_AwaitingCommunication); break; } } @@ -767,7 +767,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId) data->nPlayerModeWindowId = AddWindow(&sWindowTemplate_NumPlayerMode); FillWindowPixelBuffer(data->bButtonCancelWindowId, PIXEL_FILL(2)); - UR_AddTextPrinterParameterized(data->bButtonCancelWindowId, 0, gUnknown_845747C, 8, 2, UR_COLOR_WHT_DKE_LTE); + UR_AddTextPrinterParameterized(data->bButtonCancelWindowId, 0, gText_UR_BButtonCancel, 8, 2, UR_COLOR_WHT_DKE_LTE); PutWindowTilemap(data->bButtonCancelWindowId); CopyWindowToVram(data->bButtonCancelWindowId, COPYWIN_GFX); @@ -789,9 +789,9 @@ static void Task_TryBecomeLinkLeader(u8 taskId) if ((sPlayerActivityGroupSize >> 4) != 0) { if (data->playerCount > (sPlayerActivityGroupSize >> 4) - 1 && (sPlayerActivityGroupSize & 0xF) != 0) - StringExpandPlaceholders(gStringVar4, gUnknown_8457264); + StringExpandPlaceholders(gStringVar4, gText_UR_AwaitingLinkPressStart); else - StringExpandPlaceholders(gStringVar4, gUnknown_8457234); + StringExpandPlaceholders(gStringVar4, gText_UR_AwaitingCommunication); } else { @@ -839,7 +839,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId) break; case 10: id = ((sPlayerCurrActivity & 0xF) == 2) ? 1 : 0; - if (PrintOnTextbox(&data->textState, gUnknown_845767C[id])) + if (PrintOnTextbox(&data->textState, gTexts_UR_PlayerUnavailable[id])) { data->playerCount = UnionRoomLeaderField0CompactionAndCount(data->field_0); RedrawListMenu(data->listTaskId); @@ -849,7 +849,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId) case 29: // Other player cancelled. id = ((sPlayerActivityGroupSize & 0xF) == 2) ? 0 : 1; - if (PrintOnTextbox(&data->textState, gUnknown_845767C[id])) + if (PrintOnTextbox(&data->textState, gTexts_UR_PlayerUnavailable[id])) { data->state = 21; } @@ -903,7 +903,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId) else { IntlConvPartnerUname7(gStringVar1, data->field_0->arr[data->playerCount - 1]); - StringExpandPlaceholders(gStringVar4, gUnknown_8457554); + StringExpandPlaceholders(gStringVar4, gText_UR_AnOKWasSentToPlayer); data->state = 13; } @@ -943,8 +943,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId) data->state = 17; break; case 15: - // Are these members OK? - if (PrintOnTextbox(&data->textState, gUnknown_8457514)) + if (PrintOnTextbox(&data->textState, gText_UR_AreTheseMembersOK)) data->state = 16; break; case 16: @@ -965,7 +964,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId) } break; case 19: - if (PrintOnTextbox(&data->textState, gUnknown_8457530)) + if (PrintOnTextbox(&data->textState, gText_UR_CancelModeWithTheseMembers)) data->state = 20; break; case 20: @@ -1006,8 +1005,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId) } break; case 30: - // Mode with members will be canceled. - if (PrintOnTextbox(&data->textState, gUnknown_8457610)) + if (PrintOnTextbox(&data->textState, gText_UR_ModeWithTheseMembersWillBeCanceled)) data->state = 23; break; case 21: @@ -1072,17 +1070,17 @@ static void Leader_GetAcceptNewMemberPrompt(u8 *dst, u8 activity) case ACTIVITY_BATTLE: case ACTIVITY_DBLBATTLE: case ACTIVITY_TRADE: - StringExpandPlaceholders(dst, gUnknown_84574A0); + StringExpandPlaceholders(dst, gText_UR_PlayerContactedYouForXAccept); break; case ACTIVITY_WCARD2: case ACTIVITY_WNEWS2: - StringExpandPlaceholders(dst, gUnknown_84574C4); + StringExpandPlaceholders(dst, gText_UR_PlayerContactedYouShareX); break; case ACTIVITY_MLTBATTLE: case ACTIVITY_PJUMP: case ACTIVITY_BCRUSH: case ACTIVITY_BPICK: - StringExpandPlaceholders(dst, gUnknown_84574EC); + StringExpandPlaceholders(dst, gText_UR_PlayerContactedYouAddToMembers); break; } } @@ -1093,11 +1091,11 @@ static void GetYouDeclinedTheOfferMessage(u8 *dst, u8 activity) { case ACTIVITY_BATTLE | IN_UNION_ROOM: case ACTIVITY_TRADE | IN_UNION_ROOM: - StringExpandPlaceholders(dst, gUnknown_8457E28); + StringExpandPlaceholders(dst, gText_UR_OfferDeclined1); break; case ACTIVITY_CHAT | IN_UNION_ROOM: case ACTIVITY_CARD | IN_UNION_ROOM: - StringExpandPlaceholders(dst, gUnknown_8457E44); + StringExpandPlaceholders(dst, gText_UR_OfferDeclined2); break; } } @@ -1111,13 +1109,13 @@ static void GetYouAskedToJoinGroupPleaseWaitMessage(u8 *dst, u8 activity) case ACTIVITY_TRADE: case ACTIVITY_WCARD2: case ACTIVITY_WNEWS2: - StringExpandPlaceholders(dst, gUnknown_8459238); + StringExpandPlaceholders(dst, gText_UR_AwaitingPlayersResponse); break; case ACTIVITY_MLTBATTLE: case ACTIVITY_PJUMP: case ACTIVITY_BCRUSH: case ACTIVITY_BPICK: - StringExpandPlaceholders(dst, gUnknown_8459250); + StringExpandPlaceholders(dst, gText_UR_PlayerHasBeenAskedToRegisterYouPleaseWait); break; } } @@ -1131,13 +1129,13 @@ static void GetGroupLeaderSentAnOKMessage(u8 *dst, u8 caseId) case ACTIVITY_TRADE: case ACTIVITY_WCARD2: case ACTIVITY_WNEWS2: - StringExpandPlaceholders(dst, gUnknown_84576AC); + StringExpandPlaceholders(dst, gText_UR_PlayerSentBackOK); break; case ACTIVITY_MLTBATTLE: case ACTIVITY_PJUMP: case ACTIVITY_BCRUSH: case ACTIVITY_BPICK: - StringExpandPlaceholders(dst, gUnknown_84576C4); + StringExpandPlaceholders(dst, gText_UR_PlayerOKdRegistration); break; } } @@ -1299,7 +1297,7 @@ static void Task_TryJoinLinkGroup(u8 taskId) data->state = 1; break; case 1: - if (PrintOnTextbox(&data->textState, gUnknown_84591B8[gSpecialVar_0x8004])) + if (PrintOnTextbox(&data->textState, gTexts_UR_ChooseTrainer[gSpecialVar_0x8004])) data->state = 2; break; case 2: @@ -1311,7 +1309,7 @@ static void Task_TryJoinLinkGroup(u8 taskId) data->playerNameAndIdWindowId = AddWindow(&sWindowTemplate_MysteryGiftPlayerNameAndId); FillWindowPixelBuffer(data->bButtonCancelWindowId, PIXEL_FILL(2)); - UR_AddTextPrinterParameterized(data->bButtonCancelWindowId, 0, gUnknown_8458FC8, 8, 2, UR_COLOR_WHT_DKE_LTE); + UR_AddTextPrinterParameterized(data->bButtonCancelWindowId, 0, gText_UR_ChooseJoinCancel, 8, 2, UR_COLOR_WHT_DKE_LTE); PutWindowTilemap(data->bButtonCancelWindowId); CopyWindowToVram(data->bButtonCancelWindowId, COPYWIN_GFX); @@ -1357,7 +1355,7 @@ static void Task_TryJoinLinkGroup(u8 taskId) else { // Postgame flags not both set - StringCopy(gStringVar4, gUnknown_8457608[var - 1]); + StringCopy(gStringVar4, gTexts_UR_CantTransmitToTrainer[var - 1]); data->state = 18; PlaySE(SE_POKENAV_ON); } @@ -1425,7 +1423,7 @@ static void Task_TryJoinLinkGroup(u8 taskId) { RfuSetStatus(RFU_STATUS_WAIT_ACK_JOIN_GROUP, 0); StringCopy(gStringVar1, sUnionRoomActivityStringPtrs[sPlayerCurrActivity]); - StringExpandPlaceholders(gStringVar4, gUnknown_8457700); + StringExpandPlaceholders(gStringVar4, gText_UR_AwaitingOtherMembers); } break; case 7: @@ -1449,7 +1447,7 @@ static void Task_TryJoinLinkGroup(u8 taskId) data->state = 7; break; case 7: - if (PrintOnTextbox(&data->textState, gUnknown_845771C)) + if (PrintOnTextbox(&data->textState, gText_UR_QuitBeingMember)) data->state = 8; break; case 8: @@ -1496,7 +1494,7 @@ static void Task_TryJoinLinkGroup(u8 taskId) break; case 13: DestroyWirelessStatusIndicatorSprite(); - if (PrintOnTextbox(&data->textState, gUnknown_8457754[RfuGetStatus()])) + if (PrintOnTextbox(&data->textState, gTexts_UR_PlayerDisconnected[RfuGetStatus()])) { gSpecialVar_Result = 6; data->state = 23; @@ -1509,7 +1507,7 @@ static void Task_TryJoinLinkGroup(u8 taskId) break; case 15: DestroyWirelessStatusIndicatorSprite(); - if (PrintOnTextbox(&data->textState, gUnknown_8457754[RfuGetStatus()])) + if (PrintOnTextbox(&data->textState, gTexts_UR_PlayerDisconnected[RfuGetStatus()])) { gSpecialVar_Result = 8; data->state = 23; @@ -2128,8 +2126,7 @@ static void Task_MEvent_Leader(u8 taskId) } break; case 6: - // The link with your friend has been dropped... - if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gUnknown_84577F8)) + if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gText_UR_LinkWithFriendDropped)) { data->playerCount = UnionRoomLeaderField0CompactionAndCount(data->field_0); RedrawListMenu(data->listTaskId); @@ -2169,7 +2166,7 @@ static void Task_MEvent_Leader(u8 taskId) RedrawListMenu(data->listTaskId); data->playerCount++; IntlConvPartnerUname7(gStringVar1, data->field_0->arr[data->playerCount - 1]); - StringExpandPlaceholders(gStringVar4, gUnknown_8457554); + StringExpandPlaceholders(gStringVar4, gText_UR_AnOKWasSentToPlayer); data->state = 9; LinkRfu_StopManagerAndFinalizeSlots(); } @@ -2227,7 +2224,7 @@ static void Task_MEvent_Leader(u8 taskId) break; case 14: // Please start over from the beginning. - if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gUnknown_84571B8)) + if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gText_UR_PleaseStartOver)) { DestroyTask(taskId); gSpecialVar_Result = 5; @@ -2295,7 +2292,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId) data->state = 1; break; case 1: - AddTextPrinterToWindow1(gUnknown_8458FE4); + AddTextPrinterToWindow1(gText_UR_ChooseTrainer); data->state = 2; break; case 2: @@ -2365,7 +2362,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId) } break; case 4: - AddTextPrinterToWindow1(gUnknown_8459238); + AddTextPrinterToWindow1(gText_UR_AwaitingPlayersResponse); IntlConvPartnerUname(gStringVar1, data->field_0->arr[data->leaderId]); data->state = 5; break; @@ -2384,7 +2381,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId) data->state = 8; break; case 5: - AddTextPrinterToWindow1(gUnknown_84576AC); + AddTextPrinterToWindow1(gText_UR_PlayerSentBackOK); RfuSetStatus(RFU_STATUS_OK, 0); break; } @@ -2402,7 +2399,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId) data->state++; break; case 9: - if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gUnknown_8457838[RfuGetStatus()])) + if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gTexts_UR_LinkDropped[RfuGetStatus()])) { DestroyWirelessStatusIndicatorSprite(); DestroyTask(taskId); @@ -2412,7 +2409,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId) break; case 7: DestroyWirelessStatusIndicatorSprite(); - AddTextPrinterToWindow1(gUnknown_84571B8); + AddTextPrinterToWindow1(gText_UR_PleaseStartOver); DestroyTask(taskId); LinkRfu_Shutdown(); gSpecialVar_Result = 5; @@ -2461,7 +2458,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId) data->state = 1; break; case 1: - AddTextPrinterToWindow1(gUnknown_84591DC); + AddTextPrinterToWindow1(gText_UR_SearchingForWirelessSystemWait); data->state = 2; break; case 2: @@ -2530,7 +2527,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId) } break; case 4: - AddTextPrinterToWindow1(gUnknown_845928C); + AddTextPrinterToWindow1(gText_UR_AwaitingResponseFromWirelessSystem); IntlConvPartnerUname(gStringVar1, data->field_0->arr[data->leaderId]); data->state = 5; break; @@ -2549,7 +2546,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId) data->state = 8; break; case 5: - AddTextPrinterToWindow1(gUnknown_845777C); + AddTextPrinterToWindow1(gText_UR_WirelessLinkEstablished); RfuSetStatus(RFU_STATUS_OK, 0); break; } @@ -2570,7 +2567,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId) data->state++; break; case 9: - if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gUnknown_84577BC)) + if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gText_UR_WirelessLinkDropped)) { DestroyWirelessStatusIndicatorSprite(); DestroyTask(taskId); @@ -2579,7 +2576,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId) } break; case 7: - if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gUnknown_84571E0)) + if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gText_UR_WirelessSearchCanceled)) { DestroyWirelessStatusIndicatorSprite(); DestroyTask(taskId); @@ -2588,7 +2585,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId) } break; case 11: - if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gUnknown_845933C[data->cardOrNews])) + if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gTexts_UR_NoWonderShared[data->cardOrNews])) { DestroyWirelessStatusIndicatorSprite(); DestroyTask(taskId); @@ -2717,11 +2714,11 @@ static void Task_RunUnionRoom(u8 taskId) { ResetUnionRoomTrade(&sUnionRoomTrade); RfuUpdatePlayerGnameStateAndSend(0, 0, 0); - UnionRoom_ScheduleFieldMessageAndExit(gUnknown_8458D54); + UnionRoom_ScheduleFieldMessageAndExit(gText_UR_RegistrationCanceled); } else if (!RegisterTradeMonAndGetIsEgg(GetCursorSelectionMonId(), &sUnionRoomTrade)) { - UnionRoom_ScheduleFieldMessageWithFollowupState(52, gURText_PleaseChooseTypeOfMon); + UnionRoom_ScheduleFieldMessageWithFollowupState(52, gText_UR_ChooseRequestedMonType); } else { @@ -2733,7 +2730,7 @@ static void Task_RunUnionRoom(u8 taskId) taskData[1] = sUnionRoomTrade.field_8; if (id >= PARTY_SIZE) { - UnionRoom_ScheduleFieldMessageAndExit(gUnknown_8458D9C); + UnionRoom_ScheduleFieldMessageAndExit(gText_UR_TradeCanceled); } else { @@ -2852,9 +2849,9 @@ static void Task_RunUnionRoom(u8 taskId) case 1: case 2: if (IsUnionRoomListenTaskActive() == TRUE) - UnionRoom_ScheduleFieldMessageAndExit(gUnknown_8457F90); + UnionRoom_ScheduleFieldMessageAndExit(gText_UR_TrainerAppearsBusy); else - UnionRoom_ScheduleFieldMessageWithFollowupState(30, gUnknown_8457F90); + UnionRoom_ScheduleFieldMessageWithFollowupState(30, gText_UR_TrainerAppearsBusy); sPlayerCurrActivity = IN_UNION_ROOM; break; @@ -2871,7 +2868,7 @@ static void Task_RunUnionRoom(u8 taskId) if (!FuncIsActiveTask(Task_ExchangeCards)) { if (sPlayerCurrActivity == (ACTIVITY_TRADE | IN_UNION_ROOM)) - UnionRoom_ScheduleFieldMessageWithFollowupState(31, gUnknown_84578BC); + UnionRoom_ScheduleFieldMessageWithFollowupState(31, gText_UR_AwaitingPlayersResponseAboutTrade); else data->state = 5; } @@ -2887,7 +2884,7 @@ static void Task_RunUnionRoom(u8 taskId) case 5: id = ConvPartnerUnameAndGetWhetherMetAlready(&data->field_0->arr[taskData[1]]); playerGender = GetUnionRoomPlayerGender(taskData[1], data->field_0); - UnionRoom_ScheduleFieldMessageWithFollowupState(6, gURText_FriendPromptsForActivity[id][playerGender]); + UnionRoom_ScheduleFieldMessageWithFollowupState(6, gTexts_UR_HiDoSomething[id][playerGender]); break; case 6: var5 = ListMenuHandler_AllItemsAvailable(&data->textState, &data->topListMenuWindowId, &data->topListMenuListMenuId, &sWindowTemplate_InviteToActivity, &sListMenuTemplate_InviteToActivity); @@ -2905,7 +2902,7 @@ static void Task_RunUnionRoom(u8 taskId) { data->playerSendBuffer[0] = IN_UNION_ROOM; Rfu_SendPacket(data->playerSendBuffer); - StringCopy(gStringVar4, gUnknown_845842C[gLinkPlayers[0].gender]); + StringCopy(gStringVar4, gTexts_UR_IfYouWantToDoSomething[gLinkPlayers[0].gender]); data->state = 32; } else @@ -2914,7 +2911,7 @@ static void Task_RunUnionRoom(u8 taskId) sPlayerActivityGroupSize = (u32)(var5) >> 8; if (sPlayerCurrActivity == (ACTIVITY_BATTLE | IN_UNION_ROOM) && !HasAtLeastTwoMonsOfLevel30OrLower()) { - UnionRoom_ScheduleFieldMessageWithFollowupState(5, gUnknown_845847C); + UnionRoom_ScheduleFieldMessageWithFollowupState(5, gText_UR_NeedTwoMonsOfLevel30OrLower1); } else { @@ -2927,14 +2924,14 @@ static void Task_RunUnionRoom(u8 taskId) } break; case 28: - StringCopy(gStringVar4, gUnknown_8458434); + StringCopy(gStringVar4, gText_UR_TrainerBattleBusy); data->state = 36; break; case 27: PollPartnerYesNoResponse(data); playerGender = GetUnionRoomPlayerGender(taskData[1], data->field_0); id = GetResponseIdx_InviteToURoomActivity(data->playerSendBuffer[0] & 0x3F); - if (PrintOnTextbox(&data->textState, gResponseToURoomActivityInviteStringPtrs[playerGender][id])) + if (PrintOnTextbox(&data->textState, gTexts_UR_WaitOrShowCard[playerGender][id])) { taskData[3] = 0; data->state = 29; @@ -2954,7 +2951,7 @@ static void Task_RunUnionRoom(u8 taskId) case 29: if (!gReceivedRemoteLinkPlayers) { - StringCopy(gStringVar4, gUnknown_8458434); + StringCopy(gStringVar4, gText_UR_TrainerBattleBusy); data->state = 28; } else @@ -2984,7 +2981,7 @@ static void Task_RunUnionRoom(u8 taskId) case 7: id = ConvPartnerUnameAndGetWhetherMetAlready(&data->field_0->arr[taskData[1]]); playerGender = GetUnionRoomPlayerGender(taskData[1], data->field_0); - UnionRoom_ScheduleFieldMessageWithFollowupState(6, gURText_FriendPromptsForActivity[id][playerGender]); + UnionRoom_ScheduleFieldMessageWithFollowupState(6, gTexts_UR_HiDoSomething[id][playerGender]); break; case 40: if (PrintOnTextbox(&data->textState, gStringVar4)) @@ -3002,7 +2999,7 @@ static void Task_RunUnionRoom(u8 taskId) { StringCopy(gStringVar1, gLinkPlayers[GetMultiplayerId() ^ 1].name); id = PlayerHasMetTrainerBefore(gLinkPlayers[1].trainerId, gLinkPlayers[1].name); - StringExpandPlaceholders(gStringVar4, gUnknown_8457C20[id]); + StringExpandPlaceholders(gStringVar4, gTexts_UR_AwaitingResponse[id]); data->state = 33; } else @@ -3026,7 +3023,7 @@ static void Task_RunUnionRoom(u8 taskId) case 1: case -1: playerGender = GetUnionRoomPlayerGender(taskData[1], data->field_0); - UnionRoom_ScheduleFieldMessageAndExit(gUnknown_8458548[playerGender]); + UnionRoom_ScheduleFieldMessageAndExit(gTexts_UR_DeclineChat[playerGender]); break; } break; @@ -3049,9 +3046,9 @@ static void Task_RunUnionRoom(u8 taskId) playerGender = GetUnionRoomPlayerGender(taskData[1], data->field_0); UpdateGameDataWithActivitySpriteGendersFlag(ACTIVITY_PLYRTALK | IN_UNION_ROOM, 0, TRUE); if (IsUnionRoomListenTaskActive() == TRUE) - UnionRoom_ScheduleFieldMessageAndExit(gUnknown_84585E8[playerGender]); + UnionRoom_ScheduleFieldMessageAndExit(gTexts_UR_ChatDeclined[playerGender]); else - UnionRoom_ScheduleFieldMessageWithFollowupState(30, gUnknown_84585E8[playerGender]); + UnionRoom_ScheduleFieldMessageWithFollowupState(30, gTexts_UR_ChatDeclined[playerGender]); break; case 3: data->state = 22; @@ -3065,9 +3062,9 @@ static void Task_RunUnionRoom(u8 taskId) playerGender = GetUnionRoomPlayerGender(taskData[1], data->field_0); UpdateGameDataWithActivitySpriteGendersFlag(ACTIVITY_PLYRTALK | IN_UNION_ROOM, 0, TRUE); if (IsUnionRoomListenTaskActive() == TRUE) - UnionRoom_ScheduleFieldMessageAndExit(gUnknown_84585E8[playerGender]); + UnionRoom_ScheduleFieldMessageAndExit(gTexts_UR_ChatDeclined[playerGender]); else - UnionRoom_ScheduleFieldMessageWithFollowupState(30, gUnknown_84585E8[playerGender]); + UnionRoom_ScheduleFieldMessageWithFollowupState(30, gTexts_UR_ChatDeclined[playerGender]); } if (gReceivedRemoteLinkPlayers) data->state = 16; @@ -3098,7 +3095,7 @@ static void Task_RunUnionRoom(u8 taskId) data->state = 33; StringCopy(gStringVar1, gLinkPlayers[1].name); id = PlayerHasMetTrainerBefore(gLinkPlayers[1].trainerId, gLinkPlayers[1].name); - StringExpandPlaceholders(gStringVar4, gUnknown_8457BCC[id]); + StringExpandPlaceholders(gStringVar4, gTexts_UR_PlayerContactedYou[id]); } break; case 33: @@ -3111,7 +3108,7 @@ static void Task_RunUnionRoom(u8 taskId) if (UnionRoom_HandleContactFromOtherPlayer(data) && JOY_NEW(B_BUTTON)) { sub_80FBD6C(1); - StringCopy(gStringVar4, gUnknown_8457E60); + StringCopy(gStringVar4, gText_UR_ChatEnded); data->state = 36; } break; @@ -3138,7 +3135,7 @@ static void Task_RunUnionRoom(u8 taskId) data->playerSendBuffer[0] = ACTIVITY_DECLINE | IN_UNION_ROOM; Rfu_SendPacket(data->playerSendBuffer); data->state = 10; - StringCopy(gStringVar4, gUnknown_84584C0); + StringCopy(gStringVar4, gText_UR_NeedTwoMonsOfLevel30OrLower2); } else { @@ -3229,19 +3226,19 @@ static void Task_RunUnionRoom(u8 taskId) { if (GetHostRFUtgtGname()->species == SPECIES_EGG) { - StringCopy(gStringVar4, gUnknown_8458DE8); + StringCopy(gStringVar4, gText_UR_CancelRegistrationOfEgg); } else { StringCopy(gStringVar1, gSpeciesNames[GetHostRFUtgtGname()->species]); ConvertIntToDecimalStringN(gStringVar2, GetHostRFUtgtGname()->level, STR_CONV_MODE_LEFT_ALIGN, 3); - StringExpandPlaceholders(gStringVar4, gUnknown_8458DBC); + StringExpandPlaceholders(gStringVar4, gText_UR_CancelRegistrationOfMon); } UnionRoom_ScheduleFieldMessageWithFollowupState(44, gStringVar4); } break; case 43: - if (PrintOnTextbox(&data->textState, gUnknown_8458AB8)) + if (PrintOnTextbox(&data->textState, gText_UR_RegisterMonAtTradingBoard)) data->state = 47; break; case 47: @@ -3258,10 +3255,10 @@ static void Task_RunUnionRoom(u8 taskId) switch (var5) { case 1: // REGISTER - UnionRoom_ScheduleFieldMessageWithFollowupState(53, gUnknown_8458D1C); + UnionRoom_ScheduleFieldMessageWithFollowupState(53, gText_UR_WhichMonWillYouOffer); break; case 2: // INFO - UnionRoom_ScheduleFieldMessageWithFollowupState(47, gUnknown_8458B44); + UnionRoom_ScheduleFieldMessageWithFollowupState(47, gText_UR_TradingBoardInfo); break; } } @@ -3290,7 +3287,7 @@ static void Task_RunUnionRoom(u8 taskId) case 18: ResetUnionRoomTrade(&sUnionRoomTrade); RfuUpdatePlayerGnameStateAndSend(0, 0, 0); - UnionRoom_ScheduleFieldMessageAndExit(gUnknown_8458D54); + UnionRoom_ScheduleFieldMessageAndExit(gText_UR_RegistrationCanceled); break; default: sUnionRoomTrade.type = var5; @@ -3301,7 +3298,7 @@ static void Task_RunUnionRoom(u8 taskId) break; case 55: RfuUpdatePlayerGnameStateAndSend(sUnionRoomTrade.type, sUnionRoomTrade.playerSpecies, sUnionRoomTrade.playerLevel); - UnionRoom_ScheduleFieldMessageAndExit(gUnknown_8458D78); + UnionRoom_ScheduleFieldMessageAndExit(gText_UR_RegistraionCompleted); break; case 44: switch (UnionRoomHandleYesNo(&data->textState, FALSE)) @@ -3317,7 +3314,7 @@ static void Task_RunUnionRoom(u8 taskId) } break; case 56: - if (PrintOnTextbox(&data->textState, gUnknown_8458E10)) + if (PrintOnTextbox(&data->textState, gText_UR_RegistrationCanceled2)) { RfuUpdatePlayerGnameStateAndSend(0, 0, 0); ResetUnionRoomTrade(&sUnionRoomTrade); @@ -3326,7 +3323,7 @@ static void Task_RunUnionRoom(u8 taskId) } break; case 45: - if (PrintOnTextbox(&data->textState, gUnknown_8458A98)) + if (PrintOnTextbox(&data->textState, gText_UR_XCheckedTradingBoard)) data->state = 46; break; case 46: @@ -3350,18 +3347,18 @@ static void Task_RunUnionRoom(u8 taskId) { case UR_TRADE_MATCH: IntlConvPartnerUname(gStringVar1, data->field_0->arr[var5]); - UnionRoom_ScheduleFieldMessageWithFollowupState(49, gUnknown_8458E70); + UnionRoom_ScheduleFieldMessageWithFollowupState(49, gText_UR_AskTrainerToMakeTrade); taskData[1] = var5; break; case UR_TRADE_NOTYPE: IntlConvPartnerUname(gStringVar1, data->field_0->arr[var5]); StringCopy(gStringVar2, gTypeNames[data->field_0->arr[var5].gname_uname.gname.type]); - UnionRoom_ScheduleFieldMessageWithFollowupState(46, gUnknown_8458ED0); + UnionRoom_ScheduleFieldMessageWithFollowupState(46, gText_UR_DontHaveTypeTrainerWants); break; case UR_TRADE_NOEGG: IntlConvPartnerUname(gStringVar1, data->field_0->arr[var5]); StringCopy(gStringVar2, gTypeNames[data->field_0->arr[var5].gname_uname.gname.type]); - UnionRoom_ScheduleFieldMessageWithFollowupState(46, gUnknown_8458F04); + UnionRoom_ScheduleFieldMessageWithFollowupState(46, gText_UR_DontHaveEggTrainerWants); break; } break; @@ -3382,7 +3379,7 @@ static void Task_RunUnionRoom(u8 taskId) } break; case 50: - if (PrintOnTextbox(&data->textState, gUnknown_8458D1C)) + if (PrintOnTextbox(&data->textState, gText_UR_WhichMonWillYouOffer)) { sUnionRoomTrade.field_0 = 2; memcpy(&gPartnerTgtGnameSub, &data->field_0->arr[taskData[1]].gname_uname.gname.unk_00, sizeof(gPartnerTgtGnameSub)); @@ -3398,7 +3395,7 @@ static void Task_RunUnionRoom(u8 taskId) sPlayerCurrActivity = ACTIVITY_TRADE | IN_UNION_ROOM; sub_80FC114(data->field_0->arr[taskData[1]].gname_uname.uname, &data->field_0->arr[taskData[1]].gname_uname.gname, ACTIVITY_TRADE | IN_UNION_ROOM); IntlConvPartnerUname(gStringVar1, data->field_0->arr[taskData[1]]); - UR_PrintFieldMessage(gURText_PleaseWaitMsgs[2]); + UR_PrintFieldMessage(gTexts_UR_CommunicatingWait[2]); data->state = 25; break; case 26: @@ -3862,7 +3859,7 @@ static u8 CreateTradeBoardWindow(const struct WindowTemplate * template) u8 windowId = AddWindow(template); DrawStdWindowFrame(windowId, FALSE); FillWindowPixelBuffer(windowId, PIXEL_FILL(15)); - UR_AddTextPrinterParameterized(windowId, 0, gUnknown_8459378, 8, 1, UR_COLOR_DN5_DN6_LTB); + UR_AddTextPrinterParameterized(windowId, 0, gText_UR_NameWantedOfferLv, 8, 1, UR_COLOR_DN5_DN6_LTB); PutWindowTilemap(windowId); CopyWindowToVram(windowId, COPYWIN_GFX); return windowId; @@ -4180,7 +4177,7 @@ static void PrintUnionRoomGroupOnWindow(u8 windowId, u8 x, u8 y, struct UnkStruc u8 uname[30]; ConvertIntToDecimalStringN(gStringVar4, id + 1, STR_CONV_MODE_LEADING_ZEROS, 2); - StringAppend(gStringVar4, gUnknown_84571B0); + StringAppend(gStringVar4, gText_UR_Colon); UR_AddTextPrinterParameterized(windowId, 0, gStringVar4, x, y, UR_COLOR_DKE_WHT_LTE); x += 18; activity = group->gname_uname.gname.activity; @@ -4189,7 +4186,7 @@ static void PrintUnionRoomGroupOnWindow(u8 windowId, u8 x, u8 y, struct UnkStruc IntlConvPartnerUname(uname, *group); UR_AddTextPrinterParameterized(windowId, 2, uname, x, y, colorIdx); ConvertIntToDecimalStringN(id_str, group->gname_uname.gname.unk_00.playerTrainerId[0] | (group->gname_uname.gname.unk_00.playerTrainerId[1] << 8), STR_CONV_MODE_LEADING_ZEROS, 5); - StringCopy(gStringVar4, gUnknown_84571B4); + StringCopy(gStringVar4, gText_UR_ID); StringAppend(gStringVar4, id_str); x += 77; UR_AddTextPrinterParameterized(windowId, 0, gStringVar4, x, y, colorIdx); @@ -4206,7 +4203,7 @@ static void PrintGroupMemberCandidateOnWindowWithColor(u8 windowId, u8 x, u8 y, IntlConvPartnerUname(uname, *group); UR_AddTextPrinterParameterized(windowId, 2, uname, x, y, colorIdx); ConvertIntToDecimalStringN(id_str, group->gname_uname.gname.unk_00.playerTrainerId[0] | (group->gname_uname.gname.unk_00.playerTrainerId[1] << 8), STR_CONV_MODE_LEADING_ZEROS, 5); - StringCopy(gStringVar4, gUnknown_84571B4); + StringCopy(gStringVar4, gText_UR_ID); StringAppend(gStringVar4, id_str); x += 71; UR_AddTextPrinterParameterized(windowId, 0, gStringVar4, x, y, colorIdx); @@ -4268,12 +4265,12 @@ static s32 UnionRoomGetPlayerInteractionResponse(struct UnkStruct_Main0 * main0, metBefore = PlayerHasMetTrainerBefore(ReadAsU16(x20->gname_uname.gname.unk_00.playerTrainerId), gStringVar1); if (x20->gname_uname.gname.activity == (ACTIVITY_CHAT | IN_UNION_ROOM)) { - StringExpandPlaceholders(gStringVar4, gUnknown_8457F80[metBefore][playerGender]); + StringExpandPlaceholders(gStringVar4, gTexts_UR_JoinChat[metBefore][playerGender]); return 2; } else { - UR_PrintFieldMessage(gURText_PleaseWaitMsgs[metBefore]); + UR_PrintFieldMessage(gTexts_UR_CommunicatingWait[metBefore]); return 1; } } @@ -4287,24 +4284,19 @@ static s32 UnionRoomGetPlayerInteractionResponse(struct UnkStruct_Main0 * main0, switch (x20->gname_uname.gname.activity & 0x3F) { case ACTIVITY_BATTLE: - // Battling - StringExpandPlaceholders(gStringVar4, gUnknown_8458758[playerGender][Random() % 4]); + StringExpandPlaceholders(gStringVar4, gTexts_UR_BattleReaction[playerGender][Random() % 4]); break; case ACTIVITY_TRADE: - // Trading - StringExpandPlaceholders(gStringVar4, gUnknown_8458A78[playerGender][Random() % 2]); + StringExpandPlaceholders(gStringVar4, gTexts_UR_TradeReaction[playerGender][Random() % 2]); break; case ACTIVITY_CHAT: - // Chatting - StringExpandPlaceholders(gStringVar4, gUnknown_84588BC[playerGender][Random() % 4]); + StringExpandPlaceholders(gStringVar4, gTexts_UR_ChatReaction[playerGender][Random() % 4]); break; case ACTIVITY_CARD: - // Sharing cards - StringExpandPlaceholders(gStringVar4, gUnknown_84589AC[playerGender][Random() % 2]); + StringExpandPlaceholders(gStringVar4, gTexts_UR_TrainerCardReaction[playerGender][Random() % 2]); break; default: - // Unknown - StringExpandPlaceholders(gStringVar4, gUnknown_8457F90); + StringExpandPlaceholders(gStringVar4, gText_UR_TrainerAppearsBusy); break; } return 0; @@ -4325,7 +4317,7 @@ static void TradeBoardPrintItemInfo(u8 windowId, u8 y, struct GFtgtGname * gname UR_AddTextPrinterParameterized(windowId, 2, uname, 8, y, colorIdx); if (species == SPECIES_EGG) { - UR_AddTextPrinterParameterized(windowId, 2, gText_EggTrade, 0x44, y, colorIdx); + UR_AddTextPrinterParameterized(windowId, 2, gText_UR_EggTrade, 0x44, y, colorIdx); } else { @@ -4430,16 +4422,16 @@ static void GetURoomActivityRejectMsg(u8 *dst, s32 activity, u32 playerGender) switch (activity) { case ACTIVITY_BATTLE | IN_UNION_ROOM: - StringExpandPlaceholders(dst, gUnknown_8458314[playerGender]); + StringExpandPlaceholders(dst, gTexts_UR_BattleDeclined[playerGender]); break; case ACTIVITY_CHAT | IN_UNION_ROOM: - StringExpandPlaceholders(dst, gUnknown_84585E8[playerGender]); + StringExpandPlaceholders(dst, gTexts_UR_ChatDeclined[playerGender]); break; case ACTIVITY_TRADE | IN_UNION_ROOM: - StringExpandPlaceholders(dst, gUnknown_8458F9C); + StringExpandPlaceholders(dst, gText_UR_TradeOfferRejected); break; case ACTIVITY_CARD | IN_UNION_ROOM: - StringExpandPlaceholders(dst, gUnknown_84583B4[playerGender]); + StringExpandPlaceholders(dst, gTexts_UR_ShowTrainerCardDeclined[playerGender]); break; } } @@ -4452,13 +4444,13 @@ static void GetURoomActivityStartMsg(u8 *dst, u8 activity) switch (activity) { case ACTIVITY_BATTLE | IN_UNION_ROOM: - StringCopy(dst, gUnknown_8458230[mpId][gender][0]); + StringCopy(dst, gTexts_UR_StartActivity[mpId][gender][0]); break; case ACTIVITY_TRADE | IN_UNION_ROOM: - StringCopy(dst, gUnknown_8458230[mpId][gender][2]); + StringCopy(dst, gTexts_UR_StartActivity[mpId][gender][2]); break; case ACTIVITY_CHAT | IN_UNION_ROOM: - StringCopy(dst, gUnknown_8458230[mpId][gender][1]); + StringCopy(dst, gTexts_UR_StartActivity[mpId][gender][1]); break; } } @@ -4472,11 +4464,11 @@ static s32 GetChatLeaderActionRequestMessage(u8 *dst, u32 gender, u16 *activity_ switch (activity_p[0]) { case ACTIVITY_BATTLE | IN_UNION_ROOM: - StringExpandPlaceholders(dst, gUnknown_8457CA4); + StringExpandPlaceholders(dst, gText_UR_BattleChallenge); result = 1; break; case ACTIVITY_CHAT | IN_UNION_ROOM: - StringExpandPlaceholders(dst, gUnknown_8457CF8); + StringExpandPlaceholders(dst, gText_UR_ChatInvitation); result = 1; break; case ACTIVITY_TRADE | IN_UNION_ROOM: @@ -4494,7 +4486,7 @@ static s32 GetChatLeaderActionRequestMessage(u8 *dst, u32 gender, u16 *activity_ } if (species == SPECIES_EGG) { - StringCopy(dst, gUnknown_8457DB8); + StringCopy(dst, gText_UR_OfferToTradeEgg); } else { @@ -4502,17 +4494,17 @@ static s32 GetChatLeaderActionRequestMessage(u8 *dst, u32 gender, u16 *activity_ { DynamicPlaceholderTextUtil_SetPlaceholderPtr(i, arg3->activityRequestStrbufs[i]); } - DynamicPlaceholderTextUtil_ExpandPlaceholders(dst, gUnknown_8457D44); + DynamicPlaceholderTextUtil_ExpandPlaceholders(dst, gText_UR_OfferToTradeMon); } result = 1; break; case ACTIVITY_CARD | IN_UNION_ROOM: - StringExpandPlaceholders(dst, gUnknown_8457C48); + StringExpandPlaceholders(dst, gText_UR_ShowTrainerCard); result = 1; break; case IN_UNION_ROOM: // Chat dropped - StringExpandPlaceholders(dst, gUnknown_8457E0C); + StringExpandPlaceholders(dst, gText_UR_ChatDropped); result = 2; break; } @@ -4699,7 +4691,7 @@ static void ViewURoomPartnerTrainerCard(u8 *unused, struct UnkStruct_URoom * uro DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, trainerCard->rse.playerName); - StringCopy(uroom->field_174, gUnknown_84594B0[trainerCard->rse.stars]); + StringCopy(uroom->field_174, gTexts_UR_CardColor[trainerCard->rse.stars]); DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, uroom->field_174); ConvertIntToDecimalStringN(uroom->trainerCardStrbufs[2], trainerCard->rse.caughtMonsCount, STR_CONV_MODE_LEFT_ALIGN, 3); @@ -4710,7 +4702,7 @@ static void ViewURoomPartnerTrainerCard(u8 *unused, struct UnkStruct_URoom * uro DynamicPlaceholderTextUtil_SetPlaceholderPtr(4, uroom->trainerCardStrbufs[3]); DynamicPlaceholderTextUtil_SetPlaceholderPtr(5, uroom->trainerCardStrbufs[4]); - DynamicPlaceholderTextUtil_ExpandPlaceholders(uroom->field_1A4, gUnknown_84594C4); + DynamicPlaceholderTextUtil_ExpandPlaceholders(uroom->field_1A4, gText_UR_TrainerCardInfoPage1); StringCopy(gStringVar4, uroom->field_1A4); n = trainerCard->rse.linkBattleWins; @@ -4738,17 +4730,17 @@ static void ViewURoomPartnerTrainerCard(u8 *unused, struct UnkStruct_URoom * uro DynamicPlaceholderTextUtil_SetPlaceholderPtr(i + 4, uroom->trainerCardStrbufs[i + 3]); } - DynamicPlaceholderTextUtil_ExpandPlaceholders(uroom->field_1A4, gUnknown_8459504); + DynamicPlaceholderTextUtil_ExpandPlaceholders(uroom->field_1A4, gText_UR_TrainerCardInfoPage2); StringAppend(gStringVar4, uroom->field_1A4); if (parent_child == MODE_PARENT) { - DynamicPlaceholderTextUtil_ExpandPlaceholders(uroom->field_1A4, gUnknown_8459588); + DynamicPlaceholderTextUtil_ExpandPlaceholders(uroom->field_1A4, gText_UR_FinishedCheckingPlayersTrainerCard); StringAppend(gStringVar4, uroom->field_1A4); } else if (parent_child == MODE_CHILD) { - DynamicPlaceholderTextUtil_ExpandPlaceholders(uroom->field_1A4, gUnknown_8459580[trainerCard->rse.gender]); + DynamicPlaceholderTextUtil_ExpandPlaceholders(uroom->field_1A4, gTexts_UR_GladToMeetYou[trainerCard->rse.gender]); StringAppend(gStringVar4, uroom->field_1A4); } } diff --git a/src/union_room_message.c b/src/union_room_message.c index ad0737962..16b0fc632 100644 --- a/src/union_room_message.c +++ b/src/union_room_message.c @@ -1,46 +1,47 @@ #include "global.h" +#include "link_rfu.h" #include "mevent_server.h" #include "constants/union_room.h" -ALIGNED(4) const u8 gUnionRoomActivity_Blank[] = _(""); -ALIGNED(4) const u8 gUnknown_84571B0[] = _(":"); -ALIGNED(4) const u8 gUnknown_84571B4[] = _("{ID}"); -ALIGNED(4) const u8 gUnknown_84571B8[] = _("Please start over from the beginning."); -ALIGNED(4) const u8 gUnknown_84571E0[] = _("The WIRELESS COMMUNICATION\nSYSTEM search has been canceled."); -ALIGNED(4) static const u8 gUnref_845721C[] = _("ともだちからの れんらくを\nまっています"); -ALIGNED(4) const u8 gUnknown_8457234[] = _("{STR_VAR_1}! Awaiting\ncommunication from another player."); -ALIGNED(4) const u8 gUnknown_8457264[] = _("{STR_VAR_1}! Awaiting link!\nPress START when everyone's ready."); +ALIGNED(4) const u8 gText_UR_EmptyString[] = _(""); +ALIGNED(4) const u8 gText_UR_Colon[] = _(":"); +ALIGNED(4) const u8 gText_UR_ID[] = _("{ID}"); +ALIGNED(4) const u8 gText_UR_PleaseStartOver[] = _("Please start over from the beginning."); +ALIGNED(4) const u8 gText_UR_WirelessSearchCanceled[] = _("The WIRELESS COMMUNICATION\nSYSTEM search has been canceled."); +ALIGNED(4) static const u8 sText_AwaitingCommunucation2[] = _("ともだちからの れんらくを\nまっています"); +ALIGNED(4) const u8 gText_UR_AwaitingCommunication[] = _("{STR_VAR_1}! Awaiting\ncommunication from another player."); +ALIGNED(4) const u8 gText_UR_AwaitingLinkPressStart[] = _("{STR_VAR_1}! Awaiting link!\nPress START when everyone's ready."); -ALIGNED(4) static const u8 sJPText_SingleBattle[] = _("シングルバトルを かいさいする"); -ALIGNED(4) static const u8 sJPText_DoubleBattle[] = _("ダブルバトルを かいさいする"); -ALIGNED(4) static const u8 sJPText_MultiBattle[] = _("マルチバトルを かいさいする"); -ALIGNED(4) static const u8 sJPText_TradePokemon[] = _("ポケモンこうかんを かいさいする"); -ALIGNED(4) static const u8 sJPText_Chat[] = _("チャットを かいさいする"); -ALIGNED(4) static const u8 sJPText_DistWonderCard[] = _("ふしぎなカードをくばる"); -ALIGNED(4) static const u8 sJPText_DistWonderNews[] = _("ふしぎなニュースをくばる"); -ALIGNED(4) static const u8 sJPText_DistMysteryEvent[] = _("ふしぎなできごとを かいさいする"); -ALIGNED(4) static const u8 sJPText_HoldPokemonJump[] = _("なわとびを かいさいする"); -ALIGNED(4) static const u8 sJPText_HoldBerryCrush[] = _("きのみマッシャーを かいさいする"); -ALIGNED(4) static const u8 sJPText_HoldBerryPicking[] = _("きのみどりを かいさいする"); -ALIGNED(4) static const u8 sJPText_HoldSpinTrade[] = _("ぐるぐるこうかんを かいさいする"); -ALIGNED(4) static const u8 sJPText_HoldSpinShop[] = _("ぐるぐるショップを かいさいする"); +ALIGNED(4) static const u8 sText_SingleBattle[] = _("シングルバトルを かいさいする"); +ALIGNED(4) static const u8 sText_DoubleBattle[] = _("ダブルバトルを かいさいする"); +ALIGNED(4) static const u8 sText_MultiBattle[] = _("マルチバトルを かいさいする"); +ALIGNED(4) static const u8 sText_TradePokemon[] = _("ポケモンこうかんを かいさいする"); +ALIGNED(4) static const u8 sText_Chat[] = _("チャットを かいさいする"); +ALIGNED(4) static const u8 sText_DistWonderCard[] = _("ふしぎなカードをくばる"); +ALIGNED(4) static const u8 sText_DistWonderNews[] = _("ふしぎなニュースをくばる"); +ALIGNED(4) static const u8 sText_DistMysteryEvent[] = _("ふしぎなできごとを かいさいする"); +ALIGNED(4) static const u8 sText_HoldPokemonJump[] = _("なわとびを かいさいする"); +ALIGNED(4) static const u8 sText_HoldBerryCrush[] = _("きのみマッシャーを かいさいする"); +ALIGNED(4) static const u8 sText_HoldBerryPicking[] = _("きのみどりを かいさいする"); +ALIGNED(4) static const u8 sText_HoldSpinTrade[] = _("ぐるぐるこうかんを かいさいする"); +ALIGNED(4) static const u8 sText_HoldSpinShop[] = _("ぐるぐるショップを かいさいする"); // Unused -static const u8 *const sJPLinkGroupActionTexts[] = { - sJPText_SingleBattle, - sJPText_DoubleBattle, - sJPText_MultiBattle, - sJPText_TradePokemon, - sJPText_Chat, - sJPText_DistWonderCard, - sJPText_DistWonderNews, - sJPText_DistWonderCard, - sJPText_HoldPokemonJump, - sJPText_HoldBerryCrush, - sJPText_HoldBerryPicking, - sJPText_HoldBerryPicking, - sJPText_HoldSpinTrade, - sJPText_HoldSpinShop +static const u8 *const sLinkGroupActionTexts[] = { + sText_SingleBattle, + sText_DoubleBattle, + sText_MultiBattle, + sText_TradePokemon, + sText_Chat, + sText_DistWonderCard, + sText_DistWonderNews, + sText_DistWonderCard, + sText_HoldPokemonJump, + sText_HoldBerryCrush, + sText_HoldBerryPicking, + sText_HoldBerryPicking, + sText_HoldSpinTrade, + sText_HoldSpinShop }; static const u8 sText_1PlayerNeeded[] = _("1 player\nneeded."); @@ -52,7 +53,7 @@ static const u8 sText_3PlayerMode[] = _("3-PLAYER\nMODE"); static const u8 sText_4PlayerMode[] = _("4-PLAYER\nMODE"); static const u8 sText_5PlayerMode[] = _("5-PLAYER\nMODE"); -const u8 *const gUnknown_845742C[][5] = { +const u8 *const gTexts_UR_PlayersNeededOrMode[][5] = { { // 2 players required sText_1PlayerNeeded, sText_2PlayerMode @@ -79,70 +80,69 @@ const u8 *const gUnknown_845742C[][5] = { } }; -ALIGNED(4) const u8 gUnknown_845747C[] = _("{B_BUTTON}CANCEL"); -ALIGNED(4) static const u8 sJPText_SearchingForParticipants[] = _("ため\nさんかしゃ ぼしゅうちゅう です！"); -ALIGNED(4) const u8 gUnknown_84574A0[] = _("{STR_VAR_2} contacted you for\n{STR_VAR_1}. Accept?"); -ALIGNED(4) const u8 gUnknown_84574C4[] = _("{STR_VAR_2} contacted you.\nWill you share {STR_VAR_1}?"); -ALIGNED(4) const u8 gUnknown_84574EC[] = _("{STR_VAR_2} contacted you.\nAdd to the members?"); -ALIGNED(4) const u8 gUnknown_8457514[] = _("{STR_VAR_1}!\nAre these members OK?"); -ALIGNED(4) const u8 gUnknown_8457530[] = _("Cancel {STR_VAR_1} MODE\nwith these members?"); -ALIGNED(4) const u8 gUnknown_8457554[] = _("An “OK” was sent\nto {STR_VAR_1}."); +ALIGNED(4) const u8 gText_UR_BButtonCancel[] = _("{B_BUTTON}CANCEL"); +ALIGNED(4) static const u8 sText_SearchingForParticipants[] = _("ため\nさんかしゃ ぼしゅうちゅう です！"); +ALIGNED(4) const u8 gText_UR_PlayerContactedYouForXAccept[] = _("{STR_VAR_2} contacted you for\n{STR_VAR_1}. Accept?"); +ALIGNED(4) const u8 gText_UR_PlayerContactedYouShareX[] = _("{STR_VAR_2} contacted you.\nWill you share {STR_VAR_1}?"); +ALIGNED(4) const u8 gText_UR_PlayerContactedYouAddToMembers[] = _("{STR_VAR_2} contacted you.\nAdd to the members?"); +ALIGNED(4) const u8 gText_UR_AreTheseMembersOK[] = _("{STR_VAR_1}!\nAre these members OK?"); +ALIGNED(4) const u8 gText_UR_CancelModeWithTheseMembers[] = _("Cancel {STR_VAR_1} MODE\nwith these members?"); +ALIGNED(4) const u8 gText_UR_AnOKWasSentToPlayer[] = _("An “OK” was sent\nto {STR_VAR_1}."); ALIGNED(4) static const u8 sText_OtherTrainerUnavailableNow[] = _("The other TRAINER doesn't appear\nto be available now…\p"); ALIGNED(4) static const u8 sText_CantTransmitTrainerTooFar[] = _("You can't transmit with a TRAINER\nwho is too far away.\p"); ALIGNED(4) static const u8 sText_TrainersNotReadyYet[] = _("The other TRAINER(S) is/are not\nready yet.\p"); -const u8 *const gUnknown_8457608[] = { +const u8 *const gTexts_UR_CantTransmitToTrainer[] = { sText_CantTransmitTrainerTooFar, sText_TrainersNotReadyYet }; -ALIGNED(4) const u8 gUnknown_8457610[] = _("The {STR_VAR_1} MODE with\nthese members will be canceled.{PAUSE 90}"); +ALIGNED(4) const u8 gText_UR_ModeWithTheseMembersWillBeCanceled[] = _("The {STR_VAR_1} MODE with\nthese members will be canceled.{PAUSE 90}"); ALIGNED(4) static const u8 sText_MemberNoLongerAvailable[] = _("There is a member who can no\nlonger remain available.\p"); -const u8 *const gUnknown_845767C[] = { +const u8 *const gTexts_UR_PlayerUnavailable[] = { sText_OtherTrainerUnavailableNow, sText_MemberNoLongerAvailable }; ALIGNED(4) static const u8 sText_TrainerAppearsUnavailable[] = _("The other TRAINER appears\nunavailable…\p"); -ALIGNED(4) const u8 gUnknown_84576AC[] = _("{STR_VAR_1} sent back an “OK”!"); -ALIGNED(4) const u8 gUnknown_84576C4[] = _("{STR_VAR_1} OK'd your registration as\na member."); +ALIGNED(4) const u8 gText_UR_PlayerSentBackOK[] = _("{STR_VAR_1} sent back an “OK”!"); +ALIGNED(4) const u8 gText_UR_PlayerOKdRegistration[] = _("{STR_VAR_1} OK'd your registration as\na member."); ALIGNED(4) static const u8 sText_PlayerRepliedNo[] = _("{STR_VAR_1} replied, “No…”\p"); -ALIGNED(4) const u8 gUnknown_8457700[] = _("{STR_VAR_1}!\nAwaiting other members!"); -ALIGNED(4) const u8 gUnknown_845771C[] = _("Quit being a member?"); +ALIGNED(4) const u8 gText_UR_AwaitingOtherMembers[] = _("{STR_VAR_1}!\nAwaiting other members!"); +ALIGNED(4) const u8 gText_UR_QuitBeingMember[] = _("Quit being a member?"); ALIGNED(4) static const u8 sText_StoppedBeingMember[] = _("You stopped being a member.\p"); -const u8 *const gUnknown_8457754[] = { - NULL, - sText_MemberNoLongerAvailable, - sText_TrainerAppearsUnavailable, - NULL, - NULL, - NULL, - sText_PlayerRepliedNo, - NULL, - NULL, - sText_StoppedBeingMember +const u8 *const gTexts_UR_PlayerDisconnected[] = { + [RFU_STATUS_OK] = NULL, + [RFU_STATUS_FATAL_ERROR] = sText_MemberNoLongerAvailable, + [RFU_STATUS_CONNECTION_ERROR] = sText_TrainerAppearsUnavailable, + [RFU_STATUS_CHILD_SEND_COMPLETE] = NULL, + [RFU_STATUS_NEW_CHILD_DETECTED] = NULL, + [RFU_STATUS_JOIN_GROUP_OK] = NULL, + [RFU_STATUS_JOIN_GROUP_NO] = sText_PlayerRepliedNo, + [RFU_STATUS_WAIT_ACK_JOIN_GROUP] = NULL, + [RFU_STATUS_LEAVE_GROUP_NOTICE] = NULL, + [RFU_STATUS_LEAVE_GROUP] = sText_StoppedBeingMember }; -ALIGNED(4) const u8 gUnknown_845777C[] = _("The WIRELESS COMMUNICATION\nSYSTEM link has been established."); -ALIGNED(4) const u8 gUnknown_84577BC[] = _("The WIRELESS COMMUNICATION\nSYSTEM link has been dropped…"); - -ALIGNED(4) const u8 gUnknown_84577F8[] = _("The link with your friend has been\ndropped…"); +ALIGNED(4) const u8 gText_UR_WirelessLinkEstablished[] = _("The WIRELESS COMMUNICATION\nSYSTEM link has been established."); +ALIGNED(4) const u8 gText_UR_WirelessLinkDropped[] = _("The WIRELESS COMMUNICATION\nSYSTEM link has been dropped…"); +ALIGNED(4) const u8 gText_UR_LinkWithFriendDropped[] = _("The link with your friend has been\ndropped…"); ALIGNED(4) static const u8 sText_PlayerRepliedNo2[] = _("{STR_VAR_1} replied, “No…”"); -const u8 *const gUnknown_8457838[] = { - NULL, - gUnknown_84577F8, - gUnknown_84577F8, - NULL, - NULL, - NULL, - sText_PlayerRepliedNo2, - NULL, - NULL, - NULL +const u8 *const gTexts_UR_LinkDropped[] = { + [RFU_STATUS_OK] = NULL, + [RFU_STATUS_FATAL_ERROR] = gText_UR_LinkWithFriendDropped, + [RFU_STATUS_CONNECTION_ERROR] = gText_UR_LinkWithFriendDropped, + [RFU_STATUS_CHILD_SEND_COMPLETE] = NULL, + [RFU_STATUS_NEW_CHILD_DETECTED] = NULL, + [RFU_STATUS_JOIN_GROUP_OK] = NULL, + [RFU_STATUS_JOIN_GROUP_NO] = sText_PlayerRepliedNo2, + [RFU_STATUS_WAIT_ACK_JOIN_GROUP] = NULL, + [RFU_STATUS_LEAVE_GROUP_NOTICE] = NULL, + [RFU_STATUS_LEAVE_GROUP] = NULL }; ALIGNED(4) static const u8 sText_DoYouWantXMode[] = _("Do you want the {STR_VAR_2}\nMODE?"); @@ -155,13 +155,13 @@ static const u8 *const sDoYouWantModeTexts[] = { }; ALIGNED(4) static const u8 sText_CommunicatingPleaseWait[] = _("はなしかけています…\nしょうしょう おまちください"); // Unused -ALIGNED(4) const u8 gUnknown_84578BC[] = _("Awaiting {STR_VAR_1}'s response about\nthe trade…"); +ALIGNED(4) const u8 gText_UR_AwaitingPlayersResponseAboutTrade[] = _("Awaiting {STR_VAR_1}'s response about\nthe trade…"); ALIGNED(4) static const u8 sText_Communicating[] = _("Communicating{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.\n{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}."); ALIGNED(4) static const u8 sText_CommunicatingWithPlayer[] = _("Communicating with {STR_VAR_1}{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.\n{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}."); ALIGNED(4) static const u8 sText_PleaseWaitAWhile[] = _("Please wait a while{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.\n{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}."); -const u8 *const gURText_PleaseWaitMsgs[] = { +const u8 *const gTexts_UR_CommunicatingWait[] = { sText_Communicating, sText_CommunicatingWithPlayer, sText_PleaseWaitAWhile @@ -172,7 +172,7 @@ ALIGNED(4) static const u8 sText_HiDoSomethingFemale[] = _("Hello!\nWould you li ALIGNED(4) static const u8 sText_HiDoSomethingAgainMale[] = _("{STR_VAR_1}: Hiya, we meet again!\nWhat are you up for this time?"); ALIGNED(4) static const u8 sText_HiDoSomethingAgainFemale[] = _("{STR_VAR_1}: Oh! {PLAYER}, hello!\nWould you like to do something?"); -const u8 *const gURText_FriendPromptsForActivity[][2] = { +const u8 *const gTexts_UR_HiDoSomething[][2] = { { sText_HiDoSomethingMale, sText_HiDoSomethingFemale @@ -198,7 +198,7 @@ static const u8 *const sDoSomethingTexts[] = { ALIGNED(4) static const u8 sText_SomebodyHasContactedYou[] = _("Somebody has contacted you.{PAUSE 60}"); ALIGNED(4) static const u8 sText_PlayerHasContactedYou[] = _("{STR_VAR_1} has contacted you.{PAUSE 60}"); -const u8 *const gUnknown_8457BCC[] = { +const u8 *const gTexts_UR_PlayerContactedYou[] = { sText_SomebodyHasContactedYou, sText_PlayerHasContactedYou }; @@ -206,29 +206,29 @@ const u8 *const gUnknown_8457BCC[] = { ALIGNED(4) static const u8 sText_AwaitingResponseFromTrainer[] = _("Awaiting a response from\nthe other TRAINER…"); ALIGNED(4) static const u8 sText_AwaitingResponseFromPlayer[] = _("Awaiting a response from\n{STR_VAR_1}…"); -const u8 *const gUnknown_8457C20[] = { +const u8 *const gTexts_UR_AwaitingResponse[] = { sText_AwaitingResponseFromTrainer, sText_AwaitingResponseFromPlayer }; -ALIGNED(4) static const u8 gUnknown_8457C28[] = _("あいての ていあんを まっています\nビーボタンで キャンセル"); +ALIGNED(4) static const u8 sText_AwaitingResponseCancelBButton[] = _("あいての ていあんを まっています\nビーボタンで キャンセル"); -ALIGNED(4) const u8 gUnknown_8457C48[] = _("The other TRAINER showed\nyou their TRAINER CARD.\pWould you like to show your\nTRAINER CARD?"); -ALIGNED(4) const u8 gUnknown_8457CA4[] = _("The other TRAINER challenges you\nto battle.\pWill you accept the battle\nchallenge?"); -ALIGNED(4) const u8 gUnknown_8457CF8[] = _("The other TRAINER invites you\nto chat.\pWill you accept the chat\ninvitation?"); -ALIGNED(4) const u8 gUnknown_8457D44[] = _("There is an offer to trade your\nregistered Lv. {DYNAMIC 0} {DYNAMIC 1}\pin exchange for a\nLv. {DYNAMIC 2} {DYNAMIC 3}.\pWill you accept this trade\noffer?"); -ALIGNED(4) const u8 gUnknown_8457DB8[] = _("There is an offer to trade your\nregistered EGG.\lWill you accept this trade offer?"); -ALIGNED(4) const u8 gUnknown_8457E0C[] = _("The chat has been dropped.\p"); -ALIGNED(4) const u8 gUnknown_8457E28[] = _("You declined the offer.\p"); -ALIGNED(4) const u8 gUnknown_8457E44[] = _("You declined the offer.\p"); -ALIGNED(4) const u8 gUnknown_8457E60[] = _("The chat was ended.\p"); +ALIGNED(4) const u8 gText_UR_ShowTrainerCard[] = _("The other TRAINER showed\nyou their TRAINER CARD.\pWould you like to show your\nTRAINER CARD?"); +ALIGNED(4) const u8 gText_UR_BattleChallenge[] = _("The other TRAINER challenges you\nto battle.\pWill you accept the battle\nchallenge?"); +ALIGNED(4) const u8 gText_UR_ChatInvitation[] = _("The other TRAINER invites you\nto chat.\pWill you accept the chat\ninvitation?"); +ALIGNED(4) const u8 gText_UR_OfferToTradeMon[] = _("There is an offer to trade your\nregistered Lv. {DYNAMIC 0} {DYNAMIC 1}\pin exchange for a\nLv. {DYNAMIC 2} {DYNAMIC 3}.\pWill you accept this trade\noffer?"); +ALIGNED(4) const u8 gText_UR_OfferToTradeEgg[] = _("There is an offer to trade your\nregistered EGG.\lWill you accept this trade offer?"); +ALIGNED(4) const u8 gText_UR_ChatDropped[] = _("The chat has been dropped.\p"); +ALIGNED(4) const u8 gText_UR_OfferDeclined1[] = _("You declined the offer.\p"); +ALIGNED(4) const u8 gText_UR_OfferDeclined2[] = _("You declined the offer.\p"); +ALIGNED(4) const u8 gText_UR_ChatEnded[] = _("The chat was ended.\p"); // Unused static const u8 *const sInvitationTexts[] = { - gUnknown_8457C48, - gUnknown_8457CA4, - gUnknown_8457CF8, - gUnknown_8457D44 + gText_UR_ShowTrainerCard, + gText_UR_BattleChallenge, + gText_UR_ChatInvitation, + gText_UR_OfferToTradeMon }; ALIGNED(4) static const u8 sText_JoinChatMale[] = _("Oh, hey! We're in a chat right now.\nWant to join us?"); @@ -236,7 +236,7 @@ ALIGNED(4) static const u8 sText_PlayerJoinChatMale[] = _("{STR_VAR_1}: Hey, {PL ALIGNED(4) static const u8 sText_JoinChatFemale[] = _("Oh, hi! We're having a chat now.\nWould you like to join us?"); ALIGNED(4) static const u8 sText_PlayerJoinChatFemale[] = _("{STR_VAR_1}: Oh, hi, {PLAYER}!\nWe're having a chat now.\lWould you like to join us?"); -const u8 *const gUnknown_8457F80[][2] = { +const u8 *const gTexts_UR_JoinChat[GENDER_COUNT][2] = { { sText_JoinChatMale, sText_JoinChatFemale @@ -246,7 +246,7 @@ const u8 *const gUnknown_8457F80[][2] = { } }; -ALIGNED(4) const u8 gUnknown_8457F90[] = _("……\nThe TRAINER appears to be busy…\p"); +ALIGNED(4) const u8 gText_UR_TrainerAppearsBusy[] = _("……\nThe TRAINER appears to be busy…\p"); ALIGNED(4) static const u8 sText_WaitForBattleMale[] = _("A battle, huh?\nAll right, just give me some time."); ALIGNED(4) static const u8 sText_WaitForChatMale[] = _("You want to chat, huh?\nSure, just wait a little."); ALIGNED(4) static const u8 sText_ShowTrainerCardMale[] = _("Sure thing! As my “Greetings,”\nhere's my TRAINER CARD."); @@ -254,7 +254,7 @@ ALIGNED(4) static const u8 sText_WaitForBattleFemale[] = _("A battle? Of course, ALIGNED(4) static const u8 sText_WaitForChatFemale[] = _("Did you want to chat?\nOkay, but please wait a moment."); ALIGNED(4) static const u8 sText_ShowTrainerCardFemale[] = _("As my introduction, I'll show you\nmy TRAINER CARD."); -const u8 *const gResponseToURoomActivityInviteStringPtrs[][4] = { +const u8 *const gTexts_UR_WaitOrShowCard[GENDER_COUNT][4] = { { sText_WaitForBattleMale, sText_WaitForChatMale, @@ -277,7 +277,7 @@ ALIGNED(4) static const u8 sText_TradeWillBeStarted[] = _("The trade will be sta ALIGNED(4) static const u8 sText_BattleWillBeStarted[] = _("The battle will be started.{PAUSE 60}"); ALIGNED(4) static const u8 sText_EnteringChat[] = _("Entering the chat…{PAUSE 60}"); -const u8 *const gUnknown_8458230[][2][3] = { +const u8 *const gTexts_UR_StartActivity[][GENDER_COUNT][3] = { { { sText_BattleWillBeStarted, @@ -304,7 +304,7 @@ const u8 *const gUnknown_8458230[][2][3] = { ALIGNED(4) static const u8 sText_BattleDeclinedMale[] = _("Sorry! My POKéMON don't seem to\nbe feeling too well right now.\lLet me battle you another time.\p"); ALIGNED(4) static const u8 sText_BattleDeclinedFemale[] = _("I'm terribly sorry, but my POKéMON\naren't feeling well…\pLet's battle another time.\p"); -const u8 *const gUnknown_8458314[] = { +const u8 *const gTexts_UR_BattleDeclined[GENDER_COUNT] = { sText_BattleDeclinedMale, sText_BattleDeclinedFemale }; @@ -312,7 +312,7 @@ const u8 *const gUnknown_8458314[] = { ALIGNED(4) static const u8 sText_ShowTrainerCardDeclinedMale[] = _("Huh? My TRAINER CARD…\nWhere'd it go now?\lSorry! I'll show you another time!\p"); ALIGNED(4) static const u8 sText_ShowTrainerCardDeclinedFemale[] = _("Oh? Now where did I put my\nTRAINER CARD?…\lSorry! I'll show you later!\p"); -const u8 *const gUnknown_84583B4[] = { +const u8 *const gTexts_UR_ShowTrainerCardDeclined[GENDER_COUNT] = { sText_ShowTrainerCardDeclinedMale, sText_ShowTrainerCardDeclinedFemale }; @@ -320,20 +320,20 @@ const u8 *const gUnknown_84583B4[] = { ALIGNED(4) static const u8 sText_IfYouWantToDoSomethingMale[] = _("If you want to do something with\nme, just give me a shout!\p"); ALIGNED(4) static const u8 sText_IfYouWantToDoSomethingFemale[] = _("If you want to do something with\nme, don't be shy.\p"); -const u8 *const gUnknown_845842C[] = { +const u8 *const gTexts_UR_IfYouWantToDoSomething[GENDER_COUNT] = { sText_IfYouWantToDoSomethingMale, sText_IfYouWantToDoSomethingFemale }; -ALIGNED(4) const u8 gUnknown_8458434[] = _("Whoops! Sorry, but I have to do\nsomething else.\lAnother time, okay?\p"); -ALIGNED(4) const u8 gUnknown_845847C[] = _("If you want to battle, you need\ntwo POKéMON that are below\lLv. 30.\p"); -ALIGNED(4) const u8 gUnknown_84584C0[] = _("For a battle, you need two\nPOKéMON that are below Lv. 30.\p"); +ALIGNED(4) const u8 gText_UR_TrainerBattleBusy[] = _("Whoops! Sorry, but I have to do\nsomething else.\lAnother time, okay?\p"); +ALIGNED(4) const u8 gText_UR_NeedTwoMonsOfLevel30OrLower1[] = _("If you want to battle, you need\ntwo POKéMON that are below\lLv. 30.\p"); +ALIGNED(4) const u8 gText_UR_NeedTwoMonsOfLevel30OrLower2[] = _("For a battle, you need two\nPOKéMON that are below Lv. 30.\p"); ALIGNED(4) static const u8 sText_DeclineChatMale[] = _("Oh, all right.\nCome see me anytime, okay?\p"); ALIGNED(4) static const u8 stext_DeclineChatFemale[] = _("Oh…\nPlease come by anytime.\p"); // Response from partner when player declines chat -const u8 *const gUnknown_8458548[] = { +const u8 *const gTexts_UR_DeclineChat[GENDER_COUNT] = { sText_DeclineChatMale, stext_DeclineChatFemale }; @@ -342,7 +342,7 @@ ALIGNED(4) static const u8 sText_ChatDeclinedMale[] = _("Oh, sorry!\nI just can' ALIGNED(4) static const u8 sText_ChatDeclinedFemale[] = _("Oh, I'm sorry.\nI have too much to do right now.\lLet's chat some other time.\p"); // Response from partner when they decline chat -const u8 *const gUnknown_84585E8[] = { +const u8 *const gTexts_UR_ChatDeclined[GENDER_COUNT] = { sText_ChatDeclinedMale, sText_ChatDeclinedFemale }; @@ -356,7 +356,7 @@ ALIGNED(4) static const u8 sText_UsedGoodMoveFemale[] = _("That's it!\nThis is t ALIGNED(4) static const u8 sText_BattleSurpriseFemale[] = _("That's awesome!\nYou can battle that way?\p"); ALIGNED(4) static const u8 sText_SwitchedMonsFemale[] = _("You have exquisite timing for\nswitching POKéMON!\p"); -const u8 *const gUnknown_8458758[][4] = { +const u8 *const gTexts_UR_BattleReaction[GENDER_COUNT][4] = { { sText_YoureToughMale, sText_UsedGoodMoveMale, @@ -379,7 +379,7 @@ ALIGNED(4) static const u8 sText_ThatsFunnyFemale[] = _("Ahaha!\nWhat is that ab ALIGNED(4) static const u8 sText_RandomChatFemale1[] = _("Yes, that's exactly it!\nThat's what I meant.\p"); ALIGNED(4) static const u8 sText_RandomChatFemale2[] = _("In other words…\nYes! That's right!\p"); -const u8 *const gUnknown_84588BC[][4] = { +const u8 *const gTexts_UR_ChatReaction[GENDER_COUNT][4] = { { sText_LearnedSomethingMale, sText_ThatsFunnyMale, @@ -398,7 +398,7 @@ ALIGNED(4) static const u8 sText_ShowedTrainerCardMale2[] = _("I hope I get to k ALIGNED(4) static const u8 sText_ShowedTrainerCardFemale1[] = _("We're showing each other our\nTRAINER CARDS to get acquainted.\p"); ALIGNED(4) static const u8 sText_ShowedTrainerCardFemale2[] = _("Glad to meet you.\nPlease don't be a stranger!\p"); -const u8 *const gUnknown_84589AC[][2] = { +const u8 *const gTexts_UR_TrainerCardReaction[GENDER_COUNT][2] = { { sText_ShowedTrainerCardMale1, sText_ShowedTrainerCardMale2 @@ -413,7 +413,7 @@ ALIGNED(4) static const u8 sText_MaleTraded2[] = _("Finally, a trade got me that ALIGNED(4) static const u8 sText_FemaleTraded1[] = _("I'm trading POKéMON right now.\p"); ALIGNED(4) static const u8 sText_FemaleTraded2[] = _("I finally got that POKéMON I\nwanted in a trade!\p"); -const u8 *const gUnknown_8458A78[][4] = { +const u8 *const gTexts_UR_TradeReaction[GENDER_COUNT][4] = { { sText_MaleTraded1, sText_MaleTraded2 @@ -423,36 +423,36 @@ const u8 *const gUnknown_8458A78[][4] = { } }; -const u8 gUnknown_8458A98[] = _("{STR_VAR_1} checked the\nTRADING BOARD.\p"); -ALIGNED(4) const u8 gUnknown_8458AB8[] = _("Welcome to the TRADING BOARD.\pYou may register your POKéMON\nand offer it up for a trade.\pWould you like to register one of\nyour POKéMON?"); -ALIGNED(4) const u8 gUnknown_8458B44[] = _("This TRADING BOARD is used for\n" - "offering a POKéMON for a trade.\p" - "All you need to do is register a\n" - "POKéMON for a trade.\p" - "Another TRAINER may offer a party\n" - "POKéMON in return for the trade.\p" - "We hope you will register POKéMON\n" - "and trade them with many, many\l" - "other TRAINERS.\p" - "Would you like to register one of\n" - "your POKéMON?"); +const u8 gText_UR_XCheckedTradingBoard[] = _("{STR_VAR_1} checked the\nTRADING BOARD.\p"); +ALIGNED(4) const u8 gText_UR_RegisterMonAtTradingBoard[] = _("Welcome to the TRADING BOARD.\pYou may register your POKéMON\nand offer it up for a trade.\pWould you like to register one of\nyour POKéMON?"); +ALIGNED(4) const u8 gText_UR_TradingBoardInfo[] = _("This TRADING BOARD is used for\n" + "offering a POKéMON for a trade.\p" + "All you need to do is register a\n" + "POKéMON for a trade.\p" + "Another TRAINER may offer a party\n" + "POKéMON in return for the trade.\p" + "We hope you will register POKéMON\n" + "and trade them with many, many\l" + "other TRAINERS.\p" + "Would you like to register one of\n" + "your POKéMON?"); ALIGNED(4) static const u8 sText_ThankYouForRegistering[] = _("こうかんけいじばん の とうろくが\nかんりょう しました\pごりよう ありがとう\nございました！\p"); ALIGNED(4) static const u8 sText_NobodyHasRegistered[] = _("けいじばんに だれも ポケモンを\nとうろく していません\p\n"); -ALIGNED(4) const u8 gURText_PleaseChooseTypeOfMon[] = _("Please choose the type of POKéMON\nthat you would like in the trade.\n"); -ALIGNED(4) const u8 gUnknown_8458D1C[] = _("Which of your party POKéMON will\nyou offer in trade?\p"); -ALIGNED(4) const u8 gUnknown_8458D54[] = _("Registration has been canceled.\p"); -ALIGNED(4) const u8 gUnknown_8458D78[] = _("Registration has been completed.\p"); -ALIGNED(4) const u8 gUnknown_8458D9C[] = _("The trade has been canceled.\p"); -ALIGNED(4) const u8 gUnknown_8458DBC[] = _("Cancel the registration of your\nLv. {STR_VAR_2} {STR_VAR_1}?"); -ALIGNED(4) const u8 gUnknown_8458DE8[] = _("Cancel the registration of your\nEGG?"); -ALIGNED(4) const u8 gUnknown_8458E10[] = _("The registration has been canceled.\p"); +ALIGNED(4) const u8 gText_UR_ChooseRequestedMonType[] = _("Please choose the type of POKéMON\nthat you would like in the trade.\n"); +ALIGNED(4) const u8 gText_UR_WhichMonWillYouOffer[] = _("Which of your party POKéMON will\nyou offer in trade?\p"); +ALIGNED(4) const u8 gText_UR_RegistrationCanceled[] = _("Registration has been canceled.\p"); +ALIGNED(4) const u8 gText_UR_RegistraionCompleted[] = _("Registration has been completed.\p"); +ALIGNED(4) const u8 gText_UR_TradeCanceled[] = _("The trade has been canceled.\p"); +ALIGNED(4) const u8 gText_UR_CancelRegistrationOfMon[] = _("Cancel the registration of your\nLv. {STR_VAR_2} {STR_VAR_1}?"); +ALIGNED(4) const u8 gText_UR_CancelRegistrationOfEgg[] = _("Cancel the registration of your\nEGG?"); +ALIGNED(4) const u8 gText_UR_RegistrationCanceled2[] = _("The registration has been canceled.\p"); ALIGNED(4) static const u8 sText_TradeTrainersWillBeListed[] = _("こうかんを きぼうしているひとを\nひょうじします"); ALIGNED(4) static const u8 sText_ChooseTrainerToTradeWith2[] = _("こうかん したい トレーナーを\nえらんで ください"); -ALIGNED(4) const u8 gUnknown_8458E70[] = _("Would you like to ask {STR_VAR_1} to\nmake a trade?"); +ALIGNED(4) const u8 gText_UR_AskTrainerToMakeTrade[] = _("Would you like to ask {STR_VAR_1} to\nmake a trade?"); ALIGNED(4) static const u8 sText_AwaitingResponseFromTrainer2[] = _("……\nあいての へんじを まっています"); ALIGNED(4) static const u8 sText_NotRegisteredAMonForTrade[] = _("あなたが こうかんにだす\nポケモンが とうろくされていません\p"); -ALIGNED(4) const u8 gUnknown_8458ED0[] = _("You don't have a {STR_VAR_2}-type\nPOKéMON that {STR_VAR_1} wants.\p"); -ALIGNED(4) const u8 gUnknown_8458F04[] = _("You don't have an EGG that\n{STR_VAR_1} wants.\p"); +ALIGNED(4) const u8 gText_UR_DontHaveTypeTrainerWants[] = _("You don't have a {STR_VAR_2}-type\nPOKéMON that {STR_VAR_1} wants.\p"); +ALIGNED(4) const u8 gText_UR_DontHaveEggTrainerWants[] = _("You don't have an EGG that\n{STR_VAR_1} wants.\p"); ALIGNED(4) static const u8 sText_PlayerCantTradeForYourMon[] = _("{STR_VAR_1} can't make a trade for\nyour POKéMON right now.\p"); ALIGNED(4) static const u8 sText_CantTradeForPartnersMon[] = _("You can't make a trade for\n{STR_VAR_1}'s POKéMON right now.\p"); @@ -463,11 +463,10 @@ static const u8 *const sCantTradeMonTexts[] = { sText_CantTradeForPartnersMon }; -ALIGNED(4) const u8 gUnknown_8458F9C[] = _("Your trade offer was rejected.\p"); -ALIGNED(4) const u8 gText_EggTrade[] = _("EGG TRADE"); -ALIGNED(4) const u8 gUnknown_8458FC8[] = _("{DPAD_UPDOWN}CHOOSE {A_BUTTON}JOIN {B_BUTTON}CANCEL"); -ALIGNED(4) const u8 gUnknown_8458FE4[] = _("Please choose a TRAINER."); - +ALIGNED(4) const u8 gText_UR_TradeOfferRejected[] = _("Your trade offer was rejected.\p"); +ALIGNED(4) const u8 gText_UR_EggTrade[] = _("EGG TRADE"); +ALIGNED(4) const u8 gText_UR_ChooseJoinCancel[] = _("{DPAD_UPDOWN}CHOOSE {A_BUTTON}JOIN {B_BUTTON}CANCEL"); +ALIGNED(4) const u8 gText_UR_ChooseTrainer[] = _("Please choose a TRAINER."); ALIGNED(4) static const u8 sText_ChooseTrainerSingleBattle[] = _("Please choose a TRAINER for\na SINGLE BATTLE."); ALIGNED(4) static const u8 sText_ChooseTrainerDoubleBattle[] = _("Please choose a TRAINER for\na DOUBLE BATTLE."); ALIGNED(4) static const u8 sText_ChooseLeaderMultiBattle[] = _("Please choose the LEADER\nfor a MULTI BATTLE."); @@ -478,7 +477,7 @@ ALIGNED(4) static const u8 sText_ChooseLeaderPokemonJump[] = _("Jump with mini P ALIGNED(4) static const u8 sText_ChooseLeaderBerryCrush[] = _("BERRY CRUSH!\nPlease choose the LEADER."); ALIGNED(4) static const u8 sText_ChooseLeaderBerryPicking[] = _("DODRIO BERRY-PICKING!\nPlease choose the LEADER."); -const u8 *const gUnknown_84591B8[] = { +const u8 *const gTexts_UR_ChooseTrainer[] = { [LINK_GROUP_SINGLE_BATTLE] = sText_ChooseTrainerSingleBattle, [LINK_GROUP_DOUBLE_BATTLE] = sText_ChooseTrainerDoubleBattle, [LINK_GROUP_MULTI_BATTLE] = sText_ChooseLeaderMultiBattle, @@ -490,44 +489,44 @@ const u8 *const gUnknown_84591B8[] = { [LINK_GROUP_WONDER_NEWS] = sText_ChooseTrainerToShareWonderNews }; -ALIGNED(4) const u8 gUnknown_84591DC[] = _("Searching for a WIRELESS\nCOMMUNICATION SYSTEM. Wait..."); +ALIGNED(4) const u8 gText_UR_SearchingForWirelessSystemWait[] = _("Searching for a WIRELESS\nCOMMUNICATION SYSTEM. Wait..."); ALIGNED(4) static const u8 sText_MustHaveTwoMonsForDoubleBattle[] = _("ダブルバトルでは 2ひき いじょうの\nポケモンが ひつようです\p"); -ALIGNED(4) const u8 gUnknown_8459238[] = _("Awaiting {STR_VAR_1}'s response…"); -ALIGNED(4) const u8 gUnknown_8459250[] = _("{STR_VAR_1} has been asked to register\nyou as a member. Please wait."); -ALIGNED(4) const u8 gUnknown_845928C[] = _("Awaiting a response from the\nWIRELESS COMMUNICATION SYSTEM."); +ALIGNED(4) const u8 gText_UR_AwaitingPlayersResponse[] = _("Awaiting {STR_VAR_1}'s response…"); +ALIGNED(4) const u8 gText_UR_PlayerHasBeenAskedToRegisterYouPleaseWait[] = _("{STR_VAR_1} has been asked to register\nyou as a member. Please wait."); +ALIGNED(4) const u8 gText_UR_AwaitingResponseFromWirelessSystem[] = _("Awaiting a response from the\nWIRELESS COMMUNICATION SYSTEM."); ALIGNED(4) static const u8 sText_PleaseWaitForOtherTrainersToGather[] = _("ほかの さんかしゃが そろうまで\nしょうしょう おまちください"); ALIGNED(4) static const u8 sText_NoCardsSharedRightNow[] = _("No CARDS appear to be shared \nright now."); ALIGNED(4) static const u8 sText_NoNewsSharedRightNow[] = _("No NEWS appears to be shared\nright now."); -const u8 *const gUnknown_845933C[] = { +const u8 *const gTexts_UR_NoWonderShared[] = { sText_NoCardsSharedRightNow, sText_NoNewsSharedRightNow }; -ALIGNED(4) const u8 gUnknown_8459344[] = _("BATTLE"); -ALIGNED(4) const u8 gUnknown_845934C[] = _("CHAT"); -ALIGNED(4) const u8 gUnknown_8459354[] = _("GREETINGS"); -ALIGNED(4) const u8 gUnknown_8459360[] = _("EXIT"); +ALIGNED(4) const u8 gText_UR_Battle[] = _("BATTLE"); +ALIGNED(4) const u8 gText_UR_Chat2[] = _("CHAT"); +ALIGNED(4) const u8 gText_UR_Greetings[] = _("GREETINGS"); +ALIGNED(4) const u8 gText_UR_Exit[] = _("EXIT"); -ALIGNED(4) const u8 gUnknown_8459368[] = _("EXIT"); -ALIGNED(4) const u8 gUnknown_8459370[] = _("INFO"); -ALIGNED(4) const u8 gUnknown_8459378[] = _("NAME{CLEAR_TO 0x3C}WANTED{CLEAR_TO 0x6E}OFFER{CLEAR_TO 0xC6}LV."); +ALIGNED(4) const u8 gText_UR_Exit2[] = _("EXIT"); +ALIGNED(4) const u8 gText_UR_Info[] = _("INFO"); +ALIGNED(4) const u8 gText_UR_NameWantedOfferLv[] = _("NAME{CLEAR_TO 0x3C}WANTED{CLEAR_TO 0x6E}OFFER{CLEAR_TO 0xC6}LV."); -ALIGNED(4) const u8 gUnionRoomActivity_SingleBattle[] = _("SINGLE BATTLE"); -ALIGNED(4) const u8 gUnionRoomActivity_DoubleBattle[] = _("DOUBLE BATTLE"); -ALIGNED(4) const u8 gUnionRoomActivity_MultiBattle[] = _("MULTI BATTLE"); -ALIGNED(4) const u8 gUnionRoomActivity_PokemonTrades[] = _("POKéMON TRADES"); -ALIGNED(4) const u8 gUnionRoomActivity_Chat[] = _("CHAT"); -ALIGNED(4) const u8 gUnionRoomActivity_Cards[] = _("CARDS"); -ALIGNED(4) const u8 gUnionRoomActivity_WonderCards[] = _("WONDER CARDS"); -ALIGNED(4) const u8 gunionRoomActivity_WonderNews[] = _("WONDER NEWS"); -ALIGNED(4) const u8 gUnionRoomActivity_PokemonJump[] = _("POKéMON JUMP"); -ALIGNED(4) const u8 gUnionRoomActivity_BerryCrush[] = _("BERRY CRUSH"); -ALIGNED(4) const u8 gUnionRoomActivity_BerryPicking[] = _("BERRY-PICKING"); -ALIGNED(4) const u8 gUnionRoomActivity_Search[] = _("SEARCH"); -ALIGNED(4) const u8 gUnionRoomActivity_SpinTradeJP[] = _("ぐるぐるこうかん"); -ALIGNED(4) const u8 gUnionRoomActivity_ItemTradeJP[] = _("アイテムトレード"); +ALIGNED(4) const u8 gText_UR_SingleBattle[] = _("SINGLE BATTLE"); +ALIGNED(4) const u8 gText_UR_DoubleBattle[] = _("DOUBLE BATTLE"); +ALIGNED(4) const u8 gText_UR_MultiBattle[] = _("MULTI BATTLE"); +ALIGNED(4) const u8 gText_UR_PokemonTrades[] = _("POKéMON TRADES"); +ALIGNED(4) const u8 gText_UR_Chat[] = _("CHAT"); +ALIGNED(4) const u8 gText_UR_Cards[] = _("CARDS"); +ALIGNED(4) const u8 gText_UR_WonderCards[] = _("WONDER CARDS"); +ALIGNED(4) const u8 gText_UR_WonderNews[] = _("WONDER NEWS"); +ALIGNED(4) const u8 gText_UR_PokemonJump[] = _("POKéMON JUMP"); +ALIGNED(4) const u8 gText_UR_BerryCrush[] = _("BERRY CRUSH"); +ALIGNED(4) const u8 gText_UR_BerryPicking[] = _("BERRY-PICKING"); +ALIGNED(4) const u8 gText_UR_Search[] = _("SEARCH"); +ALIGNED(4) const u8 gText_UR_SpinTrade[] = _("ぐるぐるこうかん"); +ALIGNED(4) const u8 gText_UR_ItemTrade[] = _("アイテムトレード"); ALIGNED(4) static const u8 sText_ItsNormalCard[] = _("It's a NORMAL CARD."); ALIGNED(4) static const u8 sText_ItsBronzeCard[] = _("It's a BRONZE CARD!"); @@ -535,7 +534,7 @@ ALIGNED(4) static const u8 sText_ItsCopperCard[] = _("It's a COPPER CARD!"); ALIGNED(4) static const u8 sText_ItsSilverCard[] = _("It's a SILVER CARD!"); ALIGNED(4) static const u8 sText_ItsGoldCard[] = _("It's a GOLD CARD!"); -const u8 *const gUnknown_84594B0[] = { +const u8 *const gTexts_UR_CardColor[] = { sText_ItsNormalCard, sText_ItsBronzeCard, sText_ItsCopperCard, @@ -543,19 +542,18 @@ const u8 *const gUnknown_84594B0[] = { sText_ItsGoldCard }; -ALIGNED(4) const u8 gUnknown_84594C4[] = _("This is {SPECIAL_F7 0x00} {SPECIAL_F7 0x01}'s\nTRAINER CARD…\l{SPECIAL_F7 0x02}\pPOKéDEX: {SPECIAL_F7 0x03}\nTIME: {SPECIAL_F7 0x04}:{SPECIAL_F7 0x05}\p"); -ALIGNED(4) const u8 gUnknown_8459504[] = _("BATTLES: {SPECIAL_F7 0x00} WINS {SPECIAL_F7 0x02} LOSSES\nTRADES: {SPECIAL_F7 0x03} TIMES\p“{SPECIAL_F7 0x04} {SPECIAL_F7 0x05}\n{SPECIAL_F7 0x06} {SPECIAL_F7 0x07}”\p"); - +ALIGNED(4) const u8 gText_UR_TrainerCardInfoPage1[] = _("This is {SPECIAL_F7 0x00} {SPECIAL_F7 0x01}'s\nTRAINER CARD…\l{SPECIAL_F7 0x02}\pPOKéDEX: {SPECIAL_F7 0x03}\nTIME: {SPECIAL_F7 0x04}:{SPECIAL_F7 0x05}\p"); +ALIGNED(4) const u8 gText_UR_TrainerCardInfoPage2[] = _("BATTLES: {SPECIAL_F7 0x00} WINS {SPECIAL_F7 0x02} LOSSES\nTRADES: {SPECIAL_F7 0x03} TIMES\p“{SPECIAL_F7 0x04} {SPECIAL_F7 0x05}\n{SPECIAL_F7 0x06} {SPECIAL_F7 0x07}”\p"); ALIGNED(4) static const u8 sText_GladToMeetYouMale[] = _("{SPECIAL_F7 0x01}: Glad to have met you!{PAUSE 60}"); ALIGNED(4) static const u8 sText_GladToMeetYouFemale[] = _("{SPECIAL_F7 0x01}: Glad to meet you!{PAUSE 60}"); -const u8 *const gUnknown_8459580[] = { +const u8 *const gTexts_UR_GladToMeetYou[GENDER_COUNT] = { sText_GladToMeetYouMale, sText_GladToMeetYouFemale }; -ALIGNED(4) const u8 gUnknown_8459588[] = _("Finished checking {SPECIAL_F7 0x01}'s\nTRAINER CARD.{PAUSE 60}"); -ALIGNED(4) static const u8 gUnknown_84595B0[] = _("Canceled reading the Card."); +ALIGNED(4) const u8 gText_UR_FinishedCheckingPlayersTrainerCard[] = _("Finished checking {SPECIAL_F7 0x01}'s\nTRAINER CARD.{PAUSE 60}"); +ALIGNED(4) static const u8 sText_CanceledReadingCard[] = _("Canceled reading the Card."); const struct mevent_client_cmd gUnknown_84595CC[] = { CLI_RECEIVE(0x15), @@ -567,7 +565,7 @@ const struct mevent_client_cmd gUnknown_84595CC[] = { const struct mevent_server_cmd gMEventSrvScript_OtherTrainerCanceled[] = { SRV_SEND(0x20, gUnknown_84595CC), SRV_WAITSND, - SRV_SENDSTR(0x1b, gUnknown_84595B0), + SRV_SENDSTR(0x1b, sText_CanceledReadingCard), SRV_WAITSND, SRV_RECV(0x14), SRV_RETURN(0x09) From c9281e5a577cf2856b24539b885350046e052512 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 12 Sep 2022 14:54:05 -0400 Subject: [PATCH 3/3] Add more usage of GENDER_COUNT --- include/union_room_message.h | 4 ++-- src/union_room_message.c | 17 ++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/include/union_room_message.h b/include/union_room_message.h index ad0011452..961b25bc1 100644 --- a/include/union_room_message.h +++ b/include/union_room_message.h @@ -32,7 +32,7 @@ extern const u8 gText_UR_LinkWithFriendDropped[]; extern const u8 *const gTexts_UR_LinkDropped[]; extern const u8 gText_UR_AwaitingPlayersResponseAboutTrade[]; extern const u8 *const gTexts_UR_CommunicatingWait[]; -extern const u8 *const gTexts_UR_HiDoSomething[][2]; +extern const u8 *const gTexts_UR_HiDoSomething[][GENDER_COUNT]; extern const u8 *const gTexts_UR_PlayerContactedYou[]; extern const u8 *const gTexts_UR_AwaitingResponse[]; extern const u8 gText_UR_ShowTrainerCard[]; @@ -44,7 +44,7 @@ extern const u8 gText_UR_ChatDropped[]; extern const u8 gText_UR_OfferDeclined1[]; extern const u8 gText_UR_OfferDeclined2[]; extern const u8 gText_UR_ChatEnded[]; -extern const u8 *const gTexts_UR_JoinChat[GENDER_COUNT][2]; +extern const u8 *const gTexts_UR_JoinChat[][GENDER_COUNT]; extern const u8 gText_UR_TrainerAppearsBusy[]; extern const u8 *const gTexts_UR_WaitOrShowCard[GENDER_COUNT][4]; extern const u8 *const gTexts_UR_StartActivity[][GENDER_COUNT][3]; diff --git a/src/union_room_message.c b/src/union_room_message.c index 16b0fc632..e84e666e1 100644 --- a/src/union_room_message.c +++ b/src/union_room_message.c @@ -172,7 +172,7 @@ ALIGNED(4) static const u8 sText_HiDoSomethingFemale[] = _("Hello!\nWould you li ALIGNED(4) static const u8 sText_HiDoSomethingAgainMale[] = _("{STR_VAR_1}: Hiya, we meet again!\nWhat are you up for this time?"); ALIGNED(4) static const u8 sText_HiDoSomethingAgainFemale[] = _("{STR_VAR_1}: Oh! {PLAYER}, hello!\nWould you like to do something?"); -const u8 *const gTexts_UR_HiDoSomething[][2] = { +const u8 *const gTexts_UR_HiDoSomething[][GENDER_COUNT] = { { sText_HiDoSomethingMale, sText_HiDoSomethingFemale @@ -188,11 +188,14 @@ ALIGNED(4) static const u8 sText_DoSomethingAgainMale[] = _("{STR_VAR_1}: What w ALIGNED(4) static const u8 sText_DoSomethingAgainFemale[] = _("{STR_VAR_1}‘また なにかする？"); // Unused -static const u8 *const sDoSomethingTexts[] = { - sText_DoSomethingMale, - sText_DoSomethingFemale, - sText_DoSomethingAgainMale, - sText_DoSomethingAgainMale // was probably supposed to be sText_DoSomethingAgainFemale +static const u8 *const sDoSomethingTexts[][GENDER_COUNT] = { + { + sText_DoSomethingMale, + sText_DoSomethingFemale + }, { + sText_DoSomethingAgainMale, + sText_DoSomethingAgainMale // was probably supposed to be sText_DoSomethingAgainFemale + } }; ALIGNED(4) static const u8 sText_SomebodyHasContactedYou[] = _("Somebody has contacted you.{PAUSE 60}"); @@ -236,7 +239,7 @@ ALIGNED(4) static const u8 sText_PlayerJoinChatMale[] = _("{STR_VAR_1}: Hey, {PL ALIGNED(4) static const u8 sText_JoinChatFemale[] = _("Oh, hi! We're having a chat now.\nWould you like to join us?"); ALIGNED(4) static const u8 sText_PlayerJoinChatFemale[] = _("{STR_VAR_1}: Oh, hi, {PLAYER}!\nWe're having a chat now.\lWould you like to join us?"); -const u8 *const gTexts_UR_JoinChat[GENDER_COUNT][2] = { +const u8 *const gTexts_UR_JoinChat[][GENDER_COUNT] = { { sText_JoinChatMale, sText_JoinChatFemale