Merge branch 'beta' into magic-bounce

public/images/pokemon/back/658.json

@@ -1,19 +1,19 @@
 { "frames": [
    {
     "filename": "0001.png",
-    "frame": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "frame": { "x": 0, "y": 0, "w": 77, "h": 65 },
     "rotated": false,
     "trimmed": false,
-    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
-    "sourceSize": { "w": 77, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 65 },
+    "sourceSize": { "w": 77, "h": 65 },
     "duration": 100
    }
  ],
  "meta": {
   "app": "https://www.aseprite.org/",
-  "version": "1.3.7-x64",
+  "version": "1.3.9.2-x64",
   "format": "I8",
-  "size": { "w": 77, "h": 77 },
+  "size": { "w": 77, "h": 65 },
   "scale": "1"
  }
 }

public/images/pokemon/back/shiny/658.json

@@ -1,11 +1,11 @@
 { "frames": [
    {
     "filename": "0001.png",
-    "frame": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "frame": { "x": 0, "y": 0, "w": 77, "h": 65 },
     "rotated": false,
     "trimmed": false,
-    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
-    "sourceSize": { "w": 77, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 65 },
+    "sourceSize": { "w": 77, "h": 65 },
     "duration": 100
    }
  ],
@@ -13,7 +13,7 @@
   "app": "https://www.aseprite.org/",
   "version": "1.3.7-x64",
   "format": "I8",
-  "size": { "w": 77, "h": 77 },
+  "size": { "w": 77, "h": 65 },
   "scale": "1"
  }
 }

src/field/pokemon.ts

@@ -1066,6 +1066,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     globalScene.applyModifiers(PokemonBaseStatFlatModifier, this.isPlayer(), this, baseStats);
     if (this.isFusion()) {
       const fusionBaseStats = this.getFusionSpeciesForm(true).baseStats;
+      applyChallenges(globalScene.gameMode, ChallengeType.FLIP_STAT, this, fusionBaseStats);
+
       for (const s of PERMANENT_STATS) {
         baseStats[s] = Math.ceil((baseStats[s] + fusionBaseStats[s]) / 2);
       }