General tidying up

This commit is contained in:
Maruno17
2020-12-28 15:46:08 +00:00
parent d3d7222fd3
commit fb29c6b760
44 changed files with 1822 additions and 2650 deletions

View File

@@ -75,32 +75,36 @@ class PokemonPartyConfirmCancelSprite < SpriteWrapper
end
end
#===============================================================================
#
#===============================================================================
class PokemonPartyCancelSprite < PokemonPartyConfirmCancelSprite
def initialize(viewport=nil)
super(_INTL("CANCEL"),398,328,false,viewport)
end
end
#===============================================================================
#
#===============================================================================
class PokemonPartyConfirmSprite < PokemonPartyConfirmCancelSprite
def initialize(viewport=nil)
super(_INTL("CONFIRM"),398,308,true,viewport)
end
end
#===============================================================================
#
#===============================================================================
class PokemonPartyCancelSprite2 < PokemonPartyConfirmCancelSprite
def initialize(viewport=nil)
super(_INTL("CANCEL"),398,346,true,viewport)
end
end
#===============================================================================
#
#===============================================================================
class Window_CommandPokemonColor < Window_CommandPokemon
def initialize(commands,width=nil)
@colorKey = []
@@ -127,10 +131,8 @@ class Window_CommandPokemonColor < Window_CommandPokemon
end
end
#===============================================================================
# Pokémon party panels
# Blank party panel
#===============================================================================
class PokemonPartyBlankPanel < SpriteWrapper
attr_accessor :text
@@ -158,8 +160,9 @@ class PokemonPartyBlankPanel < SpriteWrapper
def refresh; end
end
#===============================================================================
# Pokémon party panel
#===============================================================================
class PokemonPartyPanel < SpriteWrapper
attr_reader :pokemon
attr_reader :active
@@ -423,8 +426,6 @@ class PokemonPartyPanel < SpriteWrapper
end
end
#===============================================================================
# Pokémon party visuals
#===============================================================================
@@ -820,8 +821,6 @@ class PokemonParty_Scene
end
end
#===============================================================================
# Pokémon party mechanics
#===============================================================================
@@ -941,7 +940,7 @@ class PokemonPartyScreen
def pbChooseMove(pokemon,helptext,index=0)
movenames = []
for i in pokemon.moves
break if i.id==0
next if !i || !i.id
if i.total_pp<=0
movenames.push(_INTL("{1} (PP: ---)",i.name))
else
@@ -1324,8 +1323,6 @@ class PokemonPartyScreen
end
end
#===============================================================================
# Open the party screen
#===============================================================================