Enabled any pokemon having all HMs in Sandbox mode. Pichu can have Volt Tackle now. Fixed a crash related to Daycare.

This commit is contained in:
CaptainSegis 2017-01-11 13:41:44 -05:00
parent 66c31c533b
commit c721a1125b
8 changed files with 17 additions and 13 deletions

View File

@ -100,6 +100,11 @@
Next
Next
End If
'Volt Tackle on Pikachu
If (parent1.Item IsNot Nothing AndAlso parent1.Item.Name.ToLower = "light ball") OrElse (parent2.Item IsNot Nothing AndAlso parent2.Item.Name.ToLower = "light ball") Then
Dim newAttack As BattleSystem.Attack = BattleSystem.Attack.GetAttackByID(344)
EggMoves.Add(newAttack)
End If
Dim learnMoves As New List(Of BattleSystem.Attack)
If EggMoves.Count <= 4 Then

View File

@ -254,32 +254,32 @@
Me.MenuID = 0
ChooseBox.Show({Localization.GetString("pokemon_screen_summary"), Localization.GetString("pokemon_screen_switch"), Localization.GetString("pokemon_screen_item"), Localization.GetString("pokemon_screen_back")}, 0, {})
If (PokemonHasMove(Core.Player.Pokemons(index), "Cut") = True And Badge.CanUseHMMove(Badge.HMMoves.Cut) = True And Core.Player.Pokemons(index).IsEgg() = False) Or GameController.IS_DEBUG_ACTIVE = True Then
If (PokemonHasMove(Core.Player.Pokemons(index), "Cut") = True And Badge.CanUseHMMove(Badge.HMMoves.Cut) = True And Core.Player.Pokemons(index).IsEgg() = False) OrElse GameController.IS_DEBUG_ACTIVE = True OrElse Core.Player.SandBoxMode Then
Dim options As List(Of String) = ChooseBox.Options.ToList()
options.Insert(1, "Cut")
ChooseBox.Options = options.ToArray()
End If
If (PokemonHasMove(Core.Player.Pokemons(index), "Flash") = True And Badge.CanUseHMMove(Badge.HMMoves.Flash) = True And Core.Player.Pokemons(index).IsEgg() = False) Or GameController.IS_DEBUG_ACTIVE = True Then
If (PokemonHasMove(Core.Player.Pokemons(index), "Flash") = True And Badge.CanUseHMMove(Badge.HMMoves.Flash) = True And Core.Player.Pokemons(index).IsEgg() = False) OrElse GameController.IS_DEBUG_ACTIVE = True OrElse Core.Player.SandBoxMode Then
Dim options As List(Of String) = ChooseBox.Options.ToList()
options.Insert(1, "Flash")
ChooseBox.Options = options.ToArray()
End If
If (PokemonHasMove(Core.Player.Pokemons(index), "Ride") = True And Badge.CanUseHMMove(Badge.HMMoves.Ride) = True And Core.Player.Pokemons(index).IsEgg() = False) Or GameController.IS_DEBUG_ACTIVE = True Then
If (PokemonHasMove(Core.Player.Pokemons(index), "Ride") = True And Badge.CanUseHMMove(Badge.HMMoves.Ride) = True And Core.Player.Pokemons(index).IsEgg() = False) OrElse GameController.IS_DEBUG_ACTIVE = True OrElse Core.Player.SandBoxMode Then
Dim options As List(Of String) = ChooseBox.Options.ToList()
options.Insert(1, "Ride")
ChooseBox.Options = options.ToArray()
End If
If (PokemonHasMove(Core.Player.Pokemons(index), "Dig") = True And Core.Player.Pokemons(index).IsEgg() = False) Or GameController.IS_DEBUG_ACTIVE = True Then
If (PokemonHasMove(Core.Player.Pokemons(index), "Dig") = True And Core.Player.Pokemons(index).IsEgg() = False) OrElse GameController.IS_DEBUG_ACTIVE = True OrElse Core.Player.SandBoxMode Then
Dim options As List(Of String) = ChooseBox.Options.ToList()
options.Insert(1, "Dig")
ChooseBox.Options = options.ToArray()
End If
If (PokemonHasMove(Core.Player.Pokemons(index), "Teleport") = True And Core.Player.Pokemons(index).IsEgg() = False) Or GameController.IS_DEBUG_ACTIVE = True Then
If (PokemonHasMove(Core.Player.Pokemons(index), "Teleport") = True And Core.Player.Pokemons(index).IsEgg() = False) OrElse GameController.IS_DEBUG_ACTIVE = True OrElse Core.Player.SandBoxMode Then
Dim options As List(Of String) = ChooseBox.Options.ToList()
options.Insert(1, "Teleport")
ChooseBox.Options = options.ToArray()
End If
If (PokemonHasMove(Core.Player.Pokemons(index), "Fly") = True And Badge.CanUseHMMove(Badge.HMMoves.Fly) = True And Core.Player.Pokemons(index).IsEgg() = False) Or GameController.IS_DEBUG_ACTIVE = True Then
If (PokemonHasMove(Core.Player.Pokemons(index), "Fly") = True And Badge.CanUseHMMove(Badge.HMMoves.Fly) = True And Core.Player.Pokemons(index).IsEgg() = False) OrElse GameController.IS_DEBUG_ACTIVE = True OrElse Core.Player.SandBoxMode Then
Dim options As List(Of String) = ChooseBox.Options.ToList()
options.Insert(1, "Fly")
ChooseBox.Options = options.ToArray()
@ -450,7 +450,7 @@
End Sub
Private Function PokemonHasMove(ByVal p As Pokemon, ByVal moveName As String) As Boolean
If GameController.IS_DEBUG_ACTIVE = True Then
If GameController.IS_DEBUG_ACTIVE = True OrElse Core.Player.SandBoxMode Then
Return True
Else
For Each a As BattleSystem.Attack In p.Attacks

View File

@ -6,8 +6,8 @@
Shared _valid As Boolean = False
Const RUNVALIDATION As Boolean = False
Const EXPECTEDSIZE As Integer = 42306954
Const METAHASH As String = "ODdEQzA1OEVGNjJCMkUwMzk3QjAyNUM5RTQ4NUJCOUE="
Const EXPECTEDSIZE As Integer = 42306946
Const METAHASH As String = "ODM3QjVGQ0FGMjYzMzMwMzU5ODUzNThCRjQ1MzQ3MDE="
Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean
Get

View File

@ -17,7 +17,7 @@ IsMale|50
Ability1|9
Ability2|Nothing
HiddenAbility|31
EggMoves|516,117,268,574,3,227,203,252,175,381,217,179,9,321,344,273,6
EggMoves|516,117,268,574,3,227,203,252,175,381,217,179,9,321,273,6
Machines|29,174,205,92,192,237,173,63,182,240,203,218,231,87,216,189,104,207,214,129,111,197,156,213,5,25,34,36,68,69,99,85,102,117,86,164,113,351,263,290,374,451,416,445,363,447,496,497,521,528,590,148
BaseHP|20
BaseAttack|40

View File

@ -34,7 +34,6 @@ CanFly|0
CanSwim|0
Pokedex|This intelligent Pokémon roasts hard berries with electricity to make them tender enough to eat.\Mouse Pokémon\6\0.4\0,148,0
Scale|0.7
Move|1,344
Move|1,39
Move|1,84
Move|5,45
@ -52,6 +51,6 @@ Move|42,435
Move|45,113
Move|50,87
EvolutionCondition|26,item,23,item
Item|1,163
Item|5,163
Item|50,2006
TradeValue|20

File diff suppressed because one or more lines are too long