mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-05 16:02:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolved conflicts

Browse Source
This commit is contained in:
pom-eranian 2025-05-04 02:34:59 -04:00
parent 2df5e74f0a
commit c99d9a70bb
5 changed files with 75 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
public/images/pokemon/variant/207.json
View File

@ -1,24 +1,26 @@
{ {
"1": { "1": {
"63314a": "7f4812",
"e6a5ce": "f8dd84",
"ad6394": "b67322",
"de84b5": "daa93f", "de84b5": "daa93f",
"bd6b5a": "49a3d2", "e6a5ce": "f8dd84",
"63314a": "275487",
"4a73bd": "3b426f", "4a73bd": "3b426f",
"ffa584": "68caed",
"294a7b": "1f2142", "294a7b": "1f2142",
"6b9cef": "596596" "ad6394": "b67322",
"612f48": "7f4812",
"6b9cef": "596596",
"ffa584": "68caed",
"bd6b5a": "49a3d2"
}, },
"2": { "2": {
"63314a": "5f1723",
"e6a5ce": "ef6b58",
"ad6394": "97343c",
"de84b5": "c04144", "de84b5": "c04144",
"bd6b5a": "c86539", "e6a5ce": "ef6b58",
"63314a": "752d17",
"4a73bd": "42bca0", "4a73bd": "42bca0",
"ffa584": "f0a452",
"294a7b": "33817e", "294a7b": "33817e",
"6b9cef": "81e4b3" "ad6394": "97343c",
"612f48": "5f1723",
"6b9cef": "81e4b3",
"ffa584": "f0a452",
"bd6b5a": "c86539"
} }
} }

36
public/images/pokemon/variant/572.json
View File

@ -1,20 +1,28 @@
{ {
"1": { "1": {
"8c847b": "b2af6e", "4f473f": "113026",
"524a42": "525042", "4d443e": "428066",
"bdb5a5": "dad7a1", "918b83": "60a37b",
"bd2929": "f28989", "d65252": "458256",
"d65252": "f8c1c1", "47403b": "802b50",
"ef8484": "fab7b7" "faf5f5": "b3e8ba",
"8c847b": "b34967",
"decec5": "87cc9a",
"bdb5a5": "cf6b77",
"bd2929": "256145",
"ef8484": "63a86a"
}, },
"2": { "2": {
"8c847b": "5f807e", "4f473f": "19d684",
"524a42": "5f807e", "4d443e": "466336",
"ffffff": "d7e8e6", "918b83": "67824d",
"decec5": "cbdcda", "d65252": "82a65e",
"bdb5a5": "aec8c6", "47403b": "101931",
"bd2929": "b08631", "faf5f5": "d9e3aa",
"d65252": "e6c88d", "8c847b": "193457",
"ef8484": "dab977" "decec5": "7f915e",
"bdb5a5": "294a6b",
"bd2929": "558f45",
"ef8484": "b4cf88"
} }
} }

21
public/images/pokemon/variant/back/572.json
View File

@ -1,13 +1,20 @@
{ {
"1": { "1": {
"8c847b": "b2af6e", "ffffff": "b3e8ba",
"ffffff": "feffd9", "4d473d": "802b50",
"bdb5a5": "dad7a1" "524940": "428066",
"decec5": "87cc9a",
"bdb5a5": "cf6b77",
"918a83": "60a37b",
"8c847b": "b34967"
}, },
"2": { "2": {
"8c847b": "86aaa7", "ffffff": "d9e3aa",
"524a42": "5f807e", "4d473d": "101931",
"decec5": "d7e8e6", "524940": "466336",
"bdb5a5": "aec8c6" "decec5": "7f915e",
"bdb5a5": "294a6b",
"918a83": "67824d",
"8c847b": "193457"
} }
} }

16
public/images/pokemon/variant/back/female/207.json
View File

@ -1,14 +1,14 @@
{ {
"1": { "1": {
"63314a": "7f4812", "de84b5": "e3784d",
"e6a5ce": "f8dd84", "e6a5ce": "f7a565",
"de84b5": "daa93f", "63314a": "802019",
"ad6394": "b67322" "ad6394": "ba4732"
}, },
"2": { "2": {
"63314a": "5f1723", "de84b5": "42bca0",
"e6a5ce": "ef6b58", "e6a5ce": "70e0b7",
"de84b5": "c04144", "63314a": "134e5e",
"ad6394": "97343c" "ad6394": "27868a"
} }
} }

30
public/images/pokemon/variant/female/207.json
View File

@ -1,22 +1,26 @@
{ {
"1": { "1": {
"63314a": "7f4812", "de84b5": "e3784d",
"e6a5ce": "f8dd84", "e6a5ce": "f7a565",
"ad6394": "b67322", "63314a": "2b8199",
"de84b5": "daa93f",
"4a73bd": "3b426f", "4a73bd": "3b426f",
"294a7b": "1f2142", "294a7b": "1f2142",
"6b9cef": "596596" "ad6394": "ba4732",
"612f48": "802019",
"6b9cef": "596596",
"ffa584": "68edca",
"bd6b5a": "44c5c9"
}, },
"2": { "2": {
"63314a": "5f1723", "de84b5": "42bca0",
"e6a5ce": "ef6b58", "e6a5ce": "70e0b7",
"ad6394": "97343c", "63314a": "752d17",
"de84b5": "c04144", "4a73bd": "de597e",
"bd6b5a": "c86539", "294a7b": "8a2b54",
"4a73bd": "42bca0", "ad6394": "27868a",
"612f48": "134e5e",
"6b9cef": "f78f96",
"ffa584": "f0a452", "ffa584": "f0a452",
"294a7b": "33817e", "bd6b5a": "c86539"
"6b9cef": "81e4b3"
} }
} }