DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-08 05:34:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Maruno17
2021-08-22 00:03:32 +01:00
parent 1b9e7400f9 e0e5cfebb7
commit e57e1f4a1e
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Data/Scripts/016_UI/003_UI_Pokedex_Main.rb
View File

@@ -140,7 +140,7 @@ class PokedexSearchSelectionSprite < SpriteWrapper
self.src_rect.y = 88; self.src_rect.height = 44
when 3,4 # Height, weight
self.src_rect.y = 132; self.src_rect.height = 44
when 6 # Form
when 6 # Shape
self.src_rect.y = 176; self.src_rect.height = 68
else # Reset/start/cancel
self.src_rect.y = 244; self.src_rect.height = 40
@@ -325,7 +325,8 @@ class PokemonPokedex_Scene
regionalSpecies.each_with_index do |species, i|
next if !species
next if !pbCanAddForModeList?($PokemonGlobal.pokedexMode, species)
species_data = GameData::Species.get(species)
_gender, form = $Trainer.pokedex.last_form_seen(species)
species_data = GameData::Species.get_species_form(species, form)
color = species_data.color
type1 = species_data.type1
type2 = species_data.type2 || type1
@@ -1106,7 +1107,7 @@ class PokemonPokedex_Scene
newparam = pbDexSearchCommands(5,[params[8]],index)
params[8] = newparam[0] if newparam!=nil
pbRefreshDexSearch(params,index)
when 6 # Filter by form
when 6 # Filter by shape
newparam = pbDexSearchCommands(6,[params[9]],index)
params[9] = newparam[0] if newparam!=nil
pbRefreshDexSearch(params,index)