mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
6.4 update (minus sprites)
This commit is contained in:
@@ -106,13 +106,15 @@ class DoublePreviewScreen
|
||||
body_pokemon = getBodyID(dexNumber)
|
||||
head_pokemon = getHeadID(dexNumber, body_pokemon)
|
||||
|
||||
picturePath = getPicturePath(head_pokemon, body_pokemon)
|
||||
bitmap = AnimatedBitmap.new(picturePath)
|
||||
# picturePath = getPicturePath(head_pokemon, body_pokemon)
|
||||
# bitmap = AnimatedBitmap.new(picturePath)
|
||||
spriteLoader = BattleSpriteLoader.new
|
||||
bitmap = spriteLoader.load_fusion_sprite(head_pokemon,body_pokemon)
|
||||
bitmap.scale_bitmap(Settings::FRONTSPRITE_SCALE)
|
||||
|
||||
#hasCustom = picturePath.include?("CustomBattlers")
|
||||
hasCustom = customSpriteExistsBase(body_pokemon,head_pokemon)
|
||||
|
||||
#hasCustom = customSpriteExistsBase(body_pokemon,head_pokemon)
|
||||
hasCustom = customSpriteExists(body_pokemon,head_pokemon)
|
||||
previewwindow = PictureWindow.new(bitmap)
|
||||
previewwindow.x = x
|
||||
previewwindow.y = y
|
||||
@@ -131,10 +133,6 @@ class DoublePreviewScreen
|
||||
end
|
||||
|
||||
|
||||
def getPicturePath(head_pokemon, body_pokemon)
|
||||
return get_fusion_sprite_path(head_pokemon,body_pokemon)
|
||||
end
|
||||
|
||||
def drawFusionInformation(fusedDexNum, level, x = 0)
|
||||
viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
|
||||
@typewindows << drawPokemonType(fusedDexNum, viewport, x + 55, 220) if @draw_types
|
||||
|
||||
Reference in New Issue
Block a user