mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-26 17:29:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

696 697 Tyrunt Tyrantrum [Colorfixes] - @ rival_kieran

Browse Source 
- Fixed Front Shiny exp for Tyrunt (used to have the base color in 5/6 of the frames of its exp on the tailspike, it should load properly now without flicker).
- !! IMPORTANT !! Back Shiny exp for Tyrunt is currently unused because there's a worse copy of it in the /variant/exp/back folder (and I've checked and this is the one the masterlist calls for) it'd be best to revert it as the one in /variant/exp/back has extra colors due to two weird pixels + there's no real need as Tyrunt doesn't have a Base Replace
- Epic variant has been tweaked for all sprites to un-custom the eye (as it had been edited to have a slit eye instead of the ring it should have in Tyrantrum and a slightly modified ring in Tyrunt) and slightly tweak the claws (in Tyrunt, the arm claws had an extra unneeded color as border that caused issues, in Tyrantrum they weren't split properly for a change the Epic introduced). (This affects: Static Front, Static Back, Front exp, Back exp)
- Base sprites have been edited so all variants can load from shader/.json file. .json file has been put in its respective folder and should work.
- All spritesheets should be indexed and clean.
This commit is contained in:
pom-eranian 2024-09-20 12:13:56 -04:00
parent 48430c8feb
commit 2bf3249808
20 changed files with 337 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/exp-sprites.json
View File

@ -4633,11 +4633,7 @@
"690",
"691",
"696",
"696_3",
"696_3",
"697",
"697_3",
"697_3",
"700",
"704",
"705_2",

BIN
public/images/pokemon/696.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 702 B

After

Width:  |  Height:  |  Size: 749 B

BIN
public/images/pokemon/697.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
public/images/pokemon/back/696.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 638 B

After

Width:  |  Height:  |  Size: 677 B

BIN
public/images/pokemon/back/697.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
public/images/pokemon/exp/696.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
public/images/pokemon/exp/697.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
public/images/pokemon/exp/back/696.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
public/images/pokemon/exp/back/697.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
public/images/pokemon/exp/back/shiny/696.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
public/images/pokemon/exp/shiny/696.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

61
public/images/pokemon/variant/696.json
View File

@ -1,14 +1,53 @@
{
"1": {
"734517": "5e0b0b",
"ffa64c": "a50d0d",
"4a322c": "023425",
"404040": "4c3216",
"101010": "101010",
"65483a": "0b4c29",
"966858": "1b6430",
"f8f8f8": "dfdea7",
"8c8c8c": "ad8c63",
"bfbfbf": "cbbe8c"
"734517":"5e0b0b",
"ffa64c":"a50d0d",
"4a322c":"023425",
"404040":"4c3216",
"101010":"101010",
"65483a":"0b4c29",
"966858":"1b6430",
"f8f8f8":"dfdea7",
"8c8c8c":"ad8c63",
"bfbfbf":"cbbe8c",
"121212":"121212",
"bdbdbd":"cfc28f"
},
"2": {
"734517":"395cb7",
"ffa64c":"d2e9ff",
"4a322c":"3e1f18",
"404040":"250860",
"101010":"101010",
"65483a":"644943",
"966858":"83726e",
"f8f8f8":"6e46a7",
"8c8c8c":"411684",
"bfbfbf":"593097",
"121212":"decaff",
"bdbdbd":"79c8d3"
}
}
}

49
public/images/pokemon/variant/697.json
View File

@ -1,16 +1,39 @@
{
"1": {
"54434c": "4c3216",
"080808": "080808",
"fafafa": "dfdea7",
"964b1c": "5e0b0b",
"f19d5a": "b52424",
"bf7545": "971c1c",
"cccccc": "cbbe8c",
"50131e": "0b241e",
"963e4e": "285234",
"722533": "153626",
"32252c": "3e1e17",
"9f9d98": "ad8c63"
"54434c":"4c3216",
"080808":"080808",
"fafafa":"dfdea7",
"964b1c":"5e0b0b",
"f19d5a":"b52424",
"bf7545":"971c1c",
"cccccc":"cbbe8c",
"50131e":"0b241e",
"963e4e":"285234",
"722533":"153626",
"32252c":"401f18",
"c9c9c9":"cfc28f",
"f7f7f7":"e0dfa8",
"9f9d98":"ad8c63",
"2f2329":"3e1e17",
"584650":"4a3115"
},
"2": {
"54434c":"170c25",
"080808":"080808",
"fafafa":"4b2e64",
"964b1c":"9d5390",
"f19d5a":"f3daf5",
"bf7545":"cd7aca",
"cccccc":"33214f",
"50131e":"52352f",
"963e4e":"ab9b97",
"722533":"83726e",
"32252c":"0d0124",
"c9c9c9":"ce7ecc",
"f7f7f7":"f4dbf6",
"9f9d98":"26173b",
"2f2329":"c979c7",
"584650":"eed5f0"
}
}
}

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

