From 481616c2ad3cbd12ef8a7d6f603677efc9475732 Mon Sep 17 00:00:00 2001
From: AJ Fontaine <36677462+Fontbane@users.noreply.github.com>
Date: Thu, 16 Jan 2025 16:25:50 -0500
Subject: [PATCH 1/2] [Sprite] Fix female Scizor variants not showing (#5097)

Co-authored-by: damocleas <damocleas25@gmail.com>
---
 .../images/pokemon/variant/_masterlist.json   |  2 +
 .../pokemon/variant/back/female/212.json      | 41 +++++++++++++++++++
 public/images/pokemon/variant/female/212.json | 41 +++++++++++++++++++
 3 files changed, 84 insertions(+)
 create mode 100644 public/images/pokemon/variant/back/female/212.json
 create mode 100644 public/images/pokemon/variant/female/212.json

diff --git a/public/images/pokemon/variant/_masterlist.json b/public/images/pokemon/variant/_masterlist.json
index 11f8e9cb7ec..3c5aedf2084 100644
--- a/public/images/pokemon/variant/_masterlist.json
+++ b/public/images/pokemon/variant/_masterlist.json
@@ -869,6 +869,7 @@
 		"198": [0, 1, 1],
 		"203": [0, 1, 1],
 		"207": [0, 1, 1],
+		"212": [1, 1, 1],
 		"215": [0, 1, 1],
 		"217": [1, 1, 1],
 		"229": [0, 1, 1],
@@ -1778,6 +1779,7 @@
 			"198": [0, 1, 1],
 			"203": [0, 1, 1],
 			"207": [0, 1, 1],
+			"212": [1, 1, 1],
 			"215": [0, 1, 1],
 			"217": [1, 1, 1],
 			"229": [0, 1, 1],
diff --git a/public/images/pokemon/variant/back/female/212.json b/public/images/pokemon/variant/back/female/212.json
new file mode 100644
index 00000000000..84f12bf1434
--- /dev/null
+++ b/public/images/pokemon/variant/back/female/212.json
@@ -0,0 +1,41 @@
+{
+	"0": {
+		"632929": "215a2d",
+		"f76b6b": "8cce73",
+		"a52929": "2f794e",
+		"101010": "101010",
+		"d63a3a": "4a9c53",
+		"9494a5": "9494a5",
+		"ffffff": "ffffff",
+		"b5b5ce": "b5b5ce",
+		"3a3a4a": "3a3a4a",
+		"9c6b21": "9c6b21",
+		"dec510": "dec510"
+	},
+	"1": {
+		"632929": "2f2962",
+		"f76b6b": "639cf7",
+		"a52929": "29429c",
+		"101010": "101010",
+		"d63a3a": "4263ef",
+		"9494a5": "6262a4",
+		"ffffff": "ffffff",
+		"b5b5ce": "b5b5ce",
+		"3a3a4a": "3c3c50",
+		"9c6b21": "131387",
+		"dec510": "10bdde"
+	},
+	"2": {
+		"632929": "645117",
+		"f76b6b": "c59f29",
+		"a52929": "b88619",
+		"101010": "101010",
+		"d63a3a": "ffca2a",
+		"9494a5": "3c4543",
+		"ffffff": "ffffff",
+		"b5b5ce": "b5b5ce",
+		"3a3a4a": "282d2c",
+		"9c6b21": "9c6b21",
+		"dec510": "dec510"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/female/212.json b/public/images/pokemon/variant/female/212.json
new file mode 100644
index 00000000000..55fcc0858ac
--- /dev/null
+++ b/public/images/pokemon/variant/female/212.json
@@ -0,0 +1,41 @@
+{
+	"0": {
+		"632929": "215a2d",
+		"f76b6b": "8cce73",
+		"101010": "101010",
+		"3a3a4a": "3a3a4a",
+		"ffffff": "ffffff",
+		"d63a3a": "4a9c53",
+		"b5b5ce": "b5b5ce",
+		"9494a5": "9494a5",
+		"a52929": "2f794e",
+		"dec510": "dec510",
+		"9c6b21": "9c6b21"
+	},
+	"1": {
+		"632929": "2f2962",
+		"f76b6b": "639cf7",
+		"101010": "101010",
+		"3a3a4a": "3c3c50",
+		"ffffff": "ffffff",
+		"d63a3a": "4263ef",
+		"b5b5ce": "b5b5ce",
+		"9494a5": "6262a4",
+		"a52929": "29429c",
+		"dec510": "10bdde",
+		"9c6b21": "131387"
+	},
+	"2": {
+		"632929": "645117",
+		"f76b6b": "c59f29",
+		"101010": "101010",
+		"3a3a4a": "282d2c",
+		"ffffff": "ffffff",
+		"d63a3a": "ffca2a",
+		"b5b5ce": "b5b5ce",
+		"9494a5": "3c4543",
+		"a52929": "b88619",
+		"dec510": "dec510",
+		"9c6b21": "9c6b21"
+	}
+}
\ No newline at end of file

From ca0522436aff60e3229e2350c244660f233b8449 Mon Sep 17 00:00:00 2001
From: Scooom <97370685+Scoooom@users.noreply.github.com>
Date: Thu, 16 Jan 2025 18:50:19 -0600
Subject: [PATCH 2/2] [Challenge] Make the Flip Inverse Challenge Secret
 (#5133)

Co-authored-by: Scooom <jerry@hosterslice.com>
---
 src/system/achv.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/system/achv.ts b/src/system/achv.ts
index fb17e7b1ced..a2777101186 100644
--- a/src/system/achv.ts
+++ b/src/system/achv.ts
@@ -365,7 +365,7 @@ export const achvs = {
   FRESH_START: new ChallengeAchv("FRESH_START", "", "FRESH_START.description", "reviver_seed", 100, (c) => c instanceof FreshStartChallenge && c.value > 0 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
   INVERSE_BATTLE: new ChallengeAchv("INVERSE_BATTLE", "", "INVERSE_BATTLE.description", "inverse", 100, (c) => c instanceof InverseBattleChallenge && c.value > 0),
   FLIP_STATS: new ChallengeAchv("FLIP_STATS", "", "FLIP_STATS.description", "dubious_disc", 100, (c) => c instanceof FlipStatChallenge && c.value > 0),
-  FLIP_INVERSE: new ChallengeAchv("FLIP_INVERSE", "", "FLIP_INVERSE.description", "cracked_pot", 100, (c) => c instanceof FlipStatChallenge && c.value > 0 && globalScene.gameMode.challenges.every(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
+  FLIP_INVERSE: new ChallengeAchv("FLIP_INVERSE", "", "FLIP_INVERSE.description", "cracked_pot", 100, (c) => c instanceof FlipStatChallenge && c.value > 0 && globalScene.gameMode.challenges.every(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)).setSecret(),
   BREEDERS_IN_SPACE: new Achv("BREEDERS_IN_SPACE", "", "BREEDERS_IN_SPACE.description", "moon_stone", 50).setSecret(),
 };