PkMn Selection & Battle Menu translatable

P3D/Battle/BattleSystemV2/BattleMenu.vb

@@ -491,7 +491,7 @@
 
                 If isSelected = True Then
                     If Move.Disabled > 0 OrElse BattleScreen.FieldEffects.OwnEncore > 0 AndAlso BattleScreen.FieldEffects.OwnEncoreMove.ID <> Move.ID Then
-                        Core.SpriteBatch.DrawString(FontManager.MainFont, "Disabled!", New Vector2(CInt(Core.windowSize.Width - (AllExtended + extraExtended) + 28), CInt(152 + Index * 96)), Color.Black)
+                        Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("battle_MoveDisabled", "Disabled!"), New Vector2(CInt(Core.windowSize.Width - (AllExtended + extraExtended) + 28), CInt(152 + Index * 96)), Color.Black)
                     Else
                         Dim ppColor As Color = GetPPColor()
                         ppColor.A = CByte((extraExtended + AllExtended - deductAlpha).Clamp(0, 255))
@@ -647,7 +647,7 @@
                     TempBattleScreen = BattleScreen
 
                     Player.Temp.PokemonScreenIndex = BattleScreen.OwnPokemonIndex
-                    Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5.ToString), AddressOf ShowPokemonMenu, "Choose Pokémon", False) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = False}
+                    Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5.ToString), AddressOf ShowPokemonMenu, Localization.GetString("party_screen_ChoosePokemon", "Choose Pokémon"), False) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = False}
                     AddHandler selScreen.SelectedObject, AddressOf ShowPokemonMenuHandler
 
                     Core.SetScreen(selScreen)
@@ -669,24 +669,24 @@
                 Case BattleSystem.BattleScreen.BattleModes.Safari
                     Dim safariBallText As String = Localization.GetString("item_name_181", "Safari Ball") & " x" & Core.Player.Inventory.GetItemAmount(181.ToString).ToString()
                     If Core.Player.Inventory.GetItemAmount(181.ToString) = 0 Then
-                        safariBallText = "No Safari Balls."
+                        safariBallText = Localization.GetString("battle_NoSafariBalls", "No Safari Balls.")
                     End If
                     _mainMenuItemList.Add(New MainMenuItem(4, safariBallText, 0, AddressOf MainMenuUseSafariBall))
-                    _mainMenuItemList.Add(New MainMenuItem(0, "Throw Mud", 1, AddressOf MainMenuThrowMud))
+                    _mainMenuItemList.Add(New MainMenuItem(0, Localization.GetString("battle_action_ThrowMud", "Throw Mud"), 1, AddressOf MainMenuThrowMud))
-                    _mainMenuItemList.Add(New MainMenuItem(0, "Throw Bait", 2, AddressOf MainMenuThrowBait))
+                    _mainMenuItemList.Add(New MainMenuItem(0, Localization.GetString("battle_action_ThrowBait", "Throw Bait"), 2, AddressOf MainMenuThrowBait))
 
-                    _mainMenuItemList.Add(New MainMenuItem(3, "Run", 3, AddressOf MainMenuRun))
+                    _mainMenuItemList.Add(New MainMenuItem(3, Localization.GetString("battle_action_Run", "Run"), 3, AddressOf MainMenuRun))
 
                 Case BattleSystem.BattleScreen.BattleModes.BugContest
-                    _mainMenuItemList.Add(New MainMenuItem(0, "Battle", 0, AddressOf MainMenuOpenBattleMenu))
+                    _mainMenuItemList.Add(New MainMenuItem(0, Localization.GetString("battle_action_battle", "Battle"), 0, AddressOf MainMenuOpenBattleMenu))
 
-                    Dim sportBallText As String = "Sport Ball x" & Core.Player.Inventory.GetItemAmount(177.ToString).ToString()
+                    Dim sportBallText As String = Localization.GetString("item_name_177", "Sport Ball") & " x" & Core.Player.Inventory.GetItemAmount(177.ToString).ToString()
                     If Core.Player.Inventory.GetItemAmount(177.ToString) = 0 Then
-                        sportBallText = "No Sport Balls."
+                        sportBallText = Localization.GetString("battle_NoSportBalls", "No Sport Balls.")
                     End If
                     _mainMenuItemList.Add(New MainMenuItem(4, sportBallText, 1, AddressOf MainMenuUseSportBall))
                     _mainMenuItemList.Add(New MainMenuItem(1, "Pokémon", 2, AddressOf MainMenuOpenPokemon))
