various fixes

This commit is contained in:
infinitefusion
2022-10-29 17:27:55 -04:00
parent 49f7edb06a
commit cd906e7f1c
52 changed files with 40802 additions and 39072 deletions

View File

@@ -491,6 +491,7 @@ class PokemonEvolutionScene
def pbStartScreen(pokemon,newspecies,reversing=false)
@pokemon = pokemon
@newspecies = newspecies
@sprites = {}
@bgviewport = Viewport.new(0,0,Graphics.width,Graphics.height)

View File

@@ -77,7 +77,7 @@ off Pokémon Red and Blue, as well as
Pokémon Gold and Silver.
Both games are made by Game Freak.
ALl of the custom fused Pokémon sprites
All of the custom fused Pokémon sprites
were madeby various members of the sp
Pokémon Infinite Fusion Discord

View File

@@ -246,6 +246,7 @@ class PokemonPokedexInfo_Scene
#if @dexlist[@index][4] > 0
indexNumber = @dexlist[@index][4]
indexNumber -= 1 if @dexlist[@index][5]
indexNumber = GameData::Species.get(@species).id_number
indexText = sprintf("%03d", indexNumber)
# end
textpos = [
@@ -586,7 +587,7 @@ class PokemonPokedexInfoScreen
else
region = $PokemonGlobal.pokedexDex # National Dex -1, regional Dexes 0, 1, etc.
end
dexnum = pbGetRegionalNumber(region,species)
dexnum = GameData::Species.get(species).id_number#pbGetRegionalNumber(region,species)
dexnumshift = Settings::DEXES_WITH_OFFSETS.include?(region)
dexlist = [[species,GameData::Species.get(species).name,0,0,dexnum,dexnumshift]]
@scene.pbStartScene(dexlist,0,region)

View File

@@ -422,12 +422,12 @@ class PokemonSummary_Scene
# break
# end
# end
# if dexnum <= 0
# textpos.push(["???", 435, 74, 2, dexNumBase, dexNumShadow])
# else
# dexnum -= 1 if dexnumshift
# textpos.push([sprintf("%03d", dexnum), 435, 74, 2, dexNumBase, dexNumShadow])
# end
if dexnum <= 0
textpos.push(["???", 435, 74, 2, dexNumBase, dexNumShadow])
else
dexnum -= 1 if dexnumshift
textpos.push([sprintf("%03d", dexnum), 435, 74, 2, dexNumBase, dexNumShadow])
end
# Write Original Trainer's name and ID number
if @pokemon.owner.name.empty?
textpos.push([_INTL("RENTAL"), 435, 170, 2, Color.new(64, 64, 64), Color.new(176, 176, 176)])

View File

@@ -37,7 +37,7 @@ class StorageSystemPC
command = 0
loop do
command = pbShowCommandsWithHelp(nil,
[_INTL("Organize Boxes"),
[_INTL("Organize / Fuse"),
_INTL("Withdraw Pokémon"),
_INTL("Deposit Pokémon"),
_INTL("See ya!")],