diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata index 41edc8e26..7967a5432 100644 Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata index 1be4a9d8f..34efdd9b3 100644 Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata index 901f2bb2b..2249bec14 100644 Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index eba36f0b2..22a06f68e 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata index be622f513..004ee903d 100644 Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ diff --git a/Data/Items.rxdata b/Data/Items.rxdata index fe767fa0b..3e62ba6d2 100644 Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ diff --git a/Data/Map108.rxdata b/Data/Map108.rxdata index 3ab6701ba..ac809f2b6 100644 Binary files a/Data/Map108.rxdata and b/Data/Map108.rxdata differ diff --git a/Data/Map110.rxdata b/Data/Map110.rxdata index bb031b04d..781c81d97 100644 Binary files a/Data/Map110.rxdata and b/Data/Map110.rxdata differ diff --git a/Data/Map156.rxdata b/Data/Map156.rxdata index 734c2f98a..fd951a42f 100644 Binary files a/Data/Map156.rxdata and b/Data/Map156.rxdata differ diff --git a/Data/Map183.rxdata b/Data/Map183.rxdata index 17393f34a..c33b7b6a7 100644 Binary files a/Data/Map183.rxdata and b/Data/Map183.rxdata differ diff --git a/Data/Map192.rxdata b/Data/Map192.rxdata index 56e461d90..7cd25da8a 100644 Binary files a/Data/Map192.rxdata and b/Data/Map192.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 7c94f3d16..8dc2ac9a9 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb b/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb index 85a28a605..e83b901ff 100644 --- a/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb +++ b/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb @@ -588,6 +588,9 @@ class PokemonEvolutionScene end # Success jingle/message pbMEPlay("Evolution success") + sprite_bitmap=@sprites["rsprite2"].getBitmap + drawSpriteCredits(sprite_bitmap.filename,sprite_bitmap.path, @viewport) + newspeciesname = GameData::Species.get(@newspecies).name if !reversing pbMessageDisplay(@sprites["msgwindow"], @@ -599,6 +602,7 @@ class PokemonEvolutionScene @pokemon.name,newspeciesname)) { pbUpdate } end + @sprites["msgwindow"].text = "" # Check for consumed item and check if Pokémon should be duplicated pbEvolutionMethodAfterEvolution if !reversing diff --git a/Data/Scripts/048_Fusion/PokemonFusion.rb b/Data/Scripts/048_Fusion/PokemonFusion.rb index 9ef61464e..41cc59807 100644 --- a/Data/Scripts/048_Fusion/PokemonFusion.rb +++ b/Data/Scripts/048_Fusion/PokemonFusion.rb @@ -691,7 +691,7 @@ class PokemonFusionScene overlay = BitmapSprite.new(Graphics.width, Graphics.height, @viewport).bitmap sprite_bitmap = @sprites["rsprite2"].getBitmap - drawSpriteCredits(sprite_bitmap.filename,sprite_bitmap.path, overlay) + drawSpriteCredits(sprite_bitmap.filename,sprite_bitmap.path, @viewport) Kernel.pbMessageDisplay(@sprites["msgwindow"], _INTL("\\se[]Congratulations! Your Pokémon were fused into {2}!\\wt[80]", @pokemon1.name, newspeciesname)) @@ -770,7 +770,9 @@ class PokemonFusionScene end end -def drawSpriteCredits(filename,path,overlay) +def drawSpriteCredits(filename,path,viewport) + overlay = BitmapSprite.new(Graphics.width, Graphics.height, @viewport).bitmap + return if path.start_with?(Settings::BATTLERS_FOLDER) x= Graphics.width/2 y=240 diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata index a45219f5e..61cba7ea2 100644 Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ diff --git a/Data/States.rxdata b/Data/States.rxdata index 868d49e59..0f9b4ae5d 100644 Binary files a/Data/States.rxdata and b/Data/States.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 328f9c904..3aeb3d610 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata index c7ea19a7a..d9bd35260 100644 Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