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

Compare commits

base: mika:655e3ba24c9ddd0f35a032f8debe71b8432e1fc8
Branches Tags
mika:main
mika:minor-adds
mika:bgm-changes
mika:beta
mika:gh-pages
mika:wild-ghost-goo
mika:modifier-rework
mika:frog/dev
mika:2024-12-3-balanced-friendship
mika:2024-11-17-carpe-diem
mika:2024-10-26-halloween
mika:2024-09-07-egg-summary
mika:2024-09-27-mystery-encounter
mika:2024-08-16-august-variant-update
mika:2024-09-01-run-history
mika:beginning
..
compare: mika:eddc6d73bf7a6a04af67e1658664ca55dbfe552b
Branches Tags
mika:minor-adds
mika:bgm-changes
mika:beta
mika:gh-pages
mika:main
mika:wild-ghost-goo
mika:modifier-rework
mika:frog/dev
mika:2024-12-3-balanced-friendship
mika:2024-11-17-carpe-diem
mika:2024-10-26-halloween
mika:2024-09-07-egg-summary
mika:2024-09-27-mystery-encounter
mika:2024-08-16-august-variant-update
mika:2024-09-01-run-history
mika:beginning

3 Commits
655e3ba24c ... eddc6d73bf

Author SHA1 Message Date
chaosgrimmon
eddc6d73bf
[Bug] Fix undesired opaque pixels (#1719) 2024-06-02 09:41:05 -05:00
chaosgrimmon
59b1e58507
[Bug] Female variant Rhyhorn line missing .json palette [#1681] (#1718) 
* [Bug] Female variant Rhyperior missing .json palette

Adds the missing variant back palette map. Taken from the male variant back.

* [Bug] Female variant Rhyperior missing .json palette

Adds the missing variant front palette map. Taken from the male variant.

* [Bug] Female variant Rhydon line missing .json palette 

Lets the game know that variants, both front and back, for Rhydon, Rhyhorn, and Rhyperior exist.

* [Bug] Female variant Rhydon, Rhyperior missing .json palette 

Adds the missing variant front palette maps. Taken from the male variants.

* [Bug] Female variant Rhydon, Rhyperior missing .json palette 

Adds the missing variant back palette maps. Taken from the male variant backs.
 2024-06-02 09:40:37 -05:00
chaosgrimmon
289b42441f
[Bug] Add variant Larvesta icons (#1717) 
* [Bug] Add variant Larvesta icons

The game wants them in pokemon_cons_5v.json, where they are currently not. All Solosis and Tympole_3 sprites placements adjusted for adequate spacing.

* [Bug] Add variant Larvesta icons 

Adds the icons to the spritesheet, and moves around some other icons for optimal use of space and spacing.
 2024-06-02 09:39:01 -05:00
10 changed files with 250 additions and 8 deletions
Show Stats Expand all files Collapse all files

32
public/images/pokemon/variant/_masterlist.json
View File

@ -2750,6 +2750,16 @@
1,
1
],
"111": [
0,
1,
1
],
"112": [
0,
1,
1
],
"118": [
0,
1,
@ -2835,6 +2845,11 @@
1,
1
],
"464": [
0,
1,
1
],
"592": [
1,
1,
@ -5598,6 +5613,16 @@
1,
1
],
"111": [
0,
1,
1
],
"112": [
0,
1,
1
],
"118": [
0,
1,
@ -5683,6 +5708,11 @@
1,
1
],
"464": [
0,
1,
1
],
"592": [
1,
1,
@ -7650,4 +7680,4 @@
]
}
}
}
}

22
public/images/pokemon/variant/back/female/111.json Normal file
View File

@ -0,0 +1,22 @@
{
"1": {
"5a5a7b": "261e2d",
"bdbdce": "6a547a",
"8484ad": "402f51",
"3a3a52": "261e2d",
"101010": "101010",
"e6e6ef": "9781ab",
"ffffff": "ffffff",
"ad3a29": "ad3a29"
},
"2": {
"5a5a7b": "ab4355",
"bdbdce": "e18db3",
"8484ad": "d76688",
"3a3a52": "6d2935",
"101010": "101010",
"e6e6ef": "f7b4d1",
"ffffff": "ffffff",
"ad3a29": "ad3a29"
}
}

26
public/images/pokemon/variant/back/female/112.json Normal file
View File

@ -0,0 +1,26 @@
{
"1": {
"52525a": "3c2945",
"c5c5bd": "6a547a",
"8c8c94": "523c5c",
"101010": "101010",
"e6e6de": "9781ab",
"735a31": "6b6373",
"e6d6ad": "cecede",
"b5a573": "948cad",
"ffffff": "ffffff",
"e6523a": "e6523a"
},
"2": {
"52525a": "642224",
"c5c5bd": "cb568a",
"8c8c94": "ab3f5c",
"101010": "101010",
"e6e6de": "ef86b5",
"735a31": "6d586d",
"e6d6ad": "dacad3",
"b5a573": "be9bb6",
"ffffff": "ffffff",
"e6523a": "e6523a"
}
}

34
public/images/pokemon/variant/back/female/464.json Normal file
View File

