tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-28 16:24:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed minor index issue related to BattleMenu and PartyScreen interactions

Browse Source
This commit is contained in:
CaptainSegis 2017-03-15 02:07:40 -05:00
parent 08b0d944da
commit db6057254e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleMenu.vb
View File

@ -693,12 +693,13 @@
Private Sub MainMenuOpenPokemon(ByVal BattleScreen As BattleScreen) Private Sub MainMenuOpenPokemon(ByVal BattleScreen As BattleScreen)
TempBattleScreen = BattleScreen TempBattleScreen = BattleScreen
Player.Temp.PokemonScreenIndex = BattleScreen.OwnPokemonIndex
Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5), AddressOf ShowPokemonMenu, "Choose Pokémon", True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True} Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5), AddressOf ShowPokemonMenu, "Choose Pokémon", True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
AddHandler selScreen.SelectedObject, AddressOf ShowPokemonMenuHandler AddHandler selScreen.SelectedObject, AddressOf ShowPokemonMenuHandler
Core.SetScreen(selScreen) Core.SetScreen(selScreen)
CType(Core.CurrentScreen, PartyScreen)._index = BattleScreen.OwnPokemonIndex ''CType(Core.CurrentScreen, PartyScreen)._index = BattleScreen.OwnPokemonIndex
End Sub End Sub
Private Sub MainMenuOpenBag(ByVal BattleScreen As BattleScreen) Private Sub MainMenuOpenBag(ByVal BattleScreen As BattleScreen)
@ -710,7 +711,6 @@
AddHandler selScreen.SelectedObject, AddressOf SelectedItemHandler AddHandler selScreen.SelectedObject, AddressOf SelectedItemHandler
Core.SetScreen(selScreen) Core.SetScreen(selScreen)
'Core.SetScreen(New InventoryScreen(Core.CurrentScreen, {}, AddressOf SelectedItem))
End If End If
End Sub End Sub

3
2.5DHero/2.5DHero/Screens/Pokemon/PartyScreen.vb
View File

@ -86,6 +86,7 @@ Public Class PartyScreen
Me.ChoosePokemon = ChoosePokemon Me.ChoosePokemon = ChoosePokemon
End If End If
Me.AltPokemonList = _pokemonList Me.AltPokemonList = _pokemonList
GetPokemonList()
Identification = Identifications.PartyScreen Identification = Identifications.PartyScreen
PreScreen = currentScreen PreScreen = currentScreen
@ -101,7 +102,7 @@ Public Class PartyScreen
_texture = TextureManager.GetTexture("GUI\Menus\General") _texture = TextureManager.GetTexture("GUI\Menus\General")
_menuTexture = TextureManager.GetTexture("GUI\Menus\PokemonInfo") _menuTexture = TextureManager.GetTexture("GUI\Menus\PokemonInfo")
GetPokemonList()
If _index >= PokemonList.Count - 1 Then If _index >= PokemonList.Count - 1 Then
_index = 0 _index = 0