From c99d9a70bba37ab13e8010bb23275145d24673bd Mon Sep 17 00:00:00 2001
From: pom-eranian <detective.pomeranian@gmail.com>
Date: Sun, 4 May 2025 02:34:59 -0400
Subject: [PATCH] Resolved conflicts

---
 public/images/pokemon/variant/207.json        | 26 +++++++-------
 public/images/pokemon/variant/572.json        | 36 +++++++++++--------
 public/images/pokemon/variant/back/572.json   | 21 +++++++----
 .../pokemon/variant/back/female/207.json      | 16 ++++-----
 public/images/pokemon/variant/female/207.json | 30 +++++++++-------
 5 files changed, 75 insertions(+), 54 deletions(-)

diff --git a/public/images/pokemon/variant/207.json b/public/images/pokemon/variant/207.json
index c95faad8c5e..7d1ff05493d 100644
--- a/public/images/pokemon/variant/207.json
+++ b/public/images/pokemon/variant/207.json
@@ -1,24 +1,26 @@
 {
 	"1": {
-		"63314a": "7f4812",
-		"e6a5ce": "f8dd84",
-		"ad6394": "b67322",
 		"de84b5": "daa93f",
-		"bd6b5a": "49a3d2",
+		"e6a5ce": "f8dd84",
+		"63314a": "275487",
 		"4a73bd": "3b426f",
-		"ffa584": "68caed",
 		"294a7b": "1f2142",
-		"6b9cef": "596596"
+		"ad6394": "b67322",
+		"612f48": "7f4812",
+		"6b9cef": "596596",
+		"ffa584": "68caed",
+		"bd6b5a": "49a3d2"
 	},
 	"2": {
-		"63314a": "5f1723",
-		"e6a5ce": "ef6b58",
-		"ad6394": "97343c",
 		"de84b5": "c04144",
-		"bd6b5a": "c86539",
+		"e6a5ce": "ef6b58",
+		"63314a": "752d17",
 		"4a73bd": "42bca0",
-		"ffa584": "f0a452",
 		"294a7b": "33817e",
-		"6b9cef": "81e4b3"
+		"ad6394": "97343c",
+		"612f48": "5f1723",
+		"6b9cef": "81e4b3",
+		"ffa584": "f0a452",
+		"bd6b5a": "c86539"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/572.json b/public/images/pokemon/variant/572.json
index 38c9c557db5..84a300c590d 100644
--- a/public/images/pokemon/variant/572.json
+++ b/public/images/pokemon/variant/572.json
@@ -1,20 +1,28 @@
 {
 	"1": {
-		"8c847b": "b2af6e",
-		"524a42": "525042",
-		"bdb5a5": "dad7a1",
-		"bd2929": "f28989",
-		"d65252": "f8c1c1",
-		"ef8484": "fab7b7"
+		"4f473f": "113026",
+		"4d443e": "428066",
+		"918b83": "60a37b",
+		"d65252": "458256",
+		"47403b": "802b50",
+		"faf5f5": "b3e8ba",
+		"8c847b": "b34967",
+		"decec5": "87cc9a",
+		"bdb5a5": "cf6b77",
+		"bd2929": "256145",
+		"ef8484": "63a86a"
 	},
 	"2": {
-		"8c847b": "5f807e",
-		"524a42": "5f807e",
-		"ffffff": "d7e8e6",
-		"decec5": "cbdcda",
-		"bdb5a5": "aec8c6",
-		"bd2929": "b08631",
-		"d65252": "e6c88d",
-		"ef8484": "dab977"
+		"4f473f": "19d684",
+		"4d443e": "466336",
+		"918b83": "67824d",
+		"d65252": "82a65e",
+		"47403b": "101931",
+		"faf5f5": "d9e3aa",
+		"8c847b": "193457",
+		"decec5": "7f915e",
+		"bdb5a5": "294a6b",
+		"bd2929": "558f45",
+		"ef8484": "b4cf88"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/572.json b/public/images/pokemon/variant/back/572.json
index 0da9ad2f295..5e74f55850d 100644
--- a/public/images/pokemon/variant/back/572.json
+++ b/public/images/pokemon/variant/back/572.json
@@ -1,13 +1,20 @@
 {
 	"1": {
-		"8c847b": "b2af6e",
-		"ffffff": "feffd9",
-		"bdb5a5": "dad7a1"
+		"ffffff": "b3e8ba",
+		"4d473d": "802b50",
+		"524940": "428066",
+		"decec5": "87cc9a",
+		"bdb5a5": "cf6b77",
+		"918a83": "60a37b",
+		"8c847b": "b34967"
 	},
 	"2": {
-		"8c847b": "86aaa7",
-		"524a42": "5f807e",
-		"decec5": "d7e8e6",
-		"bdb5a5": "aec8c6"
+		"ffffff": "d9e3aa",
+		"4d473d": "101931",
+		"524940": "466336",
+		"decec5": "7f915e",
+		"bdb5a5": "294a6b",
+		"918a83": "67824d",
+		"8c847b": "193457"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/female/207.json b/public/images/pokemon/variant/back/female/207.json
index dee74529c90..89ed15e95c5 100644
--- a/public/images/pokemon/variant/back/female/207.json
+++ b/public/images/pokemon/variant/back/female/207.json
@@ -1,14 +1,14 @@
 {
 	"1": {
-		"63314a": "7f4812",
-		"e6a5ce": "f8dd84",
-		"de84b5": "daa93f",
-		"ad6394": "b67322"
+		"de84b5": "e3784d",
+		"e6a5ce": "f7a565",
+		"63314a": "802019",
+		"ad6394": "ba4732"
 	},
 	"2": {
-		"63314a": "5f1723",
-		"e6a5ce": "ef6b58",
-		"de84b5": "c04144",
-		"ad6394": "97343c"
+		"de84b5": "42bca0",
+		"e6a5ce": "70e0b7",
+		"63314a": "134e5e",
+		"ad6394": "27868a"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/female/207.json b/public/images/pokemon/variant/female/207.json
index ea30aa1e33e..b1e3582ae5c 100644
--- a/public/images/pokemon/variant/female/207.json
+++ b/public/images/pokemon/variant/female/207.json
@@ -1,22 +1,26 @@
 {
 	"1": {
-		"63314a": "7f4812",
-		"e6a5ce": "f8dd84",
-		"ad6394": "b67322",
-		"de84b5": "daa93f",
+		"de84b5": "e3784d",
+		"e6a5ce": "f7a565",
+		"63314a": "2b8199",
 		"4a73bd": "3b426f",
 		"294a7b": "1f2142",
-		"6b9cef": "596596"
+		"ad6394": "ba4732",
+		"612f48": "802019",
+		"6b9cef": "596596",
+		"ffa584": "68edca",
+		"bd6b5a": "44c5c9"
 	},
 	"2": {
-		"63314a": "5f1723",
-		"e6a5ce": "ef6b58",
-		"ad6394": "97343c",
-		"de84b5": "c04144",
-		"bd6b5a": "c86539",
-		"4a73bd": "42bca0",
+		"de84b5": "42bca0",
+		"e6a5ce": "70e0b7",
+		"63314a": "752d17",
+		"4a73bd": "de597e",
+		"294a7b": "8a2b54",
+		"ad6394": "27868a",
+		"612f48": "134e5e",
+		"6b9cef": "f78f96",
 		"ffa584": "f0a452",
-		"294a7b": "33817e",
-		"6b9cef": "81e4b3"
+		"bd6b5a": "c86539"
 	}
 }
\ No newline at end of file