fixes normal type expert team

This commit is contained in:
chardub
2025-02-06 21:14:19 -05:00
parent 44f114b5e0
commit 935c548016
8 changed files with 4 additions and 2 deletions

View File

@@ -851,7 +851,7 @@ PokemonDebugMenuCommands.register("speciesform", {
"parent" => "main", "parent" => "main",
"name" => _INTL("Species/form..."), "name" => _INTL("Species/form..."),
"always_show" => true, "always_show" => true,
"effect" => proc { |pkmn, pkmnid, heldpoke, settingUpBattle, screen| "effect" => proc { |pkmn,˚ pkmnid, heldpoke, settingUpBattle, screen|
cmd = 0 cmd = 0
loop do loop do
msg = [_INTL("Species {1}, form {2}.", pkmn.speciesName, pkmn.form), msg = [_INTL("Species {1}, form {2}.", pkmn.speciesName, pkmn.form),
@@ -870,6 +870,7 @@ PokemonDebugMenuCommands.register("speciesform", {
end end
pkmn.calc_stats pkmn.calc_stats
$Trainer.pokedex.register(pkmn) if !settingUpBattle $Trainer.pokedex.register(pkmn) if !settingUpBattle
$Trainer.pokedex.set_owned(pkmn.species) if !settingUpBattle
screen.pbRefreshSingle(pkmnid) screen.pbRefreshSingle(pkmnid)
end end
when 1 # Set form when 1 # Set form
@@ -880,7 +881,7 @@ PokemonDebugMenuCommands.register("speciesform", {
pbMessage('Body species?') pbMessage('Body species?')
body_species = pbChooseSpeciesList(old_body_dex,NB_POKEMON) body_species = pbChooseSpeciesList(old_body_dex,NB_POKEMON)
fused_species_dex = getFusionSpecies(head_species.species, body_species.species) fused_species_dex = getFusionSpecies(body_species.species,head_species.species)
species = GameData::Species.get(fused_species_dex) species = GameData::Species.get(fused_species_dex)
if species && species != pkmn.species if species && species != pkmn.species
@@ -890,6 +891,7 @@ PokemonDebugMenuCommands.register("speciesform", {
end end
pkmn.calc_stats pkmn.calc_stats
$Trainer.pokedex.register(pkmn) if !settingUpBattle $Trainer.pokedex.register(pkmn) if !settingUpBattle
$Trainer.pokedex.set_owned(pkmn.species) if !settingUpBattle
screen.pbRefreshSingle(pkmnid) screen.pbRefreshSingle(pkmnid)
end end

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.