diff --git a/Data/Scripts/048_Fusion/Sprites/CustomSpriteExtracter.rb b/Data/Scripts/048_Fusion/Sprites/CustomSpriteExtracter.rb index b7d5a46e9..0be24450b 100644 --- a/Data/Scripts/048_Fusion/Sprites/CustomSpriteExtracter.rb +++ b/Data/Scripts/048_Fusion/Sprites/CustomSpriteExtracter.rb @@ -12,14 +12,9 @@ class CustomSpriteExtracter < PIFSpriteExtracter def load_bitmap_from_spritesheet(pif_sprite) body_id = pif_sprite.body_id spritesheet_file = getSpritesheetPath(pif_sprite) - - echoln spritesheet_file spritesheet_bitmap = AnimatedBitmap.new(spritesheet_file).bitmap sprite_x_position,sprite_y_position =get_sprite_position_on_spritesheet(body_id,SPRITE_SIZE,COLUMNS) - echoln sprite_x_position - echoln sprite_y_position - src_rect = Rect.new(sprite_x_position, sprite_y_position, SPRITE_SIZE, SPRITE_SIZE) sprite_bitmap = Bitmap.new(SPRITE_SIZE, SPRITE_SIZE) diff --git a/Data/Scripts/052_AddOns/FusionSprites.rb b/Data/Scripts/052_AddOns/FusionSprites.rb index 90cb3d85b..d36172262 100644 --- a/Data/Scripts/052_AddOns/FusionSprites.rb +++ b/Data/Scripts/052_AddOns/FusionSprites.rb @@ -312,6 +312,7 @@ end def get_random_alt_letter_for_custom(head_id, body_id, onlyMain = true) spriteName = _INTL("{1}.{2}", head_id, body_id) + echoln spriteName if onlyMain alts_list = list_main_sprites_letters(spriteName) return nil if alts_list.empty? diff --git a/Data/System.rxdata b/Data/System.rxdata index 351d7e605..6df946ca1 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/sprites/sprites_rate_limit.log b/Data/sprites/sprites_rate_limit.log index d9cd09374..cefbfd4bd 100644 --- a/Data/sprites/sprites_rate_limit.log +++ b/Data/sprites/sprites_rate_limit.log @@ -1,8 +1,2 @@ -1741716194 -1741716198 -1741716201 -1741716206 -1741716225 -1741716229 -1741716244 -1741716248 \ No newline at end of file +1741723971 +1741723972 \ No newline at end of file diff --git a/Data/sprites/updated_spritesheets_cache b/Data/sprites/updated_spritesheets_cache index be5bed7ef..f4afd6d28 100644 --- a/Data/sprites/updated_spritesheets_cache +++ b/Data/sprites/updated_spritesheets_cache @@ -526,3 +526,22 @@ Graphics/CustomBattlers/spritesheets/spritesheets_base/239.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/239/239.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/187/187.png Graphics/CustomBattlers/spritesheets/spritesheets_base/460.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/356/356.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/484.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/484/484.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/318.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/318/318.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/319.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/405/405.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/481.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/246.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/246/246.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/14.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/252.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/413.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/413/413b.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/191.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/176.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/173/173.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/402.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/418/418.png