@ -2532,12 +2532,12 @@
"696": [
0,
1,
2
1
],
"697": [
0,
1,
2
1
],
"698": [
0,
@ -6565,12 +6565,12 @@
"696": [
0,
1,
2
1
],
"697": [
0,
1,
2
1
],
"698": [
0,
@ -8453,13 +8453,13 @@
],
"696": [
0,
2,
2
1,
1
],
"697": [
0,
1,
2
1
],
"698": [
0,
@ -9989,14 +9989,14 @@
1
],
"696": [
2,
2,
2
0,
1,
1
],
"697": [
0,
1,
2
1
],
"698": [
0,

61
public/images/pokemon/variant/back/696.json
View File

@ -1,14 +1,53 @@
{
"1": {
"734517": "5e0b0b",
"ffa64c": "a50d0d",
"4a322c": "023425",
"101010": "101010",
"404040": "4c3216",
"966858": "1b6430",
"f8f8f8": "dfdea7",
"65483a": "0b4c29",
"bfbfbf": "cbbe8c",
"8c8c8c": "ad8c63"
"734517":"5e0b0b",
"ffa64c":"a50d0d",
"4a322c":"023425",
"101010":"101010",
"404040":"4c3216",
"966858":"1b6430",
"f8f8f8":"dfdea7",
"65483a":"0b4c29",
"bfbfbf":"cbbe8c",
"8c8c8c":"ad8c63",
"121212":"121212",
"bdbdbd":"cfc28f"
},
"2": {
"734517":"395cb7",
"ffa64c":"d2e9ff",
"4a322c":"3e1f18",
"101010":"101010",
"404040":"250860",
"966858":"83726e",
"f8f8f8":"6e46a7",
"65483a":"644943",
"bfbfbf":"593097",
"8c8c8c":"411684",
"121212":"decaff",
"bdbdbd":"79c8d3"
}
}
}

42
public/images/pokemon/variant/back/697.json
View File

@ -1,16 +1,32 @@
{
"1": {
"54434c": "4c3216",
"080808": "080808",
"fafafa": "dfdea7",
"cccccc": "cbbe8c",
"964b1c": "5e0b0b",
"f19d5a": "b52424",
"bf7545": "971c1c",
"50131e": "0b241e",
"963e4e": "285234",
"722533": "153626",
"9f9d98": "ad8c63",
"32252c": "32252c"
"54434c":"4c3216",
"080808":"080808",
"fafafa":"dfdea7",
"cccccc":"cbbe8c",
"964b1c":"5e0b0b",
"f19d5a":"b52424",
"bf7545":"971c1c",
"50131e":"0b241e",
"963e4e":"285234",
"722533":"153626",
"9f9d98":"ad8c63",
"35272e":"36282f",
"584650":"4f3417"
},
"2": {
"54434c":"170c25",
"080808":"080808",
"fafafa":"4b2e64",
"cccccc":"33214f",
"964b1c":"9d5390",
"f19d5a":"f4dbf6",
"bf7545":"ce7ecc",
"50131e":"52352f",
"963e4e":"ab9b97",
"722533":"83726e",
"9f9d98":"26173b",
"35272e":"a15593",
"584650":"cc7cc9"
}
}
}

68
public/images/pokemon/variant/exp/696.json
View File

@ -1,21 +1,53 @@
{
"1": {
"774411": "5e0b0b",
"101010": "101010",
"ff8f1f": "a50d0d",
"4f2f1f": "023425",
"5f4f4f": "0b4c29",
"af8f7f": "478136",
"3f3f44": "4c3216",
"8f6f5f": "1b6430",
"f8f7f9": "dfdea7",
"77440f": "5e0b0b",
"bfbfcc": "cbbe8c",
"ff8f1d": "a50d0d",
"0c0c0c": "0c0c0c",
"4f2e1d": "4f2e1d",
"8f8f99": "ad8c63",
"772d34": "77452d",
"ff9bd5": "c98c68"
"774411":"5e0b0b",
"101010":"101010",
"ff8f1f":"a50d0d",
"4f2e1d":"023425",
"5f4f4f":"0b4c29",
"af8f7f":"478136",
"3f3f44":"4c3216",
"8f6f5f":"1b6430",
"f8f7f9":"dfdea7",
"bfbfcc":"cbbe8c",
"121212":"121212",
"8f8f99":"ad8c63",
"c2c2cf":"c9bc87",
"fbfafc":"dddca1",
"772d34":"77452d",
"ff9bd5":"c98c68"
},
"2": {
"774411":"395cb7",
"101010":"101010",
"ff8f1f":"d2e9ff",
"4f2e1d":"3e1f18",
"5f4f4f":"644943",
"af8f7f":"a59e9a",
"3f3f44":"250860",
"8f6f5f":"83726e",
"f8f7f9":"6e46a7",
"bfbfcc":"593097",
"121212":"decaff",
"8f8f99":"411684",
"c2c2cf":"7ccad5",
"fbfafc":"fbfafc",
"772d34":"375ab3",
"ff9bd5":"79c8d3"
}
}
}

