diff --git a/Data/Scripts/052_AddOns/GameplayUtils.rb b/Data/Scripts/052_AddOns/GameplayUtils.rb index 3f2c7b20c..6b7c8ae2e 100644 --- a/Data/Scripts/052_AddOns/GameplayUtils.rb +++ b/Data/Scripts/052_AddOns/GameplayUtils.rb @@ -842,17 +842,23 @@ def apply_concert_lighting(light, duration = 1) end def replaceFusionSpecies(pokemon, speciesToChange, newSpecies) - currentBody = pokemon.species_data.get_body_species() - currentHead = pokemon.species_data.get_head_species() + currentBody = pokemon.species_data.get_body_species_symbol() + currentHead = pokemon.species_data.get_head_species_symbol() should_update_body = currentBody == speciesToChange should_update_head = currentHead == speciesToChange + echoln speciesToChange + echoln currentBody + echoln currentHead + + return if !should_update_body && !should_update_head newSpeciesBody = should_update_body ? newSpecies : currentBody newSpeciesHead = should_update_head ? newSpecies : currentHead newSpecies = getFusionSpecies(newSpeciesBody, newSpeciesHead) + echoln newSpecies.id_number pokemon.species = newSpecies end diff --git a/Graphics/Characters/player/clothes/delinquentoutfit/clothes_surf_delinquentoutfit.png b/Graphics/Characters/player/clothes/delinquentoutfit/clothes_surf_delinquentoutfit.png new file mode 100644 index 000000000..db438a59a Binary files /dev/null and b/Graphics/Characters/player/clothes/delinquentoutfit/clothes_surf_delinquentoutfit.png differ diff --git a/Graphics/Characters/player/hair/lycanrocshorthair/hair_trainer_1_lycanrocshorthair.png b/Graphics/Characters/player/hair/lycanrocshorthair/hair_trainer_1_lycanrocshorthair.png new file mode 100644 index 000000000..f68d4d5fc Binary files /dev/null and b/Graphics/Characters/player/hair/lycanrocshorthair/hair_trainer_1_lycanrocshorthair.png differ diff --git a/Graphics/Characters/player/hair/lycanrocshorthair/hair_trainer_2_lycanrocshorthair.png b/Graphics/Characters/player/hair/lycanrocshorthair/hair_trainer_2_lycanrocshorthair.png new file mode 100644 index 000000000..9de4bdb61 Binary files /dev/null and b/Graphics/Characters/player/hair/lycanrocshorthair/hair_trainer_2_lycanrocshorthair.png differ diff --git a/Graphics/Characters/player/hair/lycanrocshorthair/hair_trainer_3_lycanrocshorthair.png b/Graphics/Characters/player/hair/lycanrocshorthair/hair_trainer_3_lycanrocshorthair.png new file mode 100644 index 000000000..7cfdbea57 Binary files /dev/null and b/Graphics/Characters/player/hair/lycanrocshorthair/hair_trainer_3_lycanrocshorthair.png differ diff --git a/Graphics/Characters/player/hair/lycanrocshorthair/hair_trainer_4_lycanrocshorthair.png b/Graphics/Characters/player/hair/lycanrocshorthair/hair_trainer_4_lycanrocshorthair.png new file mode 100644 index 000000000..c9351efb3 Binary files /dev/null and b/Graphics/Characters/player/hair/lycanrocshorthair/hair_trainer_4_lycanrocshorthair.png differ