Merge branch 'master' into event_object_movement

1 files changed, 280 insertions, 22 deletions

diff --git a/include/strings.h b/include/strings.h
index 5c8ffde4b..be3555780 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -114,7 +114,7 @@ extern const u8 gText_TurnedOverItemsWorthYen[];
 extern const u8 gPokedudeText_TMTypes[];
 extern const u8 gPokedudeText_ReadTMDescription[];
 extern const u8 gFameCheckerText_Cancel[];
-extern const u8 gFameCheckerText_ListMenuCursor[];
+extern const u8 gText_SelectorArrow2[];
 extern const u8 gFameCheckerText_FameCheckerWillBeClosed[];
 extern const u8 gFameCheckerText_ClearTextbox[];
 extern const u8 gFameCheckerText_MainScreenUI[]; // "{DPAD_ANY}PICK {DPAD_UPDOWN}SELECT {A_BUTTON}OK$"
@@ -159,7 +159,7 @@ extern const u8 gString_Someone[];
 extern const u8 gString_Help[];
 extern const u8 gString_HelpSystem_ClearTo8[];
 
-extern const u8 gOtherText_StrVar1[];
+extern const u8 gText_Var1IsSelected[];
 extern const u8 gOtherText_WhereShouldTheStrVar1BePlaced[];
 extern const u8 gOtherText_Powder[];
 extern const u8 gText_NoMoreRoomInBag[];
@@ -244,26 +244,26 @@ extern const u8 gUnknown_83FDCD2[];
 extern const u8 gUnknown_83FE6FA[];
 
 // battle_controller_pokedude
-extern const u8 gUnknown_81C5F69[];
-extern const u8 gUnknown_81C5FA7[];
-extern const u8 gUnknown_81C5FDC[];
-extern const u8 gUnknown_81C601C[];
-extern const u8 gUnknown_81C60FA[];
-extern const u8 gUnknown_81C615A[];
-extern const u8 gUnknown_81C6196[];
-extern const u8 gUnknown_81C61EA[];
-extern const u8 gUnknown_81C6202[];
-extern const u8 gUnknown_81C6301[];
-extern const u8 gUnknown_81C63A9[];
-extern const u8 gUnknown_81C63F9[];
-extern const u8 gUnknown_81C6446[];
-extern const u8 gUnknown_81C657A[];
-extern const u8 gUnknown_81C6637[];
-extern const u8 gUnknown_81C6645[];
-extern const u8 gUnknown_81C66CF[];
-extern const u8 gUnknown_81C6787[];
-extern const u8 gUnknown_81C684B[];
-extern const u8 gUnknown_81C686C[];
+extern const u8 Pokedude_Text_SpeedierBattlerGoesFirst[];
+extern const u8 Pokedude_Text_MyRattataFasterThanPidgey[];
+extern const u8 Pokedude_Text_BattlersTakeTurnsAttacking[];
+extern const u8 Pokedude_Text_MyRattataWonGetsEXP[];
+extern const u8 Pokedude_Text_UhOhRattataPoisoned[];
+extern const u8 Pokedude_Text_HealStatusRightAway[];
+extern const u8 Pokedude_Text_UsingItemTakesTurn[];
+extern const u8 Pokedude_Text_YayWeManagedToWin[];
+extern const u8 Pokedude_Text_WaterNotVeryEffectiveAgainstGrass[];
+extern const u8 Pokedude_Text_GrassEffectiveAgainstWater[];
+extern const u8 Pokedude_Text_LetsTryShiftingMons[];
+extern const u8 Pokedude_Text_ShiftingUsesTurn[];
+extern const u8 Pokedude_Text_ButterfreeDoubleResistsGrass[];
+extern const u8 Pokedude_Text_ButterfreeGoodAgainstOddish[];
+extern const u8 Pokedude_Text_YeahWeWon[];
+extern const u8 Pokedude_Text_WeakenMonBeforeCatching[];
+extern const u8 Pokedude_Text_BestIfTargetStatused[];
+extern const u8 Pokedude_Text_CantDoubleUpOnStatus[];
+extern const u8 Pokedude_Text_LetMeThrowBall[];
+extern const u8 Pokedude_Text_PickBestKindOfBall[];
 
 // party_menu
 extern const u8 gText_ChoosePokemon[];