57
public/images/pokemon/variant/exp/697.json
View File

@ -1,18 +1,45 @@
{
"1": {
"756b66": "ad8c63",
"653510": "5e0b0b",
"e39f33": "b52424",
"f0f0f2": "dfdea7",
"471515": "0a1b17",
"1f0a0a": "080808",
"b56726": "971c1c",
"b1b0b5": "cbbe8c",
"b45250": "285234",
"621e1d": "0b241e",
"902e2c": "153626",
"d16c6b": "416a45",
"573b43": "4c3216",
"ac628a": "9d5d18"
"1f0a0a":"1f0a0a",
"471515":"0a1b17",
"621e1d":"0b241e",
"902e2c":"153626",
"b45250":"285234",
"d16c6b":"416a45",
"653510":"5e0b0b",
"b56726":"971c1c",
"e39f33":"b52424",
"756b66":"ad8c63",
"b1b0b5":"cbbe8c",
"f0f0f2":"dfdea7",
"573b43":"4c3216",
"736964":"ab885f",
"ac628a":"9d5d18",
"aeadb3":"a88860",
"ededf0":"dbdaa4"
},
"2": {
"1f0a0a":"1f0a0a",
"471515":"191124",
"621e1d":"52352f",
"902e2c":"83726e",
"b45250":"ab9b97",
"d16c6b":"c7bcb9",
"653510":"9d5390",
"b56726":"ce7ecc",
"e39f33":"f4dbf6",
"756b66":"26173b",
"b1b0b5":"33214f",
"f0f0f2":"4b2e64",
"573b43":"cc7cc9",
"736964":"f6dcf7",
"ac628a":"eed5f0",
"aeadb3":"c779c4",
"ededf0":"f8defa"
}
}
}

35
public/images/pokemon/variant/exp/back/696.json Normal file
View File

@ -0,0 +1,35 @@
{
"1": {
"734517":"5e0b0b",
"ffa64c":"a50d0d",
"3e1f18":"023425",
"966858":"1b6430",
"404040":"4c3216",
"65483a":"0b4c29",
"101010":"101010",
"f8f8f8":"dfdea7",
"bfbfbf":"cbbe8c",
"8c8c8c":"ad8c63",
"121212":"121212",
"bdbdbd":"c9bd8b",
"f5f5f5":"dbdaa4",
"b73b6b":"77452d"
},
"2": {
"734517":"395cb7",
"ffa64c":"d2e9ff",
"3e1f18":"3e1f18",
"966858":"83726e",
"404040":"250860",
"65483a":"644943",
"101010":"101010",
"f8f8f8":"6e46a7",
"bfbfbf":"593097",
"8c8c8c":"411684",
"121212":"decaff",
"bdbdbd":"79c8d3",
"f5f5f5":"cce6ff",
"b73b6b":"385cb5"
}
}

49
public/images/pokemon/variant/exp/back/697.json
View File

@ -1,18 +1,37 @@
{
"1": {
"653510": "5e0b0b",
"443e3c": "4c3216",
"e39f33": "b52424",
"f0f0f2": "dfdea7",
"b56726": "971c1c",
"471515": "080808",
"b45250": "285234",
"902f2d": "153626",
"adaaae": "cbbe8c",
"756b66": "ad8c63",
"46413f": "4c3216",
"766c67": "ad8c63",
"621e1d": "0b241e",
"b56827": "971c1c"
"080808":"080808",
"621e1d":"0b241e",
"902f2d":"153626",
"b45250":"285234",
"653510":"5e0b0b",
"b56827":"971c1c",
"e39f33":"b52424",
"46413f":"4c3216",
"766c67":"ad8c63",
"adaaae":"cbbe8c",
"f0f0f2":"dfdea7",
"3d3937":"ab8a61",
"786d68":"cfc28f",
"afacb0":"c9bd8b",
"ededf0":"e0dfa8"
},
"2": {
"080808":"080808",
"621e1d":"52352f",
"902f2d":"83726e",
"b45250":"ab9b97",
"653510":"9d5390",
"b56827":"ce7ecc",
"e39f33":"f4dbf6",
"46413f":"170c25",
"766c67":"26173b",
"adaaae":"33214f",
"f0f0f2":"4b2e64",
"3d3937":"c97bc7",
"786d68":"e5a9ea",
"afacb0":"d180ce",
"ededf0":"ededf0"
}
}
}