@ -0,0 +1,34 @@
{
"1": {
"523100": "3b1f58",
"bd4200": "60418a",
"ef5200": "6f4d9f",
"29293a": "1f1028",
"3a3a4a": "3b2d40",
"101010": "101010",
"7b6b7b": "6e5d7b",
"6b6373": "6b6373",
"cecede": "cecede",
"efefff": "efefff",
"5a4a63": "514259",
"948cad": "948cad",
"943a00": "4c2f6e",
"ad2900": "ad2900"
},
"2": {
"523100": "492133",
"bd4200": "7d445c",
"ef5200": "6d3950",
"29293a": "442339",
"3a3a4a": "701f38",
"101010": "101010",
"7b6b7b": "c6405b",
"6b6373": "b66360",
"cecede": "e8a797",
"efefff": "ffdfd1",
"5a4a63": "8f2c41",
"948cad": "d98f87",
"943a00": "5b2e42",
"ad2900": "6c7c00"
}
}

22
public/images/pokemon/variant/female/111.json Normal file
View File

@ -0,0 +1,22 @@
{
"1": {
"5a5a7b": "241e2f",
"101010": "101010",
"bdbdce": "6a547a",
"e6e6ef": "9781ab",
"8484ad": "402f51",
"3a3a52": "261e2d",
"ffffff": "ffffff",
"ad3a29": "ad3a29"
},
"2": {
"5a5a7b": "ab4355",
"101010": "101010",
"bdbdce": "e18db3",
"e6e6ef": "f7b4d1",
"8484ad": "d76688",
"3a3a52": "6d2935",
"ffffff": "ffffff",
"ad3a29": "ad3a29"
}
}

32
public/images/pokemon/variant/female/112.json Normal file
View File

@ -0,0 +1,32 @@
{
"1": {
"8c8c94": "523c5c",
"101010": "101010",
"c5c5bd": "6a547a",
"52525a": "3c2945",
"e6e6de": "9781ab",
"735a31": "6b6373",
"ffefc5": "cecede",
"b5a573": "948cad",
"ffffff": "ffffff",
"a53110": "a53110",
"e6523a": "e6523a",
"e6d6ad": "cecede",
"732110": "732110"
},
"2": {
"8c8c94": "ab3f5c",
"101010": "101010",
"c5c5bd": "cb568a",
"52525a": "642224",
"e6e6de": "ef86b5",
"735a31": "6d586d",
"ffefc5": "dacad3",
"b5a573": "be9bb6",
"ffffff": "ffffff",
"a53110": "a53110",
"e6523a": "e6523a",
"e6d6ad": "dacad3",
"732110": "732110"
}
}

34
public/images/pokemon/variant/female/464.json Normal file
View File

@ -0,0 +1,34 @@
{
"1": {
"6b6373": "6b6373",
"3a3a4a": "3b2d40",
"5a4a63": "514259",
"101010": "101010",
"efefff": "efefff",
"29293a": "1f1028",
"523100": "3b1f58",
"7b6b7b": "6e5d7b",
"948cad": "948cad",
"943a00": "4c2f6e",
"ef5200": "6f4d9f",
"cecede": "cecede",
"ad2900": "ad2900",
"bd4200": "60418a"
},
"2": {
"6b6373": "b66360",
"3a3a4a": "701f38",
"5a4a63": "8f2c41",
"101010": "101010",
"efefff": "ffdfd1",
"29293a": "442339",
"523100": "492133",
"7b6b7b": "c6405b",
"948cad": "d98f87",
"943a00": "5b2e42",
"ef5200": "7d445c",
"cecede": "e8a797",
"ad2900": "6c7c00",
"bd4200": "6d3950"
}
}

BIN
public/images/pokemon_icons_2v.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 60 KiB

56
public/images/pokemon_icons_5v.json
View File

@ -3258,8 +3258,8 @@
"h": 16
},
"frame": {
"x": 205,
"y": 268,
"x": 270,
"y": 272,
"w": 17,
"h": 16
}
@ -3279,8 +3279,8 @@
"h": 16
},
"frame": {
"x": 222,
"y": 259,
"x": 270,
"y": 288,
"w": 17,
"h": 16
}
@ -3300,8 +3300,8 @@
"h": 16
},
"frame": {
"x": 239,
"y": 268,
"x": 287,
"y": 288,
"w": 17,
"h": 16
}
@ -3321,11 +3321,53 @@
"h": 13
},
"frame": {
"x": 256,
"x": 254,
"y": 271,
"w": 16,
"h": 13
}
},
{
"filename": "636_2",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 40,
"h": 30
},
"spriteSourceSize": {
"x": 9,
"y": 8,
"w": 22,
"h": 21
},
"frame": {
"x": 195,
"y": 261,
"w": 22,
"h": 21
}
},
{
"filename": "636_3",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 40,
"h": 30
},
"spriteSourceSize": {
"x": 9,
"y": 8,
"w": 22,
"h": 21
},
"frame": {
"x": 217,
"y": 263,
"w": 22,
"h": 21
}
}
]
}

BIN
public/images/pokemon_icons_5v.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 81 KiB