From 099af82e47f3fbc11e8d5089f40d4d67593b48f4 Mon Sep 17 00:00:00 2001 From: infinitefusion Date: Wed, 25 Dec 2024 14:33:52 -0500 Subject: [PATCH] split dex entry fixes --- .gitignore | 2 +- Data/Scripts/048_Fusion/FusedSpecies.rb | 9 ++++++--- Data/System.rxdata | Bin 31623 -> 31623 bytes 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ce202ae24..be881ecb7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ Graphics/CustomBattlers/* Graphics/Battlers/* Graphics/Pokemon/FusionIcons/* -Data/pokedex/* + Data/sprites/* Data/VERSION \ No newline at end of file diff --git a/Data/Scripts/048_Fusion/FusedSpecies.rb b/Data/Scripts/048_Fusion/FusedSpecies.rb index c798a4e0d..aa874b1d1 100644 --- a/Data/Scripts/048_Fusion/FusedSpecies.rb +++ b/Data/Scripts/048_Fusion/FusedSpecies.rb @@ -305,13 +305,16 @@ module GameData body_entry = all_body_entries[@body_pokemon.id_number.to_s].sample + body_entry = body_entry.gsub(/#{@body_pokemon.real_name}/i, @real_name) + body_entry = clean_json_string(body_entry).gsub(@body_pokemon.real_name, @real_name) + head_entry = all_body_entries[@head_pokemon.id_number.to_s].sample + head_entry = head_entry.gsub(/#{@head_pokemon.real_name}/i, @real_name) + head_entry = clean_json_string(head_entry).gsub(@head_pokemon.real_name, @real_name) rescue - @body_pokemon.real_pokedex_entry.gsub(@body_pokemon.real_name, @real_name) + body_entry = @body_pokemon.real_pokedex_entry.gsub(@body_pokemon.real_name, @real_name) head_entry = @head_pokemon.real_pokedex_entry.gsub(@head_pokemon.real_name, @real_name) end - body_entry = clean_json_string(body_entry).gsub(@body_pokemon.real_name, @real_name) - head_entry = clean_json_string(head_entry).gsub(@head_pokemon.real_name, @real_name) echoln body_entry echoln head_entry diff --git a/Data/System.rxdata b/Data/System.rxdata index 87a685ad5180c27f72d061f8c98b4c77f19be4a8..1633cb56b93c8c1b7143668fbdd667746ad7cbc3 100644 GIT binary patch delta 19 acmZqw&e;B)aRZ|)%kKNOESp(no8kabdk0|v delta 19 acmZqw&e;B)aRZ|)i~k!#rp>IfO>qECw+8e8