Merge branch 'main' into main

pull/544/head
sophie 2024-05-10 06:08:12 -04:00 committed by GitHub
commit ff05343d9c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2979 changed files with 41198 additions and 31806 deletions

View File

@ -44,6 +44,7 @@ Check out our [Trello Board](https://trello.com/b/z10B703R/pokerogue-board) to s
- Arata Iiyoshi
- Atsuhiro Ishizuna
- Pokémon Black/White 2
- Firel (Additional biome themes)
- edifette (Title screen music)
### 🎵 Sound Effects

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 910 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1022 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 931 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 821 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 752 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 776 B

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 750 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 885 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 921 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 781 B

After

Width:  |  Height:  |  Size: 4.7 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 400 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 408 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 408 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 407 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 406 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 683 B

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 457 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 980 B

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 456 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -4,302 +4,155 @@
"image": "716-active.png",
"format": "RGBA8888",
"size": {
"w": 474,
"h": 474
"w": 242,
"h": 242
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0026.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0002.png",
"rotated": false,
"trimmed": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
"w": 81,
"h": 98
},
"frame": {
"x": 0,
"y": 96,
"w": 80,
"h": 96
"y": 0,
"w": 81,
"h": 98
}
},
{
"filename": "0014.png",
"filename": "0010.png",
"rotated": false,
"trimmed": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
"w": 81,
"h": 98
},
"frame": {
"x": 0,
"y": 96,
"w": 80,
"h": 96
"y": 0,
"w": 81,
"h": 98
}
},
{
"filename": "0003.png",
"rotated": false,
"trimmed": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"x": 3,
"y": 0,
"w": 80,
"h": 96
"h": 98
},
"frame": {
"x": 0,
"y": 192,
"x": 81,
"y": 0,
"w": 80,
"h": 96
"h": 98
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 3,
"y": 0,
"w": 80,
"h": 98
},
"frame": {
"x": 81,
"y": 0,
"w": 80,
"h": 98
}
},
{
"filename": "0004.png",
"rotated": false,
"trimmed": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"x": 4,
"y": 0,
"w": 80,
"h": 96
"h": 98
},
"frame": {
"x": 0,
"y": 288,
"x": 161,
"y": 0,
"w": 80,
"h": 96
"h": 98
}
},
{
"filename": "0015.png",
"filename": "0008.png",
"rotated": false,
"trimmed": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"x": 4,
"y": 0,
"w": 80,
"h": 96
"h": 98
},
"frame": {
"x": 0,
"y": 288,
"x": 161,
"y": 0,
"w": 80,
"h": 96
"h": 98
}
},
{
"filename": "0005.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 80,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0013.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 160,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0016.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 240,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0018.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 320,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0025.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 80,
"y": 96,
"w": 80,
"h": 96
}
},
{
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 79,
"x": 5,
"y": 2,
"w": 81,
"h": 96
},
"frame": {
"x": 80,
"y": 192,
"w": 79,
"h": 96
}
},
{
"filename": "0017.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 79,
"h": 96
},
"frame": {
"x": 80,
"y": 288,
"w": 79,
"x": 0,
"y": 98,
"w": 81,
"h": 96
}
},
@ -308,251 +161,62 @@
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 159,
"y": 192,
"w": 80,
"h": 95
}
},
{
"filename": "0008.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 159,
"y": 192,
"w": 80,
"h": 95
}
},
{
"filename": "0011.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 160,
"y": 96,
"w": 80,
"h": 95
}
},
{
"filename": "0012.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 159,
"y": 287,
"w": 80,
"h": 95
}
},
{
"filename": "0019.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 240,
"y": 96,
"w": 80,
"h": 95
}
},
{
"filename": "0020.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 320,
"y": 96,
"w": 80,
"h": 95
}
},
{
"filename": "0024.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 239,
"y": 191,
"w": 80,
"h": 95
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"x": 5,
"y": 2,
"w": 80,
"h": 94
"w": 81,
"h": 96
},
"frame": {
"x": 319,
"y": 191,
"w": 80,
"h": 94
"x": 0,
"y": 98,
"w": 81,
"h": 96
}
},
{
"filename": "0010.png",
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"x": 6,
"y": 2,
"w": 80,
"h": 94
"w": 81,
"h": 96
},
"frame": {
"x": 319,
"y": 285,
"w": 80,
"h": 94
"x": 81,
"y": 98,
"w": 81,
"h": 96
}
},
{
"filename": "0021.png",
"filename": "0001.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"y": 2,
"y": 1,
"w": 80,
"h": 94
"h": 97
},
"frame": {
"x": 239,
"y": 286,
"x": 162,
"y": 98,
"w": 80,
"h": 94
}
},
{
"filename": "0022.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 2,
"w": 80,
"h": 94
},
"frame": {
"x": 239,
"y": 380,
"w": 80,
"h": 94
}
},
{
"filename": "0023.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 2,
"w": 80,
"h": 94
},
"frame": {
"x": 319,
"y": 379,
"w": 80,
"h": 94
"h": 97
}
}
]
@ -561,6 +225,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:0cea7db7c741e40193d7f7caa38b8e51:f7f798d7d644d2747b17e2fffa7fa283:f062a143efe7a1f42b82d0e5295ae76b$"
"smartupdate": "$TexturePacker:SmartUpdate:f3f63c4c8b91d25b294f6a6b954a36eb:2c999d295d87e9938aebe900dcdb566b:f062a143efe7a1f42b82d0e5295ae76b$"
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -4,302 +4,155 @@
"image": "716-neutral.png",
"format": "RGBA8888",
"size": {
"w": 474,
"h": 474
"w": 242,
"h": 242
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0026.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0002.png",
"rotated": false,
"trimmed": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
"w": 81,
"h": 98
},
"frame": {
"x": 0,
"y": 96,
"w": 80,
"h": 96
"y": 0,
"w": 81,
"h": 98
}
},
{
"filename": "0014.png",
"filename": "0010.png",
"rotated": false,
"trimmed": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
"w": 81,
"h": 98
},
"frame": {
"x": 0,
"y": 96,
"w": 80,
"h": 96
"y": 0,
"w": 81,
"h": 98
}
},
{
"filename": "0003.png",
"rotated": false,
"trimmed": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"x": 3,
"y": 0,
"w": 80,
"h": 96
"h": 98
},
"frame": {
"x": 0,
"y": 192,
"x": 81,
"y": 0,
"w": 80,
"h": 96
"h": 98
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 3,
"y": 0,
"w": 80,
"h": 98
},
"frame": {
"x": 81,
"y": 0,
"w": 80,
"h": 98
}
},
{
"filename": "0004.png",
"rotated": false,
"trimmed": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"x": 4,
"y": 0,
"w": 80,
"h": 96
"h": 98
},
"frame": {
"x": 0,
"y": 288,
"x": 161,
"y": 0,
"w": 80,
"h": 96
"h": 98
}
},
{
"filename": "0015.png",
"filename": "0008.png",
"rotated": false,
"trimmed": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"x": 4,
"y": 0,
"w": 80,
"h": 96
"h": 98
},
"frame": {
"x": 0,
"y": 288,
"x": 161,
"y": 0,
"w": 80,
"h": 96
"h": 98
}
},
{
"filename": "0005.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 80,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0013.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 160,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0016.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 240,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0018.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 320,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0025.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 80,
"y": 96,
"w": 80,
"h": 96
}
},
{
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 79,
"x": 5,
"y": 2,
"w": 81,
"h": 96
},
"frame": {
"x": 80,
"y": 192,
"w": 79,
"h": 96
}
},
{
"filename": "0017.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 79,
"h": 96
},
"frame": {
"x": 80,
"y": 288,
"w": 79,
"x": 0,
"y": 98,
"w": 81,
"h": 96
}
},
@ -308,251 +161,62 @@
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 159,
"y": 192,
"w": 80,
"h": 95
}
},
{
"filename": "0008.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 159,
"y": 192,
"w": 80,
"h": 95
}
},
{
"filename": "0011.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 160,
"y": 96,
"w": 80,
"h": 95
}
},
{
"filename": "0012.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 159,
"y": 287,
"w": 80,
"h": 95
}
},
{
"filename": "0019.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 240,
"y": 96,
"w": 80,
"h": 95
}
},
{
"filename": "0020.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 320,
"y": 96,
"w": 80,
"h": 95
}
},
{
"filename": "0024.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 239,
"y": 191,
"w": 80,
"h": 95
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"x": 5,
"y": 2,
"w": 80,
"h": 94
"w": 81,
"h": 96
},
"frame": {
"x": 319,
"y": 191,
"w": 80,
"h": 94
"x": 0,
"y": 98,
"w": 81,
"h": 96
}
},
{
"filename": "0010.png",
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"x": 6,
"y": 2,
"w": 80,
"h": 94
"w": 81,
"h": 96
},
"frame": {
"x": 319,
"y": 285,
"w": 80,
"h": 94
"x": 81,
"y": 98,
"w": 81,
"h": 96
}
},
{
"filename": "0021.png",
"filename": "0001.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"y": 2,
"y": 1,
"w": 80,
"h": 94
"h": 97
},
"frame": {
"x": 239,
"y": 286,
"x": 162,
"y": 98,
"w": 80,
"h": 94
}
},
{
"filename": "0022.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 2,
"w": 80,
"h": 94
},
"frame": {
"x": 239,
"y": 380,
"w": 80,
"h": 94
}
},
{
"filename": "0023.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 2,
"w": 80,
"h": 94
},
"frame": {
"x": 319,
"y": 379,
"w": 80,
"h": 94
"h": 97
}
}
]
@ -561,6 +225,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:ec804991398117c2b88f689a4f1b5070:c1c4a6ceac8aee1d59b3c02be5ffea54:b0d2498f5e4efc35ed4c0e6948ad71f3$"
"smartupdate": "$TexturePacker:SmartUpdate:8269dc2444e752deb5924ecf90702eb7:2c999d295d87e9938aebe900dcdb566b:b0d2498f5e4efc35ed4c0e6948ad71f3$"
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 27 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 33 KiB