-                    _mainMenuItemList.Add(New MainMenuItem(3, "Run", 3, AddressOf MainMenuRun))
+                    _mainMenuItemList.Add(New MainMenuItem(3, Localization.GetString("battle_action_Run", "Run"), 3, AddressOf MainMenuRun))
 
                 Case BattleSystem.BattleScreen.BattleModes.Standard
                     If BattleScreen.OwnFaint Then
@@ -709,12 +709,12 @@
                         End If
                         BattleScreen.OppFaint = False
                     Else
-                        _mainMenuItemList.Add(New MainMenuItem(0, "Battle", 0, AddressOf MainMenuOpenBattleMenu))
+                        _mainMenuItemList.Add(New MainMenuItem(0, Localization.GetString("battle_action_battle", "Battle"), 0, AddressOf MainMenuOpenBattleMenu))
                         _mainMenuItemList.Add(New MainMenuItem(1, "Pokémon", 1, AddressOf MainMenuOpenPokemon))
-                        _mainMenuItemList.Add(New MainMenuItem(2, "Bag", 2, AddressOf MainMenuOpenBag))
+                        _mainMenuItemList.Add(New MainMenuItem(2, Localization.GetString("battle_action_Bag", "Bag"), 2, AddressOf MainMenuOpenBag))
 
                         If BattleScreen.IsTrainerBattle = False Then
-                            _mainMenuItemList.Add(New MainMenuItem(3, "Run", 3, AddressOf MainMenuRun))
+                            _mainMenuItemList.Add(New MainMenuItem(3, Localization.GetString("battle_action_Run", "Run"), 3, AddressOf MainMenuRun))
                             MainMenuAddMegaEvolution(BattleScreen, 4)
                         Else
                             MainMenuAddMegaEvolution(BattleScreen, 3)
@@ -722,9 +722,9 @@
                     End If
 
                 Case BattleSystem.BattleScreen.BattleModes.PVP
-                    _mainMenuItemList.Add(New MainMenuItem(0, "Battle", 0, AddressOf MainMenuOpenBattleMenu))
+                    _mainMenuItemList.Add(New MainMenuItem(0, Localization.GetString("battle_action_battle", "Battle"), 0, AddressOf MainMenuOpenBattleMenu))
                     _mainMenuItemList.Add(New MainMenuItem(1, "Pokémon", 1, AddressOf MainMenuOpenPokemon))
-                    _mainMenuItemList.Add(New MainMenuItem(3, "Surrender", 2, AddressOf MainMenuOpenBag))
+                    _mainMenuItemList.Add(New MainMenuItem(3, Localization.GetString("battle_action_Surrender", "Surrender"), 2, AddressOf MainMenuOpenBag))
             End Select
         End Sub
 
@@ -758,14 +758,14 @@
                     If Core.Player.Pokemons(PokeIndex).Item.IsGameModeItem = True Then
                         If Core.Player.Pokemons(PokeIndex).Item.gmIsMegaStone = True Then
                             If Core.Player.Pokemons(PokeIndex).Number = CType(Core.Player.Pokemons(PokeIndex).Item, GameModeItem).gmMegaPokemonNumber Then
-                                _mainMenuItemList.Add(New MainMenuItem(5, "Mega Evolve!", Index, AddressOf MainMenuMegaEvolve))
+                                _mainMenuItemList.Add(New MainMenuItem(5, Localization.GetString("battle_action_MegaEvolve", "Mega Evolve!"), Index, AddressOf MainMenuMegaEvolve))
                             End If
                         End If
                     Else
                         If Core.Player.Pokemons(PokeIndex).Item.IsMegaStone = True Then
                             Dim megaStone = CType(Core.Player.Pokemons(PokeIndex).Item, Items.MegaStone)
                             If megaStone.MegaPokemonNumber = Core.Player.Pokemons(PokeIndex).Number Then
-                                _mainMenuItemList.Add(New MainMenuItem(5, "Mega Evolve!", Index, AddressOf MainMenuMegaEvolve))
+                                _mainMenuItemList.Add(New MainMenuItem(5, Localization.GetString("battle_action_MegaEvolve", "Mega Evolve!"), Index, AddressOf MainMenuMegaEvolve))
                             End If
                         End If
                     End If
