mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2026-01-23 23:06:00 +00:00
additional triple fusions + small pokedex fixes
This commit is contained in:
@@ -359,6 +359,9 @@ class PokemonPokedex_Scene
|
||||
end
|
||||
|
||||
def pbRefreshDexList(index=0)
|
||||
if index == nil
|
||||
index = 0
|
||||
end
|
||||
dexlist = pbGetDexList
|
||||
case $PokemonGlobal.pokedexMode
|
||||
when MODENUMERICAL
|
||||
|
||||
@@ -213,11 +213,11 @@ class PokemonPokedexInfo_Scene
|
||||
species_data = GameData::Species.get_species_form(@species, @form)
|
||||
# Write various bits of text
|
||||
indexText = "???"
|
||||
if @dexlist[@index][4] > 0
|
||||
#if @dexlist[@index][4] > 0
|
||||
indexNumber = @dexlist[@index][4]
|
||||
indexNumber -= 1 if @dexlist[@index][5]
|
||||
indexText = sprintf("%03d", indexNumber)
|
||||
end
|
||||
# end
|
||||
textpos = [
|
||||
[_INTL("{1}{2} {3}", indexText, " ", species_data.name),
|
||||
246, 36, 0, Color.new(248, 248, 248), Color.new(0, 0, 0)],
|
||||
|
||||
@@ -398,19 +398,19 @@ class PokemonSummary_Scene
|
||||
# Write the Regional/National Dex number
|
||||
dexnum = GameData::Species.get(@pokemon.species).id_number
|
||||
dexnumshift = false
|
||||
if $Trainer.pokedex.unlocked?(-1) # National Dex is unlocked
|
||||
dexnumshift = true if Settings::DEXES_WITH_OFFSETS.include?(-1)
|
||||
else
|
||||
dexnum = 0
|
||||
for i in 0...$Trainer.pokedex.dexes_count - 1
|
||||
next if !$Trainer.pokedex.unlocked?(i)
|
||||
num = pbGetRegionalNumber(i,@pokemon.species)
|
||||
next if num<=0
|
||||
dexnum = num
|
||||
dexnumshift = true if Settings::DEXES_WITH_OFFSETS.include?(i)
|
||||
break
|
||||
end
|
||||
end
|
||||
# if $Trainer.pokedex.unlocked?(-1) # National Dex is unlocked
|
||||
# dexnumshift = true if Settings::DEXES_WITH_OFFSETS.include?(-1)
|
||||
# else
|
||||
# dexnum = 0
|
||||
# for i in 0...$Trainer.pokedex.dexes_count - 1
|
||||
# next if !$Trainer.pokedex.unlocked?(i)
|
||||
# num = pbGetRegionalNumber(i,@pokemon.species)
|
||||
# next if num<=0
|
||||
# dexnum = num
|
||||
# dexnumshift = true if Settings::DEXES_WITH_OFFSETS.include?(i)
|
||||
# break
|
||||
# end
|
||||
# end
|
||||
if dexnum<=0
|
||||
textpos.push(["???",435,74,2,dexNumBase,dexNumShadow])
|
||||
else
|
||||
|
||||
@@ -284,7 +284,7 @@ class PokemonLoadScreen
|
||||
cmd_debug = -1
|
||||
cmd_quit = -1
|
||||
show_continue = !@save_data.empty?
|
||||
new_game_plus = show_continue && @save_data[:player].new_game_plus_unlocked
|
||||
new_game_plus = show_continue && (@save_data[:player].new_game_plus_unlocked || $DEBUG)
|
||||
if show_continue
|
||||
commands[cmd_continue = commands.length] = _INTL('Continue')
|
||||
if @save_data[:player].mystery_gift_unlocked
|
||||
|
||||
Reference in New Issue
Block a user