Merge branch 'master' of github.com:pret/pokefirered into dodrio_berry_picking

1 files changed, 148 insertions, 21 deletions

diff --git a/include/strings.h b/include/strings.h
index 55041a658..f2207e7a7 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -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[];
@@ -1182,4 +1182,131 @@ 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[];
+
 #endif //GUARD_STRINGS_H