@@ -794,7 +794,7 @@
             TempBattleScreen = BattleScreen
 
             Player.Temp.PokemonScreenIndex = BattleScreen.OwnPokemonIndex
-            Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5.ToString), AddressOf ShowPokemonMenu, "Choose Pokémon", True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
+            Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5.ToString), AddressOf ShowPokemonMenu, Localization.GetString("party_screen_ChoosePokemon", "Choose Pokémon"), True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
             AddHandler selScreen.SelectedObject, AddressOf ShowPokemonMenuHandler
 
             Core.SetScreen(selScreen)
@@ -863,9 +863,9 @@
 
                 Core.Player.UsedItemsToCheckScriptDelayFor.Add("181")
 
-                Dim safariBallText As String = "Safari Ball x" & Core.Player.Inventory.GetItemAmount(181.ToString).ToString()
+                Dim safariBallText As String = Localization.GetString("item_name_181", "Safari Ball") & " x" & Core.Player.Inventory.GetItemAmount(181.ToString).ToString()
                 If Core.Player.Inventory.GetItemAmount(181.ToString) = 0 Then
-                    safariBallText = "No Safari Balls."
+                    safariBallText = Localization.GetString("battle_NoSafariBalls", "No Safari Balls.")
                 End If
                 _mainMenuItemList(0).Text = safariBallText
             End If
@@ -955,7 +955,7 @@
                     _moveMenuAlpha = 0
                     If BattleScreen.OwnPokemon.Attacks(_moveMenuIndex).SwapsOutOwnPokemon = True Then
                         If PartyScreen.Selected = -1 Then
-                            Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5.ToString), Nothing, "Choose Pokémon", False, False, False) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = False}
+                            Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5.ToString), Nothing, Localization.GetString("party_screen_ChoosePokemon", "Choose Pokémon"), False, False, False) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = False, .SelectButtonText = Localization.GetString("global_switch", "Switch")}
                             AddHandler selScreen.SelectedObject, Nothing
 
                             Core.SetScreen(selScreen)
@@ -1175,7 +1175,7 @@
 
                     If Item.BattleSelectPokemon = True Then
                         'Core.SetScreen(New PartyScreen(Core.CurrentScreen, Item, AddressOf UseItem, "Use " & Item.Name, True))
