gitkeep

.gitignore

@@ -1,4 +1,5 @@
 Graphics/CustomBattlers/local_sprites/*
+Graphics/Pokemon/FusionIcons/*
 Graphics/Battlers/Shiny/*
 
 Graphics/CustomBattlers/spritesheets/*
@@ -14,4 +15,5 @@ Data/sprites/sprites_rate_limit.log
 Game.rxproj
 .DS_Store
 PBS/*
+Game.exe
 rpgmaker.sh

Data/Scripts/011_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb

@@ -245,10 +245,10 @@ class PokemonDataBox < SpriteWrapper
     pbDrawNumber(@battler.level,self.bitmap,@spriteBaseX+162,16) if !$game_switches[SWITCH_NO_LEVELS_MODE]
     # Draw shiny icon
     if @battler.shiny?
-      shinyX = (@battler.opposes?(0)) ? -8 : -6   # Foe's/player's
+      shinyX = (@battler.opposes?(0)) ? -6 : -6   # Foe's/player's
 
       pokeRadarShiny= !@battler.pokemon.debugShiny? && !@battler.pokemon.naturalShiny?
-      addShinyStarsToGraphicsArray(imagePos,@spriteBaseX+shinyX,15, @battler.pokemon.bodyShiny?,@battler.pokemon.headShiny?,@battler.pokemon.debugShiny?, pokeRadarShiny)
+      addShinyStarsToGraphicsArray(imagePos,@spriteBaseX+shinyX,35, @battler.pokemon.bodyShiny?,@battler.pokemon.headShiny?,@battler.pokemon.debugShiny?, pokeRadarShiny)
     end
     # Draw Mega Evolution/Primal Reversion icon
     if @battler.mega?

Data/Scripts/052_InfiniteFusion/GameOptions.rb

@@ -132,7 +132,7 @@ class PokemonGameOption_Scene < PokemonOption_Scene
                               },
                               [
                                 "Auto-selected sprites follow standard Pokémon sprites rules.",
-                                "Auto-selected sprites can be anything, including references, memes, jokes, etc."
+                                "Auto-selected sprites can be anything, including references, sprites, memes, and joke sprites."
                               ]
     ) ? 1 : 0
 

Data/Scripts/052_InfiniteFusion/ImprovedShinies/Shinies_AnimatedBitmap.rb

@@ -7,7 +7,6 @@ class AnimatedBitmap
   def shiftAllColors(dex_number, bodyShiny, headShiny)
     # pratically the same as hue_changecolors but for the animated bitmap
     if isFusion(dex_number)
-      return if !bodyShiny && !headShiny
       body_id = getBodyID(dex_number)
       head_id = getHeadID(dex_number, body_id)
       shiny_directory = "Graphics/Battlers/Shiny/#{head_id}.#{body_id}"

Data/outfits/clothes_data.json

@@ -89,6 +89,12 @@
         "tags": "celadon",
         "howToGet": "city exclusive outfit"
     },
+    {
+        "id": "breloomcap",
+        "name": "Breloom Cap",
+        "price": 8000,
+        "tags": "pokemon-shroomish,pokemon-breloom"
+    },
     {
         "id": "bughakama",
         "name": "Bug Hakama Dress",
@@ -545,6 +551,13 @@
         "tags": "azalea,",
         "howToGet": "city-exclusive outfit"
     },
+    {
+        "id": "pumpkaboohelmet",
+        "name": "Pumpkaboo Helmet",
+        "description": "A hollowed out pumpkin that looks like a Pumpkaboo!",
+        "price": 1031,
+        "tags": "pokemon-pumpkaboo,pokemon-gourgeist,"
+    },
     {
         "id": "Ramos",
         "name": "Gardener Outfit",
@@ -645,6 +658,13 @@
         "price": 12000,
         "tags": "pokemon-slowpoke,pokemon-slowbro,pokemon-slowking"
     },
+    {
+        "id": "sneaselfeather",
+        "name": "Sharp Feather",
+        "description": "A feather worn on the head that ressembles the ear of a Sneasel.",
+        "price": 4000,
+        "tags": "pokemon-sneasel,pokemon-weavile,"
+    },
     {
         "id": "SnowCoatFemale",
         "name": "Blue Snow Coat (F)",

Data/outfits/hats_data.json

@@ -95,12 +95,6 @@
         "tags": "headband,",
         "howToGet": "reward for hatching x number of eggs? for getting every baby mon?"
     },
-    {
-        "id": "breloomcap",
-        "name": "Breloom Cap",
-        "price": 8000,
-        "tags": "pokemon-shroomish,pokemon-breloom"
-    },
     {
         "id": "brendanORAS",
         "name": "Sporty Cap",
@@ -1037,13 +1031,6 @@
         "tags": "mask,pokemon-glalie,type-ice,weather-cold,",
         "howToGet": "gym reward"
     },
-    {
-        "id": "pumpkaboohelmet",
-        "name": "Pumpkaboo Helmet",
-        "description": "A hollowed out pumpkin that looks like a Pumpkaboo!",
-        "price": 1031,
-        "tags": "pokemon-pumpkaboo,pokemon-gourgeist,"
-    },
     {
         "id": "Ramos",
         "name": "Green Flat cap",
@@ -1300,13 +1287,6 @@
         "price": 15000,
         "tags": "hat,pokemon-slowbro,pokemon-slowking,pokemon-shellder"
     },
-    {
-        "id": "sneaselfeather",
-        "name": "Sharp Feather",
-        "description": "A feather worn on the head that ressembles the ear of a Sneasel.",
-        "price": 4000,
-        "tags": "pokemon-sneasel,pokemon-weavile,"
-    },
     {
         "id": "snorlaxhat",
         "name": "Snorlax Hat",

Data/sprites/updated_spritesheets_cache

@@ -1,7 +0,0 @@
-Graphics/CustomBattlers/spritesheets/spritesheets_base/4.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/7/7b.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/19/19.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/16.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/4/4a.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/16/16.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/4/4.png