diff --git a/Data/Map108.rxdata b/Data/Map108.rxdata index 0f4b04f72..ffb14e9aa 100644 Binary files a/Data/Map108.rxdata and b/Data/Map108.rxdata differ diff --git a/Data/Map113.rxdata b/Data/Map113.rxdata index 60aa9d27b..fd48a705d 100644 Binary files a/Data/Map113.rxdata and b/Data/Map113.rxdata differ diff --git a/Data/Map141.rxdata b/Data/Map141.rxdata index 570dfc771..bea42dc10 100644 Binary files a/Data/Map141.rxdata and b/Data/Map141.rxdata differ diff --git a/Data/Map195.rxdata b/Data/Map195.rxdata index 3a8a6854a..a703136fd 100644 Binary files a/Data/Map195.rxdata and b/Data/Map195.rxdata differ diff --git a/Data/Map212.rxdata b/Data/Map212.rxdata index 05876e474..fe02e5a67 100644 Binary files a/Data/Map212.rxdata and b/Data/Map212.rxdata differ diff --git a/Data/Map559.rxdata b/Data/Map559.rxdata index 8a76b9766..2d3915193 100644 Binary files a/Data/Map559.rxdata and b/Data/Map559.rxdata differ diff --git a/Data/Map638.rxdata b/Data/Map638.rxdata index d37383f9b..b399514c8 100644 Binary files a/Data/Map638.rxdata and b/Data/Map638.rxdata differ diff --git a/Data/Map665.rxdata b/Data/Map665.rxdata index 41fe57b46..9b0969c2a 100644 Binary files a/Data/Map665.rxdata and b/Data/Map665.rxdata differ diff --git a/Data/Map668.rxdata b/Data/Map668.rxdata index 68706c273..bd6d9bdcc 100644 Binary files a/Data/Map668.rxdata and b/Data/Map668.rxdata differ diff --git a/Data/Map757.rxdata b/Data/Map757.rxdata index 017546aa8..0267d79a8 100644 Binary files a/Data/Map757.rxdata and b/Data/Map757.rxdata differ diff --git a/Data/Map780.rxdata b/Data/Map780.rxdata index de1a8b53f..8a149178a 100644 Binary files a/Data/Map780.rxdata and b/Data/Map780.rxdata differ diff --git a/Data/Map781.rxdata b/Data/Map781.rxdata index a60978dc9..50270e658 100644 Binary files a/Data/Map781.rxdata and b/Data/Map781.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index c24173525..ceac43068 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/025-Randomizer/RandomizerUtils.rb b/Data/Scripts/025-Randomizer/RandomizerUtils.rb index 5501c509f..da596b386 100644 --- a/Data/Scripts/025-Randomizer/RandomizerUtils.rb +++ b/Data/Scripts/025-Randomizer/RandomizerUtils.rb @@ -20,7 +20,8 @@ HELD_ITEMS = [:AIRBALLOON, :BRIGHTPOWDER, :EVIOLITE, :FLOATSTONE, :DESTINYKNOT, :PETAYABERRY, :APICOTBERRY, :LANSATBERRY, :STARFBERRY, :ENIGMABERRY, :MICLEBERRY, :CUSTAPBERRY, :JABOCABERRY, :ROWAPBERRY, :FAIRYGEM] -INVALID_ITEMS = [:COVERFOSSIL, :PLUMEFOSSIL, :ACCURACYUP, :DAMAGEUP, :ANCIENTSTONE, :ODDKEYSTONE_FULL, :TM00,:DEVOLUTIONSPRAY] +INVALID_ITEMS = [:COVERFOSSIL, :PLUMEFOSSIL, :ACCURACYUP, :DAMAGEUP, :ANCIENTSTONE, :ODDKEYSTONE_FULL, + :TM00,:DEVOLUTIONSPRAY, :INVISIBALL] RANDOM_ITEM_EXCEPTIONS = [:DNASPLICERS, :DYNAMITE] def getRandomGivenTM(item) diff --git a/Data/Scripts/050_AddOns/HttpCalls.rb b/Data/Scripts/050_AddOns/HttpCalls.rb index 40edb3ea7..9808acd7e 100644 --- a/Data/Scripts/050_AddOns/HttpCalls.rb +++ b/Data/Scripts/050_AddOns/HttpCalls.rb @@ -32,7 +32,7 @@ def download_sprite(base_path, head_id, body_id) end def download_autogen_sprite(head_id, body_id) - return nil if !$PokemonSystem.download_sprites + return nil if $PokemonSystem.download_sprites != 0 base_path = "https://raw.githubusercontent.com/Aegide/autogen-fusion-sprites/master/Battlers/{1}/{1}.{2}.png" sprite = download_sprite(_INTL(base_path,head_id,body_id),head_id,body_id) return sprite if sprite @@ -40,16 +40,20 @@ def download_autogen_sprite(head_id, body_id) end def download_custom_sprite(head_id, body_id) - return nil if !$PokemonSystem.download_sprites - base_path = "https://raw.githubusercontent.com/Aegide/custom-fusion-sprites/main/CustomBattlers/{1}.{2}.png" + return nil if $PokemonSystem.download_sprites != 0 + #base_path = "https://raw.githubusercontent.com/Aegide/custom-fusion-sprites/main/CustomBattlers/{1}.{2}.png" + base_path = "https://raw.githubusercontent.com/infinitefusion/sprites/main/CustomBattlers/{1}.{2}.png" sprite = download_sprite(_INTL(base_path,head_id,body_id),head_id,body_id) return sprite if sprite return nil end #format: [1.1.png, 1.2.png, etc.] +# https://api.github.com/repos/infinitefusion/contents/sprites/CustomBattlers +# repo = "Aegide/custom-fusion-sprites" +# folder = "CustomBattlers" def list_online_custom_sprites - repo = "Aegide/custom-fusion-sprites" + repo = "infinitefusion/sprites" folder = "CustomBattlers" api_url = "https://api.github.com/repos/#{repo}/contents/#{folder}" response = HTTPLite.get(api_url) diff --git a/Data/System.rxdata b/Data/System.rxdata index f87e9f572..61d10c768 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