-                        Dim selScreen = New PartyScreen(Core.CurrentScreen, Item, AddressOf Item.UseOnPokemon, "Use " & Item.Name, True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
+                        Dim selScreen = New PartyScreen(Core.CurrentScreen, Item, AddressOf Item.UseOnPokemon, Localization.GetString("global_use", "Use") & " " & Item.OneLineName(), True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
                         AddHandler selScreen.SelectedObject, AddressOf UseItemHandler
 
                         Core.SetScreen(selScreen)

P3D/Content/Localization/Tokens_de.dat

@@ -343,6 +343,7 @@ PartyScreen:
 party_screen_Unable,Unable!
 party_screen_Able,Able!
 party_screen_FieldMove,Field Move
+party_screen_ChoosePokemon,Wähle ein Pokémon
 party_screen_CannotChoosePokemon,Cannot choose this~Pokémon.
 ---
 NewGameScreen:
@@ -515,13 +516,20 @@ berry_picked_multiple_end,Berries.
 Battle:
 battle_trainer_about_to_send_out_1,is about to send out
 battle_trainer_about_to_send_out_2,! Do you want to switch your Pokémon?
-battle_choose_pokemon,Wähle ein Pokémon
 battle_switch_already_in_battle,is already~in battle!
 battle_switch_fainted,is fainted!
 battle_switch_egg,Cannot switch in~the egg!
 battle_cannot_switch,Cannot switch out.
 battle_cannot_run,Failed to run away.
 battle_cannot_run_ability,Failed to run away because of~
+battle_MoveDisabled,Disabled!
+battle_ThrowMud,Throw Mud
+battle_ThrowBait,Throw Bait
+battle_Run,Run
+battle_Battle,Battle
+battle_Bag,Bag
+battle_Surrender,Surrender
+battle_action_MegaEvolve,Mega Evolve!
 ---
 Badges:
 badge_Boulder,Fels

P3D/Content/Localization/Tokens_en.dat

@@ -343,6 +343,7 @@ PartyScreen:
 party_screen_Unable,Unable!
 party_screen_Able,Able!
 party_screen_FieldMove,Field Move
+party_screen_ChoosePokemon,Choose Pokémon
 party_screen_CannotChoosePokemon,Cannot choose this~Pokémon.
 ---
 NewGameScreen:
@@ -515,13 +516,20 @@ berry_picked_multiple_end,Berries.
 Battle:
 battle_trainer_about_to_send_out_1,is about to send out
 battle_trainer_about_to_send_out_2,! Do you want to switch your Pokémon?
-battle_choose_pokemon,Choose Pokémon
 battle_switch_already_in_battle,is already~in battle!
 battle_switch_fainted,is fainted!
 battle_switch_egg,Cannot switch in~the egg!
 battle_cannot_switch,Cannot switch out.
 battle_cannot_run,Failed to run away.
 battle_cannot_run_ability,Failed to run away because of~
+battle_MoveDisabled,Disabled!
+battle_ThrowMud,Throw Mud
+battle_ThrowBait,Throw Bait
+battle_Run,Run
+battle_Battle,Battle
+battle_Bag,Bag
+battle_Surrender,Surrender
+battle_action_MegaEvolve,Mega Evolve!
 ---
 Badges:
 badge_1,Boulder

P3D/Content/Localization/Tokens_fr.dat

@@ -342,6 +342,7 @@ PartyScreen:
 party_screen_Unable,Unable!
 party_screen_Able,Able!
 party_screen_FieldMove,Field Move
+party_screen_ChoosePokemon,Choisi le Pokémon
 party_screen_CannotChoosePokemon,Cannot choose this~Pokémon.
 ---
 NewGameScreen:
@@ -514,13 +515,20 @@ berry_picked_multiple_end,Baies.
 Battle:
 battle_trainer_about_to_send_out_1,est sur le point d'envoyer
 battle_trainer_about_to_send_out_2,! Veux-tu changer de Pokémon ?
-battle_choose_pokemon,Choisi le Pokémon
 battle_switch_already_in_battle,est déjà en combat!
 battle_switch_fainted,est KO!
 battle_switch_egg,Impossible d'envoyer l'œuf!
 battle_cannot_switch,Impossible de changer.
 battle_cannot_run,N'a pas réussi à s'enfuir.
 battle_cannot_run_ability,N'a pas réussi a s'enfuir à cause de~
+battle_MoveDisabled,Disabled!
+battle_ThrowMud,Throw Mud
+battle_ThrowBait,Throw Bait
+battle_Run,Run
+battle_Battle,Battle
+battle_Bag,Bag
+battle_Surrender,Surrender
+battle_action_MegaEvolve,Mega Evolve!
 ---
 Badges:
 badge_1,Roche

P3D/Content/Localization/Tokens_nl.dat

@@ -343,6 +343,7 @@ PartyScreen:
 party_screen_Unable,Onmogelijk!
 party_screen_Able,Mogelijk!
 party_screen_FieldMove,Veldtechniek
+party_screen_ChoosePokemon,Kies Pokémon
 party_screen_CannotChoosePokemon,Kan deze Pokémon niet~kiezen.
 ---
 NewGameScreen:
@@ -514,13 +515,19 @@ berry_picked_multiple_end,Bessen.
 Battle:
 battle_trainer_about_to_send_out_1,staat op het punt om
 battle_trainer_about_to_send_out_2,in te zetten om te vechten! Wil je je Pokémon verwisselen met een andere?
-battle_choose_pokemon,Kies Pokémon
 battle_switch_already_in_battle,is al~aan het vechten!
 battle_switch_fainted,is uitgeschakeld!
 battle_switch_egg,Kan geen ei inzetten!
 battle_cannot_switch,Kan niet wisselen.
 battle_cannot_run,Kon niet wegrennen.
 battle_cannot_run_ability,Kon niet wegrennen vanwege~
+battle_action_ThrowMud,Gooi Modder
+battle_action_ThrowBait,Gooi Aas
+battle_action_Run,Ren
+battle_action_Battle,Vecht
+battle_action_Bag,Tas
+battle_action_Surrender,Geef Op
+battle_action_MegaEvolve,Mega-Evolueer!
 ---
 Badges:
 badge_Boulder,Rots

P3D/Content/Localization/Tokens_ptbr.dat

@@ -342,6 +342,7 @@ PartyScreen:
 party_screen_Unable,Incapaz!
 party_screen_Able,Capaz!
 party_screen_FieldMove,Mv. de Campo
+party_screen_ChoosePokemon,Escolha o Pokémon
 party_screen_CannotChoosePokemon,Não pode escolher este~Pokémon
 ---
 NewGameScreen:
@@ -515,13 +516,20 @@ berry_picked_multiple_end,Berries.
 Battle:
 battle_trainer_about_to_send_out_1,está prestes a mandar
 battle_trainer_about_to_send_out_2,! Você deseja trocar de Pokémon?
-battle_choose_pokemon,Escolha o Pokémon
 battle_switch_already_in_battle,ja está~em batalha!
 battle_switch_fainted,Desmaiou!
 battle_switch_egg,Não pode trocar~por Ovo!
 battle_cannot_switch,Não da pra trocar.
 battle_cannot_run,Não conseguiu fugir.
 battle_cannot_run_ability,Não conseguiu fugir por causa do~
+battle_MoveDisabled,Disabled!
+battle_ThrowMud,Throw Mud
+battle_ThrowBait,Throw Bait
+battle_Run,Run
+battle_Battle,Battle
+battle_Bag,Bag
+battle_Surrender,Surrender
+battle_action_MegaEvolve,Mega Evolve!
 ---
 Badges:
 badge_1,Boulder

P3D/Screens/Inventory/NewInventoryScreen.vb

@@ -1015,7 +1015,7 @@ Public Class NewInventoryScreen
                     End If
 
                 Case INFO_ITEM_OPTION_GIVE
-                    Dim selScreen = New PartyScreen(Core.CurrentScreen) With {.Mode = ISelectionScreen.ScreenMode.Selection, .CanExit = True}
+                    Dim selScreen = New PartyScreen(Core.CurrentScreen, cItem, Nothing, Localization.GetString("global_give", "Give") & " " & cItem.OneLineName(), True, True, True, Nothing, False) With {.Mode = ISelectionScreen.ScreenMode.Selection, .CanExit = True, .SelectButtonText = Localization.GetString("global_give", "Give")}
                     AddHandler selScreen.SelectedObject, AddressOf GiveItemHandler
 
                     Core.SetScreen(selScreen)

P3D/Screens/Pokemon/PartyScreen.vb

@@ -5,9 +5,10 @@ Public Class PartyScreen
     Implements ISelectionScreen
 
     Dim POKEMON_TITLE As String = "Pokémon"
-
     'Private _translation As Globalization.Classes.LOCAL_PartyScreen
 
+    Public SelectButtonText As String = Localization.GetString("global_select", "Select")
+
     ''' <summary>
     ''' Cursor index -> pointing to Pokémon (0-5).
     ''' </summary>
@@ -577,7 +578,7 @@ Public Class PartyScreen
                         If _switchIndex <> _index Then
                             Dim p1 As Pokemon = PokemonList(_switchIndex)
                             Dim p2 As Pokemon = PokemonList(_index)
-                            SoundManager.PlaySound(Localization.GetString("global_select", "Select"))
+                            SoundManager.PlaySound("Select")
                             PokemonList(_switchIndex) = p2
                             PokemonList(_index) = p1
                         End If
@@ -596,7 +597,7 @@ Public Class PartyScreen
                             used = True
                             ExitedSub(_index)
                         End If
-                        SoundManager.PlaySound(Localization.GetString("global_select", "Select"))
+                        SoundManager.PlaySound("Select")
                         _closing = True
                     End If
                 End If
@@ -615,7 +616,7 @@ Public Class PartyScreen
 
     Private Sub CreateSelectionMenu()
         Dim items As New List(Of String)
-        items.Add(Localization.GetString("global_select", "Select"))
+        items.Add(SelectButtonText)
         items.Add(Localization.GetString("global_summary", "Summary"))
         items.Add(Localization.GetString("global_back", "Back"))
 
@@ -624,7 +625,7 @@ Public Class PartyScreen
 
     Private Sub SelectSelectionMenuItem(ByVal selectMenu As UI.SelectMenu)
         Select Case selectMenu.SelectedItem
-            Case Localization.GetString("global_select", "Select")
+            Case SelectButtonText
                 'When a Pokémon got selected in Selection Mode, raise the selected event and close the screen.
                 If CanChoosePokemon(Me.PokemonList(_index)) = True Then
                     Selected = _index