Refactored code that draws the Pokémon info box in battle

This commit is contained in:
Maruno17
2022-06-13 23:17:09 +01:00
parent cc540b0132
commit c0c672806d
2 changed files with 81 additions and 56 deletions

View File

@@ -364,9 +364,9 @@ class PokemonPartyPanel < SpriteWrapper
@overlaysprite.bitmap&.clear
draw_name
draw_level
draw_gender
draw_hp
draw_status
draw_gender
draw_shiny_icon
draw_annotation
end
@@ -388,6 +388,15 @@ class PokemonPartyPanel < SpriteWrapper
pbSetSystemFont(@overlaysprite.bitmap)
end
def draw_gender
return if @pokemon.egg? || @pokemon.genderless?
gender_text = (@pokemon.male?) ? _INTL("") : _INTL("")
base_color = (@pokemon.male?) ? Color.new(0, 112, 248) : Color.new(232, 32, 16)
shadow_color = (@pokemon.male?) ? Color.new(120, 184, 232) : Color.new(248, 168, 184)
pbDrawTextPositions(@overlaysprite.bitmap,
[[gender_text, 224, 22, 0, base_color, shadow_color]])
end
def draw_hp
return if @pokemon.egg? || (@text && @text.length > 0)
# HP numbers
@@ -422,15 +431,6 @@ class PokemonPartyPanel < SpriteWrapper
@overlaysprite.bitmap.blt(78, 68, @statuses.bitmap, statusrect)
end
def draw_gender
return if @pokemon.egg? || @pokemon.genderless?
gender_text = (@pokemon.male?) ? _INTL("") : _INTL("")
base_color = (@pokemon.male?) ? Color.new(0, 112, 248) : Color.new(232, 32, 16)
shadow_color = (@pokemon.male?) ? Color.new(120, 184, 232) : Color.new(248, 168, 184)
pbDrawTextPositions(@overlaysprite.bitmap,
[[gender_text, 224, 22, 0, base_color, shadow_color]])
end
def draw_shiny_icon
return if @pokemon.egg? || !@pokemon.shiny?
pbDrawImagePositions(@overlaysprite.bitmap,