View File

@ -1023,6 +1023,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:a0a16e01d8101930311b91d6623a0918:452ea2f0b385c76e75ace96da49c65c6:b0d2498f5e4efc35ed4c0e6948ad71f3$"
"smartupdate": "$TexturePacker:SmartUpdate:e87161792eb1bba2c892539c25079db0:e35d434a4b5c1af53502fca80b6b1837:b0d2498f5e4efc35ed4c0e6948ad71f3$"
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 311 B

View File

Before

Width:  |  Height:  |  Size: 265 B

After

Width:  |  Height:  |  Size: 265 B

View File

Before

Width:  |  Height:  |  Size: 210 B

After

Width:  |  Height:  |  Size: 210 B

View File

Before

Width:  |  Height:  |  Size: 244 B

After

Width:  |  Height:  |  Size: 244 B

View File

Before

Width:  |  Height:  |  Size: 229 B

After

Width:  |  Height:  |  Size: 229 B

View File

Before

Width:  |  Height:  |  Size: 264 B

After

Width:  |  Height:  |  Size: 264 B

View File

Before

Width:  |  Height:  |  Size: 333 B

After

Width:  |  Height:  |  Size: 333 B

View File

Before

Width:  |  Height:  |  Size: 378 B

After

Width:  |  Height:  |  Size: 378 B

View File

Before

Width:  |  Height:  |  Size: 360 B

After

Width:  |  Height:  |  Size: 360 B

View File

Before

Width:  |  Height:  |  Size: 427 B

After

Width:  |  Height:  |  Size: 427 B

View File

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

View File

Before

Width:  |  Height:  |  Size: 325 B

After

Width:  |  Height:  |  Size: 325 B

Some files were not shown because too many files have changed in this diff Show More