diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata index 7967a5432..41edc8e26 100644 Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata index a900929a9..71336e1f0 100644 Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata index 2249bec14..901f2bb2b 100644 Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index ce49eedbd..89c2c5f78 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata index 004ee903d..be622f513 100644 Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ diff --git a/Data/Items.rxdata b/Data/Items.rxdata index 3e62ba6d2..fe767fa0b 100644 Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ diff --git a/Data/Map046.rxdata b/Data/Map046.rxdata index 24e369386..16bc04878 100644 Binary files a/Data/Map046.rxdata and b/Data/Map046.rxdata differ diff --git a/Data/Map411.rxdata b/Data/Map411.rxdata index 71d61ee00..28eaf89da 100644 Binary files a/Data/Map411.rxdata and b/Data/Map411.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 7234fe8a2..f73ad9892 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb index f1eb0d59f..1b96a0e32 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -59,8 +59,8 @@ module Settings HTTP_CONFIGS_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/pif-downloadables/refs/heads/master/Settings.rb" HTTP_CONFIGS_FILE_PATH = "Data/Scripts/DownloadedSettings.rb" - SPRITES_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/CUSTOM_SPRITES" - BASE_SPRITES_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/BASE_SPRITES" + SPRITES_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/sprites/CUSTOM_SPRITES" + BASE_SPRITES_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/sprites/BASE_SPRITES" STARTUP_MESSAGES = "" diff --git a/Data/Scripts/052_AddOns/HttpCalls.rb b/Data/Scripts/052_AddOns/HttpCalls.rb index a97350e59..97af2e1d2 100644 --- a/Data/Scripts/052_AddOns/HttpCalls.rb +++ b/Data/Scripts/052_AddOns/HttpCalls.rb @@ -8,6 +8,7 @@ end def updateHttpSettingsFile return if !downloadAllowed?() + echoln "UPDATING SETTINGS" download_file(Settings::HTTP_CONFIGS_FILE_URL, Settings::HTTP_CONFIGS_FILE_PATH,) end @@ -41,7 +42,7 @@ def download_file(url, saveLocation) echoln _INTL("\nDownloaded file {1} to {2}", url, saveLocation) return saveLocation else - echoln _INTL("Tried to download file {1}", url) + echoln _INTL("Failed to download file {1}", url) end return nil rescue MKXPError, Errno::ENOENT => error @@ -363,6 +364,7 @@ end def updateOnlineCustomSpritesFile return if !downloadAllowed?() + echoln "HERE" download_file(Settings::SPRITES_FILE_URL, Settings::CUSTOM_SPRITES_FILE_PATH) download_file(Settings::BASE_SPRITES_FILE_URL, Settings::BASE_SPRITES_FILE_PATH) end diff --git a/Data/Scripts/052_AddOns/MultiSaves.rb b/Data/Scripts/052_AddOns/MultiSaves.rb index 634cf9210..328e5ee78 100644 --- a/Data/Scripts/052_AddOns/MultiSaves.rb +++ b/Data/Scripts/052_AddOns/MultiSaves.rb @@ -416,6 +416,7 @@ class PokemonLoadScreen updateHttpSettingsFile updateCreditsFile updateCustomDexFile + updateOnlineCustomSpritesFile newer_version = find_newer_available_version if newer_version pbMessage(_INTL("Version {1} is now available! Please use the game's installer to download the newest version. Check the Discord for more information.", newer_version)) diff --git a/Data/Scripts/DownloadedSettings.rb b/Data/Scripts/DownloadedSettings.rb index 321503aa3..fa9b2eb2f 100644 --- a/Data/Scripts/DownloadedSettings.rb +++ b/Data/Scripts/DownloadedSettings.rb @@ -8,8 +8,10 @@ module Settings STARTUP_MESSAGES = "" CREDITS_FILE_URL = "https://infinitefusion.net/Sprite Credits.csv" - SPRITES_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/CUSTOM_SPRITES" - BASE_SPRITES_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/BASE_SPRITES" + + SPRITES_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/pif-downloadables/refs/heads/master/CUSTOM_SPRITES" + BASE_SPRITES_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/pif-downloadables/refs/heads/master/BASE_SPRITES" + VERSION_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/VERSION" CUSTOM_DEX_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/dex.json" diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata index 61cba7ea2..a45219f5e 100644 Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ diff --git a/Data/States.rxdata b/Data/States.rxdata index 0f9b4ae5d..868d49e59 100644 Binary files a/Data/States.rxdata and b/Data/States.rxdata differ diff --git a/Data/System.rxdata b/Data/System.rxdata index e137841fb..f5e304996 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 6fd4dee80..81118b37b 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata index d9bd35260..c7ea19a7a 100644 Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