Fixed GameData::Species.icon_bitmap_from_pokemon causing a crash, fixed trainer intro music not stopping after skipping their battle

This commit is contained in:
Maruno17
2022-06-09 21:05:22 +01:00
parent 49c916e1bb
commit cb2f33d8f6
2 changed files with 9 additions and 2 deletions

View File

@@ -124,7 +124,8 @@ module GameData
return (filename) ? AnimatedBitmap.new(filename).deanimate : nil
end
def self.icon_bitmap(species, form = 0, gender = 0, shiny = false, shadow = false)
def self.icon_bitmap(species, form = 0, gender = 0, shiny = false, shadow = false, egg = false)
return self.egg_icon_bitmap(species, form) if egg
filename = self.icon_filename(species, form, gender, shiny, shadow)
return (filename) ? AnimatedBitmap.new(filename).deanimate : nil
end