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

Rearranged and tidied up game data scripts

Browse Source
This commit is contained in:
Maruno17
2021-03-29 19:01:03 +01:00
parent cd62ba840c
commit 01a066a4d9
55 changed files with 263 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/017_UI/003_PScreen_PokedexMain.rb
View File

@@ -835,7 +835,9 @@ class PokemonPokedex_Scene
when 0 then @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_order")
when 1 then @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_name")
when 2
if PBTypes.regularTypesCount==18
count = 0
GameData::Type.each { |t| count += 1 if !t.pseudo_type && t.id != :SHADOW }
if count == 18
@sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_type_18")
else
@sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_type")

2
Data/Scripts/017_UI/024_PScreen_PurifyChamber.rb
View File

@@ -132,7 +132,7 @@ class PurifyChamberSet
# Purify Chamber treats Normal/Normal matchup as super effective
def self.typeAdvantage(p1,p2)
return true if p1 == :NORMAL && p2 == :NORMAL
return PBTypes.superEffective?(p1,p2)
return Effectiveness.super_effective_type?(p1, p2)
end
def self.isSuperEffective(p1,p2)