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 069b904f5..aa34e5699 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 70b797d19..26eca1d7a 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 ebe4e34a5..447118218 100644 Binary files a/Data/Map108.rxdata and b/Data/Map108.rxdata differ diff --git a/Data/Map813.rxdata b/Data/Map813.rxdata index cbbbbbab3..46aa118ed 100644 Binary files a/Data/Map813.rxdata and b/Data/Map813.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index c93b8f944..8a377201a 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/048_Fusion/SplitNames.rb b/Data/Scripts/048_Fusion/SplitNames.rb index ace590e21..7eb4ae049 100644 --- a/Data/Scripts/048_Fusion/SplitNames.rb +++ b/Data/Scripts/048_Fusion/SplitNames.rb @@ -285,11 +285,11 @@ module GameData ["Garde", "voir"], ["Sur", "skit"], ["Masque", "rain"], - ["Shroom", "mish"], - ["Bre", "reloom"], - ["Sla", "oth"], - ["Vigor", "roth"], - ["Slak", "aking"], + ["Shroom", "ish"], + ["Bre", "loom"], + ["Sla", "koth"], + ["Vigo", "roth"], + ["Sla", "king"], ["Nin", "cada"], ["Nin", "jask"], ["Shed", "inja"], @@ -299,7 +299,7 @@ module GameData ["Maku", "hita"], ["Hari", "yama"], ["Azu", "rill"], - ["Nose", "ass"], + ["Nose", "pass"], ["Skit", "itty"], ["Del", "catty"], ["Sabl", "eye"], diff --git a/Data/Scripts/050_AddOns/HttpCalls.rb b/Data/Scripts/050_AddOns/HttpCalls.rb index 848092532..bce596e56 100644 --- a/Data/Scripts/050_AddOns/HttpCalls.rb +++ b/Data/Scripts/050_AddOns/HttpCalls.rb @@ -56,7 +56,7 @@ def download_sprite(base_path, head_id, body_id, saveLocation = "Graphics/temp", downloaded_file_name = _INTL("{1}/{2}.{3}{4}.png", saveLocation, head_id, body_id, alt_letter) if !body_id || body_id == "" - downloaded_file_name = _INTL("{1}/{2}{3}.png", saveLocation, head_id, alt_letter) + downloaded_file_name = _INTL("{1}{2}{3}.png", saveLocation, head_id, alt_letter) end return downloaded_file_name if pbResolveBitmap(downloaded_file_name) @@ -109,8 +109,6 @@ def download_unfused_main_sprite(dex_num, alt_letter="") base_url = alt_letter == "" ? Settings::BASE_POKEMON_SPRITES_REPO_URL : Settings::BASE_POKEMON_ALT_SPRITES_REPO_URL filename = _INTL("{1}{2}.png",dex_num,alt_letter) url = base_url + filename - - destPath = alt_letter == "" ? _INTL("{1}{2}", Settings::BATTLERS_FOLDER, dex_num) : Settings::CUSTOM_BASE_SPRITES_FOLDER sprite = download_sprite(url, dex_num, nil, destPath,alt_letter) 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/System.rxdata b/Data/System.rxdata index 530aa9aa2..ea02376d6 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 646a60fd7..05045e8ca 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