@@ -1100,4 +1100,262 @@ extern const u8 gText_Symbols[];
 extern const u8 gText_Register2[];
 extern const u8 gText_Exit[];
 
+// wireless_communication_status_screen
+extern const u8 gUnknown_841E2B4[];
+extern const u8 gUnknown_841E2BF[];
+extern const u8 gUnknown_841E2C9[];
+extern const u8 gUnknown_841E2D4[];
+extern const u8 gText_WirelessCommunicationStatus[];
+extern const u8 gText_PeopleTrading[];
+extern const u8 gText_PeopleBattling[];
+extern const u8 gText_PeopleInUnionRoom[];
+extern const u8 gText_PeopleCommunicating[];
+
+// mevent
+extern const u8 gJPText_ReceiveMysteryGiftWithEReader[];
+extern const u8 gJPText_SelectConnectFromEReaderMenu[];
+extern const u8 gJPText_SelectConnectWithGBA[];
+extern const u8 gJPText_LinkIsIncorrect[];
+extern const u8 gJPText_CardReadingHasBeenHalted[];
+extern const u8 gJPText_Connecting[];
+extern const u8 gJPText_ConnectionErrorCheckLink[];
+extern const u8 gJPText_ConnectionErrorTryAgain[];
+extern const u8 gJPText_AllowEReaderToLoadCard[];
+extern const u8 gJPText_ConnectionComplete[];
+extern const u8 gJPText_NewTrainerHasComeToSevii[];
+extern const u8 gJPText_PleaseWaitAMoment[];
+extern const u8 gJPText_WriteErrorUnableToSaveData[];
+
+// pokemon_jump
+extern const u8 gText_WantToPlayAgain2[];
+extern const u8 gText_SavingDontTurnOffPower[];
+extern const u8 gText_SomeoneDroppedOut2[];
+extern const u8 gText_CommunicationStandby4[];
+extern const u8 gText_AwesomeWonF701F700[];
+extern const u8 gText_FilledStorageSpace2[];
+extern const u8 gText_CantHoldMore[];
+extern const u8 gText_SpacePoints2[];
+extern const u8 gText_SpaceTimes3[];
+extern const u8 gText_JumpsInARow[];
+extern const u8 gText_BestScore2[];
+extern const u8 gText_ExcellentsInARow[];
+extern const u8 gText_PkmnJumpRecords[];
+
+// cable_club
+extern const u8 gUnknown_841DF82[];
+extern const u8 gUnknown_841DF8B[];
+extern const u8 gUnknown_841DF92[];
+extern const u8 gUnknown_841DF99[];
+extern const u8 gUnknown_841DFA0[];
+
+// berry_crush
+extern const u8 gUnknown_841CE3C[];
+extern const u8 gUnknown_841CE78[];
+extern const u8 gUnknown_841CEA8[];
+extern const u8 gUnknown_841CF14[];
+extern const u8 gUnknown_841CF50[];
+extern const u8 gUnknown_841CF70[];
+extern const u8 gUnknown_841CFA0[];
+extern const u8 gUnknown_841CFD4[];
+extern const u8 gUnknown_841D008[];
+extern const u8 gText_1_ClrLtGryShdwBlk_Dynamic0[];
+extern const u8 gText_1_Dynamic0[];
+extern const u8 gText_SpaceTimes[];
+extern const u8 gText_XDotY[];
+extern const u8 gText_StrVar1Berry[];
+extern const u8 gText_TimeColon[];
+extern const u8 gText_PressingSpeed[];
+extern const u8 gText_Silkiness[];
+extern const u8 gText_StrVar1[];
+extern const u8 gText_SpaceMin[];
+extern const u8 gText_XDotY2[];
+extern const u8 gText_SpaceSec[];
+extern const u8 gText_XDotY3[];
+extern const u8 gText_TimesPerSec[];
+extern const u8 gText_Var1Percent[];
+extern const u8 gText_PressesRankings[];
+extern const u8 gText_CrushingResults[];
+extern const u8 gText_BerryCrush2[];
+extern const u8 gText_PressingSpeedRankings[];
+extern const u8 gText_Var1Players[];
+extern const u8 gText_NeatnessRankings[];
+extern const u8 gText_CooperativeRankings[];
+extern const u8 gText_PressingPowerRankings[];
+
+// quest log
+extern const u8 gText_QuestLog_PreviouslyOnYourQuest[];
+extern const u8 gText_QuestLog_SwitchMon1WithMon2[];
+extern const u8 gText_QuestLog_SwappedHeldItemsOnMon[];
+extern const u8 gText_QuestLog_TookHeldItemFromMon[];
+extern const u8 gText_QuestLog_UsedItemOnMonAtThisLocation[];
+extern const u8 gText_QuestLog_UsedTheItem[];
+extern const u8 gText_QuestLog_UsedTheKeyItem[];
+extern const u8 gText_QuestLog_MonLearnedMoveFromTM[];
+extern const u8 gText_QuestLog_MonReplacedMoveWithTM[];
+extern const u8 gText_QuestLog_MonsWereFullyRestoredAtCenter[];
+extern const u8 gText_QuestLog_PlayerBattledChampionRival[];
+extern const u8 gText_QuestLog_PlayerSentOutMon1RivalSentOutMon2[];
+extern const u8 gText_QuestLog_WonTheMatchAsAResult[];
+extern const u8 gText_QuestLog_StoredItemInPC[];
+extern const u8 gText_QuestLog_WithdrewItemFromPC[];
+extern const u8 gText_QuestLog_TradedMon1ForPersonsMon2[];
+extern const u8 gText_QuestLog_SingleBattleWithPersonResultedInOutcome[];
+extern const u8 gText_QuestLog_DoubleBattleWithPersonResultedInOutcome[];
+extern const u8 gText_QuestLog_MultiBattleWithPeopleResultedInOutcome[];
+extern const u8 gText_QuestLog_Win[];
+extern const u8 gText_QuestLog_Loss[];
+extern const u8 gText_QuestLog_MingledInUnionRoom[];
+extern const u8 gText_QuestLog_DepartedPlaceInTownForNextDestination[];
+extern const u8 gText_QuestLog_SwitchedMonsBetweenBoxes[];
+extern const u8 gText_QuestLog_MovedMonToNewBox[];
+extern const u8 gText_QuestLog_SwitchedMonsWithinBox[];
+extern const u8 gText_QuestLog_MovedMonWithinBox[];
+extern const u8 gText_QuestLog_SwitchedPartyMonForPCMon[];
+extern const u8 gText_QuestLog_WithdrewMonFromPC[];
+extern const u8 gText_QuestLog_DepositedMonInPC[];
+extern const u8 gText_QuestLog_SwitchedMultipleMons[];
+extern const u8 gText_QuestLog_ADifferentSpot[];
+extern const u8 gText_QuestLog_GaveMonHeldItemFromPC[];
+extern const u8 gText_QuestLog_SwappedHeldItemFromPC[];
+extern const u8 gText_QuestLog_ChattedWithManyTrainers[];
+extern const u8 gText_QuestLog_Handily[];
+extern const u8 gText_QuestLog_Tenaciously[];
+extern const u8 gText_QuestLog_Somehow[];
+extern const u8 gText_QuestLog_TradedMon1ForTrainersMon2[];
+extern const u8 gText_QuestLog_BattledTrainerEndedInOutcome[];
+extern const u8 gText_QuestLog_BoughtItem[];
+extern const u8 gText_QuestLog_BoughtItemsIncludingItem[];
+extern const u8 gText_QuestLog_SoldNumOfItem[];
+extern const u8 gText_QuestLog_SoldItemsIncludingItem[];
+extern const u8 gText_QuestLog_JustOne[];
+extern const u8 gText_QuestLog_Num[];
+extern const u8 gText_QuestLog_UsedSoftboiled[];
+extern const u8 gText_QuestLog_UsedMilkDrink[];
+extern const u8 gText_QuestLog_MonLearnedMoveFromHM[];
+extern const u8 gText_QuestLog_MonReplacedMoveWithHM[];
+extern const u8 gText_QuestLog_DefeatedWildMon[];
+extern const u8 gText_QuestLog_DefeatedWildMons[];
+extern const u8 gText_QuestLog_CaughtWildMon[];
+extern const u8 gText_QuestLog_CaughtWildMons[];
+extern const u8 gText_QuestLog_DefeatedWildMonAndCaughtWildMon[];
+extern const u8 gText_QuestLog_DefeatedWildMonAndCaughtWildMons[];
+extern const u8 gText_QuestLog_DefeatedWildMonsAndCaughtWildMon[];
+extern const u8 gText_QuestLog_DefeatedWildMonsAndCaughtWildMons[];
+extern const u8 gText_QuestLog_GaveMonHeldItem[];
+extern const u8 gText_QuestLog_GaveMonHeldItem2[];
+extern const u8 gText_QuestLog_UsedCut[];
+extern const u8 gText_QuestLog_UsedFly[];
+extern const u8 gText_QuestLog_UsedSurf[];
+extern const u8 gText_QuestLog_UsedStrength[];
+extern const u8 gText_QuestLog_UsedFlash[];
+extern const u8 gText_QuestLog_UsedRockSmash[];
+extern const u8 gText_QuestLog_UsedWaterfall[];
+extern const u8 gText_QuestLog_UsedDive[];
+extern const u8 gText_QuestLog_UsedDigInLocation[];
+extern const u8 gText_QuestLog_UsedSweetScent[];
+extern const u8 gText_QuestLog_UsedTeleportToLocation[];
+extern const u8 gText_QuestLog_LeftTownsLocationForNextDestination[];
+extern const u8 gText_QuestLog_PlayedGamesAtGameCorner[];
+extern const u8 gText_QuestLog_RestedAtHome[];
+extern const u8 gText_QuestLog_LeftOaksLab[];
+extern const u8 gText_QuestLog_GymWasFullOfToughTrainers[];
+extern const u8 gText_QuestLog_DepartedGym[];
+extern const u8 gText_QuestLog_HadGreatTimeInSafariZone[];
+extern const u8 gText_QuestLog_ManagedToGetOutOfLocation[];
+extern const u8 gText_QuestLog_TookOnGymLeadersMonWithMonAndWon[];
+extern const u8 gText_QuestLog_TookOnEliteFoursMonWithMonAndWon[];
+extern const u8 gText_QuestLog_TookOnTrainersMonWithMonAndWon[];
+extern const u8 gText_QuestLog_Coolly[];
+extern const u8 gText_QuestLog_Barely[];
+extern const u8 gText_QuestLog_UsedEscapeRope[];
+extern const u8 gText_QuestLog_Draw[];
+extern const u8 gText_QuestLog_DepartedTheLocationForNextDestination[];
+extern const u8 gText_QuestLog_DepartedFromLocationToNextDestination[];
+extern const u8 gText_QuestLog_ObtainedItemInLocation[];
+extern const u8 gText_QuestLog_ArrivedInLocation[];
+extern const u8 gText_QuestLog_SavedGameAtLocation[];
+extern const u8 gText_QuestLog_Home[];
+extern const u8 gText_QuestLog_OakResearchLab[];
+extern const u8 gText_QuestLog_Gym[];
+extern const u8 gText_QuestLog_PokemonLeagueGate[];
+extern const u8 gText_QuestLog_ViridianForest[];
+extern const u8 gText_QuestLog_PewterMuseumOfScience[];
+extern const u8 gText_QuestLog_MtMoon[];
+extern const u8 gText_QuestLog_BikeShop[];
+extern const u8 gText_QuestLog_BillsHouse[];
+extern const u8 gText_QuestLog_DayCare[];
+extern const u8 gText_QuestLog_UndergroundPath[];
+extern const u8 gText_QuestLog_PokemonFanClub[];
+extern const u8 gText_QuestLog_SSAnne[];
+extern const u8 gText_QuestLog_DiglettsCave[];
+extern const u8 gText_QuestLog_RockTunnel[];
+extern const u8 gText_QuestLog_PowerPlant[];
+extern const u8 gText_QuestLog_PokemonTower[];
+extern const u8 gText_QuestLog_VolunteerHouse[];
+extern const u8 gText_QuestLog_NameRatersHouse[];
+extern const u8 gText_QuestLog_CeladonDeptStore[];
+extern const u8 gText_QuestLog_CeladonMansion[];
+extern const u8 gText_QuestLog_RocketGameCorner[];
+extern const u8 gText_QuestLog_Restaurant[];
+extern const u8 gText_QuestLog_RocketHideout[];
+extern const u8 gText_QuestLog_SafariZone[];
+extern const u8 gText_QuestLog_WardensHome[];
+extern const u8 gText_QuestLog_FightingDojo[];
+extern const u8 gText_QuestLog_SilphCo[];
+extern const u8 gText_QuestLog_SeafoamIslands[];
+extern const u8 gText_QuestLog_PokemonMansion[];
+extern const u8 gText_QuestLog_PokemonResearchLab[];
+extern const u8 gText_QuestLog_VictoryRoad[];
+extern const u8 gText_QuestLog_PokemonLeague[];
+extern const u8 gText_QuestLog_CeruleanCave[];
+
+// clear_save_data_screen
+extern const u8 gUnknown_841B69E[];
+extern const u8 gUnknown_841B6B9[];
+
+// easy_chat_2
+extern const u8 gUnknown_84186D1[];
+extern const u8 gUnknown_84186EF[];
+extern const u8 gUnknown_8418706[];
+extern const u8 gUnknown_8418725[];
+extern const u8 gUnknown_8418745[];
+extern const u8 gUnknown_8418763[];
+extern const u8 gUnknown_8418780[];
+extern const u8 gUnknown_841879E[];
+extern const u8 gUnknown_84187B2[];
+extern const u8 gUnknown_84187D1[];
+extern const u8 gUnknown_84187EE[];
+extern const u8 gUnknown_841880E[];
+extern const u8 gUnknown_841881B[];
+extern const u8 gUnknown_841883E[];
+extern const u8 gUnknown_841885F[];
+extern const u8 gUnknown_8418881[];
+extern const u8 gUnknown_841888C[];
+extern const u8 gUnknown_84188AC[];
+extern const u8 gUnknown_84188B9[];
+extern const u8 gUnknown_84188D6[];
+extern const u8 gUnknown_84188F0[];
+extern const u8 gUnknown_8418902[];
+extern const u8 gUnknown_8418937[];
+extern const u8 gUnknown_8418956[];
+extern const u8 gUnknown_84189E0[];
+extern const u8 gUnknown_84189EE[];
+extern const u8 gUnknown_8418A2B[];
+extern const u8 gUnknown_8418A33[];
+extern const u8 gUnknown_8418A4A[];
+extern const u8 gUnknown_8418A61[];
+extern const u8 gUnknown_8418A77[];
+extern const u8 gUnknown_8418A87[];
+extern const u8 gUnknown_8418AA1[];
+extern const u8 gUnknown_8418AB2[];
+extern const u8 gUnknown_841EE2B[];
+
+// naming_screen
+extern const u8 gText_MoveOkBack[];
+extern const u8 gText_AlphabetUpperLower[];
+extern const u8 gText_YourName[];
+extern const u8 gText_BoxName[];
+extern const u8 gText_PkmnsNickname[];
+extern const u8 gText_RivalsName[];
+
 #endif //GUARD_STRINGS_H