Fixes issue with certain npcs when selecting pokemon with triple fusions in your party

This commit is contained in:
infinitefusion
2023-11-25 10:24:09 -05:00
parent 9aee5206cd
commit d9098afbec
13 changed files with 3 additions and 0 deletions

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.

View File

@@ -130,6 +130,7 @@ end
#in: pokemon number #in: pokemon number
def Kernel.isPartPokemon(src, target) def Kernel.isPartPokemon(src, target)
src = getDexNumberForSpecies(src) src = getDexNumberForSpecies(src)
target = getDexNumberForSpecies(target) target = getDexNumberForSpecies(target)
return true if src == target return true if src == target
@@ -150,6 +151,8 @@ def getBasePokemonID(pokemon, body = true)
pokemon = dex_number pokemon = dex_number
end end
return nil if pokemon <= 0 return nil if pokemon <= 0
return nil if pokemon >= Settings::ZAPMOLCUNO_NB
# cname = getConstantName(PBSpecies, pokemon) rescue nil # cname = getConstantName(PBSpecies, pokemon) rescue nil
cname = GameData::Species.get(pokemon).id.to_s cname = GameData::Species.get(pokemon).id.to_s
return pokemon if pokemon <= NB_POKEMON return pokemon if pokemon <= NB_POKEMON

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.