diff --git a/README.md b/README.md index d08107867..7095a36cf 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/public/audio/bgm/laboratory.mp3 b/public/audio/bgm/laboratory.mp3 index 62694e3e0..38b2b71b6 100644 Binary files a/public/audio/bgm/laboratory.mp3 and b/public/audio/bgm/laboratory.mp3 differ diff --git a/public/audio/bgm/metropolis.mp3 b/public/audio/bgm/metropolis.mp3 index 3300317d6..ff67771bd 100644 Binary files a/public/audio/bgm/metropolis.mp3 and b/public/audio/bgm/metropolis.mp3 differ diff --git a/public/images/arenas/island_a.png b/public/images/arenas/island_a.png new file mode 100644 index 000000000..e48675aa5 Binary files /dev/null and b/public/images/arenas/island_a.png differ diff --git a/public/images/arenas/island_b.png b/public/images/arenas/island_b.png new file mode 100644 index 000000000..53bd4f1fe Binary files /dev/null and b/public/images/arenas/island_b.png differ diff --git a/public/images/arenas/island_b_1.png b/public/images/arenas/island_b_1.png new file mode 100644 index 000000000..8619e406a Binary files /dev/null and b/public/images/arenas/island_b_1.png differ diff --git a/public/images/arenas/island_b_2.png b/public/images/arenas/island_b_2.png new file mode 100644 index 000000000..b6dfa0773 Binary files /dev/null and b/public/images/arenas/island_b_2.png differ diff --git a/public/images/arenas/island_b_3.png b/public/images/arenas/island_b_3.png new file mode 100644 index 000000000..192c06950 Binary files /dev/null and b/public/images/arenas/island_b_3.png differ diff --git a/public/images/arenas/island_bg.png b/public/images/arenas/island_bg.png new file mode 100644 index 000000000..5ecb6d810 Binary files /dev/null and b/public/images/arenas/island_bg.png differ diff --git a/public/images/arenas/jungle_a.png b/public/images/arenas/jungle_a.png new file mode 100644 index 000000000..5501593d9 Binary files /dev/null and b/public/images/arenas/jungle_a.png differ diff --git a/public/images/arenas/jungle_b.png b/public/images/arenas/jungle_b.png new file mode 100644 index 000000000..29ec52429 Binary files /dev/null and b/public/images/arenas/jungle_b.png differ diff --git a/public/images/arenas/jungle_b_1.png b/public/images/arenas/jungle_b_1.png new file mode 100644 index 000000000..462bd0df2 Binary files /dev/null and b/public/images/arenas/jungle_b_1.png differ diff --git a/public/images/arenas/jungle_b_2.png b/public/images/arenas/jungle_b_2.png new file mode 100644 index 000000000..1a395af55 Binary files /dev/null and b/public/images/arenas/jungle_b_2.png differ diff --git a/public/images/arenas/jungle_b_3.png b/public/images/arenas/jungle_b_3.png new file mode 100644 index 000000000..e579f4013 Binary files /dev/null and b/public/images/arenas/jungle_b_3.png differ diff --git a/public/images/arenas/jungle_bg.png b/public/images/arenas/jungle_bg.png new file mode 100644 index 000000000..ff2cda1c9 Binary files /dev/null and b/public/images/arenas/jungle_bg.png differ diff --git a/public/images/arenas/laboratory_a.png b/public/images/arenas/laboratory_a.png index c9875ae40..628a6919e 100644 Binary files a/public/images/arenas/laboratory_a.png and b/public/images/arenas/laboratory_a.png differ diff --git a/public/images/arenas/laboratory_b.png b/public/images/arenas/laboratory_b.png index 3cd283226..eabd398ba 100644 Binary files a/public/images/arenas/laboratory_b.png and b/public/images/arenas/laboratory_b.png differ diff --git a/public/images/arenas/laboratory_b_1.png b/public/images/arenas/laboratory_b_1.png index f9f7567a1..b3ee78759 100644 Binary files a/public/images/arenas/laboratory_b_1.png and b/public/images/arenas/laboratory_b_1.png differ diff --git a/public/images/arenas/laboratory_b_2.png b/public/images/arenas/laboratory_b_2.png index d5b783ce0..66ce17d94 100644 Binary files a/public/images/arenas/laboratory_b_2.png and b/public/images/arenas/laboratory_b_2.png differ diff --git a/public/images/arenas/laboratory_b_3.png b/public/images/arenas/laboratory_b_3.png index 90954be71..99b23e95a 100644 Binary files a/public/images/arenas/laboratory_b_3.png and b/public/images/arenas/laboratory_b_3.png differ diff --git a/public/images/arenas/laboratory_bg.png b/public/images/arenas/laboratory_bg.png index d94de95a0..331e15f8d 100644 Binary files a/public/images/arenas/laboratory_bg.png and b/public/images/arenas/laboratory_bg.png differ diff --git a/public/images/arenas/metropolis_a.png b/public/images/arenas/metropolis_a.png new file mode 100644 index 000000000..5a51c5007 Binary files /dev/null and b/public/images/arenas/metropolis_a.png differ diff --git a/public/images/arenas/metropolis_b.png b/public/images/arenas/metropolis_b.png new file mode 100644 index 000000000..638899f3e Binary files /dev/null and b/public/images/arenas/metropolis_b.png differ diff --git a/public/images/arenas/metropolis_b_1.png b/public/images/arenas/metropolis_b_1.png new file mode 100644 index 000000000..6e543b4c5 Binary files /dev/null and b/public/images/arenas/metropolis_b_1.png differ diff --git a/public/images/arenas/metropolis_b_2.png b/public/images/arenas/metropolis_b_2.png new file mode 100644 index 000000000..bc609ddb3 Binary files /dev/null and b/public/images/arenas/metropolis_b_2.png differ diff --git a/public/images/arenas/metropolis_b_3.png b/public/images/arenas/metropolis_b_3.png new file mode 100644 index 000000000..c29a3b7bb Binary files /dev/null and b/public/images/arenas/metropolis_b_3.png differ diff --git a/public/images/arenas/metropolis_bg.png b/public/images/arenas/metropolis_bg.png new file mode 100644 index 000000000..b84c5aa49 Binary files /dev/null and b/public/images/arenas/metropolis_bg.png differ diff --git a/public/images/arenas/snowy_forest_a.png b/public/images/arenas/snowy_forest_a.png index 7fcc26245..c44abbbce 100644 Binary files a/public/images/arenas/snowy_forest_a.png and b/public/images/arenas/snowy_forest_a.png differ diff --git a/public/images/arenas/snowy_forest_b.png b/public/images/arenas/snowy_forest_b.png index 88025db58..e4ae9f4b1 100644 Binary files a/public/images/arenas/snowy_forest_b.png and b/public/images/arenas/snowy_forest_b.png differ diff --git a/public/images/arenas/snowy_forest_b_1.png b/public/images/arenas/snowy_forest_b_1.png new file mode 100644 index 000000000..f47f4f915 Binary files /dev/null and b/public/images/arenas/snowy_forest_b_1.png differ diff --git a/public/images/arenas/snowy_forest_b_2.png b/public/images/arenas/snowy_forest_b_2.png new file mode 100644 index 000000000..5bc27fc51 Binary files /dev/null and b/public/images/arenas/snowy_forest_b_2.png differ diff --git a/public/images/arenas/snowy_forest_b_3.png b/public/images/arenas/snowy_forest_b_3.png new file mode 100644 index 000000000..521870232 Binary files /dev/null and b/public/images/arenas/snowy_forest_b_3.png differ diff --git a/public/images/arenas/snowy_forest_bg.png b/public/images/arenas/snowy_forest_bg.png index bfe7545c9..c449ddb32 100644 Binary files a/public/images/arenas/snowy_forest_bg.png and b/public/images/arenas/snowy_forest_bg.png differ diff --git a/public/images/pokemon/226.png b/public/images/pokemon/226.png index f8e761c1e..dbc04cc88 100644 Binary files a/public/images/pokemon/226.png and b/public/images/pokemon/226.png differ diff --git a/public/images/pokemon/279.png b/public/images/pokemon/279.png index 6ef399835..a50bf9524 100644 Binary files a/public/images/pokemon/279.png and b/public/images/pokemon/279.png differ diff --git a/public/images/pokemon/335.png b/public/images/pokemon/335.png index b1f6a7d4b..87f8b341b 100644 Binary files a/public/images/pokemon/335.png and b/public/images/pokemon/335.png differ diff --git a/public/images/pokemon/373.png b/public/images/pokemon/373.png index b7a69d1a8..e3f967583 100644 Binary files a/public/images/pokemon/373.png and b/public/images/pokemon/373.png differ diff --git a/public/images/pokemon/716-active.png b/public/images/pokemon/716-active.png index 6c4b9a817..50b69e5ba 100644 Binary files a/public/images/pokemon/716-active.png and b/public/images/pokemon/716-active.png differ diff --git a/public/images/pokemon/716-neutral.png b/public/images/pokemon/716-neutral.png index 6c4b9a817..62a90a55d 100644 Binary files a/public/images/pokemon/716-neutral.png and b/public/images/pokemon/716-neutral.png differ diff --git a/public/images/pokemon/997.png b/public/images/pokemon/997.png index e89c58ff9..6b9248d85 100644 Binary files a/public/images/pokemon/997.png and b/public/images/pokemon/997.png differ diff --git a/public/images/pokemon/back/716-active.png b/public/images/pokemon/back/716-active.png index 91fa651e3..0b5d2ec3c 100644 Binary files a/public/images/pokemon/back/716-active.png and b/public/images/pokemon/back/716-active.png differ diff --git a/public/images/pokemon/back/716-neutral.png b/public/images/pokemon/back/716-neutral.png index 91fa651e3..291fb1600 100644 Binary files a/public/images/pokemon/back/716-neutral.png and b/public/images/pokemon/back/716-neutral.png differ diff --git a/public/images/pokemon/back/821.png b/public/images/pokemon/back/821.png index ce06c16ec..a102a0491 100644 Binary files a/public/images/pokemon/back/821.png and b/public/images/pokemon/back/821.png differ diff --git a/public/images/pokemon/back/shiny/373-mega.png b/public/images/pokemon/back/shiny/373-mega.png index 2e87a3143..95145fd40 100644 Binary files a/public/images/pokemon/back/shiny/373-mega.png and b/public/images/pokemon/back/shiny/373-mega.png differ diff --git a/public/images/pokemon/back/shiny/477.png b/public/images/pokemon/back/shiny/477.png index 3959b80d0..25414ab5c 100644 Binary files a/public/images/pokemon/back/shiny/477.png and b/public/images/pokemon/back/shiny/477.png differ diff --git a/public/images/pokemon/back/shiny/716-active.png b/public/images/pokemon/back/shiny/716-active.png index b52781bc4..7c4db5464 100644 Binary files a/public/images/pokemon/back/shiny/716-active.png and b/public/images/pokemon/back/shiny/716-active.png differ diff --git a/public/images/pokemon/back/shiny/716-neutral.png b/public/images/pokemon/back/shiny/716-neutral.png index b52781bc4..fe52ce43e 100644 Binary files a/public/images/pokemon/back/shiny/716-neutral.png and b/public/images/pokemon/back/shiny/716-neutral.png differ diff --git a/public/images/pokemon/back/shiny/821.png b/public/images/pokemon/back/shiny/821.png index 17084ec24..200489518 100644 Binary files a/public/images/pokemon/back/shiny/821.png and b/public/images/pokemon/back/shiny/821.png differ diff --git a/public/images/pokemon/exp/373-mega.png b/public/images/pokemon/exp/373-mega.png index 4b6bdb1d6..93c27d88d 100644 Binary files a/public/images/pokemon/exp/373-mega.png and b/public/images/pokemon/exp/373-mega.png differ diff --git a/public/images/pokemon/exp/716-active.png b/public/images/pokemon/exp/716-active.png index e8edf0262..2f6ec8f76 100644 Binary files a/public/images/pokemon/exp/716-active.png and b/public/images/pokemon/exp/716-active.png differ diff --git a/public/images/pokemon/exp/716-neutral.png b/public/images/pokemon/exp/716-neutral.png index 1175c161b..dd2d18219 100644 Binary files a/public/images/pokemon/exp/716-neutral.png and b/public/images/pokemon/exp/716-neutral.png differ diff --git a/public/images/pokemon/exp/771.png b/public/images/pokemon/exp/771.png index a9edba660..d53f1e522 100644 Binary files a/public/images/pokemon/exp/771.png and b/public/images/pokemon/exp/771.png differ diff --git a/public/images/pokemon/exp/793.png b/public/images/pokemon/exp/793.png index 40d536acb..683dd1153 100644 Binary files a/public/images/pokemon/exp/793.png and b/public/images/pokemon/exp/793.png differ diff --git a/public/images/pokemon/exp/821.png b/public/images/pokemon/exp/821.png index 561a3067a..e4a73a661 100644 Binary files a/public/images/pokemon/exp/821.png and b/public/images/pokemon/exp/821.png differ diff --git a/public/images/pokemon/exp/823.png b/public/images/pokemon/exp/823.png index 57bfd4648..22301ca3a 100644 Binary files a/public/images/pokemon/exp/823.png and b/public/images/pokemon/exp/823.png differ diff --git a/public/images/pokemon/exp/983.png b/public/images/pokemon/exp/983.png index e55de6481..226d971ae 100644 Binary files a/public/images/pokemon/exp/983.png and b/public/images/pokemon/exp/983.png differ diff --git a/public/images/pokemon/exp/back/380-mega.png b/public/images/pokemon/exp/back/380-mega.png index d865e64c3..b2450dd0b 100644 Binary files a/public/images/pokemon/exp/back/380-mega.png and b/public/images/pokemon/exp/back/380-mega.png differ diff --git a/public/images/pokemon/exp/back/716-active.png b/public/images/pokemon/exp/back/716-active.png index aa22b0aef..5bd4fcd74 100644 Binary files a/public/images/pokemon/exp/back/716-active.png and b/public/images/pokemon/exp/back/716-active.png differ diff --git a/public/images/pokemon/exp/back/716-neutral.png b/public/images/pokemon/exp/back/716-neutral.png index aa22b0aef..579173b75 100644 Binary files a/public/images/pokemon/exp/back/716-neutral.png and b/public/images/pokemon/exp/back/716-neutral.png differ diff --git a/public/images/pokemon/exp/back/821.png b/public/images/pokemon/exp/back/821.png index 6770cf4c2..80d88dce2 100644 Binary files a/public/images/pokemon/exp/back/821.png and b/public/images/pokemon/exp/back/821.png differ diff --git a/public/images/pokemon/exp/back/823.png b/public/images/pokemon/exp/back/823.png index 3ef8011a6..69506ac46 100644 Binary files a/public/images/pokemon/exp/back/823.png and b/public/images/pokemon/exp/back/823.png differ diff --git a/public/images/pokemon/exp/back/shiny/373-mega.png b/public/images/pokemon/exp/back/shiny/373-mega.png index 854b30102..6c5ce34d1 100644 Binary files a/public/images/pokemon/exp/back/shiny/373-mega.png and b/public/images/pokemon/exp/back/shiny/373-mega.png differ diff --git a/public/images/pokemon/exp/back/shiny/708.png b/public/images/pokemon/exp/back/shiny/708.png index 40a909117..8673e917e 100644 Binary files a/public/images/pokemon/exp/back/shiny/708.png and b/public/images/pokemon/exp/back/shiny/708.png differ diff --git a/public/images/pokemon/exp/back/shiny/709.png b/public/images/pokemon/exp/back/shiny/709.png index 93c2eaaa2..5148cd1ed 100644 Binary files a/public/images/pokemon/exp/back/shiny/709.png and b/public/images/pokemon/exp/back/shiny/709.png differ diff --git a/public/images/pokemon/exp/back/shiny/716-active.json b/public/images/pokemon/exp/back/shiny/716-active.json index e4cc5f69d..cfa47ad9f 100644 --- a/public/images/pokemon/exp/back/shiny/716-active.json +++ b/public/images/pokemon/exp/back/shiny/716-active.json @@ -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$" } } diff --git a/public/images/pokemon/exp/back/shiny/716-active.png b/public/images/pokemon/exp/back/shiny/716-active.png index 48befc349..b99aabd14 100644 Binary files a/public/images/pokemon/exp/back/shiny/716-active.png and b/public/images/pokemon/exp/back/shiny/716-active.png differ diff --git a/public/images/pokemon/exp/back/shiny/716-neutral.json b/public/images/pokemon/exp/back/shiny/716-neutral.json index 85ec75cbd..457474ade 100644 --- a/public/images/pokemon/exp/back/shiny/716-neutral.json +++ b/public/images/pokemon/exp/back/shiny/716-neutral.json @@ -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$" } } diff --git a/public/images/pokemon/exp/back/shiny/716-neutral.png b/public/images/pokemon/exp/back/shiny/716-neutral.png index 6312e8856..c8bee30f3 100644 Binary files a/public/images/pokemon/exp/back/shiny/716-neutral.png and b/public/images/pokemon/exp/back/shiny/716-neutral.png differ diff --git a/public/images/pokemon/exp/back/shiny/821.png b/public/images/pokemon/exp/back/shiny/821.png index 55e64f59d..426a1e81f 100644 Binary files a/public/images/pokemon/exp/back/shiny/821.png and b/public/images/pokemon/exp/back/shiny/821.png differ diff --git a/public/images/pokemon/exp/back/shiny/823.png b/public/images/pokemon/exp/back/shiny/823.png index 26b06017c..81b3a07a6 100644 Binary files a/public/images/pokemon/exp/back/shiny/823.png and b/public/images/pokemon/exp/back/shiny/823.png differ diff --git a/public/images/pokemon/exp/shiny/373-mega.png b/public/images/pokemon/exp/shiny/373-mega.png index e6b9a1cb1..dc42bd436 100644 Binary files a/public/images/pokemon/exp/shiny/373-mega.png and b/public/images/pokemon/exp/shiny/373-mega.png differ diff --git a/public/images/pokemon/exp/shiny/716-active.json b/public/images/pokemon/exp/shiny/716-active.json index 755520c71..1ebd6966b 100644 --- a/public/images/pokemon/exp/shiny/716-active.json +++ b/public/images/pokemon/exp/shiny/716-active.json @@ -4,30 +4,30 @@ "image": "716-active.png", "format": "RGBA8888", "size": { - "w": 487, - "h": 487 + "w": 532, + "h": 532 }, "scale": 1, "frames": [ { - "filename": "0016.png", + "filename": "0017.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 82, - "h": 102 + "x": 5, + "y": 0, + "w": 76, + "h": 111 }, "frame": { "x": 0, "y": 0, - "w": 82, - "h": 102 + "w": 76, + "h": 111 } }, { @@ -35,20 +35,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 5, "y": 0, - "w": 81, - "h": 105 + "w": 76, + "h": 111 }, "frame": { - "x": 82, - "y": 0, - "w": 81, - "h": 105 + "x": 0, + "y": 111, + "w": 76, + "h": 111 } }, { @@ -56,41 +56,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 5, "y": 0, - "w": 81, - "h": 105 + "w": 76, + "h": 111 }, "frame": { "x": 0, - "y": 102, - "w": 81, - "h": 105 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 86, - "h": 112 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 82, - "h": 102 - }, - "frame": { - "x": 81, - "y": 105, - "w": 82, - "h": 102 + "y": 222, + "w": 76, + "h": 111 } }, { @@ -98,188 +77,62 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 5, "y": 0, - "w": 81, - "h": 105 + "w": 76, + "h": 111 }, "frame": { - "x": 163, + "x": 0, + "y": 333, + "w": 76, + "h": 111 + } + }, + { + "filename": "0021.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 81, + "h": 118 + }, + "spriteSourceSize": { + "x": 3, + "y": 2, + "w": 77, + "h": 109 + }, + "frame": { + "x": 76, "y": 0, - "w": 81, - "h": 105 + "w": 77, + "h": 109 } }, { - "filename": "0017.png", + "filename": "0016.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 81, - "h": 104 + "x": 3, + "y": 3, + "w": 77, + "h": 108 }, "frame": { - "x": 163, - "y": 105, - "w": 81, - "h": 104 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 86, - "h": 112 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 81, - "h": 101 - }, - "frame": { - "x": 0, - "y": 207, - "w": 81, - "h": 101 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 86, - "h": 112 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 81, - "h": 101 - }, - "frame": { - "x": 0, - "y": 207, - "w": 81, - "h": 101 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 86, - "h": 112 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 81, - "h": 101 - }, - "frame": { - "x": 0, - "y": 207, - "w": 81, - "h": 101 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 86, - "h": 112 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 81, - "h": 101 - }, - "frame": { - "x": 81, - "y": 207, - "w": 81, - "h": 101 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 86, - "h": 112 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 81, - "h": 101 - }, - "frame": { - "x": 81, - "y": 207, - "w": 81, - "h": 101 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 86, - "h": 112 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 81, - "h": 101 - }, - "frame": { - "x": 81, - "y": 207, - "w": 81, - "h": 101 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 86, - "h": 112 - }, - "spriteSourceSize": { - "x": 1, - "y": 7, - "w": 82, - "h": 98 - }, - "frame": { - "x": 162, - "y": 209, - "w": 82, - "h": 98 + "x": 76, + "y": 109, + "w": 77, + "h": 108 } }, { @@ -287,41 +140,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 11, - "w": 81, - "h": 101 + "y": 9, + "w": 76, + "h": 109 }, "frame": { - "x": 162, - "y": 307, - "w": 81, - "h": 101 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 86, - "h": 112 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 81, - "h": 101 - }, - "frame": { - "x": 162, - "y": 307, - "w": 81, - "h": 101 + "x": 76, + "y": 217, + "w": 76, + "h": 109 } }, { @@ -329,20 +161,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 11, - "w": 81, - "h": 101 + "y": 9, + "w": 76, + "h": 109 }, "frame": { - "x": 162, - "y": 307, - "w": 81, - "h": 101 + "x": 76, + "y": 217, + "w": 76, + "h": 109 } }, { @@ -350,20 +182,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 11, - "w": 81, - "h": 101 + "y": 9, + "w": 76, + "h": 109 }, "frame": { - "x": 0, - "y": 308, - "w": 81, - "h": 101 + "x": 76, + "y": 326, + "w": 76, + "h": 109 } }, { @@ -371,20 +203,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 11, - "w": 81, - "h": 101 + "y": 9, + "w": 76, + "h": 109 }, "frame": { - "x": 0, - "y": 308, - "w": 81, - "h": 101 + "x": 76, + "y": 326, + "w": 76, + "h": 109 } }, { @@ -392,20 +224,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 11, - "w": 81, - "h": 101 + "y": 9, + "w": 76, + "h": 109 }, "frame": { - "x": 0, - "y": 308, - "w": 81, - "h": 101 + "x": 76, + "y": 326, + "w": 76, + "h": 109 } }, { @@ -413,20 +245,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 11, - "w": 81, - "h": 101 + "y": 9, + "w": 76, + "h": 109 }, "frame": { - "x": 81, - "y": 308, - "w": 81, - "h": 101 + "x": 152, + "y": 217, + "w": 76, + "h": 109 } }, { @@ -434,20 +266,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 11, - "w": 81, - "h": 101 + "y": 9, + "w": 76, + "h": 109 }, "frame": { - "x": 81, - "y": 308, - "w": 81, - "h": 101 + "x": 152, + "y": 217, + "w": 76, + "h": 109 } }, { @@ -455,209 +287,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 11, - "w": 81, - "h": 101 + "y": 9, + "w": 76, + "h": 109 }, "frame": { - "x": 81, - "y": 308, - "w": 81, - "h": 101 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 86, - "h": 112 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 81, - "h": 101 - }, - "frame": { - "x": 243, - "y": 307, - "w": 81, - "h": 101 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 86, - "h": 112 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 81, - "h": 101 - }, - "frame": { - "x": 243, - "y": 307, - "w": 81, - "h": 101 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 86, - "h": 112 - }, - "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 81, - "h": 101 - }, - "frame": { - "x": 243, - "y": 307, - "w": 81, - "h": 101 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 86, - "h": 112 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 81, - "h": 100 - }, - "frame": { - "x": 244, - "y": 0, - "w": 81, - "h": 100 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 86, - "h": 112 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 81, - "h": 100 - }, - "frame": { - "x": 244, - "y": 0, - "w": 81, - "h": 100 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 86, - "h": 112 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 81, - "h": 100 - }, - "frame": { - "x": 244, - "y": 0, - "w": 81, - "h": 100 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 86, - "h": 112 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 81, - "h": 100 - }, - "frame": { - "x": 244, - "y": 100, - "w": 81, - "h": 100 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 86, - "h": 112 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 81, - "h": 100 - }, - "frame": { - "x": 244, - "y": 100, - "w": 81, - "h": 100 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 86, - "h": 112 - }, - "spriteSourceSize": { - "x": 0, - "y": 12, - "w": 81, - "h": 100 - }, - "frame": { - "x": 244, - "y": 100, - "w": 81, - "h": 100 + "x": 152, + "y": 217, + "w": 76, + "h": 109 } }, { @@ -665,20 +308,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 12, - "w": 81, - "h": 100 + "y": 9, + "w": 76, + "h": 109 }, "frame": { - "x": 244, - "y": 200, - "w": 81, - "h": 100 + "x": 152, + "y": 326, + "w": 76, + "h": 109 } }, { @@ -686,20 +329,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 12, - "w": 81, - "h": 100 + "y": 9, + "w": 76, + "h": 109 }, "frame": { - "x": 244, - "y": 200, - "w": 81, - "h": 100 + "x": 152, + "y": 326, + "w": 76, + "h": 109 } }, { @@ -707,20 +350,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 12, - "w": 81, - "h": 100 + "y": 9, + "w": 76, + "h": 109 }, "frame": { - "x": 244, - "y": 200, - "w": 81, - "h": 100 + "x": 152, + "y": 326, + "w": 76, + "h": 109 } }, { @@ -728,20 +371,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 12, - "w": 81, - "h": 100 + "y": 9, + "w": 76, + "h": 109 }, "frame": { - "x": 324, - "y": 300, - "w": 81, - "h": 100 + "x": 153, + "y": 0, + "w": 76, + "h": 109 } }, { @@ -749,20 +392,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 12, - "w": 81, - "h": 100 + "y": 9, + "w": 76, + "h": 109 }, "frame": { - "x": 324, - "y": 300, - "w": 81, - "h": 100 + "x": 153, + "y": 0, + "w": 76, + "h": 109 } }, { @@ -770,20 +413,62 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 12, - "w": 81, - "h": 100 + "y": 9, + "w": 76, + "h": 109 }, "frame": { - "x": 324, - "y": 300, + "x": 153, + "y": 0, + "w": 76, + "h": 109 + } + }, + { + "filename": "0001.png", + "rotated": false, + "trimmed": true, + "sourceSize": { "w": 81, - "h": 100 + "h": 118 + }, + "spriteSourceSize": { + "x": 0, + "y": 10, + "w": 76, + "h": 108 + }, + "frame": { + "x": 153, + "y": 109, + "w": 76, + "h": 108 + } + }, + { + "filename": "0037.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 81, + "h": 118 + }, + "spriteSourceSize": { + "x": 0, + "y": 10, + "w": 76, + "h": 108 + }, + "frame": { + "x": 153, + "y": 109, + "w": 76, + "h": 108 } }, { @@ -791,20 +476,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 12, - "w": 81, - "h": 100 + "y": 9, + "w": 76, + "h": 109 }, "frame": { - "x": 325, - "y": 0, - "w": 81, - "h": 100 + "x": 228, + "y": 217, + "w": 76, + "h": 109 } }, { @@ -812,20 +497,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 12, - "w": 81, - "h": 100 + "y": 9, + "w": 76, + "h": 109 }, "frame": { - "x": 325, - "y": 0, - "w": 81, - "h": 100 + "x": 228, + "y": 217, + "w": 76, + "h": 109 } }, { @@ -833,20 +518,209 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 12, - "w": 81, - "h": 100 + "y": 9, + "w": 76, + "h": 109 }, "frame": { - "x": 325, - "y": 0, + "x": 228, + "y": 217, + "w": 76, + "h": 109 + } + }, + { + "filename": "0027.png", + "rotated": false, + "trimmed": true, + "sourceSize": { "w": 81, - "h": 100 + "h": 118 + }, + "spriteSourceSize": { + "x": 0, + "y": 9, + "w": 76, + "h": 109 + }, + "frame": { + "x": 228, + "y": 326, + "w": 76, + "h": 109 + } + }, + { + "filename": "0002.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 81, + "h": 118 + }, + "spriteSourceSize": { + "x": 0, + "y": 10, + "w": 76, + "h": 108 + }, + "frame": { + "x": 229, + "y": 0, + "w": 76, + "h": 108 + } + }, + { + "filename": "0038.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 81, + "h": 118 + }, + "spriteSourceSize": { + "x": 0, + "y": 10, + "w": 76, + "h": 108 + }, + "frame": { + "x": 229, + "y": 0, + "w": 76, + "h": 108 + } + }, + { + "filename": "0006.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 81, + "h": 118 + }, + "spriteSourceSize": { + "x": 0, + "y": 10, + "w": 76, + "h": 108 + }, + "frame": { + "x": 229, + "y": 108, + "w": 76, + "h": 108 + } + }, + { + "filename": "0030.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 81, + "h": 118 + }, + "spriteSourceSize": { + "x": 0, + "y": 10, + "w": 76, + "h": 108 + }, + "frame": { + "x": 229, + "y": 108, + "w": 76, + "h": 108 + } + }, + { + "filename": "0042.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 81, + "h": 118 + }, + "spriteSourceSize": { + "x": 0, + "y": 10, + "w": 76, + "h": 108 + }, + "frame": { + "x": 229, + "y": 108, + "w": 76, + "h": 108 + } + }, + { + "filename": "0008.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 81, + "h": 118 + }, + "spriteSourceSize": { + "x": 0, + "y": 10, + "w": 76, + "h": 108 + }, + "frame": { + "x": 304, + "y": 216, + "w": 76, + "h": 108 + } + }, + { + "filename": "0032.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 81, + "h": 118 + }, + "spriteSourceSize": { + "x": 0, + "y": 10, + "w": 76, + "h": 108 + }, + "frame": { + "x": 304, + "y": 216, + "w": 76, + "h": 108 + } + }, + { + "filename": "0044.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 81, + "h": 118 + }, + "spriteSourceSize": { + "x": 0, + "y": 10, + "w": 76, + "h": 108 + }, + "frame": { + "x": 304, + "y": 216, + "w": 76, + "h": 108 } }, { @@ -854,20 +728,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 12, - "w": 81, - "h": 100 + "y": 10, + "w": 76, + "h": 108 }, "frame": { - "x": 325, - "y": 100, - "w": 81, - "h": 100 + "x": 304, + "y": 324, + "w": 76, + "h": 108 } }, { @@ -875,20 +749,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 12, - "w": 81, - "h": 100 + "y": 10, + "w": 76, + "h": 108 }, "frame": { - "x": 325, - "y": 100, - "w": 81, - "h": 100 + "x": 304, + "y": 324, + "w": 76, + "h": 108 } }, { @@ -896,20 +770,146 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 12, - "w": 81, - "h": 100 + "y": 10, + "w": 76, + "h": 108 }, "frame": { - "x": 325, - "y": 100, + "x": 304, + "y": 324, + "w": 76, + "h": 108 + } + }, + { + "filename": "0007.png", + "rotated": false, + "trimmed": true, + "sourceSize": { "w": 81, - "h": 100 + "h": 118 + }, + "spriteSourceSize": { + "x": 0, + "y": 11, + "w": 76, + "h": 107 + }, + "frame": { + "x": 305, + "y": 0, + "w": 76, + "h": 107 + } + }, + { + "filename": "0031.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 81, + "h": 118 + }, + "spriteSourceSize": { + "x": 0, + "y": 11, + "w": 76, + "h": 107 + }, + "frame": { + "x": 305, + "y": 0, + "w": 76, + "h": 107 + } + }, + { + "filename": "0043.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 81, + "h": 118 + }, + "spriteSourceSize": { + "x": 0, + "y": 11, + "w": 76, + "h": 107 + }, + "frame": { + "x": 305, + "y": 0, + "w": 76, + "h": 107 + } + }, + { + "filename": "0025.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 81, + "h": 118 + }, + "spriteSourceSize": { + "x": 0, + "y": 11, + "w": 76, + "h": 107 + }, + "frame": { + "x": 305, + "y": 107, + "w": 76, + "h": 107 + } + }, + { + "filename": "0026.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 81, + "h": 118 + }, + "spriteSourceSize": { + "x": 0, + "y": 11, + "w": 76, + "h": 107 + }, + "frame": { + "x": 380, + "y": 214, + "w": 76, + "h": 107 + } + }, + { + "filename": "0022.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 81, + "h": 118 + }, + "spriteSourceSize": { + "x": 1, + "y": 6, + "w": 77, + "h": 105 + }, + "frame": { + "x": 380, + "y": 321, + "w": 77, + "h": 105 } }, { @@ -917,41 +917,20 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 13, - "w": 81, - "h": 99 + "y": 12, + "w": 76, + "h": 106 }, "frame": { - "x": 325, - "y": 200, - "w": 81, - "h": 99 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 86, - "h": 112 - }, - "spriteSourceSize": { - "x": 0, - "y": 13, - "w": 81, - "h": 99 - }, - "frame": { - "x": 405, - "y": 299, - "w": 81, - "h": 99 + "x": 380, + "y": 426, + "w": 76, + "h": 106 } }, { @@ -959,41 +938,41 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 15, - "w": 81, - "h": 97 + "y": 12, + "w": 76, + "h": 106 }, "frame": { - "x": 406, - "y": 0, - "w": 81, - "h": 97 + "x": 456, + "y": 426, + "w": 76, + "h": 106 } }, { - "filename": "0014.png", + "filename": "0024.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 15, - "w": 81, - "h": 95 + "y": 13, + "w": 76, + "h": 105 }, "frame": { - "x": 406, - "y": 97, - "w": 81, - "h": 95 + "x": 456, + "y": 0, + "w": 76, + "h": 105 } }, { @@ -1001,20 +980,41 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 86, - "h": 112 + "w": 81, + "h": 118 }, "spriteSourceSize": { "x": 0, - "y": 12, - "w": 81, - "h": 93 + "y": 8, + "w": 77, + "h": 103 }, "frame": { - "x": 406, - "y": 192, + "x": 381, + "y": 105, + "w": 77, + "h": 103 + } + }, + { + "filename": "0014.png", + "rotated": false, + "trimmed": true, + "sourceSize": { "w": 81, - "h": 93 + "h": 118 + }, + "spriteSourceSize": { + "x": 0, + "y": 14, + "w": 76, + "h": 102 + }, + "frame": { + "x": 456, + "y": 208, + "w": 76, + "h": 102 } } ] @@ -1023,6 +1023,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:9488e2ce12d87edc7ccf427920c6cd1c:f7b4396d4321d6c5380695721332589b:f062a143efe7a1f42b82d0e5295ae76b$" + "smartupdate": "$TexturePacker:SmartUpdate:268d98afbf06530e982cdc2aaae634e3:1aff810b601812011ee1629132fe6e7a:f062a143efe7a1f42b82d0e5295ae76b$" } } diff --git a/public/images/pokemon/exp/shiny/716-active.png b/public/images/pokemon/exp/shiny/716-active.png index f46b10772..898d23dd4 100644 Binary files a/public/images/pokemon/exp/shiny/716-active.png and b/public/images/pokemon/exp/shiny/716-active.png differ diff --git a/public/images/pokemon/exp/shiny/716-neutral.json b/public/images/pokemon/exp/shiny/716-neutral.json index fba11ab0a..97d3ca689 100644 --- a/public/images/pokemon/exp/shiny/716-neutral.json +++ b/public/images/pokemon/exp/shiny/716-neutral.json @@ -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$" } } diff --git a/public/images/pokemon/exp/shiny/716-neutral.png b/public/images/pokemon/exp/shiny/716-neutral.png index 9643fb5a6..062deb9ba 100644 Binary files a/public/images/pokemon/exp/shiny/716-neutral.png and b/public/images/pokemon/exp/shiny/716-neutral.png differ diff --git a/public/images/pokemon/exp/shiny/771.png b/public/images/pokemon/exp/shiny/771.png index 2506de390..76bf27514 100644 Binary files a/public/images/pokemon/exp/shiny/771.png and b/public/images/pokemon/exp/shiny/771.png differ diff --git a/public/images/pokemon/exp/shiny/793.png b/public/images/pokemon/exp/shiny/793.png index d563a6f86..7cc43d73f 100644 Binary files a/public/images/pokemon/exp/shiny/793.png and b/public/images/pokemon/exp/shiny/793.png differ diff --git a/public/images/pokemon/exp/shiny/821.png b/public/images/pokemon/exp/shiny/821.png index fb7a14f38..5c03c17c7 100644 Binary files a/public/images/pokemon/exp/shiny/821.png and b/public/images/pokemon/exp/shiny/821.png differ diff --git a/public/images/pokemon/exp/shiny/823.png b/public/images/pokemon/exp/shiny/823.png index 3024563f1..1e90dcb67 100644 Binary files a/public/images/pokemon/exp/shiny/823.png and b/public/images/pokemon/exp/shiny/823.png differ diff --git a/public/images/pokemon/exp/shiny/857.png b/public/images/pokemon/exp/shiny/857.png index 86e7458fa..65a7c0f8f 100644 Binary files a/public/images/pokemon/exp/shiny/857.png and b/public/images/pokemon/exp/shiny/857.png differ diff --git a/public/images/pokemon/exp/shiny/983.png b/public/images/pokemon/exp/shiny/983.png index bddb9fcb9..36e0df815 100644 Binary files a/public/images/pokemon/exp/shiny/983.png and b/public/images/pokemon/exp/shiny/983.png differ diff --git a/public/images/pokemon/icons/1.png b/public/images/pokemon/icons/1/1.png similarity index 100% rename from public/images/pokemon/icons/1.png rename to public/images/pokemon/icons/1/1.png diff --git a/public/images/pokemon/icons/10.png b/public/images/pokemon/icons/1/10.png similarity index 100% rename from public/images/pokemon/icons/10.png rename to public/images/pokemon/icons/1/10.png diff --git a/public/images/pokemon/icons/100.png b/public/images/pokemon/icons/1/100.png similarity index 100% rename from public/images/pokemon/icons/100.png rename to public/images/pokemon/icons/1/100.png diff --git a/public/images/pokemon/icons/100s.png b/public/images/pokemon/icons/1/100s.png similarity index 100% rename from public/images/pokemon/icons/100s.png rename to public/images/pokemon/icons/1/100s.png diff --git a/public/images/pokemon/icons/101.png b/public/images/pokemon/icons/1/101.png similarity index 100% rename from public/images/pokemon/icons/101.png rename to public/images/pokemon/icons/1/101.png diff --git a/public/images/pokemon/icons/101s.png b/public/images/pokemon/icons/1/101s.png similarity index 100% rename from public/images/pokemon/icons/101s.png rename to public/images/pokemon/icons/1/101s.png diff --git a/public/images/pokemon/icons/102.png b/public/images/pokemon/icons/1/102.png similarity index 100% rename from public/images/pokemon/icons/102.png rename to public/images/pokemon/icons/1/102.png diff --git a/public/images/pokemon/icons/102s.png b/public/images/pokemon/icons/1/102s.png similarity index 100% rename from public/images/pokemon/icons/102s.png rename to public/images/pokemon/icons/1/102s.png diff --git a/public/images/pokemon/icons/103.png b/public/images/pokemon/icons/1/103.png similarity index 100% rename from public/images/pokemon/icons/103.png rename to public/images/pokemon/icons/1/103.png diff --git a/public/images/pokemon/icons/103s.png b/public/images/pokemon/icons/1/103s.png similarity index 100% rename from public/images/pokemon/icons/103s.png rename to public/images/pokemon/icons/1/103s.png diff --git a/public/images/pokemon/icons/104.png b/public/images/pokemon/icons/1/104.png similarity index 100% rename from public/images/pokemon/icons/104.png rename to public/images/pokemon/icons/1/104.png diff --git a/public/images/pokemon/icons/104s.png b/public/images/pokemon/icons/1/104s.png similarity index 100% rename from public/images/pokemon/icons/104s.png rename to public/images/pokemon/icons/1/104s.png diff --git a/public/images/pokemon/icons/105.png b/public/images/pokemon/icons/1/105.png similarity index 100% rename from public/images/pokemon/icons/105.png rename to public/images/pokemon/icons/1/105.png diff --git a/public/images/pokemon/icons/105s.png b/public/images/pokemon/icons/1/105s.png similarity index 100% rename from public/images/pokemon/icons/105s.png rename to public/images/pokemon/icons/1/105s.png diff --git a/public/images/pokemon/icons/106.png b/public/images/pokemon/icons/1/106.png similarity index 100% rename from public/images/pokemon/icons/106.png rename to public/images/pokemon/icons/1/106.png diff --git a/public/images/pokemon/icons/106s.png b/public/images/pokemon/icons/1/106s.png similarity index 100% rename from public/images/pokemon/icons/106s.png rename to public/images/pokemon/icons/1/106s.png diff --git a/public/images/pokemon/icons/107.png b/public/images/pokemon/icons/1/107.png similarity index 100% rename from public/images/pokemon/icons/107.png rename to public/images/pokemon/icons/1/107.png diff --git a/public/images/pokemon/icons/107s.png b/public/images/pokemon/icons/1/107s.png similarity index 100% rename from public/images/pokemon/icons/107s.png rename to public/images/pokemon/icons/1/107s.png diff --git a/public/images/pokemon/icons/108.png b/public/images/pokemon/icons/1/108.png similarity index 100% rename from public/images/pokemon/icons/108.png rename to public/images/pokemon/icons/1/108.png diff --git a/public/images/pokemon/icons/108s.png b/public/images/pokemon/icons/1/108s.png similarity index 100% rename from public/images/pokemon/icons/108s.png rename to public/images/pokemon/icons/1/108s.png diff --git a/public/images/pokemon/icons/109.png b/public/images/pokemon/icons/1/109.png similarity index 100% rename from public/images/pokemon/icons/109.png rename to public/images/pokemon/icons/1/109.png diff --git a/public/images/pokemon/icons/109s.png b/public/images/pokemon/icons/1/109s.png similarity index 100% rename from public/images/pokemon/icons/109s.png rename to public/images/pokemon/icons/1/109s.png diff --git a/public/images/pokemon/icons/10s.png b/public/images/pokemon/icons/1/10s.png similarity index 100% rename from public/images/pokemon/icons/10s.png rename to public/images/pokemon/icons/1/10s.png diff --git a/public/images/pokemon/icons/11.png b/public/images/pokemon/icons/1/11.png similarity index 100% rename from public/images/pokemon/icons/11.png rename to public/images/pokemon/icons/1/11.png diff --git a/public/images/pokemon/icons/110.png b/public/images/pokemon/icons/1/110.png similarity index 100% rename from public/images/pokemon/icons/110.png rename to public/images/pokemon/icons/1/110.png diff --git a/public/images/pokemon/icons/110s.png b/public/images/pokemon/icons/1/110s.png similarity index 100% rename from public/images/pokemon/icons/110s.png rename to public/images/pokemon/icons/1/110s.png diff --git a/public/images/pokemon/icons/111.png b/public/images/pokemon/icons/1/111.png similarity index 100% rename from public/images/pokemon/icons/111.png rename to public/images/pokemon/icons/1/111.png diff --git a/public/images/pokemon/icons/111s.png b/public/images/pokemon/icons/1/111s.png similarity index 100% rename from public/images/pokemon/icons/111s.png rename to public/images/pokemon/icons/1/111s.png diff --git a/public/images/pokemon/icons/112.png b/public/images/pokemon/icons/1/112.png similarity index 100% rename from public/images/pokemon/icons/112.png rename to public/images/pokemon/icons/1/112.png diff --git a/public/images/pokemon/icons/112s.png b/public/images/pokemon/icons/1/112s.png similarity index 100% rename from public/images/pokemon/icons/112s.png rename to public/images/pokemon/icons/1/112s.png diff --git a/public/images/pokemon/icons/113.png b/public/images/pokemon/icons/1/113.png similarity index 100% rename from public/images/pokemon/icons/113.png rename to public/images/pokemon/icons/1/113.png diff --git a/public/images/pokemon/icons/113s.png b/public/images/pokemon/icons/1/113s.png similarity index 100% rename from public/images/pokemon/icons/113s.png rename to public/images/pokemon/icons/1/113s.png diff --git a/public/images/pokemon/icons/114.png b/public/images/pokemon/icons/1/114.png similarity index 100% rename from public/images/pokemon/icons/114.png rename to public/images/pokemon/icons/1/114.png diff --git a/public/images/pokemon/icons/114s.png b/public/images/pokemon/icons/1/114s.png similarity index 100% rename from public/images/pokemon/icons/114s.png rename to public/images/pokemon/icons/1/114s.png diff --git a/public/images/pokemon/icons/115-mega.png b/public/images/pokemon/icons/1/115-mega.png similarity index 100% rename from public/images/pokemon/icons/115-mega.png rename to public/images/pokemon/icons/1/115-mega.png diff --git a/public/images/pokemon/icons/115.png b/public/images/pokemon/icons/1/115.png similarity index 100% rename from public/images/pokemon/icons/115.png rename to public/images/pokemon/icons/1/115.png diff --git a/public/images/pokemon/icons/115s-mega.png b/public/images/pokemon/icons/1/115s-mega.png similarity index 100% rename from public/images/pokemon/icons/115s-mega.png rename to public/images/pokemon/icons/1/115s-mega.png diff --git a/public/images/pokemon/icons/115s.png b/public/images/pokemon/icons/1/115s.png similarity index 100% rename from public/images/pokemon/icons/115s.png rename to public/images/pokemon/icons/1/115s.png diff --git a/public/images/pokemon/icons/116.png b/public/images/pokemon/icons/1/116.png similarity index 100% rename from public/images/pokemon/icons/116.png rename to public/images/pokemon/icons/1/116.png diff --git a/public/images/pokemon/icons/116s.png b/public/images/pokemon/icons/1/116s.png similarity index 100% rename from public/images/pokemon/icons/116s.png rename to public/images/pokemon/icons/1/116s.png diff --git a/public/images/pokemon/icons/117.png b/public/images/pokemon/icons/1/117.png similarity index 100% rename from public/images/pokemon/icons/117.png rename to public/images/pokemon/icons/1/117.png diff --git a/public/images/pokemon/icons/117s.png b/public/images/pokemon/icons/1/117s.png similarity index 100% rename from public/images/pokemon/icons/117s.png rename to public/images/pokemon/icons/1/117s.png diff --git a/public/images/pokemon/icons/118.png b/public/images/pokemon/icons/1/118.png similarity index 100% rename from public/images/pokemon/icons/118.png rename to public/images/pokemon/icons/1/118.png diff --git a/public/images/pokemon/icons/118s.png b/public/images/pokemon/icons/1/118s.png similarity index 100% rename from public/images/pokemon/icons/118s.png rename to public/images/pokemon/icons/1/118s.png diff --git a/public/images/pokemon/icons/119.png b/public/images/pokemon/icons/1/119.png similarity index 100% rename from public/images/pokemon/icons/119.png rename to public/images/pokemon/icons/1/119.png diff --git a/public/images/pokemon/icons/119s.png b/public/images/pokemon/icons/1/119s.png similarity index 100% rename from public/images/pokemon/icons/119s.png rename to public/images/pokemon/icons/1/119s.png diff --git a/public/images/pokemon/icons/11s.png b/public/images/pokemon/icons/1/11s.png similarity index 100% rename from public/images/pokemon/icons/11s.png rename to public/images/pokemon/icons/1/11s.png diff --git a/public/images/pokemon/icons/12-gigantamax.png b/public/images/pokemon/icons/1/12-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/12-gigantamax.png rename to public/images/pokemon/icons/1/12-gigantamax.png diff --git a/public/images/pokemon/icons/12.png b/public/images/pokemon/icons/1/12.png similarity index 100% rename from public/images/pokemon/icons/12.png rename to public/images/pokemon/icons/1/12.png diff --git a/public/images/pokemon/icons/120.png b/public/images/pokemon/icons/1/120.png similarity index 100% rename from public/images/pokemon/icons/120.png rename to public/images/pokemon/icons/1/120.png diff --git a/public/images/pokemon/icons/120s.png b/public/images/pokemon/icons/1/120s.png similarity index 100% rename from public/images/pokemon/icons/120s.png rename to public/images/pokemon/icons/1/120s.png diff --git a/public/images/pokemon/icons/121.png b/public/images/pokemon/icons/1/121.png similarity index 100% rename from public/images/pokemon/icons/121.png rename to public/images/pokemon/icons/1/121.png diff --git a/public/images/pokemon/icons/121s.png b/public/images/pokemon/icons/1/121s.png similarity index 100% rename from public/images/pokemon/icons/121s.png rename to public/images/pokemon/icons/1/121s.png diff --git a/public/images/pokemon/icons/122.png b/public/images/pokemon/icons/1/122.png similarity index 100% rename from public/images/pokemon/icons/122.png rename to public/images/pokemon/icons/1/122.png diff --git a/public/images/pokemon/icons/122s.png b/public/images/pokemon/icons/1/122s.png similarity index 100% rename from public/images/pokemon/icons/122s.png rename to public/images/pokemon/icons/1/122s.png diff --git a/public/images/pokemon/icons/123.png b/public/images/pokemon/icons/1/123.png similarity index 100% rename from public/images/pokemon/icons/123.png rename to public/images/pokemon/icons/1/123.png diff --git a/public/images/pokemon/icons/123s.png b/public/images/pokemon/icons/1/123s.png similarity index 100% rename from public/images/pokemon/icons/123s.png rename to public/images/pokemon/icons/1/123s.png diff --git a/public/images/pokemon/icons/124.png b/public/images/pokemon/icons/1/124.png similarity index 100% rename from public/images/pokemon/icons/124.png rename to public/images/pokemon/icons/1/124.png diff --git a/public/images/pokemon/icons/124s.png b/public/images/pokemon/icons/1/124s.png similarity index 100% rename from public/images/pokemon/icons/124s.png rename to public/images/pokemon/icons/1/124s.png diff --git a/public/images/pokemon/icons/125.png b/public/images/pokemon/icons/1/125.png similarity index 100% rename from public/images/pokemon/icons/125.png rename to public/images/pokemon/icons/1/125.png diff --git a/public/images/pokemon/icons/125s.png b/public/images/pokemon/icons/1/125s.png similarity index 100% rename from public/images/pokemon/icons/125s.png rename to public/images/pokemon/icons/1/125s.png diff --git a/public/images/pokemon/icons/126.png b/public/images/pokemon/icons/1/126.png similarity index 100% rename from public/images/pokemon/icons/126.png rename to public/images/pokemon/icons/1/126.png diff --git a/public/images/pokemon/icons/126s.png b/public/images/pokemon/icons/1/126s.png similarity index 100% rename from public/images/pokemon/icons/126s.png rename to public/images/pokemon/icons/1/126s.png diff --git a/public/images/pokemon/icons/127-mega.png b/public/images/pokemon/icons/1/127-mega.png similarity index 100% rename from public/images/pokemon/icons/127-mega.png rename to public/images/pokemon/icons/1/127-mega.png diff --git a/public/images/pokemon/icons/127.png b/public/images/pokemon/icons/1/127.png similarity index 100% rename from public/images/pokemon/icons/127.png rename to public/images/pokemon/icons/1/127.png diff --git a/public/images/pokemon/icons/127s-mega.png b/public/images/pokemon/icons/1/127s-mega.png similarity index 100% rename from public/images/pokemon/icons/127s-mega.png rename to public/images/pokemon/icons/1/127s-mega.png diff --git a/public/images/pokemon/icons/127s.png b/public/images/pokemon/icons/1/127s.png similarity index 100% rename from public/images/pokemon/icons/127s.png rename to public/images/pokemon/icons/1/127s.png diff --git a/public/images/pokemon/icons/128.png b/public/images/pokemon/icons/1/128.png similarity index 100% rename from public/images/pokemon/icons/128.png rename to public/images/pokemon/icons/1/128.png diff --git a/public/images/pokemon/icons/128s.png b/public/images/pokemon/icons/1/128s.png similarity index 100% rename from public/images/pokemon/icons/128s.png rename to public/images/pokemon/icons/1/128s.png diff --git a/public/images/pokemon/icons/129.png b/public/images/pokemon/icons/1/129.png similarity index 100% rename from public/images/pokemon/icons/129.png rename to public/images/pokemon/icons/1/129.png diff --git a/public/images/pokemon/icons/129s.png b/public/images/pokemon/icons/1/129s.png similarity index 100% rename from public/images/pokemon/icons/129s.png rename to public/images/pokemon/icons/1/129s.png diff --git a/public/images/pokemon/icons/12s-gigantamax.png b/public/images/pokemon/icons/1/12s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/12s-gigantamax.png rename to public/images/pokemon/icons/1/12s-gigantamax.png diff --git a/public/images/pokemon/icons/12s.png b/public/images/pokemon/icons/1/12s.png similarity index 100% rename from public/images/pokemon/icons/12s.png rename to public/images/pokemon/icons/1/12s.png diff --git a/public/images/pokemon/icons/13.png b/public/images/pokemon/icons/1/13.png similarity index 100% rename from public/images/pokemon/icons/13.png rename to public/images/pokemon/icons/1/13.png diff --git a/public/images/pokemon/icons/130-mega.png b/public/images/pokemon/icons/1/130-mega.png similarity index 100% rename from public/images/pokemon/icons/130-mega.png rename to public/images/pokemon/icons/1/130-mega.png diff --git a/public/images/pokemon/icons/130.png b/public/images/pokemon/icons/1/130.png similarity index 100% rename from public/images/pokemon/icons/130.png rename to public/images/pokemon/icons/1/130.png diff --git a/public/images/pokemon/icons/130s-mega.png b/public/images/pokemon/icons/1/130s-mega.png similarity index 100% rename from public/images/pokemon/icons/130s-mega.png rename to public/images/pokemon/icons/1/130s-mega.png diff --git a/public/images/pokemon/icons/130s.png b/public/images/pokemon/icons/1/130s.png similarity index 100% rename from public/images/pokemon/icons/130s.png rename to public/images/pokemon/icons/1/130s.png diff --git a/public/images/pokemon/icons/131-gigantamax.png b/public/images/pokemon/icons/1/131-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/131-gigantamax.png rename to public/images/pokemon/icons/1/131-gigantamax.png diff --git a/public/images/pokemon/icons/131.png b/public/images/pokemon/icons/1/131.png similarity index 100% rename from public/images/pokemon/icons/131.png rename to public/images/pokemon/icons/1/131.png diff --git a/public/images/pokemon/icons/131s-gigantamax.png b/public/images/pokemon/icons/1/131s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/131s-gigantamax.png rename to public/images/pokemon/icons/1/131s-gigantamax.png diff --git a/public/images/pokemon/icons/131s.png b/public/images/pokemon/icons/1/131s.png similarity index 100% rename from public/images/pokemon/icons/131s.png rename to public/images/pokemon/icons/1/131s.png diff --git a/public/images/pokemon/icons/132.png b/public/images/pokemon/icons/1/132.png similarity index 100% rename from public/images/pokemon/icons/132.png rename to public/images/pokemon/icons/1/132.png diff --git a/public/images/pokemon/icons/132s.png b/public/images/pokemon/icons/1/132s.png similarity index 100% rename from public/images/pokemon/icons/132s.png rename to public/images/pokemon/icons/1/132s.png diff --git a/public/images/pokemon/icons/133-gigantamax.png b/public/images/pokemon/icons/1/133-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/133-gigantamax.png rename to public/images/pokemon/icons/1/133-gigantamax.png diff --git a/public/images/pokemon/icons/133.png b/public/images/pokemon/icons/1/133.png similarity index 100% rename from public/images/pokemon/icons/133.png rename to public/images/pokemon/icons/1/133.png diff --git a/public/images/pokemon/icons/133s-gigantamax.png b/public/images/pokemon/icons/1/133s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/133s-gigantamax.png rename to public/images/pokemon/icons/1/133s-gigantamax.png diff --git a/public/images/pokemon/icons/133s.png b/public/images/pokemon/icons/1/133s.png similarity index 100% rename from public/images/pokemon/icons/133s.png rename to public/images/pokemon/icons/1/133s.png diff --git a/public/images/pokemon/icons/134.png b/public/images/pokemon/icons/1/134.png similarity index 100% rename from public/images/pokemon/icons/134.png rename to public/images/pokemon/icons/1/134.png diff --git a/public/images/pokemon/icons/134s.png b/public/images/pokemon/icons/1/134s.png similarity index 100% rename from public/images/pokemon/icons/134s.png rename to public/images/pokemon/icons/1/134s.png diff --git a/public/images/pokemon/icons/135.png b/public/images/pokemon/icons/1/135.png similarity index 100% rename from public/images/pokemon/icons/135.png rename to public/images/pokemon/icons/1/135.png diff --git a/public/images/pokemon/icons/135s.png b/public/images/pokemon/icons/1/135s.png similarity index 100% rename from public/images/pokemon/icons/135s.png rename to public/images/pokemon/icons/1/135s.png diff --git a/public/images/pokemon/icons/136.png b/public/images/pokemon/icons/1/136.png similarity index 100% rename from public/images/pokemon/icons/136.png rename to public/images/pokemon/icons/1/136.png diff --git a/public/images/pokemon/icons/136s.png b/public/images/pokemon/icons/1/136s.png similarity index 100% rename from public/images/pokemon/icons/136s.png rename to public/images/pokemon/icons/1/136s.png diff --git a/public/images/pokemon/icons/137.png b/public/images/pokemon/icons/1/137.png similarity index 100% rename from public/images/pokemon/icons/137.png rename to public/images/pokemon/icons/1/137.png diff --git a/public/images/pokemon/icons/137s.png b/public/images/pokemon/icons/1/137s.png similarity index 100% rename from public/images/pokemon/icons/137s.png rename to public/images/pokemon/icons/1/137s.png diff --git a/public/images/pokemon/icons/138.png b/public/images/pokemon/icons/1/138.png similarity index 100% rename from public/images/pokemon/icons/138.png rename to public/images/pokemon/icons/1/138.png diff --git a/public/images/pokemon/icons/138s.png b/public/images/pokemon/icons/1/138s.png similarity index 100% rename from public/images/pokemon/icons/138s.png rename to public/images/pokemon/icons/1/138s.png diff --git a/public/images/pokemon/icons/139.png b/public/images/pokemon/icons/1/139.png similarity index 100% rename from public/images/pokemon/icons/139.png rename to public/images/pokemon/icons/1/139.png diff --git a/public/images/pokemon/icons/139s.png b/public/images/pokemon/icons/1/139s.png similarity index 100% rename from public/images/pokemon/icons/139s.png rename to public/images/pokemon/icons/1/139s.png diff --git a/public/images/pokemon/icons/13s.png b/public/images/pokemon/icons/1/13s.png similarity index 100% rename from public/images/pokemon/icons/13s.png rename to public/images/pokemon/icons/1/13s.png diff --git a/public/images/pokemon/icons/14.png b/public/images/pokemon/icons/1/14.png similarity index 100% rename from public/images/pokemon/icons/14.png rename to public/images/pokemon/icons/1/14.png diff --git a/public/images/pokemon/icons/140.png b/public/images/pokemon/icons/1/140.png similarity index 100% rename from public/images/pokemon/icons/140.png rename to public/images/pokemon/icons/1/140.png diff --git a/public/images/pokemon/icons/140s.png b/public/images/pokemon/icons/1/140s.png similarity index 100% rename from public/images/pokemon/icons/140s.png rename to public/images/pokemon/icons/1/140s.png diff --git a/public/images/pokemon/icons/141.png b/public/images/pokemon/icons/1/141.png similarity index 100% rename from public/images/pokemon/icons/141.png rename to public/images/pokemon/icons/1/141.png diff --git a/public/images/pokemon/icons/141s.png b/public/images/pokemon/icons/1/141s.png similarity index 100% rename from public/images/pokemon/icons/141s.png rename to public/images/pokemon/icons/1/141s.png diff --git a/public/images/pokemon/icons/142-mega.png b/public/images/pokemon/icons/1/142-mega.png similarity index 100% rename from public/images/pokemon/icons/142-mega.png rename to public/images/pokemon/icons/1/142-mega.png diff --git a/public/images/pokemon/icons/142.png b/public/images/pokemon/icons/1/142.png similarity index 100% rename from public/images/pokemon/icons/142.png rename to public/images/pokemon/icons/1/142.png diff --git a/public/images/pokemon/icons/142s-mega.png b/public/images/pokemon/icons/1/142s-mega.png similarity index 100% rename from public/images/pokemon/icons/142s-mega.png rename to public/images/pokemon/icons/1/142s-mega.png diff --git a/public/images/pokemon/icons/142s.png b/public/images/pokemon/icons/1/142s.png similarity index 100% rename from public/images/pokemon/icons/142s.png rename to public/images/pokemon/icons/1/142s.png diff --git a/public/images/pokemon/icons/143-gigantamax.png b/public/images/pokemon/icons/1/143-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/143-gigantamax.png rename to public/images/pokemon/icons/1/143-gigantamax.png diff --git a/public/images/pokemon/icons/143.png b/public/images/pokemon/icons/1/143.png similarity index 100% rename from public/images/pokemon/icons/143.png rename to public/images/pokemon/icons/1/143.png diff --git a/public/images/pokemon/icons/143s-gigantamax.png b/public/images/pokemon/icons/1/143s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/143s-gigantamax.png rename to public/images/pokemon/icons/1/143s-gigantamax.png diff --git a/public/images/pokemon/icons/143s.png b/public/images/pokemon/icons/1/143s.png similarity index 100% rename from public/images/pokemon/icons/143s.png rename to public/images/pokemon/icons/1/143s.png diff --git a/public/images/pokemon/icons/144.png b/public/images/pokemon/icons/1/144.png similarity index 100% rename from public/images/pokemon/icons/144.png rename to public/images/pokemon/icons/1/144.png diff --git a/public/images/pokemon/icons/144s.png b/public/images/pokemon/icons/1/144s.png similarity index 100% rename from public/images/pokemon/icons/144s.png rename to public/images/pokemon/icons/1/144s.png diff --git a/public/images/pokemon/icons/145.png b/public/images/pokemon/icons/1/145.png similarity index 100% rename from public/images/pokemon/icons/145.png rename to public/images/pokemon/icons/1/145.png diff --git a/public/images/pokemon/icons/145s.png b/public/images/pokemon/icons/1/145s.png similarity index 100% rename from public/images/pokemon/icons/145s.png rename to public/images/pokemon/icons/1/145s.png diff --git a/public/images/pokemon/icons/146.png b/public/images/pokemon/icons/1/146.png similarity index 100% rename from public/images/pokemon/icons/146.png rename to public/images/pokemon/icons/1/146.png diff --git a/public/images/pokemon/icons/146s.png b/public/images/pokemon/icons/1/146s.png similarity index 100% rename from public/images/pokemon/icons/146s.png rename to public/images/pokemon/icons/1/146s.png diff --git a/public/images/pokemon/icons/147.png b/public/images/pokemon/icons/1/147.png similarity index 100% rename from public/images/pokemon/icons/147.png rename to public/images/pokemon/icons/1/147.png diff --git a/public/images/pokemon/icons/147s.png b/public/images/pokemon/icons/1/147s.png similarity index 100% rename from public/images/pokemon/icons/147s.png rename to public/images/pokemon/icons/1/147s.png diff --git a/public/images/pokemon/icons/148.png b/public/images/pokemon/icons/1/148.png similarity index 100% rename from public/images/pokemon/icons/148.png rename to public/images/pokemon/icons/1/148.png diff --git a/public/images/pokemon/icons/148s.png b/public/images/pokemon/icons/1/148s.png similarity index 100% rename from public/images/pokemon/icons/148s.png rename to public/images/pokemon/icons/1/148s.png diff --git a/public/images/pokemon/icons/149.png b/public/images/pokemon/icons/1/149.png similarity index 100% rename from public/images/pokemon/icons/149.png rename to public/images/pokemon/icons/1/149.png diff --git a/public/images/pokemon/icons/149s.png b/public/images/pokemon/icons/1/149s.png similarity index 100% rename from public/images/pokemon/icons/149s.png rename to public/images/pokemon/icons/1/149s.png diff --git a/public/images/pokemon/icons/14s.png b/public/images/pokemon/icons/1/14s.png similarity index 100% rename from public/images/pokemon/icons/14s.png rename to public/images/pokemon/icons/1/14s.png diff --git a/public/images/pokemon/icons/15-mega.png b/public/images/pokemon/icons/1/15-mega.png similarity index 100% rename from public/images/pokemon/icons/15-mega.png rename to public/images/pokemon/icons/1/15-mega.png diff --git a/public/images/pokemon/icons/15.png b/public/images/pokemon/icons/1/15.png similarity index 100% rename from public/images/pokemon/icons/15.png rename to public/images/pokemon/icons/1/15.png diff --git a/public/images/pokemon/icons/150-mega-x.png b/public/images/pokemon/icons/1/150-mega-x.png similarity index 100% rename from public/images/pokemon/icons/150-mega-x.png rename to public/images/pokemon/icons/1/150-mega-x.png diff --git a/public/images/pokemon/icons/150-mega-y.png b/public/images/pokemon/icons/1/150-mega-y.png similarity index 100% rename from public/images/pokemon/icons/150-mega-y.png rename to public/images/pokemon/icons/1/150-mega-y.png diff --git a/public/images/pokemon/icons/150.png b/public/images/pokemon/icons/1/150.png similarity index 100% rename from public/images/pokemon/icons/150.png rename to public/images/pokemon/icons/1/150.png diff --git a/public/images/pokemon/icons/150s-mega-x.png b/public/images/pokemon/icons/1/150s-mega-x.png similarity index 100% rename from public/images/pokemon/icons/150s-mega-x.png rename to public/images/pokemon/icons/1/150s-mega-x.png diff --git a/public/images/pokemon/icons/150s-mega-y.png b/public/images/pokemon/icons/1/150s-mega-y.png similarity index 100% rename from public/images/pokemon/icons/150s-mega-y.png rename to public/images/pokemon/icons/1/150s-mega-y.png diff --git a/public/images/pokemon/icons/150s.png b/public/images/pokemon/icons/1/150s.png similarity index 100% rename from public/images/pokemon/icons/150s.png rename to public/images/pokemon/icons/1/150s.png diff --git a/public/images/pokemon/icons/151.png b/public/images/pokemon/icons/1/151.png similarity index 100% rename from public/images/pokemon/icons/151.png rename to public/images/pokemon/icons/1/151.png diff --git a/public/images/pokemon/icons/151s.png b/public/images/pokemon/icons/1/151s.png similarity index 100% rename from public/images/pokemon/icons/151s.png rename to public/images/pokemon/icons/1/151s.png diff --git a/public/images/pokemon/icons/15s-mega.png b/public/images/pokemon/icons/1/15s-mega.png similarity index 100% rename from public/images/pokemon/icons/15s-mega.png rename to public/images/pokemon/icons/1/15s-mega.png diff --git a/public/images/pokemon/icons/15s.png b/public/images/pokemon/icons/1/15s.png similarity index 100% rename from public/images/pokemon/icons/15s.png rename to public/images/pokemon/icons/1/15s.png diff --git a/public/images/pokemon/icons/16.png b/public/images/pokemon/icons/1/16.png similarity index 100% rename from public/images/pokemon/icons/16.png rename to public/images/pokemon/icons/1/16.png diff --git a/public/images/pokemon/icons/16s.png b/public/images/pokemon/icons/1/16s.png similarity index 100% rename from public/images/pokemon/icons/16s.png rename to public/images/pokemon/icons/1/16s.png diff --git a/public/images/pokemon/icons/17.png b/public/images/pokemon/icons/1/17.png similarity index 100% rename from public/images/pokemon/icons/17.png rename to public/images/pokemon/icons/1/17.png diff --git a/public/images/pokemon/icons/17s.png b/public/images/pokemon/icons/1/17s.png similarity index 100% rename from public/images/pokemon/icons/17s.png rename to public/images/pokemon/icons/1/17s.png diff --git a/public/images/pokemon/icons/18-mega.png b/public/images/pokemon/icons/1/18-mega.png similarity index 100% rename from public/images/pokemon/icons/18-mega.png rename to public/images/pokemon/icons/1/18-mega.png diff --git a/public/images/pokemon/icons/18.png b/public/images/pokemon/icons/1/18.png similarity index 100% rename from public/images/pokemon/icons/18.png rename to public/images/pokemon/icons/1/18.png diff --git a/public/images/pokemon/icons/18s-mega.png b/public/images/pokemon/icons/1/18s-mega.png similarity index 100% rename from public/images/pokemon/icons/18s-mega.png rename to public/images/pokemon/icons/1/18s-mega.png diff --git a/public/images/pokemon/icons/18s.png b/public/images/pokemon/icons/1/18s.png similarity index 100% rename from public/images/pokemon/icons/18s.png rename to public/images/pokemon/icons/1/18s.png diff --git a/public/images/pokemon/icons/19.png b/public/images/pokemon/icons/1/19.png similarity index 100% rename from public/images/pokemon/icons/19.png rename to public/images/pokemon/icons/1/19.png diff --git a/public/images/pokemon/icons/19s.png b/public/images/pokemon/icons/1/19s.png similarity index 100% rename from public/images/pokemon/icons/19s.png rename to public/images/pokemon/icons/1/19s.png diff --git a/public/images/pokemon/icons/1s.png b/public/images/pokemon/icons/1/1s.png similarity index 100% rename from public/images/pokemon/icons/1s.png rename to public/images/pokemon/icons/1/1s.png diff --git a/public/images/pokemon/icons/2.png b/public/images/pokemon/icons/1/2.png similarity index 100% rename from public/images/pokemon/icons/2.png rename to public/images/pokemon/icons/1/2.png diff --git a/public/images/pokemon/icons/20.png b/public/images/pokemon/icons/1/20.png similarity index 100% rename from public/images/pokemon/icons/20.png rename to public/images/pokemon/icons/1/20.png diff --git a/public/images/pokemon/icons/20s.png b/public/images/pokemon/icons/1/20s.png similarity index 100% rename from public/images/pokemon/icons/20s.png rename to public/images/pokemon/icons/1/20s.png diff --git a/public/images/pokemon/icons/21.png b/public/images/pokemon/icons/1/21.png similarity index 100% rename from public/images/pokemon/icons/21.png rename to public/images/pokemon/icons/1/21.png diff --git a/public/images/pokemon/icons/21s.png b/public/images/pokemon/icons/1/21s.png similarity index 100% rename from public/images/pokemon/icons/21s.png rename to public/images/pokemon/icons/1/21s.png diff --git a/public/images/pokemon/icons/22.png b/public/images/pokemon/icons/1/22.png similarity index 100% rename from public/images/pokemon/icons/22.png rename to public/images/pokemon/icons/1/22.png diff --git a/public/images/pokemon/icons/22s.png b/public/images/pokemon/icons/1/22s.png similarity index 100% rename from public/images/pokemon/icons/22s.png rename to public/images/pokemon/icons/1/22s.png diff --git a/public/images/pokemon/icons/23.png b/public/images/pokemon/icons/1/23.png similarity index 100% rename from public/images/pokemon/icons/23.png rename to public/images/pokemon/icons/1/23.png diff --git a/public/images/pokemon/icons/23s.png b/public/images/pokemon/icons/1/23s.png similarity index 100% rename from public/images/pokemon/icons/23s.png rename to public/images/pokemon/icons/1/23s.png diff --git a/public/images/pokemon/icons/24.png b/public/images/pokemon/icons/1/24.png similarity index 100% rename from public/images/pokemon/icons/24.png rename to public/images/pokemon/icons/1/24.png diff --git a/public/images/pokemon/icons/24s.png b/public/images/pokemon/icons/1/24s.png similarity index 100% rename from public/images/pokemon/icons/24s.png rename to public/images/pokemon/icons/1/24s.png diff --git a/public/images/pokemon/icons/25-gigantamax.png b/public/images/pokemon/icons/1/25-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/25-gigantamax.png rename to public/images/pokemon/icons/1/25-gigantamax.png diff --git a/public/images/pokemon/icons/25.png b/public/images/pokemon/icons/1/25.png similarity index 100% rename from public/images/pokemon/icons/25.png rename to public/images/pokemon/icons/1/25.png diff --git a/public/images/pokemon/icons/25s-gigantamax.png b/public/images/pokemon/icons/1/25s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/25s-gigantamax.png rename to public/images/pokemon/icons/1/25s-gigantamax.png diff --git a/public/images/pokemon/icons/25s.png b/public/images/pokemon/icons/1/25s.png similarity index 100% rename from public/images/pokemon/icons/25s.png rename to public/images/pokemon/icons/1/25s.png diff --git a/public/images/pokemon/icons/26.png b/public/images/pokemon/icons/1/26.png similarity index 100% rename from public/images/pokemon/icons/26.png rename to public/images/pokemon/icons/1/26.png diff --git a/public/images/pokemon/icons/26s.png b/public/images/pokemon/icons/1/26s.png similarity index 100% rename from public/images/pokemon/icons/26s.png rename to public/images/pokemon/icons/1/26s.png diff --git a/public/images/pokemon/icons/27.png b/public/images/pokemon/icons/1/27.png similarity index 100% rename from public/images/pokemon/icons/27.png rename to public/images/pokemon/icons/1/27.png diff --git a/public/images/pokemon/icons/27s.png b/public/images/pokemon/icons/1/27s.png similarity index 100% rename from public/images/pokemon/icons/27s.png rename to public/images/pokemon/icons/1/27s.png diff --git a/public/images/pokemon/icons/28.png b/public/images/pokemon/icons/1/28.png similarity index 100% rename from public/images/pokemon/icons/28.png rename to public/images/pokemon/icons/1/28.png diff --git a/public/images/pokemon/icons/28s.png b/public/images/pokemon/icons/1/28s.png similarity index 100% rename from public/images/pokemon/icons/28s.png rename to public/images/pokemon/icons/1/28s.png diff --git a/public/images/pokemon/icons/29.png b/public/images/pokemon/icons/1/29.png similarity index 100% rename from public/images/pokemon/icons/29.png rename to public/images/pokemon/icons/1/29.png diff --git a/public/images/pokemon/icons/29s.png b/public/images/pokemon/icons/1/29s.png similarity index 100% rename from public/images/pokemon/icons/29s.png rename to public/images/pokemon/icons/1/29s.png diff --git a/public/images/pokemon/icons/2s.png b/public/images/pokemon/icons/1/2s.png similarity index 100% rename from public/images/pokemon/icons/2s.png rename to public/images/pokemon/icons/1/2s.png diff --git a/public/images/pokemon/icons/3-gigantamax.png b/public/images/pokemon/icons/1/3-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/3-gigantamax.png rename to public/images/pokemon/icons/1/3-gigantamax.png diff --git a/public/images/pokemon/icons/3-mega.png b/public/images/pokemon/icons/1/3-mega.png similarity index 100% rename from public/images/pokemon/icons/3-mega.png rename to public/images/pokemon/icons/1/3-mega.png diff --git a/public/images/pokemon/icons/3.png b/public/images/pokemon/icons/1/3.png similarity index 100% rename from public/images/pokemon/icons/3.png rename to public/images/pokemon/icons/1/3.png diff --git a/public/images/pokemon/icons/30.png b/public/images/pokemon/icons/1/30.png similarity index 100% rename from public/images/pokemon/icons/30.png rename to public/images/pokemon/icons/1/30.png diff --git a/public/images/pokemon/icons/30s.png b/public/images/pokemon/icons/1/30s.png similarity index 100% rename from public/images/pokemon/icons/30s.png rename to public/images/pokemon/icons/1/30s.png diff --git a/public/images/pokemon/icons/31.png b/public/images/pokemon/icons/1/31.png similarity index 100% rename from public/images/pokemon/icons/31.png rename to public/images/pokemon/icons/1/31.png diff --git a/public/images/pokemon/icons/31s.png b/public/images/pokemon/icons/1/31s.png similarity index 100% rename from public/images/pokemon/icons/31s.png rename to public/images/pokemon/icons/1/31s.png diff --git a/public/images/pokemon/icons/32.png b/public/images/pokemon/icons/1/32.png similarity index 100% rename from public/images/pokemon/icons/32.png rename to public/images/pokemon/icons/1/32.png diff --git a/public/images/pokemon/icons/32s.png b/public/images/pokemon/icons/1/32s.png similarity index 100% rename from public/images/pokemon/icons/32s.png rename to public/images/pokemon/icons/1/32s.png diff --git a/public/images/pokemon/icons/33.png b/public/images/pokemon/icons/1/33.png similarity index 100% rename from public/images/pokemon/icons/33.png rename to public/images/pokemon/icons/1/33.png diff --git a/public/images/pokemon/icons/33s.png b/public/images/pokemon/icons/1/33s.png similarity index 100% rename from public/images/pokemon/icons/33s.png rename to public/images/pokemon/icons/1/33s.png diff --git a/public/images/pokemon/icons/34.png b/public/images/pokemon/icons/1/34.png similarity index 100% rename from public/images/pokemon/icons/34.png rename to public/images/pokemon/icons/1/34.png diff --git a/public/images/pokemon/icons/34s.png b/public/images/pokemon/icons/1/34s.png similarity index 100% rename from public/images/pokemon/icons/34s.png rename to public/images/pokemon/icons/1/34s.png diff --git a/public/images/pokemon/icons/35.png b/public/images/pokemon/icons/1/35.png similarity index 100% rename from public/images/pokemon/icons/35.png rename to public/images/pokemon/icons/1/35.png diff --git a/public/images/pokemon/icons/35s.png b/public/images/pokemon/icons/1/35s.png similarity index 100% rename from public/images/pokemon/icons/35s.png rename to public/images/pokemon/icons/1/35s.png diff --git a/public/images/pokemon/icons/36.png b/public/images/pokemon/icons/1/36.png similarity index 100% rename from public/images/pokemon/icons/36.png rename to public/images/pokemon/icons/1/36.png diff --git a/public/images/pokemon/icons/36s.png b/public/images/pokemon/icons/1/36s.png similarity index 100% rename from public/images/pokemon/icons/36s.png rename to public/images/pokemon/icons/1/36s.png diff --git a/public/images/pokemon/icons/37.png b/public/images/pokemon/icons/1/37.png similarity index 100% rename from public/images/pokemon/icons/37.png rename to public/images/pokemon/icons/1/37.png diff --git a/public/images/pokemon/icons/37s.png b/public/images/pokemon/icons/1/37s.png similarity index 100% rename from public/images/pokemon/icons/37s.png rename to public/images/pokemon/icons/1/37s.png diff --git a/public/images/pokemon/icons/38.png b/public/images/pokemon/icons/1/38.png similarity index 100% rename from public/images/pokemon/icons/38.png rename to public/images/pokemon/icons/1/38.png diff --git a/public/images/pokemon/icons/38s.png b/public/images/pokemon/icons/1/38s.png similarity index 100% rename from public/images/pokemon/icons/38s.png rename to public/images/pokemon/icons/1/38s.png diff --git a/public/images/pokemon/icons/39.png b/public/images/pokemon/icons/1/39.png similarity index 100% rename from public/images/pokemon/icons/39.png rename to public/images/pokemon/icons/1/39.png diff --git a/public/images/pokemon/icons/39s.png b/public/images/pokemon/icons/1/39s.png similarity index 100% rename from public/images/pokemon/icons/39s.png rename to public/images/pokemon/icons/1/39s.png diff --git a/public/images/pokemon/icons/3s-gigantamax.png b/public/images/pokemon/icons/1/3s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/3s-gigantamax.png rename to public/images/pokemon/icons/1/3s-gigantamax.png diff --git a/public/images/pokemon/icons/3s-mega.png b/public/images/pokemon/icons/1/3s-mega.png similarity index 100% rename from public/images/pokemon/icons/3s-mega.png rename to public/images/pokemon/icons/1/3s-mega.png diff --git a/public/images/pokemon/icons/3s.png b/public/images/pokemon/icons/1/3s.png similarity index 100% rename from public/images/pokemon/icons/3s.png rename to public/images/pokemon/icons/1/3s.png diff --git a/public/images/pokemon/icons/4.png b/public/images/pokemon/icons/1/4.png similarity index 100% rename from public/images/pokemon/icons/4.png rename to public/images/pokemon/icons/1/4.png diff --git a/public/images/pokemon/icons/40.png b/public/images/pokemon/icons/1/40.png similarity index 100% rename from public/images/pokemon/icons/40.png rename to public/images/pokemon/icons/1/40.png diff --git a/public/images/pokemon/icons/40s.png b/public/images/pokemon/icons/1/40s.png similarity index 100% rename from public/images/pokemon/icons/40s.png rename to public/images/pokemon/icons/1/40s.png diff --git a/public/images/pokemon/icons/41.png b/public/images/pokemon/icons/1/41.png similarity index 100% rename from public/images/pokemon/icons/41.png rename to public/images/pokemon/icons/1/41.png diff --git a/public/images/pokemon/icons/41s.png b/public/images/pokemon/icons/1/41s.png similarity index 100% rename from public/images/pokemon/icons/41s.png rename to public/images/pokemon/icons/1/41s.png diff --git a/public/images/pokemon/icons/42.png b/public/images/pokemon/icons/1/42.png similarity index 100% rename from public/images/pokemon/icons/42.png rename to public/images/pokemon/icons/1/42.png diff --git a/public/images/pokemon/icons/42s.png b/public/images/pokemon/icons/1/42s.png similarity index 100% rename from public/images/pokemon/icons/42s.png rename to public/images/pokemon/icons/1/42s.png diff --git a/public/images/pokemon/icons/43.png b/public/images/pokemon/icons/1/43.png similarity index 100% rename from public/images/pokemon/icons/43.png rename to public/images/pokemon/icons/1/43.png diff --git a/public/images/pokemon/icons/43s.png b/public/images/pokemon/icons/1/43s.png similarity index 100% rename from public/images/pokemon/icons/43s.png rename to public/images/pokemon/icons/1/43s.png diff --git a/public/images/pokemon/icons/44.png b/public/images/pokemon/icons/1/44.png similarity index 100% rename from public/images/pokemon/icons/44.png rename to public/images/pokemon/icons/1/44.png diff --git a/public/images/pokemon/icons/44s.png b/public/images/pokemon/icons/1/44s.png similarity index 100% rename from public/images/pokemon/icons/44s.png rename to public/images/pokemon/icons/1/44s.png diff --git a/public/images/pokemon/icons/45.png b/public/images/pokemon/icons/1/45.png similarity index 100% rename from public/images/pokemon/icons/45.png rename to public/images/pokemon/icons/1/45.png diff --git a/public/images/pokemon/icons/45s.png b/public/images/pokemon/icons/1/45s.png similarity index 100% rename from public/images/pokemon/icons/45s.png rename to public/images/pokemon/icons/1/45s.png diff --git a/public/images/pokemon/icons/46.png b/public/images/pokemon/icons/1/46.png similarity index 100% rename from public/images/pokemon/icons/46.png rename to public/images/pokemon/icons/1/46.png diff --git a/public/images/pokemon/icons/46s.png b/public/images/pokemon/icons/1/46s.png similarity index 100% rename from public/images/pokemon/icons/46s.png rename to public/images/pokemon/icons/1/46s.png diff --git a/public/images/pokemon/icons/47.png b/public/images/pokemon/icons/1/47.png similarity index 100% rename from public/images/pokemon/icons/47.png rename to public/images/pokemon/icons/1/47.png diff --git a/public/images/pokemon/icons/47s.png b/public/images/pokemon/icons/1/47s.png similarity index 100% rename from public/images/pokemon/icons/47s.png rename to public/images/pokemon/icons/1/47s.png diff --git a/public/images/pokemon/icons/48.png b/public/images/pokemon/icons/1/48.png similarity index 100% rename from public/images/pokemon/icons/48.png rename to public/images/pokemon/icons/1/48.png diff --git a/public/images/pokemon/icons/48s.png b/public/images/pokemon/icons/1/48s.png similarity index 100% rename from public/images/pokemon/icons/48s.png rename to public/images/pokemon/icons/1/48s.png diff --git a/public/images/pokemon/icons/49.png b/public/images/pokemon/icons/1/49.png similarity index 100% rename from public/images/pokemon/icons/49.png rename to public/images/pokemon/icons/1/49.png diff --git a/public/images/pokemon/icons/49s.png b/public/images/pokemon/icons/1/49s.png similarity index 100% rename from public/images/pokemon/icons/49s.png rename to public/images/pokemon/icons/1/49s.png diff --git a/public/images/pokemon/icons/4s.png b/public/images/pokemon/icons/1/4s.png similarity index 100% rename from public/images/pokemon/icons/4s.png rename to public/images/pokemon/icons/1/4s.png diff --git a/public/images/pokemon/icons/5.png b/public/images/pokemon/icons/1/5.png similarity index 100% rename from public/images/pokemon/icons/5.png rename to public/images/pokemon/icons/1/5.png diff --git a/public/images/pokemon/icons/50.png b/public/images/pokemon/icons/1/50.png similarity index 100% rename from public/images/pokemon/icons/50.png rename to public/images/pokemon/icons/1/50.png diff --git a/public/images/pokemon/icons/50s.png b/public/images/pokemon/icons/1/50s.png similarity index 100% rename from public/images/pokemon/icons/50s.png rename to public/images/pokemon/icons/1/50s.png diff --git a/public/images/pokemon/icons/51.png b/public/images/pokemon/icons/1/51.png similarity index 100% rename from public/images/pokemon/icons/51.png rename to public/images/pokemon/icons/1/51.png diff --git a/public/images/pokemon/icons/51s.png b/public/images/pokemon/icons/1/51s.png similarity index 100% rename from public/images/pokemon/icons/51s.png rename to public/images/pokemon/icons/1/51s.png diff --git a/public/images/pokemon/icons/52-gigantamax.png b/public/images/pokemon/icons/1/52-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/52-gigantamax.png rename to public/images/pokemon/icons/1/52-gigantamax.png diff --git a/public/images/pokemon/icons/52.png b/public/images/pokemon/icons/1/52.png similarity index 100% rename from public/images/pokemon/icons/52.png rename to public/images/pokemon/icons/1/52.png diff --git a/public/images/pokemon/icons/52s-gigantamax.png b/public/images/pokemon/icons/1/52s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/52s-gigantamax.png rename to public/images/pokemon/icons/1/52s-gigantamax.png diff --git a/public/images/pokemon/icons/52s.png b/public/images/pokemon/icons/1/52s.png similarity index 100% rename from public/images/pokemon/icons/52s.png rename to public/images/pokemon/icons/1/52s.png diff --git a/public/images/pokemon/icons/53.png b/public/images/pokemon/icons/1/53.png similarity index 100% rename from public/images/pokemon/icons/53.png rename to public/images/pokemon/icons/1/53.png diff --git a/public/images/pokemon/icons/53s.png b/public/images/pokemon/icons/1/53s.png similarity index 100% rename from public/images/pokemon/icons/53s.png rename to public/images/pokemon/icons/1/53s.png diff --git a/public/images/pokemon/icons/54.png b/public/images/pokemon/icons/1/54.png similarity index 100% rename from public/images/pokemon/icons/54.png rename to public/images/pokemon/icons/1/54.png diff --git a/public/images/pokemon/icons/54s.png b/public/images/pokemon/icons/1/54s.png similarity index 100% rename from public/images/pokemon/icons/54s.png rename to public/images/pokemon/icons/1/54s.png diff --git a/public/images/pokemon/icons/55.png b/public/images/pokemon/icons/1/55.png similarity index 100% rename from public/images/pokemon/icons/55.png rename to public/images/pokemon/icons/1/55.png diff --git a/public/images/pokemon/icons/55s.png b/public/images/pokemon/icons/1/55s.png similarity index 100% rename from public/images/pokemon/icons/55s.png rename to public/images/pokemon/icons/1/55s.png diff --git a/public/images/pokemon/icons/56.png b/public/images/pokemon/icons/1/56.png similarity index 100% rename from public/images/pokemon/icons/56.png rename to public/images/pokemon/icons/1/56.png diff --git a/public/images/pokemon/icons/56s.png b/public/images/pokemon/icons/1/56s.png similarity index 100% rename from public/images/pokemon/icons/56s.png rename to public/images/pokemon/icons/1/56s.png diff --git a/public/images/pokemon/icons/57.png b/public/images/pokemon/icons/1/57.png similarity index 100% rename from public/images/pokemon/icons/57.png rename to public/images/pokemon/icons/1/57.png diff --git a/public/images/pokemon/icons/57s.png b/public/images/pokemon/icons/1/57s.png similarity index 100% rename from public/images/pokemon/icons/57s.png rename to public/images/pokemon/icons/1/57s.png diff --git a/public/images/pokemon/icons/58.png b/public/images/pokemon/icons/1/58.png similarity index 100% rename from public/images/pokemon/icons/58.png rename to public/images/pokemon/icons/1/58.png diff --git a/public/images/pokemon/icons/58s.png b/public/images/pokemon/icons/1/58s.png similarity index 100% rename from public/images/pokemon/icons/58s.png rename to public/images/pokemon/icons/1/58s.png diff --git a/public/images/pokemon/icons/59.png b/public/images/pokemon/icons/1/59.png similarity index 100% rename from public/images/pokemon/icons/59.png rename to public/images/pokemon/icons/1/59.png diff --git a/public/images/pokemon/icons/59s.png b/public/images/pokemon/icons/1/59s.png similarity index 100% rename from public/images/pokemon/icons/59s.png rename to public/images/pokemon/icons/1/59s.png diff --git a/public/images/pokemon/icons/5s.png b/public/images/pokemon/icons/1/5s.png similarity index 100% rename from public/images/pokemon/icons/5s.png rename to public/images/pokemon/icons/1/5s.png diff --git a/public/images/pokemon/icons/6-gigantamax.png b/public/images/pokemon/icons/1/6-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/6-gigantamax.png rename to public/images/pokemon/icons/1/6-gigantamax.png diff --git a/public/images/pokemon/icons/6-mega-x.png b/public/images/pokemon/icons/1/6-mega-x.png similarity index 100% rename from public/images/pokemon/icons/6-mega-x.png rename to public/images/pokemon/icons/1/6-mega-x.png diff --git a/public/images/pokemon/icons/6-mega-y.png b/public/images/pokemon/icons/1/6-mega-y.png similarity index 100% rename from public/images/pokemon/icons/6-mega-y.png rename to public/images/pokemon/icons/1/6-mega-y.png diff --git a/public/images/pokemon/icons/6.png b/public/images/pokemon/icons/1/6.png similarity index 100% rename from public/images/pokemon/icons/6.png rename to public/images/pokemon/icons/1/6.png diff --git a/public/images/pokemon/icons/60.png b/public/images/pokemon/icons/1/60.png similarity index 100% rename from public/images/pokemon/icons/60.png rename to public/images/pokemon/icons/1/60.png diff --git a/public/images/pokemon/icons/60s.png b/public/images/pokemon/icons/1/60s.png similarity index 100% rename from public/images/pokemon/icons/60s.png rename to public/images/pokemon/icons/1/60s.png diff --git a/public/images/pokemon/icons/61.png b/public/images/pokemon/icons/1/61.png similarity index 100% rename from public/images/pokemon/icons/61.png rename to public/images/pokemon/icons/1/61.png diff --git a/public/images/pokemon/icons/61s.png b/public/images/pokemon/icons/1/61s.png similarity index 100% rename from public/images/pokemon/icons/61s.png rename to public/images/pokemon/icons/1/61s.png diff --git a/public/images/pokemon/icons/62.png b/public/images/pokemon/icons/1/62.png similarity index 100% rename from public/images/pokemon/icons/62.png rename to public/images/pokemon/icons/1/62.png diff --git a/public/images/pokemon/icons/62s.png b/public/images/pokemon/icons/1/62s.png similarity index 100% rename from public/images/pokemon/icons/62s.png rename to public/images/pokemon/icons/1/62s.png diff --git a/public/images/pokemon/icons/63.png b/public/images/pokemon/icons/1/63.png similarity index 100% rename from public/images/pokemon/icons/63.png rename to public/images/pokemon/icons/1/63.png diff --git a/public/images/pokemon/icons/63s.png b/public/images/pokemon/icons/1/63s.png similarity index 100% rename from public/images/pokemon/icons/63s.png rename to public/images/pokemon/icons/1/63s.png diff --git a/public/images/pokemon/icons/64.png b/public/images/pokemon/icons/1/64.png similarity index 100% rename from public/images/pokemon/icons/64.png rename to public/images/pokemon/icons/1/64.png diff --git a/public/images/pokemon/icons/64s.png b/public/images/pokemon/icons/1/64s.png similarity index 100% rename from public/images/pokemon/icons/64s.png rename to public/images/pokemon/icons/1/64s.png diff --git a/public/images/pokemon/icons/65-mega.png b/public/images/pokemon/icons/1/65-mega.png similarity index 100% rename from public/images/pokemon/icons/65-mega.png rename to public/images/pokemon/icons/1/65-mega.png diff --git a/public/images/pokemon/icons/65.png b/public/images/pokemon/icons/1/65.png similarity index 100% rename from public/images/pokemon/icons/65.png rename to public/images/pokemon/icons/1/65.png diff --git a/public/images/pokemon/icons/65s-mega.png b/public/images/pokemon/icons/1/65s-mega.png similarity index 100% rename from public/images/pokemon/icons/65s-mega.png rename to public/images/pokemon/icons/1/65s-mega.png diff --git a/public/images/pokemon/icons/65s.png b/public/images/pokemon/icons/1/65s.png similarity index 100% rename from public/images/pokemon/icons/65s.png rename to public/images/pokemon/icons/1/65s.png diff --git a/public/images/pokemon/icons/66.png b/public/images/pokemon/icons/1/66.png similarity index 100% rename from public/images/pokemon/icons/66.png rename to public/images/pokemon/icons/1/66.png diff --git a/public/images/pokemon/icons/66s.png b/public/images/pokemon/icons/1/66s.png similarity index 100% rename from public/images/pokemon/icons/66s.png rename to public/images/pokemon/icons/1/66s.png diff --git a/public/images/pokemon/icons/67.png b/public/images/pokemon/icons/1/67.png similarity index 100% rename from public/images/pokemon/icons/67.png rename to public/images/pokemon/icons/1/67.png diff --git a/public/images/pokemon/icons/67s.png b/public/images/pokemon/icons/1/67s.png similarity index 100% rename from public/images/pokemon/icons/67s.png rename to public/images/pokemon/icons/1/67s.png diff --git a/public/images/pokemon/icons/68-gigantamax.png b/public/images/pokemon/icons/1/68-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/68-gigantamax.png rename to public/images/pokemon/icons/1/68-gigantamax.png diff --git a/public/images/pokemon/icons/68.png b/public/images/pokemon/icons/1/68.png similarity index 100% rename from public/images/pokemon/icons/68.png rename to public/images/pokemon/icons/1/68.png diff --git a/public/images/pokemon/icons/68s-gigantamax.png b/public/images/pokemon/icons/1/68s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/68s-gigantamax.png rename to public/images/pokemon/icons/1/68s-gigantamax.png diff --git a/public/images/pokemon/icons/68s.png b/public/images/pokemon/icons/1/68s.png similarity index 100% rename from public/images/pokemon/icons/68s.png rename to public/images/pokemon/icons/1/68s.png diff --git a/public/images/pokemon/icons/69.png b/public/images/pokemon/icons/1/69.png similarity index 100% rename from public/images/pokemon/icons/69.png rename to public/images/pokemon/icons/1/69.png diff --git a/public/images/pokemon/icons/69s.png b/public/images/pokemon/icons/1/69s.png similarity index 100% rename from public/images/pokemon/icons/69s.png rename to public/images/pokemon/icons/1/69s.png diff --git a/public/images/pokemon/icons/6s-gigantamax.png b/public/images/pokemon/icons/1/6s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/6s-gigantamax.png rename to public/images/pokemon/icons/1/6s-gigantamax.png diff --git a/public/images/pokemon/icons/6s-mega-x.png b/public/images/pokemon/icons/1/6s-mega-x.png similarity index 100% rename from public/images/pokemon/icons/6s-mega-x.png rename to public/images/pokemon/icons/1/6s-mega-x.png diff --git a/public/images/pokemon/icons/6s-mega-y.png b/public/images/pokemon/icons/1/6s-mega-y.png similarity index 100% rename from public/images/pokemon/icons/6s-mega-y.png rename to public/images/pokemon/icons/1/6s-mega-y.png diff --git a/public/images/pokemon/icons/6s.png b/public/images/pokemon/icons/1/6s.png similarity index 100% rename from public/images/pokemon/icons/6s.png rename to public/images/pokemon/icons/1/6s.png diff --git a/public/images/pokemon/icons/7.png b/public/images/pokemon/icons/1/7.png similarity index 100% rename from public/images/pokemon/icons/7.png rename to public/images/pokemon/icons/1/7.png diff --git a/public/images/pokemon/icons/70.png b/public/images/pokemon/icons/1/70.png similarity index 100% rename from public/images/pokemon/icons/70.png rename to public/images/pokemon/icons/1/70.png diff --git a/public/images/pokemon/icons/70s.png b/public/images/pokemon/icons/1/70s.png similarity index 100% rename from public/images/pokemon/icons/70s.png rename to public/images/pokemon/icons/1/70s.png diff --git a/public/images/pokemon/icons/71.png b/public/images/pokemon/icons/1/71.png similarity index 100% rename from public/images/pokemon/icons/71.png rename to public/images/pokemon/icons/1/71.png diff --git a/public/images/pokemon/icons/71s.png b/public/images/pokemon/icons/1/71s.png similarity index 100% rename from public/images/pokemon/icons/71s.png rename to public/images/pokemon/icons/1/71s.png diff --git a/public/images/pokemon/icons/72.png b/public/images/pokemon/icons/1/72.png similarity index 100% rename from public/images/pokemon/icons/72.png rename to public/images/pokemon/icons/1/72.png diff --git a/public/images/pokemon/icons/72s.png b/public/images/pokemon/icons/1/72s.png similarity index 100% rename from public/images/pokemon/icons/72s.png rename to public/images/pokemon/icons/1/72s.png diff --git a/public/images/pokemon/icons/73.png b/public/images/pokemon/icons/1/73.png similarity index 100% rename from public/images/pokemon/icons/73.png rename to public/images/pokemon/icons/1/73.png diff --git a/public/images/pokemon/icons/73s.png b/public/images/pokemon/icons/1/73s.png similarity index 100% rename from public/images/pokemon/icons/73s.png rename to public/images/pokemon/icons/1/73s.png diff --git a/public/images/pokemon/icons/74.png b/public/images/pokemon/icons/1/74.png similarity index 100% rename from public/images/pokemon/icons/74.png rename to public/images/pokemon/icons/1/74.png diff --git a/public/images/pokemon/icons/74s.png b/public/images/pokemon/icons/1/74s.png similarity index 100% rename from public/images/pokemon/icons/74s.png rename to public/images/pokemon/icons/1/74s.png diff --git a/public/images/pokemon/icons/75.png b/public/images/pokemon/icons/1/75.png similarity index 100% rename from public/images/pokemon/icons/75.png rename to public/images/pokemon/icons/1/75.png diff --git a/public/images/pokemon/icons/75s.png b/public/images/pokemon/icons/1/75s.png similarity index 100% rename from public/images/pokemon/icons/75s.png rename to public/images/pokemon/icons/1/75s.png diff --git a/public/images/pokemon/icons/76.png b/public/images/pokemon/icons/1/76.png similarity index 100% rename from public/images/pokemon/icons/76.png rename to public/images/pokemon/icons/1/76.png diff --git a/public/images/pokemon/icons/76s.png b/public/images/pokemon/icons/1/76s.png similarity index 100% rename from public/images/pokemon/icons/76s.png rename to public/images/pokemon/icons/1/76s.png diff --git a/public/images/pokemon/icons/77.png b/public/images/pokemon/icons/1/77.png similarity index 100% rename from public/images/pokemon/icons/77.png rename to public/images/pokemon/icons/1/77.png diff --git a/public/images/pokemon/icons/77s.png b/public/images/pokemon/icons/1/77s.png similarity index 100% rename from public/images/pokemon/icons/77s.png rename to public/images/pokemon/icons/1/77s.png diff --git a/public/images/pokemon/icons/78.png b/public/images/pokemon/icons/1/78.png similarity index 100% rename from public/images/pokemon/icons/78.png rename to public/images/pokemon/icons/1/78.png diff --git a/public/images/pokemon/icons/78s.png b/public/images/pokemon/icons/1/78s.png similarity index 100% rename from public/images/pokemon/icons/78s.png rename to public/images/pokemon/icons/1/78s.png diff --git a/public/images/pokemon/icons/79.png b/public/images/pokemon/icons/1/79.png similarity index 100% rename from public/images/pokemon/icons/79.png rename to public/images/pokemon/icons/1/79.png diff --git a/public/images/pokemon/icons/79s.png b/public/images/pokemon/icons/1/79s.png similarity index 100% rename from public/images/pokemon/icons/79s.png rename to public/images/pokemon/icons/1/79s.png diff --git a/public/images/pokemon/icons/7s.png b/public/images/pokemon/icons/1/7s.png similarity index 100% rename from public/images/pokemon/icons/7s.png rename to public/images/pokemon/icons/1/7s.png diff --git a/public/images/pokemon/icons/8.png b/public/images/pokemon/icons/1/8.png similarity index 100% rename from public/images/pokemon/icons/8.png rename to public/images/pokemon/icons/1/8.png diff --git a/public/images/pokemon/icons/80-mega.png b/public/images/pokemon/icons/1/80-mega.png similarity index 100% rename from public/images/pokemon/icons/80-mega.png rename to public/images/pokemon/icons/1/80-mega.png diff --git a/public/images/pokemon/icons/80.png b/public/images/pokemon/icons/1/80.png similarity index 100% rename from public/images/pokemon/icons/80.png rename to public/images/pokemon/icons/1/80.png diff --git a/public/images/pokemon/icons/80s-mega.png b/public/images/pokemon/icons/1/80s-mega.png similarity index 100% rename from public/images/pokemon/icons/80s-mega.png rename to public/images/pokemon/icons/1/80s-mega.png diff --git a/public/images/pokemon/icons/80s.png b/public/images/pokemon/icons/1/80s.png similarity index 100% rename from public/images/pokemon/icons/80s.png rename to public/images/pokemon/icons/1/80s.png diff --git a/public/images/pokemon/icons/81.png b/public/images/pokemon/icons/1/81.png similarity index 100% rename from public/images/pokemon/icons/81.png rename to public/images/pokemon/icons/1/81.png diff --git a/public/images/pokemon/icons/81s.png b/public/images/pokemon/icons/1/81s.png similarity index 100% rename from public/images/pokemon/icons/81s.png rename to public/images/pokemon/icons/1/81s.png diff --git a/public/images/pokemon/icons/82.png b/public/images/pokemon/icons/1/82.png similarity index 100% rename from public/images/pokemon/icons/82.png rename to public/images/pokemon/icons/1/82.png diff --git a/public/images/pokemon/icons/82s.png b/public/images/pokemon/icons/1/82s.png similarity index 100% rename from public/images/pokemon/icons/82s.png rename to public/images/pokemon/icons/1/82s.png diff --git a/public/images/pokemon/icons/83.png b/public/images/pokemon/icons/1/83.png similarity index 100% rename from public/images/pokemon/icons/83.png rename to public/images/pokemon/icons/1/83.png diff --git a/public/images/pokemon/icons/83s.png b/public/images/pokemon/icons/1/83s.png similarity index 100% rename from public/images/pokemon/icons/83s.png rename to public/images/pokemon/icons/1/83s.png diff --git a/public/images/pokemon/icons/84.png b/public/images/pokemon/icons/1/84.png similarity index 100% rename from public/images/pokemon/icons/84.png rename to public/images/pokemon/icons/1/84.png diff --git a/public/images/pokemon/icons/84s.png b/public/images/pokemon/icons/1/84s.png similarity index 100% rename from public/images/pokemon/icons/84s.png rename to public/images/pokemon/icons/1/84s.png diff --git a/public/images/pokemon/icons/85.png b/public/images/pokemon/icons/1/85.png similarity index 100% rename from public/images/pokemon/icons/85.png rename to public/images/pokemon/icons/1/85.png diff --git a/public/images/pokemon/icons/85s.png b/public/images/pokemon/icons/1/85s.png similarity index 100% rename from public/images/pokemon/icons/85s.png rename to public/images/pokemon/icons/1/85s.png diff --git a/public/images/pokemon/icons/86.png b/public/images/pokemon/icons/1/86.png similarity index 100% rename from public/images/pokemon/icons/86.png rename to public/images/pokemon/icons/1/86.png diff --git a/public/images/pokemon/icons/86s.png b/public/images/pokemon/icons/1/86s.png similarity index 100% rename from public/images/pokemon/icons/86s.png rename to public/images/pokemon/icons/1/86s.png diff --git a/public/images/pokemon/icons/87.png b/public/images/pokemon/icons/1/87.png similarity index 100% rename from public/images/pokemon/icons/87.png rename to public/images/pokemon/icons/1/87.png diff --git a/public/images/pokemon/icons/87s.png b/public/images/pokemon/icons/1/87s.png similarity index 100% rename from public/images/pokemon/icons/87s.png rename to public/images/pokemon/icons/1/87s.png diff --git a/public/images/pokemon/icons/88.png b/public/images/pokemon/icons/1/88.png similarity index 100% rename from public/images/pokemon/icons/88.png rename to public/images/pokemon/icons/1/88.png diff --git a/public/images/pokemon/icons/88s.png b/public/images/pokemon/icons/1/88s.png similarity index 100% rename from public/images/pokemon/icons/88s.png rename to public/images/pokemon/icons/1/88s.png diff --git a/public/images/pokemon/icons/89.png b/public/images/pokemon/icons/1/89.png similarity index 100% rename from public/images/pokemon/icons/89.png rename to public/images/pokemon/icons/1/89.png diff --git a/public/images/pokemon/icons/89s.png b/public/images/pokemon/icons/1/89s.png similarity index 100% rename from public/images/pokemon/icons/89s.png rename to public/images/pokemon/icons/1/89s.png diff --git a/public/images/pokemon/icons/8s.png b/public/images/pokemon/icons/1/8s.png similarity index 100% rename from public/images/pokemon/icons/8s.png rename to public/images/pokemon/icons/1/8s.png diff --git a/public/images/pokemon/icons/9-gigantamax.png b/public/images/pokemon/icons/1/9-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/9-gigantamax.png rename to public/images/pokemon/icons/1/9-gigantamax.png diff --git a/public/images/pokemon/icons/9-mega.png b/public/images/pokemon/icons/1/9-mega.png similarity index 100% rename from public/images/pokemon/icons/9-mega.png rename to public/images/pokemon/icons/1/9-mega.png diff --git a/public/images/pokemon/icons/9.png b/public/images/pokemon/icons/1/9.png similarity index 100% rename from public/images/pokemon/icons/9.png rename to public/images/pokemon/icons/1/9.png diff --git a/public/images/pokemon/icons/90.png b/public/images/pokemon/icons/1/90.png similarity index 100% rename from public/images/pokemon/icons/90.png rename to public/images/pokemon/icons/1/90.png diff --git a/public/images/pokemon/icons/90s.png b/public/images/pokemon/icons/1/90s.png similarity index 100% rename from public/images/pokemon/icons/90s.png rename to public/images/pokemon/icons/1/90s.png diff --git a/public/images/pokemon/icons/91.png b/public/images/pokemon/icons/1/91.png similarity index 100% rename from public/images/pokemon/icons/91.png rename to public/images/pokemon/icons/1/91.png diff --git a/public/images/pokemon/icons/91s.png b/public/images/pokemon/icons/1/91s.png similarity index 100% rename from public/images/pokemon/icons/91s.png rename to public/images/pokemon/icons/1/91s.png diff --git a/public/images/pokemon/icons/92.png b/public/images/pokemon/icons/1/92.png similarity index 100% rename from public/images/pokemon/icons/92.png rename to public/images/pokemon/icons/1/92.png diff --git a/public/images/pokemon/icons/92s.png b/public/images/pokemon/icons/1/92s.png similarity index 100% rename from public/images/pokemon/icons/92s.png rename to public/images/pokemon/icons/1/92s.png diff --git a/public/images/pokemon/icons/93.png b/public/images/pokemon/icons/1/93.png similarity index 100% rename from public/images/pokemon/icons/93.png rename to public/images/pokemon/icons/1/93.png diff --git a/public/images/pokemon/icons/93s.png b/public/images/pokemon/icons/1/93s.png similarity index 100% rename from public/images/pokemon/icons/93s.png rename to public/images/pokemon/icons/1/93s.png diff --git a/public/images/pokemon/icons/94-gigantamax.png b/public/images/pokemon/icons/1/94-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/94-gigantamax.png rename to public/images/pokemon/icons/1/94-gigantamax.png diff --git a/public/images/pokemon/icons/94-mega.png b/public/images/pokemon/icons/1/94-mega.png similarity index 100% rename from public/images/pokemon/icons/94-mega.png rename to public/images/pokemon/icons/1/94-mega.png diff --git a/public/images/pokemon/icons/94.png b/public/images/pokemon/icons/1/94.png similarity index 100% rename from public/images/pokemon/icons/94.png rename to public/images/pokemon/icons/1/94.png diff --git a/public/images/pokemon/icons/94s-gigantamax.png b/public/images/pokemon/icons/1/94s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/94s-gigantamax.png rename to public/images/pokemon/icons/1/94s-gigantamax.png diff --git a/public/images/pokemon/icons/94s-mega.png b/public/images/pokemon/icons/1/94s-mega.png similarity index 100% rename from public/images/pokemon/icons/94s-mega.png rename to public/images/pokemon/icons/1/94s-mega.png diff --git a/public/images/pokemon/icons/94s.png b/public/images/pokemon/icons/1/94s.png similarity index 100% rename from public/images/pokemon/icons/94s.png rename to public/images/pokemon/icons/1/94s.png diff --git a/public/images/pokemon/icons/95.png b/public/images/pokemon/icons/1/95.png similarity index 100% rename from public/images/pokemon/icons/95.png rename to public/images/pokemon/icons/1/95.png diff --git a/public/images/pokemon/icons/95s.png b/public/images/pokemon/icons/1/95s.png similarity index 100% rename from public/images/pokemon/icons/95s.png rename to public/images/pokemon/icons/1/95s.png diff --git a/public/images/pokemon/icons/96.png b/public/images/pokemon/icons/1/96.png similarity index 100% rename from public/images/pokemon/icons/96.png rename to public/images/pokemon/icons/1/96.png diff --git a/public/images/pokemon/icons/96s.png b/public/images/pokemon/icons/1/96s.png similarity index 100% rename from public/images/pokemon/icons/96s.png rename to public/images/pokemon/icons/1/96s.png diff --git a/public/images/pokemon/icons/97.png b/public/images/pokemon/icons/1/97.png similarity index 100% rename from public/images/pokemon/icons/97.png rename to public/images/pokemon/icons/1/97.png diff --git a/public/images/pokemon/icons/97s.png b/public/images/pokemon/icons/1/97s.png similarity index 100% rename from public/images/pokemon/icons/97s.png rename to public/images/pokemon/icons/1/97s.png diff --git a/public/images/pokemon/icons/98.png b/public/images/pokemon/icons/1/98.png similarity index 100% rename from public/images/pokemon/icons/98.png rename to public/images/pokemon/icons/1/98.png diff --git a/public/images/pokemon/icons/98s.png b/public/images/pokemon/icons/1/98s.png similarity index 100% rename from public/images/pokemon/icons/98s.png rename to public/images/pokemon/icons/1/98s.png diff --git a/public/images/pokemon/icons/99-gigantamax.png b/public/images/pokemon/icons/1/99-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/99-gigantamax.png rename to public/images/pokemon/icons/1/99-gigantamax.png diff --git a/public/images/pokemon/icons/99.png b/public/images/pokemon/icons/1/99.png similarity index 100% rename from public/images/pokemon/icons/99.png rename to public/images/pokemon/icons/1/99.png diff --git a/public/images/pokemon/icons/99s-gigantamax.png b/public/images/pokemon/icons/1/99s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/99s-gigantamax.png rename to public/images/pokemon/icons/1/99s-gigantamax.png diff --git a/public/images/pokemon/icons/99s.png b/public/images/pokemon/icons/1/99s.png similarity index 100% rename from public/images/pokemon/icons/99s.png rename to public/images/pokemon/icons/1/99s.png diff --git a/public/images/pokemon/icons/9s-gigantamax.png b/public/images/pokemon/icons/1/9s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/9s-gigantamax.png rename to public/images/pokemon/icons/1/9s-gigantamax.png diff --git a/public/images/pokemon/icons/9s-mega.png b/public/images/pokemon/icons/1/9s-mega.png similarity index 100% rename from public/images/pokemon/icons/9s-mega.png rename to public/images/pokemon/icons/1/9s-mega.png diff --git a/public/images/pokemon/icons/9s.png b/public/images/pokemon/icons/1/9s.png similarity index 100% rename from public/images/pokemon/icons/9s.png rename to public/images/pokemon/icons/1/9s.png diff --git a/public/images/pokemon/icons/1/icons.bat b/public/images/pokemon/icons/1/icons.bat new file mode 100644 index 000000000..daa630cfa --- /dev/null +++ b/public/images/pokemon/icons/1/icons.bat @@ -0,0 +1 @@ +cmd /c TexturePacker ./ ../configuration.tps --sheet ../../../pokemon_icons_1.png --data ../../../pokemon_icons_1.json --replace .png= \ No newline at end of file diff --git a/public/images/pokemon/icons/152.png b/public/images/pokemon/icons/2/152.png similarity index 100% rename from public/images/pokemon/icons/152.png rename to public/images/pokemon/icons/2/152.png diff --git a/public/images/pokemon/icons/152s.png b/public/images/pokemon/icons/2/152s.png similarity index 100% rename from public/images/pokemon/icons/152s.png rename to public/images/pokemon/icons/2/152s.png diff --git a/public/images/pokemon/icons/153.png b/public/images/pokemon/icons/2/153.png similarity index 100% rename from public/images/pokemon/icons/153.png rename to public/images/pokemon/icons/2/153.png diff --git a/public/images/pokemon/icons/153s.png b/public/images/pokemon/icons/2/153s.png similarity index 100% rename from public/images/pokemon/icons/153s.png rename to public/images/pokemon/icons/2/153s.png diff --git a/public/images/pokemon/icons/154.png b/public/images/pokemon/icons/2/154.png similarity index 100% rename from public/images/pokemon/icons/154.png rename to public/images/pokemon/icons/2/154.png diff --git a/public/images/pokemon/icons/154s.png b/public/images/pokemon/icons/2/154s.png similarity index 100% rename from public/images/pokemon/icons/154s.png rename to public/images/pokemon/icons/2/154s.png diff --git a/public/images/pokemon/icons/155.png b/public/images/pokemon/icons/2/155.png similarity index 100% rename from public/images/pokemon/icons/155.png rename to public/images/pokemon/icons/2/155.png diff --git a/public/images/pokemon/icons/155s.png b/public/images/pokemon/icons/2/155s.png similarity index 100% rename from public/images/pokemon/icons/155s.png rename to public/images/pokemon/icons/2/155s.png diff --git a/public/images/pokemon/icons/156.png b/public/images/pokemon/icons/2/156.png similarity index 100% rename from public/images/pokemon/icons/156.png rename to public/images/pokemon/icons/2/156.png diff --git a/public/images/pokemon/icons/156s.png b/public/images/pokemon/icons/2/156s.png similarity index 100% rename from public/images/pokemon/icons/156s.png rename to public/images/pokemon/icons/2/156s.png diff --git a/public/images/pokemon/icons/157.png b/public/images/pokemon/icons/2/157.png similarity index 100% rename from public/images/pokemon/icons/157.png rename to public/images/pokemon/icons/2/157.png diff --git a/public/images/pokemon/icons/157s.png b/public/images/pokemon/icons/2/157s.png similarity index 100% rename from public/images/pokemon/icons/157s.png rename to public/images/pokemon/icons/2/157s.png diff --git a/public/images/pokemon/icons/158.png b/public/images/pokemon/icons/2/158.png similarity index 100% rename from public/images/pokemon/icons/158.png rename to public/images/pokemon/icons/2/158.png diff --git a/public/images/pokemon/icons/158s.png b/public/images/pokemon/icons/2/158s.png similarity index 100% rename from public/images/pokemon/icons/158s.png rename to public/images/pokemon/icons/2/158s.png diff --git a/public/images/pokemon/icons/159.png b/public/images/pokemon/icons/2/159.png similarity index 100% rename from public/images/pokemon/icons/159.png rename to public/images/pokemon/icons/2/159.png diff --git a/public/images/pokemon/icons/159s.png b/public/images/pokemon/icons/2/159s.png similarity index 100% rename from public/images/pokemon/icons/159s.png rename to public/images/pokemon/icons/2/159s.png diff --git a/public/images/pokemon/icons/160.png b/public/images/pokemon/icons/2/160.png similarity index 100% rename from public/images/pokemon/icons/160.png rename to public/images/pokemon/icons/2/160.png diff --git a/public/images/pokemon/icons/160s.png b/public/images/pokemon/icons/2/160s.png similarity index 100% rename from public/images/pokemon/icons/160s.png rename to public/images/pokemon/icons/2/160s.png diff --git a/public/images/pokemon/icons/161.png b/public/images/pokemon/icons/2/161.png similarity index 100% rename from public/images/pokemon/icons/161.png rename to public/images/pokemon/icons/2/161.png diff --git a/public/images/pokemon/icons/161s.png b/public/images/pokemon/icons/2/161s.png similarity index 100% rename from public/images/pokemon/icons/161s.png rename to public/images/pokemon/icons/2/161s.png diff --git a/public/images/pokemon/icons/162.png b/public/images/pokemon/icons/2/162.png similarity index 100% rename from public/images/pokemon/icons/162.png rename to public/images/pokemon/icons/2/162.png diff --git a/public/images/pokemon/icons/162s.png b/public/images/pokemon/icons/2/162s.png similarity index 100% rename from public/images/pokemon/icons/162s.png rename to public/images/pokemon/icons/2/162s.png diff --git a/public/images/pokemon/icons/163.png b/public/images/pokemon/icons/2/163.png similarity index 100% rename from public/images/pokemon/icons/163.png rename to public/images/pokemon/icons/2/163.png diff --git a/public/images/pokemon/icons/163s.png b/public/images/pokemon/icons/2/163s.png similarity index 100% rename from public/images/pokemon/icons/163s.png rename to public/images/pokemon/icons/2/163s.png diff --git a/public/images/pokemon/icons/164.png b/public/images/pokemon/icons/2/164.png similarity index 100% rename from public/images/pokemon/icons/164.png rename to public/images/pokemon/icons/2/164.png diff --git a/public/images/pokemon/icons/164s.png b/public/images/pokemon/icons/2/164s.png similarity index 100% rename from public/images/pokemon/icons/164s.png rename to public/images/pokemon/icons/2/164s.png diff --git a/public/images/pokemon/icons/165.png b/public/images/pokemon/icons/2/165.png similarity index 100% rename from public/images/pokemon/icons/165.png rename to public/images/pokemon/icons/2/165.png diff --git a/public/images/pokemon/icons/165s.png b/public/images/pokemon/icons/2/165s.png similarity index 100% rename from public/images/pokemon/icons/165s.png rename to public/images/pokemon/icons/2/165s.png diff --git a/public/images/pokemon/icons/166.png b/public/images/pokemon/icons/2/166.png similarity index 100% rename from public/images/pokemon/icons/166.png rename to public/images/pokemon/icons/2/166.png diff --git a/public/images/pokemon/icons/166s.png b/public/images/pokemon/icons/2/166s.png similarity index 100% rename from public/images/pokemon/icons/166s.png rename to public/images/pokemon/icons/2/166s.png diff --git a/public/images/pokemon/icons/167.png b/public/images/pokemon/icons/2/167.png similarity index 100% rename from public/images/pokemon/icons/167.png rename to public/images/pokemon/icons/2/167.png diff --git a/public/images/pokemon/icons/167s.png b/public/images/pokemon/icons/2/167s.png similarity index 100% rename from public/images/pokemon/icons/167s.png rename to public/images/pokemon/icons/2/167s.png diff --git a/public/images/pokemon/icons/168.png b/public/images/pokemon/icons/2/168.png similarity index 100% rename from public/images/pokemon/icons/168.png rename to public/images/pokemon/icons/2/168.png diff --git a/public/images/pokemon/icons/168s.png b/public/images/pokemon/icons/2/168s.png similarity index 100% rename from public/images/pokemon/icons/168s.png rename to public/images/pokemon/icons/2/168s.png diff --git a/public/images/pokemon/icons/169.png b/public/images/pokemon/icons/2/169.png similarity index 100% rename from public/images/pokemon/icons/169.png rename to public/images/pokemon/icons/2/169.png diff --git a/public/images/pokemon/icons/169s.png b/public/images/pokemon/icons/2/169s.png similarity index 100% rename from public/images/pokemon/icons/169s.png rename to public/images/pokemon/icons/2/169s.png diff --git a/public/images/pokemon/icons/170.png b/public/images/pokemon/icons/2/170.png similarity index 100% rename from public/images/pokemon/icons/170.png rename to public/images/pokemon/icons/2/170.png diff --git a/public/images/pokemon/icons/170s.png b/public/images/pokemon/icons/2/170s.png similarity index 100% rename from public/images/pokemon/icons/170s.png rename to public/images/pokemon/icons/2/170s.png diff --git a/public/images/pokemon/icons/171.png b/public/images/pokemon/icons/2/171.png similarity index 100% rename from public/images/pokemon/icons/171.png rename to public/images/pokemon/icons/2/171.png diff --git a/public/images/pokemon/icons/171s.png b/public/images/pokemon/icons/2/171s.png similarity index 100% rename from public/images/pokemon/icons/171s.png rename to public/images/pokemon/icons/2/171s.png diff --git a/public/images/pokemon/icons/172-spiky.png b/public/images/pokemon/icons/2/172-spiky.png similarity index 100% rename from public/images/pokemon/icons/172-spiky.png rename to public/images/pokemon/icons/2/172-spiky.png diff --git a/public/images/pokemon/icons/172.png b/public/images/pokemon/icons/2/172.png similarity index 100% rename from public/images/pokemon/icons/172.png rename to public/images/pokemon/icons/2/172.png diff --git a/public/images/pokemon/icons/172s-spiky.png b/public/images/pokemon/icons/2/172s-spiky.png similarity index 100% rename from public/images/pokemon/icons/172s-spiky.png rename to public/images/pokemon/icons/2/172s-spiky.png diff --git a/public/images/pokemon/icons/172s.png b/public/images/pokemon/icons/2/172s.png similarity index 100% rename from public/images/pokemon/icons/172s.png rename to public/images/pokemon/icons/2/172s.png diff --git a/public/images/pokemon/icons/173.png b/public/images/pokemon/icons/2/173.png similarity index 100% rename from public/images/pokemon/icons/173.png rename to public/images/pokemon/icons/2/173.png diff --git a/public/images/pokemon/icons/173s.png b/public/images/pokemon/icons/2/173s.png similarity index 100% rename from public/images/pokemon/icons/173s.png rename to public/images/pokemon/icons/2/173s.png diff --git a/public/images/pokemon/icons/174.png b/public/images/pokemon/icons/2/174.png similarity index 100% rename from public/images/pokemon/icons/174.png rename to public/images/pokemon/icons/2/174.png diff --git a/public/images/pokemon/icons/174s.png b/public/images/pokemon/icons/2/174s.png similarity index 100% rename from public/images/pokemon/icons/174s.png rename to public/images/pokemon/icons/2/174s.png diff --git a/public/images/pokemon/icons/175.png b/public/images/pokemon/icons/2/175.png similarity index 100% rename from public/images/pokemon/icons/175.png rename to public/images/pokemon/icons/2/175.png diff --git a/public/images/pokemon/icons/175s.png b/public/images/pokemon/icons/2/175s.png similarity index 100% rename from public/images/pokemon/icons/175s.png rename to public/images/pokemon/icons/2/175s.png diff --git a/public/images/pokemon/icons/176.png b/public/images/pokemon/icons/2/176.png similarity index 100% rename from public/images/pokemon/icons/176.png rename to public/images/pokemon/icons/2/176.png diff --git a/public/images/pokemon/icons/176s.png b/public/images/pokemon/icons/2/176s.png similarity index 100% rename from public/images/pokemon/icons/176s.png rename to public/images/pokemon/icons/2/176s.png diff --git a/public/images/pokemon/icons/177.png b/public/images/pokemon/icons/2/177.png similarity index 100% rename from public/images/pokemon/icons/177.png rename to public/images/pokemon/icons/2/177.png diff --git a/public/images/pokemon/icons/177s.png b/public/images/pokemon/icons/2/177s.png similarity index 100% rename from public/images/pokemon/icons/177s.png rename to public/images/pokemon/icons/2/177s.png diff --git a/public/images/pokemon/icons/178.png b/public/images/pokemon/icons/2/178.png similarity index 100% rename from public/images/pokemon/icons/178.png rename to public/images/pokemon/icons/2/178.png diff --git a/public/images/pokemon/icons/178s.png b/public/images/pokemon/icons/2/178s.png similarity index 100% rename from public/images/pokemon/icons/178s.png rename to public/images/pokemon/icons/2/178s.png diff --git a/public/images/pokemon/icons/179.png b/public/images/pokemon/icons/2/179.png similarity index 100% rename from public/images/pokemon/icons/179.png rename to public/images/pokemon/icons/2/179.png diff --git a/public/images/pokemon/icons/179s.png b/public/images/pokemon/icons/2/179s.png similarity index 100% rename from public/images/pokemon/icons/179s.png rename to public/images/pokemon/icons/2/179s.png diff --git a/public/images/pokemon/icons/180.png b/public/images/pokemon/icons/2/180.png similarity index 100% rename from public/images/pokemon/icons/180.png rename to public/images/pokemon/icons/2/180.png diff --git a/public/images/pokemon/icons/180s.png b/public/images/pokemon/icons/2/180s.png similarity index 100% rename from public/images/pokemon/icons/180s.png rename to public/images/pokemon/icons/2/180s.png diff --git a/public/images/pokemon/icons/181-mega.png b/public/images/pokemon/icons/2/181-mega.png similarity index 100% rename from public/images/pokemon/icons/181-mega.png rename to public/images/pokemon/icons/2/181-mega.png diff --git a/public/images/pokemon/icons/181.png b/public/images/pokemon/icons/2/181.png similarity index 100% rename from public/images/pokemon/icons/181.png rename to public/images/pokemon/icons/2/181.png diff --git a/public/images/pokemon/icons/181s-mega.png b/public/images/pokemon/icons/2/181s-mega.png similarity index 100% rename from public/images/pokemon/icons/181s-mega.png rename to public/images/pokemon/icons/2/181s-mega.png diff --git a/public/images/pokemon/icons/181s.png b/public/images/pokemon/icons/2/181s.png similarity index 100% rename from public/images/pokemon/icons/181s.png rename to public/images/pokemon/icons/2/181s.png diff --git a/public/images/pokemon/icons/182.png b/public/images/pokemon/icons/2/182.png similarity index 100% rename from public/images/pokemon/icons/182.png rename to public/images/pokemon/icons/2/182.png diff --git a/public/images/pokemon/icons/182s.png b/public/images/pokemon/icons/2/182s.png similarity index 100% rename from public/images/pokemon/icons/182s.png rename to public/images/pokemon/icons/2/182s.png diff --git a/public/images/pokemon/icons/183.png b/public/images/pokemon/icons/2/183.png similarity index 100% rename from public/images/pokemon/icons/183.png rename to public/images/pokemon/icons/2/183.png diff --git a/public/images/pokemon/icons/183s.png b/public/images/pokemon/icons/2/183s.png similarity index 100% rename from public/images/pokemon/icons/183s.png rename to public/images/pokemon/icons/2/183s.png diff --git a/public/images/pokemon/icons/184.png b/public/images/pokemon/icons/2/184.png similarity index 100% rename from public/images/pokemon/icons/184.png rename to public/images/pokemon/icons/2/184.png diff --git a/public/images/pokemon/icons/184s.png b/public/images/pokemon/icons/2/184s.png similarity index 100% rename from public/images/pokemon/icons/184s.png rename to public/images/pokemon/icons/2/184s.png diff --git a/public/images/pokemon/icons/185.png b/public/images/pokemon/icons/2/185.png similarity index 100% rename from public/images/pokemon/icons/185.png rename to public/images/pokemon/icons/2/185.png diff --git a/public/images/pokemon/icons/185s.png b/public/images/pokemon/icons/2/185s.png similarity index 100% rename from public/images/pokemon/icons/185s.png rename to public/images/pokemon/icons/2/185s.png diff --git a/public/images/pokemon/icons/186.png b/public/images/pokemon/icons/2/186.png similarity index 100% rename from public/images/pokemon/icons/186.png rename to public/images/pokemon/icons/2/186.png diff --git a/public/images/pokemon/icons/186s.png b/public/images/pokemon/icons/2/186s.png similarity index 100% rename from public/images/pokemon/icons/186s.png rename to public/images/pokemon/icons/2/186s.png diff --git a/public/images/pokemon/icons/187.png b/public/images/pokemon/icons/2/187.png similarity index 100% rename from public/images/pokemon/icons/187.png rename to public/images/pokemon/icons/2/187.png diff --git a/public/images/pokemon/icons/187s.png b/public/images/pokemon/icons/2/187s.png similarity index 100% rename from public/images/pokemon/icons/187s.png rename to public/images/pokemon/icons/2/187s.png diff --git a/public/images/pokemon/icons/188.png b/public/images/pokemon/icons/2/188.png similarity index 100% rename from public/images/pokemon/icons/188.png rename to public/images/pokemon/icons/2/188.png diff --git a/public/images/pokemon/icons/188s.png b/public/images/pokemon/icons/2/188s.png similarity index 100% rename from public/images/pokemon/icons/188s.png rename to public/images/pokemon/icons/2/188s.png diff --git a/public/images/pokemon/icons/189.png b/public/images/pokemon/icons/2/189.png similarity index 100% rename from public/images/pokemon/icons/189.png rename to public/images/pokemon/icons/2/189.png diff --git a/public/images/pokemon/icons/189s.png b/public/images/pokemon/icons/2/189s.png similarity index 100% rename from public/images/pokemon/icons/189s.png rename to public/images/pokemon/icons/2/189s.png diff --git a/public/images/pokemon/icons/190.png b/public/images/pokemon/icons/2/190.png similarity index 100% rename from public/images/pokemon/icons/190.png rename to public/images/pokemon/icons/2/190.png diff --git a/public/images/pokemon/icons/190s.png b/public/images/pokemon/icons/2/190s.png similarity index 100% rename from public/images/pokemon/icons/190s.png rename to public/images/pokemon/icons/2/190s.png diff --git a/public/images/pokemon/icons/191.png b/public/images/pokemon/icons/2/191.png similarity index 100% rename from public/images/pokemon/icons/191.png rename to public/images/pokemon/icons/2/191.png diff --git a/public/images/pokemon/icons/191s.png b/public/images/pokemon/icons/2/191s.png similarity index 100% rename from public/images/pokemon/icons/191s.png rename to public/images/pokemon/icons/2/191s.png diff --git a/public/images/pokemon/icons/192.png b/public/images/pokemon/icons/2/192.png similarity index 100% rename from public/images/pokemon/icons/192.png rename to public/images/pokemon/icons/2/192.png diff --git a/public/images/pokemon/icons/192s.png b/public/images/pokemon/icons/2/192s.png similarity index 100% rename from public/images/pokemon/icons/192s.png rename to public/images/pokemon/icons/2/192s.png diff --git a/public/images/pokemon/icons/193.png b/public/images/pokemon/icons/2/193.png similarity index 100% rename from public/images/pokemon/icons/193.png rename to public/images/pokemon/icons/2/193.png diff --git a/public/images/pokemon/icons/193s.png b/public/images/pokemon/icons/2/193s.png similarity index 100% rename from public/images/pokemon/icons/193s.png rename to public/images/pokemon/icons/2/193s.png diff --git a/public/images/pokemon/icons/194.png b/public/images/pokemon/icons/2/194.png similarity index 100% rename from public/images/pokemon/icons/194.png rename to public/images/pokemon/icons/2/194.png diff --git a/public/images/pokemon/icons/194s.png b/public/images/pokemon/icons/2/194s.png similarity index 100% rename from public/images/pokemon/icons/194s.png rename to public/images/pokemon/icons/2/194s.png diff --git a/public/images/pokemon/icons/195.png b/public/images/pokemon/icons/2/195.png similarity index 100% rename from public/images/pokemon/icons/195.png rename to public/images/pokemon/icons/2/195.png diff --git a/public/images/pokemon/icons/195s.png b/public/images/pokemon/icons/2/195s.png similarity index 100% rename from public/images/pokemon/icons/195s.png rename to public/images/pokemon/icons/2/195s.png diff --git a/public/images/pokemon/icons/196.png b/public/images/pokemon/icons/2/196.png similarity index 100% rename from public/images/pokemon/icons/196.png rename to public/images/pokemon/icons/2/196.png diff --git a/public/images/pokemon/icons/196s.png b/public/images/pokemon/icons/2/196s.png similarity index 100% rename from public/images/pokemon/icons/196s.png rename to public/images/pokemon/icons/2/196s.png diff --git a/public/images/pokemon/icons/197.png b/public/images/pokemon/icons/2/197.png similarity index 100% rename from public/images/pokemon/icons/197.png rename to public/images/pokemon/icons/2/197.png diff --git a/public/images/pokemon/icons/197s.png b/public/images/pokemon/icons/2/197s.png similarity index 100% rename from public/images/pokemon/icons/197s.png rename to public/images/pokemon/icons/2/197s.png diff --git a/public/images/pokemon/icons/198.png b/public/images/pokemon/icons/2/198.png similarity index 100% rename from public/images/pokemon/icons/198.png rename to public/images/pokemon/icons/2/198.png diff --git a/public/images/pokemon/icons/198s.png b/public/images/pokemon/icons/2/198s.png similarity index 100% rename from public/images/pokemon/icons/198s.png rename to public/images/pokemon/icons/2/198s.png diff --git a/public/images/pokemon/icons/199.png b/public/images/pokemon/icons/2/199.png similarity index 100% rename from public/images/pokemon/icons/199.png rename to public/images/pokemon/icons/2/199.png diff --git a/public/images/pokemon/icons/199s.png b/public/images/pokemon/icons/2/199s.png similarity index 100% rename from public/images/pokemon/icons/199s.png rename to public/images/pokemon/icons/2/199s.png diff --git a/public/images/pokemon/icons/200.png b/public/images/pokemon/icons/2/200.png similarity index 100% rename from public/images/pokemon/icons/200.png rename to public/images/pokemon/icons/2/200.png diff --git a/public/images/pokemon/icons/200s.png b/public/images/pokemon/icons/2/200s.png similarity index 100% rename from public/images/pokemon/icons/200s.png rename to public/images/pokemon/icons/2/200s.png diff --git a/public/images/pokemon/icons/201-a.png b/public/images/pokemon/icons/2/201-a.png similarity index 100% rename from public/images/pokemon/icons/201-a.png rename to public/images/pokemon/icons/2/201-a.png diff --git a/public/images/pokemon/icons/201-b.png b/public/images/pokemon/icons/2/201-b.png similarity index 100% rename from public/images/pokemon/icons/201-b.png rename to public/images/pokemon/icons/2/201-b.png diff --git a/public/images/pokemon/icons/201-c.png b/public/images/pokemon/icons/2/201-c.png similarity index 100% rename from public/images/pokemon/icons/201-c.png rename to public/images/pokemon/icons/2/201-c.png diff --git a/public/images/pokemon/icons/201-d.png b/public/images/pokemon/icons/2/201-d.png similarity index 100% rename from public/images/pokemon/icons/201-d.png rename to public/images/pokemon/icons/2/201-d.png diff --git a/public/images/pokemon/icons/201-e.png b/public/images/pokemon/icons/2/201-e.png similarity index 100% rename from public/images/pokemon/icons/201-e.png rename to public/images/pokemon/icons/2/201-e.png diff --git a/public/images/pokemon/icons/201-exclamation.png b/public/images/pokemon/icons/2/201-exclamation.png similarity index 100% rename from public/images/pokemon/icons/201-exclamation.png rename to public/images/pokemon/icons/2/201-exclamation.png diff --git a/public/images/pokemon/icons/201-f.png b/public/images/pokemon/icons/2/201-f.png similarity index 100% rename from public/images/pokemon/icons/201-f.png rename to public/images/pokemon/icons/2/201-f.png diff --git a/public/images/pokemon/icons/201-g.png b/public/images/pokemon/icons/2/201-g.png similarity index 100% rename from public/images/pokemon/icons/201-g.png rename to public/images/pokemon/icons/2/201-g.png diff --git a/public/images/pokemon/icons/201-h.png b/public/images/pokemon/icons/2/201-h.png similarity index 100% rename from public/images/pokemon/icons/201-h.png rename to public/images/pokemon/icons/2/201-h.png diff --git a/public/images/pokemon/icons/201-i.png b/public/images/pokemon/icons/2/201-i.png similarity index 100% rename from public/images/pokemon/icons/201-i.png rename to public/images/pokemon/icons/2/201-i.png diff --git a/public/images/pokemon/icons/201-j.png b/public/images/pokemon/icons/2/201-j.png similarity index 100% rename from public/images/pokemon/icons/201-j.png rename to public/images/pokemon/icons/2/201-j.png diff --git a/public/images/pokemon/icons/201-k.png b/public/images/pokemon/icons/2/201-k.png similarity index 100% rename from public/images/pokemon/icons/201-k.png rename to public/images/pokemon/icons/2/201-k.png diff --git a/public/images/pokemon/icons/201-l.png b/public/images/pokemon/icons/2/201-l.png similarity index 100% rename from public/images/pokemon/icons/201-l.png rename to public/images/pokemon/icons/2/201-l.png diff --git a/public/images/pokemon/icons/201-m.png b/public/images/pokemon/icons/2/201-m.png similarity index 100% rename from public/images/pokemon/icons/201-m.png rename to public/images/pokemon/icons/2/201-m.png diff --git a/public/images/pokemon/icons/201-n.png b/public/images/pokemon/icons/2/201-n.png similarity index 100% rename from public/images/pokemon/icons/201-n.png rename to public/images/pokemon/icons/2/201-n.png diff --git a/public/images/pokemon/icons/201-o.png b/public/images/pokemon/icons/2/201-o.png similarity index 100% rename from public/images/pokemon/icons/201-o.png rename to public/images/pokemon/icons/2/201-o.png diff --git a/public/images/pokemon/icons/201-p.png b/public/images/pokemon/icons/2/201-p.png similarity index 100% rename from public/images/pokemon/icons/201-p.png rename to public/images/pokemon/icons/2/201-p.png diff --git a/public/images/pokemon/icons/201-q.png b/public/images/pokemon/icons/2/201-q.png similarity index 100% rename from public/images/pokemon/icons/201-q.png rename to public/images/pokemon/icons/2/201-q.png diff --git a/public/images/pokemon/icons/201-question.png b/public/images/pokemon/icons/2/201-question.png similarity index 100% rename from public/images/pokemon/icons/201-question.png rename to public/images/pokemon/icons/2/201-question.png diff --git a/public/images/pokemon/icons/201-r.png b/public/images/pokemon/icons/2/201-r.png similarity index 100% rename from public/images/pokemon/icons/201-r.png rename to public/images/pokemon/icons/2/201-r.png diff --git a/public/images/pokemon/icons/201-s.png b/public/images/pokemon/icons/2/201-s.png similarity index 100% rename from public/images/pokemon/icons/201-s.png rename to public/images/pokemon/icons/2/201-s.png diff --git a/public/images/pokemon/icons/201-t.png b/public/images/pokemon/icons/2/201-t.png similarity index 100% rename from public/images/pokemon/icons/201-t.png rename to public/images/pokemon/icons/2/201-t.png diff --git a/public/images/pokemon/icons/201-u.png b/public/images/pokemon/icons/2/201-u.png similarity index 100% rename from public/images/pokemon/icons/201-u.png rename to public/images/pokemon/icons/2/201-u.png diff --git a/public/images/pokemon/icons/201-v.png b/public/images/pokemon/icons/2/201-v.png similarity index 100% rename from public/images/pokemon/icons/201-v.png rename to public/images/pokemon/icons/2/201-v.png diff --git a/public/images/pokemon/icons/201-w.png b/public/images/pokemon/icons/2/201-w.png similarity index 100% rename from public/images/pokemon/icons/201-w.png rename to public/images/pokemon/icons/2/201-w.png diff --git a/public/images/pokemon/icons/201-x.png b/public/images/pokemon/icons/2/201-x.png similarity index 100% rename from public/images/pokemon/icons/201-x.png rename to public/images/pokemon/icons/2/201-x.png diff --git a/public/images/pokemon/icons/201-y.png b/public/images/pokemon/icons/2/201-y.png similarity index 100% rename from public/images/pokemon/icons/201-y.png rename to public/images/pokemon/icons/2/201-y.png diff --git a/public/images/pokemon/icons/201-z.png b/public/images/pokemon/icons/2/201-z.png similarity index 100% rename from public/images/pokemon/icons/201-z.png rename to public/images/pokemon/icons/2/201-z.png diff --git a/public/images/pokemon/icons/201s-a.png b/public/images/pokemon/icons/2/201s-a.png similarity index 100% rename from public/images/pokemon/icons/201s-a.png rename to public/images/pokemon/icons/2/201s-a.png diff --git a/public/images/pokemon/icons/201s-b.png b/public/images/pokemon/icons/2/201s-b.png similarity index 100% rename from public/images/pokemon/icons/201s-b.png rename to public/images/pokemon/icons/2/201s-b.png diff --git a/public/images/pokemon/icons/201s-c.png b/public/images/pokemon/icons/2/201s-c.png similarity index 100% rename from public/images/pokemon/icons/201s-c.png rename to public/images/pokemon/icons/2/201s-c.png diff --git a/public/images/pokemon/icons/201s-d.png b/public/images/pokemon/icons/2/201s-d.png similarity index 100% rename from public/images/pokemon/icons/201s-d.png rename to public/images/pokemon/icons/2/201s-d.png diff --git a/public/images/pokemon/icons/201s-e.png b/public/images/pokemon/icons/2/201s-e.png similarity index 100% rename from public/images/pokemon/icons/201s-e.png rename to public/images/pokemon/icons/2/201s-e.png diff --git a/public/images/pokemon/icons/201s-exclamation.png b/public/images/pokemon/icons/2/201s-exclamation.png similarity index 100% rename from public/images/pokemon/icons/201s-exclamation.png rename to public/images/pokemon/icons/2/201s-exclamation.png diff --git a/public/images/pokemon/icons/201s-f.png b/public/images/pokemon/icons/2/201s-f.png similarity index 100% rename from public/images/pokemon/icons/201s-f.png rename to public/images/pokemon/icons/2/201s-f.png diff --git a/public/images/pokemon/icons/201s-g.png b/public/images/pokemon/icons/2/201s-g.png similarity index 100% rename from public/images/pokemon/icons/201s-g.png rename to public/images/pokemon/icons/2/201s-g.png diff --git a/public/images/pokemon/icons/201s-h.png b/public/images/pokemon/icons/2/201s-h.png similarity index 100% rename from public/images/pokemon/icons/201s-h.png rename to public/images/pokemon/icons/2/201s-h.png diff --git a/public/images/pokemon/icons/201s-i.png b/public/images/pokemon/icons/2/201s-i.png similarity index 100% rename from public/images/pokemon/icons/201s-i.png rename to public/images/pokemon/icons/2/201s-i.png diff --git a/public/images/pokemon/icons/201s-j.png b/public/images/pokemon/icons/2/201s-j.png similarity index 100% rename from public/images/pokemon/icons/201s-j.png rename to public/images/pokemon/icons/2/201s-j.png diff --git a/public/images/pokemon/icons/201s-k.png b/public/images/pokemon/icons/2/201s-k.png similarity index 100% rename from public/images/pokemon/icons/201s-k.png rename to public/images/pokemon/icons/2/201s-k.png diff --git a/public/images/pokemon/icons/201s-l.png b/public/images/pokemon/icons/2/201s-l.png similarity index 100% rename from public/images/pokemon/icons/201s-l.png rename to public/images/pokemon/icons/2/201s-l.png diff --git a/public/images/pokemon/icons/201s-m.png b/public/images/pokemon/icons/2/201s-m.png similarity index 100% rename from public/images/pokemon/icons/201s-m.png rename to public/images/pokemon/icons/2/201s-m.png diff --git a/public/images/pokemon/icons/201s-n.png b/public/images/pokemon/icons/2/201s-n.png similarity index 100% rename from public/images/pokemon/icons/201s-n.png rename to public/images/pokemon/icons/2/201s-n.png diff --git a/public/images/pokemon/icons/201s-o.png b/public/images/pokemon/icons/2/201s-o.png similarity index 100% rename from public/images/pokemon/icons/201s-o.png rename to public/images/pokemon/icons/2/201s-o.png diff --git a/public/images/pokemon/icons/201s-p.png b/public/images/pokemon/icons/2/201s-p.png similarity index 100% rename from public/images/pokemon/icons/201s-p.png rename to public/images/pokemon/icons/2/201s-p.png diff --git a/public/images/pokemon/icons/201s-q.png b/public/images/pokemon/icons/2/201s-q.png similarity index 100% rename from public/images/pokemon/icons/201s-q.png rename to public/images/pokemon/icons/2/201s-q.png diff --git a/public/images/pokemon/icons/201s-question.png b/public/images/pokemon/icons/2/201s-question.png similarity index 100% rename from public/images/pokemon/icons/201s-question.png rename to public/images/pokemon/icons/2/201s-question.png diff --git a/public/images/pokemon/icons/201s-r.png b/public/images/pokemon/icons/2/201s-r.png similarity index 100% rename from public/images/pokemon/icons/201s-r.png rename to public/images/pokemon/icons/2/201s-r.png diff --git a/public/images/pokemon/icons/201s-s.png b/public/images/pokemon/icons/2/201s-s.png similarity index 100% rename from public/images/pokemon/icons/201s-s.png rename to public/images/pokemon/icons/2/201s-s.png diff --git a/public/images/pokemon/icons/201s-t.png b/public/images/pokemon/icons/2/201s-t.png similarity index 100% rename from public/images/pokemon/icons/201s-t.png rename to public/images/pokemon/icons/2/201s-t.png diff --git a/public/images/pokemon/icons/201s-u.png b/public/images/pokemon/icons/2/201s-u.png similarity index 100% rename from public/images/pokemon/icons/201s-u.png rename to public/images/pokemon/icons/2/201s-u.png diff --git a/public/images/pokemon/icons/201s-v.png b/public/images/pokemon/icons/2/201s-v.png similarity index 100% rename from public/images/pokemon/icons/201s-v.png rename to public/images/pokemon/icons/2/201s-v.png diff --git a/public/images/pokemon/icons/201s-w.png b/public/images/pokemon/icons/2/201s-w.png similarity index 100% rename from public/images/pokemon/icons/201s-w.png rename to public/images/pokemon/icons/2/201s-w.png diff --git a/public/images/pokemon/icons/201s-x.png b/public/images/pokemon/icons/2/201s-x.png similarity index 100% rename from public/images/pokemon/icons/201s-x.png rename to public/images/pokemon/icons/2/201s-x.png diff --git a/public/images/pokemon/icons/201s-y.png b/public/images/pokemon/icons/2/201s-y.png similarity index 100% rename from public/images/pokemon/icons/201s-y.png rename to public/images/pokemon/icons/2/201s-y.png diff --git a/public/images/pokemon/icons/201s-z.png b/public/images/pokemon/icons/2/201s-z.png similarity index 100% rename from public/images/pokemon/icons/201s-z.png rename to public/images/pokemon/icons/2/201s-z.png diff --git a/public/images/pokemon/icons/202.png b/public/images/pokemon/icons/2/202.png similarity index 100% rename from public/images/pokemon/icons/202.png rename to public/images/pokemon/icons/2/202.png diff --git a/public/images/pokemon/icons/202s.png b/public/images/pokemon/icons/2/202s.png similarity index 100% rename from public/images/pokemon/icons/202s.png rename to public/images/pokemon/icons/2/202s.png diff --git a/public/images/pokemon/icons/203.png b/public/images/pokemon/icons/2/203.png similarity index 100% rename from public/images/pokemon/icons/203.png rename to public/images/pokemon/icons/2/203.png diff --git a/public/images/pokemon/icons/203s.png b/public/images/pokemon/icons/2/203s.png similarity index 100% rename from public/images/pokemon/icons/203s.png rename to public/images/pokemon/icons/2/203s.png diff --git a/public/images/pokemon/icons/204.png b/public/images/pokemon/icons/2/204.png similarity index 100% rename from public/images/pokemon/icons/204.png rename to public/images/pokemon/icons/2/204.png diff --git a/public/images/pokemon/icons/204s.png b/public/images/pokemon/icons/2/204s.png similarity index 100% rename from public/images/pokemon/icons/204s.png rename to public/images/pokemon/icons/2/204s.png diff --git a/public/images/pokemon/icons/205.png b/public/images/pokemon/icons/2/205.png similarity index 100% rename from public/images/pokemon/icons/205.png rename to public/images/pokemon/icons/2/205.png diff --git a/public/images/pokemon/icons/205s.png b/public/images/pokemon/icons/2/205s.png similarity index 100% rename from public/images/pokemon/icons/205s.png rename to public/images/pokemon/icons/2/205s.png diff --git a/public/images/pokemon/icons/206.png b/public/images/pokemon/icons/2/206.png similarity index 100% rename from public/images/pokemon/icons/206.png rename to public/images/pokemon/icons/2/206.png diff --git a/public/images/pokemon/icons/206s.png b/public/images/pokemon/icons/2/206s.png similarity index 100% rename from public/images/pokemon/icons/206s.png rename to public/images/pokemon/icons/2/206s.png diff --git a/public/images/pokemon/icons/207.png b/public/images/pokemon/icons/2/207.png similarity index 100% rename from public/images/pokemon/icons/207.png rename to public/images/pokemon/icons/2/207.png diff --git a/public/images/pokemon/icons/207s.png b/public/images/pokemon/icons/2/207s.png similarity index 100% rename from public/images/pokemon/icons/207s.png rename to public/images/pokemon/icons/2/207s.png diff --git a/public/images/pokemon/icons/208-mega.png b/public/images/pokemon/icons/2/208-mega.png similarity index 100% rename from public/images/pokemon/icons/208-mega.png rename to public/images/pokemon/icons/2/208-mega.png diff --git a/public/images/pokemon/icons/208.png b/public/images/pokemon/icons/2/208.png similarity index 100% rename from public/images/pokemon/icons/208.png rename to public/images/pokemon/icons/2/208.png diff --git a/public/images/pokemon/icons/208s-mega.png b/public/images/pokemon/icons/2/208s-mega.png similarity index 100% rename from public/images/pokemon/icons/208s-mega.png rename to public/images/pokemon/icons/2/208s-mega.png diff --git a/public/images/pokemon/icons/208s.png b/public/images/pokemon/icons/2/208s.png similarity index 100% rename from public/images/pokemon/icons/208s.png rename to public/images/pokemon/icons/2/208s.png diff --git a/public/images/pokemon/icons/209.png b/public/images/pokemon/icons/2/209.png similarity index 100% rename from public/images/pokemon/icons/209.png rename to public/images/pokemon/icons/2/209.png diff --git a/public/images/pokemon/icons/209s.png b/public/images/pokemon/icons/2/209s.png similarity index 100% rename from public/images/pokemon/icons/209s.png rename to public/images/pokemon/icons/2/209s.png diff --git a/public/images/pokemon/icons/210.png b/public/images/pokemon/icons/2/210.png similarity index 100% rename from public/images/pokemon/icons/210.png rename to public/images/pokemon/icons/2/210.png diff --git a/public/images/pokemon/icons/210s.png b/public/images/pokemon/icons/2/210s.png similarity index 100% rename from public/images/pokemon/icons/210s.png rename to public/images/pokemon/icons/2/210s.png diff --git a/public/images/pokemon/icons/211.png b/public/images/pokemon/icons/2/211.png similarity index 100% rename from public/images/pokemon/icons/211.png rename to public/images/pokemon/icons/2/211.png diff --git a/public/images/pokemon/icons/211s.png b/public/images/pokemon/icons/2/211s.png similarity index 100% rename from public/images/pokemon/icons/211s.png rename to public/images/pokemon/icons/2/211s.png diff --git a/public/images/pokemon/icons/212-mega.png b/public/images/pokemon/icons/2/212-mega.png similarity index 100% rename from public/images/pokemon/icons/212-mega.png rename to public/images/pokemon/icons/2/212-mega.png diff --git a/public/images/pokemon/icons/212.png b/public/images/pokemon/icons/2/212.png similarity index 100% rename from public/images/pokemon/icons/212.png rename to public/images/pokemon/icons/2/212.png diff --git a/public/images/pokemon/icons/212s-mega.png b/public/images/pokemon/icons/2/212s-mega.png similarity index 100% rename from public/images/pokemon/icons/212s-mega.png rename to public/images/pokemon/icons/2/212s-mega.png diff --git a/public/images/pokemon/icons/212s.png b/public/images/pokemon/icons/2/212s.png similarity index 100% rename from public/images/pokemon/icons/212s.png rename to public/images/pokemon/icons/2/212s.png diff --git a/public/images/pokemon/icons/213.png b/public/images/pokemon/icons/2/213.png similarity index 100% rename from public/images/pokemon/icons/213.png rename to public/images/pokemon/icons/2/213.png diff --git a/public/images/pokemon/icons/213s.png b/public/images/pokemon/icons/2/213s.png similarity index 100% rename from public/images/pokemon/icons/213s.png rename to public/images/pokemon/icons/2/213s.png diff --git a/public/images/pokemon/icons/214-mega.png b/public/images/pokemon/icons/2/214-mega.png similarity index 100% rename from public/images/pokemon/icons/214-mega.png rename to public/images/pokemon/icons/2/214-mega.png diff --git a/public/images/pokemon/icons/214.png b/public/images/pokemon/icons/2/214.png similarity index 100% rename from public/images/pokemon/icons/214.png rename to public/images/pokemon/icons/2/214.png diff --git a/public/images/pokemon/icons/214s-mega.png b/public/images/pokemon/icons/2/214s-mega.png similarity index 100% rename from public/images/pokemon/icons/214s-mega.png rename to public/images/pokemon/icons/2/214s-mega.png diff --git a/public/images/pokemon/icons/214s.png b/public/images/pokemon/icons/2/214s.png similarity index 100% rename from public/images/pokemon/icons/214s.png rename to public/images/pokemon/icons/2/214s.png diff --git a/public/images/pokemon/icons/215.png b/public/images/pokemon/icons/2/215.png similarity index 100% rename from public/images/pokemon/icons/215.png rename to public/images/pokemon/icons/2/215.png diff --git a/public/images/pokemon/icons/215s.png b/public/images/pokemon/icons/2/215s.png similarity index 100% rename from public/images/pokemon/icons/215s.png rename to public/images/pokemon/icons/2/215s.png diff --git a/public/images/pokemon/icons/216.png b/public/images/pokemon/icons/2/216.png similarity index 100% rename from public/images/pokemon/icons/216.png rename to public/images/pokemon/icons/2/216.png diff --git a/public/images/pokemon/icons/216s.png b/public/images/pokemon/icons/2/216s.png similarity index 100% rename from public/images/pokemon/icons/216s.png rename to public/images/pokemon/icons/2/216s.png diff --git a/public/images/pokemon/icons/217.png b/public/images/pokemon/icons/2/217.png similarity index 100% rename from public/images/pokemon/icons/217.png rename to public/images/pokemon/icons/2/217.png diff --git a/public/images/pokemon/icons/217s.png b/public/images/pokemon/icons/2/217s.png similarity index 100% rename from public/images/pokemon/icons/217s.png rename to public/images/pokemon/icons/2/217s.png diff --git a/public/images/pokemon/icons/218.png b/public/images/pokemon/icons/2/218.png similarity index 100% rename from public/images/pokemon/icons/218.png rename to public/images/pokemon/icons/2/218.png diff --git a/public/images/pokemon/icons/218s.png b/public/images/pokemon/icons/2/218s.png similarity index 100% rename from public/images/pokemon/icons/218s.png rename to public/images/pokemon/icons/2/218s.png diff --git a/public/images/pokemon/icons/219.png b/public/images/pokemon/icons/2/219.png similarity index 100% rename from public/images/pokemon/icons/219.png rename to public/images/pokemon/icons/2/219.png diff --git a/public/images/pokemon/icons/219s.png b/public/images/pokemon/icons/2/219s.png similarity index 100% rename from public/images/pokemon/icons/219s.png rename to public/images/pokemon/icons/2/219s.png diff --git a/public/images/pokemon/icons/220.png b/public/images/pokemon/icons/2/220.png similarity index 100% rename from public/images/pokemon/icons/220.png rename to public/images/pokemon/icons/2/220.png diff --git a/public/images/pokemon/icons/220s.png b/public/images/pokemon/icons/2/220s.png similarity index 100% rename from public/images/pokemon/icons/220s.png rename to public/images/pokemon/icons/2/220s.png diff --git a/public/images/pokemon/icons/221.png b/public/images/pokemon/icons/2/221.png similarity index 100% rename from public/images/pokemon/icons/221.png rename to public/images/pokemon/icons/2/221.png diff --git a/public/images/pokemon/icons/221s.png b/public/images/pokemon/icons/2/221s.png similarity index 100% rename from public/images/pokemon/icons/221s.png rename to public/images/pokemon/icons/2/221s.png diff --git a/public/images/pokemon/icons/222.png b/public/images/pokemon/icons/2/222.png similarity index 100% rename from public/images/pokemon/icons/222.png rename to public/images/pokemon/icons/2/222.png diff --git a/public/images/pokemon/icons/222s.png b/public/images/pokemon/icons/2/222s.png similarity index 100% rename from public/images/pokemon/icons/222s.png rename to public/images/pokemon/icons/2/222s.png diff --git a/public/images/pokemon/icons/223.png b/public/images/pokemon/icons/2/223.png similarity index 100% rename from public/images/pokemon/icons/223.png rename to public/images/pokemon/icons/2/223.png diff --git a/public/images/pokemon/icons/223s.png b/public/images/pokemon/icons/2/223s.png similarity index 100% rename from public/images/pokemon/icons/223s.png rename to public/images/pokemon/icons/2/223s.png diff --git a/public/images/pokemon/icons/224.png b/public/images/pokemon/icons/2/224.png similarity index 100% rename from public/images/pokemon/icons/224.png rename to public/images/pokemon/icons/2/224.png diff --git a/public/images/pokemon/icons/224s.png b/public/images/pokemon/icons/2/224s.png similarity index 100% rename from public/images/pokemon/icons/224s.png rename to public/images/pokemon/icons/2/224s.png diff --git a/public/images/pokemon/icons/225.png b/public/images/pokemon/icons/2/225.png similarity index 100% rename from public/images/pokemon/icons/225.png rename to public/images/pokemon/icons/2/225.png diff --git a/public/images/pokemon/icons/225s.png b/public/images/pokemon/icons/2/225s.png similarity index 100% rename from public/images/pokemon/icons/225s.png rename to public/images/pokemon/icons/2/225s.png diff --git a/public/images/pokemon/icons/226.png b/public/images/pokemon/icons/2/226.png similarity index 100% rename from public/images/pokemon/icons/226.png rename to public/images/pokemon/icons/2/226.png diff --git a/public/images/pokemon/icons/226s.png b/public/images/pokemon/icons/2/226s.png similarity index 100% rename from public/images/pokemon/icons/226s.png rename to public/images/pokemon/icons/2/226s.png diff --git a/public/images/pokemon/icons/227.png b/public/images/pokemon/icons/2/227.png similarity index 100% rename from public/images/pokemon/icons/227.png rename to public/images/pokemon/icons/2/227.png diff --git a/public/images/pokemon/icons/227s.png b/public/images/pokemon/icons/2/227s.png similarity index 100% rename from public/images/pokemon/icons/227s.png rename to public/images/pokemon/icons/2/227s.png diff --git a/public/images/pokemon/icons/228.png b/public/images/pokemon/icons/2/228.png similarity index 100% rename from public/images/pokemon/icons/228.png rename to public/images/pokemon/icons/2/228.png diff --git a/public/images/pokemon/icons/228s.png b/public/images/pokemon/icons/2/228s.png similarity index 100% rename from public/images/pokemon/icons/228s.png rename to public/images/pokemon/icons/2/228s.png diff --git a/public/images/pokemon/icons/229-mega.png b/public/images/pokemon/icons/2/229-mega.png similarity index 100% rename from public/images/pokemon/icons/229-mega.png rename to public/images/pokemon/icons/2/229-mega.png diff --git a/public/images/pokemon/icons/229.png b/public/images/pokemon/icons/2/229.png similarity index 100% rename from public/images/pokemon/icons/229.png rename to public/images/pokemon/icons/2/229.png diff --git a/public/images/pokemon/icons/229s-mega.png b/public/images/pokemon/icons/2/229s-mega.png similarity index 100% rename from public/images/pokemon/icons/229s-mega.png rename to public/images/pokemon/icons/2/229s-mega.png diff --git a/public/images/pokemon/icons/229s.png b/public/images/pokemon/icons/2/229s.png similarity index 100% rename from public/images/pokemon/icons/229s.png rename to public/images/pokemon/icons/2/229s.png diff --git a/public/images/pokemon/icons/230.png b/public/images/pokemon/icons/2/230.png similarity index 100% rename from public/images/pokemon/icons/230.png rename to public/images/pokemon/icons/2/230.png diff --git a/public/images/pokemon/icons/230s.png b/public/images/pokemon/icons/2/230s.png similarity index 100% rename from public/images/pokemon/icons/230s.png rename to public/images/pokemon/icons/2/230s.png diff --git a/public/images/pokemon/icons/231.png b/public/images/pokemon/icons/2/231.png similarity index 100% rename from public/images/pokemon/icons/231.png rename to public/images/pokemon/icons/2/231.png diff --git a/public/images/pokemon/icons/231s.png b/public/images/pokemon/icons/2/231s.png similarity index 100% rename from public/images/pokemon/icons/231s.png rename to public/images/pokemon/icons/2/231s.png diff --git a/public/images/pokemon/icons/232.png b/public/images/pokemon/icons/2/232.png similarity index 100% rename from public/images/pokemon/icons/232.png rename to public/images/pokemon/icons/2/232.png diff --git a/public/images/pokemon/icons/232s.png b/public/images/pokemon/icons/2/232s.png similarity index 100% rename from public/images/pokemon/icons/232s.png rename to public/images/pokemon/icons/2/232s.png diff --git a/public/images/pokemon/icons/233.png b/public/images/pokemon/icons/2/233.png similarity index 100% rename from public/images/pokemon/icons/233.png rename to public/images/pokemon/icons/2/233.png diff --git a/public/images/pokemon/icons/233s.png b/public/images/pokemon/icons/2/233s.png similarity index 100% rename from public/images/pokemon/icons/233s.png rename to public/images/pokemon/icons/2/233s.png diff --git a/public/images/pokemon/icons/234.png b/public/images/pokemon/icons/2/234.png similarity index 100% rename from public/images/pokemon/icons/234.png rename to public/images/pokemon/icons/2/234.png diff --git a/public/images/pokemon/icons/234s.png b/public/images/pokemon/icons/2/234s.png similarity index 100% rename from public/images/pokemon/icons/234s.png rename to public/images/pokemon/icons/2/234s.png diff --git a/public/images/pokemon/icons/235.png b/public/images/pokemon/icons/2/235.png similarity index 100% rename from public/images/pokemon/icons/235.png rename to public/images/pokemon/icons/2/235.png diff --git a/public/images/pokemon/icons/235s.png b/public/images/pokemon/icons/2/235s.png similarity index 100% rename from public/images/pokemon/icons/235s.png rename to public/images/pokemon/icons/2/235s.png diff --git a/public/images/pokemon/icons/236.png b/public/images/pokemon/icons/2/236.png similarity index 100% rename from public/images/pokemon/icons/236.png rename to public/images/pokemon/icons/2/236.png diff --git a/public/images/pokemon/icons/236s.png b/public/images/pokemon/icons/2/236s.png similarity index 100% rename from public/images/pokemon/icons/236s.png rename to public/images/pokemon/icons/2/236s.png diff --git a/public/images/pokemon/icons/237.png b/public/images/pokemon/icons/2/237.png similarity index 100% rename from public/images/pokemon/icons/237.png rename to public/images/pokemon/icons/2/237.png diff --git a/public/images/pokemon/icons/237s.png b/public/images/pokemon/icons/2/237s.png similarity index 100% rename from public/images/pokemon/icons/237s.png rename to public/images/pokemon/icons/2/237s.png diff --git a/public/images/pokemon/icons/238.png b/public/images/pokemon/icons/2/238.png similarity index 100% rename from public/images/pokemon/icons/238.png rename to public/images/pokemon/icons/2/238.png diff --git a/public/images/pokemon/icons/238s.png b/public/images/pokemon/icons/2/238s.png similarity index 100% rename from public/images/pokemon/icons/238s.png rename to public/images/pokemon/icons/2/238s.png diff --git a/public/images/pokemon/icons/239.png b/public/images/pokemon/icons/2/239.png similarity index 100% rename from public/images/pokemon/icons/239.png rename to public/images/pokemon/icons/2/239.png diff --git a/public/images/pokemon/icons/239s.png b/public/images/pokemon/icons/2/239s.png similarity index 100% rename from public/images/pokemon/icons/239s.png rename to public/images/pokemon/icons/2/239s.png diff --git a/public/images/pokemon/icons/240.png b/public/images/pokemon/icons/2/240.png similarity index 100% rename from public/images/pokemon/icons/240.png rename to public/images/pokemon/icons/2/240.png diff --git a/public/images/pokemon/icons/240s.png b/public/images/pokemon/icons/2/240s.png similarity index 100% rename from public/images/pokemon/icons/240s.png rename to public/images/pokemon/icons/2/240s.png diff --git a/public/images/pokemon/icons/241.png b/public/images/pokemon/icons/2/241.png similarity index 100% rename from public/images/pokemon/icons/241.png rename to public/images/pokemon/icons/2/241.png diff --git a/public/images/pokemon/icons/241s.png b/public/images/pokemon/icons/2/241s.png similarity index 100% rename from public/images/pokemon/icons/241s.png rename to public/images/pokemon/icons/2/241s.png diff --git a/public/images/pokemon/icons/242.png b/public/images/pokemon/icons/2/242.png similarity index 100% rename from public/images/pokemon/icons/242.png rename to public/images/pokemon/icons/2/242.png diff --git a/public/images/pokemon/icons/242s.png b/public/images/pokemon/icons/2/242s.png similarity index 100% rename from public/images/pokemon/icons/242s.png rename to public/images/pokemon/icons/2/242s.png diff --git a/public/images/pokemon/icons/243.png b/public/images/pokemon/icons/2/243.png similarity index 100% rename from public/images/pokemon/icons/243.png rename to public/images/pokemon/icons/2/243.png diff --git a/public/images/pokemon/icons/243s.png b/public/images/pokemon/icons/2/243s.png similarity index 100% rename from public/images/pokemon/icons/243s.png rename to public/images/pokemon/icons/2/243s.png diff --git a/public/images/pokemon/icons/244.png b/public/images/pokemon/icons/2/244.png similarity index 100% rename from public/images/pokemon/icons/244.png rename to public/images/pokemon/icons/2/244.png diff --git a/public/images/pokemon/icons/244s.png b/public/images/pokemon/icons/2/244s.png similarity index 100% rename from public/images/pokemon/icons/244s.png rename to public/images/pokemon/icons/2/244s.png diff --git a/public/images/pokemon/icons/245.png b/public/images/pokemon/icons/2/245.png similarity index 100% rename from public/images/pokemon/icons/245.png rename to public/images/pokemon/icons/2/245.png diff --git a/public/images/pokemon/icons/245s.png b/public/images/pokemon/icons/2/245s.png similarity index 100% rename from public/images/pokemon/icons/245s.png rename to public/images/pokemon/icons/2/245s.png diff --git a/public/images/pokemon/icons/246.png b/public/images/pokemon/icons/2/246.png similarity index 100% rename from public/images/pokemon/icons/246.png rename to public/images/pokemon/icons/2/246.png diff --git a/public/images/pokemon/icons/246s.png b/public/images/pokemon/icons/2/246s.png similarity index 100% rename from public/images/pokemon/icons/246s.png rename to public/images/pokemon/icons/2/246s.png diff --git a/public/images/pokemon/icons/247.png b/public/images/pokemon/icons/2/247.png similarity index 100% rename from public/images/pokemon/icons/247.png rename to public/images/pokemon/icons/2/247.png diff --git a/public/images/pokemon/icons/247s.png b/public/images/pokemon/icons/2/247s.png similarity index 100% rename from public/images/pokemon/icons/247s.png rename to public/images/pokemon/icons/2/247s.png diff --git a/public/images/pokemon/icons/248-mega.png b/public/images/pokemon/icons/2/248-mega.png similarity index 100% rename from public/images/pokemon/icons/248-mega.png rename to public/images/pokemon/icons/2/248-mega.png diff --git a/public/images/pokemon/icons/248.png b/public/images/pokemon/icons/2/248.png similarity index 100% rename from public/images/pokemon/icons/248.png rename to public/images/pokemon/icons/2/248.png diff --git a/public/images/pokemon/icons/248s-mega.png b/public/images/pokemon/icons/2/248s-mega.png similarity index 100% rename from public/images/pokemon/icons/248s-mega.png rename to public/images/pokemon/icons/2/248s-mega.png diff --git a/public/images/pokemon/icons/248s.png b/public/images/pokemon/icons/2/248s.png similarity index 100% rename from public/images/pokemon/icons/248s.png rename to public/images/pokemon/icons/2/248s.png diff --git a/public/images/pokemon/icons/249.png b/public/images/pokemon/icons/2/249.png similarity index 100% rename from public/images/pokemon/icons/249.png rename to public/images/pokemon/icons/2/249.png diff --git a/public/images/pokemon/icons/249s.png b/public/images/pokemon/icons/2/249s.png similarity index 100% rename from public/images/pokemon/icons/249s.png rename to public/images/pokemon/icons/2/249s.png diff --git a/public/images/pokemon/icons/250.png b/public/images/pokemon/icons/2/250.png similarity index 100% rename from public/images/pokemon/icons/250.png rename to public/images/pokemon/icons/2/250.png diff --git a/public/images/pokemon/icons/250s.png b/public/images/pokemon/icons/2/250s.png similarity index 100% rename from public/images/pokemon/icons/250s.png rename to public/images/pokemon/icons/2/250s.png diff --git a/public/images/pokemon/icons/251.png b/public/images/pokemon/icons/2/251.png similarity index 100% rename from public/images/pokemon/icons/251.png rename to public/images/pokemon/icons/2/251.png diff --git a/public/images/pokemon/icons/251s.png b/public/images/pokemon/icons/2/251s.png similarity index 100% rename from public/images/pokemon/icons/251s.png rename to public/images/pokemon/icons/2/251s.png diff --git a/public/images/pokemon/icons/2/icons.bat b/public/images/pokemon/icons/2/icons.bat new file mode 100644 index 000000000..d819051d0 --- /dev/null +++ b/public/images/pokemon/icons/2/icons.bat @@ -0,0 +1 @@ +cmd /c TexturePacker ./ ../configuration.tps --sheet ../../../pokemon_icons_2.png --data ../../../pokemon_icons_2.json --replace .png= \ No newline at end of file diff --git a/public/images/pokemon/icons/252.png b/public/images/pokemon/icons/3/252.png similarity index 100% rename from public/images/pokemon/icons/252.png rename to public/images/pokemon/icons/3/252.png diff --git a/public/images/pokemon/icons/252s.png b/public/images/pokemon/icons/3/252s.png similarity index 100% rename from public/images/pokemon/icons/252s.png rename to public/images/pokemon/icons/3/252s.png diff --git a/public/images/pokemon/icons/253.png b/public/images/pokemon/icons/3/253.png similarity index 100% rename from public/images/pokemon/icons/253.png rename to public/images/pokemon/icons/3/253.png diff --git a/public/images/pokemon/icons/253s.png b/public/images/pokemon/icons/3/253s.png similarity index 100% rename from public/images/pokemon/icons/253s.png rename to public/images/pokemon/icons/3/253s.png diff --git a/public/images/pokemon/icons/254-mega.png b/public/images/pokemon/icons/3/254-mega.png similarity index 100% rename from public/images/pokemon/icons/254-mega.png rename to public/images/pokemon/icons/3/254-mega.png diff --git a/public/images/pokemon/icons/254.png b/public/images/pokemon/icons/3/254.png similarity index 100% rename from public/images/pokemon/icons/254.png rename to public/images/pokemon/icons/3/254.png diff --git a/public/images/pokemon/icons/254s-mega.png b/public/images/pokemon/icons/3/254s-mega.png similarity index 100% rename from public/images/pokemon/icons/254s-mega.png rename to public/images/pokemon/icons/3/254s-mega.png diff --git a/public/images/pokemon/icons/254s.png b/public/images/pokemon/icons/3/254s.png similarity index 100% rename from public/images/pokemon/icons/254s.png rename to public/images/pokemon/icons/3/254s.png diff --git a/public/images/pokemon/icons/255.png b/public/images/pokemon/icons/3/255.png similarity index 100% rename from public/images/pokemon/icons/255.png rename to public/images/pokemon/icons/3/255.png diff --git a/public/images/pokemon/icons/255s.png b/public/images/pokemon/icons/3/255s.png similarity index 100% rename from public/images/pokemon/icons/255s.png rename to public/images/pokemon/icons/3/255s.png diff --git a/public/images/pokemon/icons/256.png b/public/images/pokemon/icons/3/256.png similarity index 100% rename from public/images/pokemon/icons/256.png rename to public/images/pokemon/icons/3/256.png diff --git a/public/images/pokemon/icons/256s.png b/public/images/pokemon/icons/3/256s.png similarity index 100% rename from public/images/pokemon/icons/256s.png rename to public/images/pokemon/icons/3/256s.png diff --git a/public/images/pokemon/icons/257-mega.png b/public/images/pokemon/icons/3/257-mega.png similarity index 100% rename from public/images/pokemon/icons/257-mega.png rename to public/images/pokemon/icons/3/257-mega.png diff --git a/public/images/pokemon/icons/257.png b/public/images/pokemon/icons/3/257.png similarity index 100% rename from public/images/pokemon/icons/257.png rename to public/images/pokemon/icons/3/257.png diff --git a/public/images/pokemon/icons/257s-mega.png b/public/images/pokemon/icons/3/257s-mega.png similarity index 100% rename from public/images/pokemon/icons/257s-mega.png rename to public/images/pokemon/icons/3/257s-mega.png diff --git a/public/images/pokemon/icons/257s.png b/public/images/pokemon/icons/3/257s.png similarity index 100% rename from public/images/pokemon/icons/257s.png rename to public/images/pokemon/icons/3/257s.png diff --git a/public/images/pokemon/icons/258.png b/public/images/pokemon/icons/3/258.png similarity index 100% rename from public/images/pokemon/icons/258.png rename to public/images/pokemon/icons/3/258.png diff --git a/public/images/pokemon/icons/258s.png b/public/images/pokemon/icons/3/258s.png similarity index 100% rename from public/images/pokemon/icons/258s.png rename to public/images/pokemon/icons/3/258s.png diff --git a/public/images/pokemon/icons/259.png b/public/images/pokemon/icons/3/259.png similarity index 100% rename from public/images/pokemon/icons/259.png rename to public/images/pokemon/icons/3/259.png diff --git a/public/images/pokemon/icons/259s.png b/public/images/pokemon/icons/3/259s.png similarity index 100% rename from public/images/pokemon/icons/259s.png rename to public/images/pokemon/icons/3/259s.png diff --git a/public/images/pokemon/icons/260-mega.png b/public/images/pokemon/icons/3/260-mega.png similarity index 100% rename from public/images/pokemon/icons/260-mega.png rename to public/images/pokemon/icons/3/260-mega.png diff --git a/public/images/pokemon/icons/260.png b/public/images/pokemon/icons/3/260.png similarity index 100% rename from public/images/pokemon/icons/260.png rename to public/images/pokemon/icons/3/260.png diff --git a/public/images/pokemon/icons/260s-mega.png b/public/images/pokemon/icons/3/260s-mega.png similarity index 100% rename from public/images/pokemon/icons/260s-mega.png rename to public/images/pokemon/icons/3/260s-mega.png diff --git a/public/images/pokemon/icons/260s.png b/public/images/pokemon/icons/3/260s.png similarity index 100% rename from public/images/pokemon/icons/260s.png rename to public/images/pokemon/icons/3/260s.png diff --git a/public/images/pokemon/icons/261.png b/public/images/pokemon/icons/3/261.png similarity index 100% rename from public/images/pokemon/icons/261.png rename to public/images/pokemon/icons/3/261.png diff --git a/public/images/pokemon/icons/261s.png b/public/images/pokemon/icons/3/261s.png similarity index 100% rename from public/images/pokemon/icons/261s.png rename to public/images/pokemon/icons/3/261s.png diff --git a/public/images/pokemon/icons/262.png b/public/images/pokemon/icons/3/262.png similarity index 100% rename from public/images/pokemon/icons/262.png rename to public/images/pokemon/icons/3/262.png diff --git a/public/images/pokemon/icons/262s.png b/public/images/pokemon/icons/3/262s.png similarity index 100% rename from public/images/pokemon/icons/262s.png rename to public/images/pokemon/icons/3/262s.png diff --git a/public/images/pokemon/icons/263.png b/public/images/pokemon/icons/3/263.png similarity index 100% rename from public/images/pokemon/icons/263.png rename to public/images/pokemon/icons/3/263.png diff --git a/public/images/pokemon/icons/263s.png b/public/images/pokemon/icons/3/263s.png similarity index 100% rename from public/images/pokemon/icons/263s.png rename to public/images/pokemon/icons/3/263s.png diff --git a/public/images/pokemon/icons/264.png b/public/images/pokemon/icons/3/264.png similarity index 100% rename from public/images/pokemon/icons/264.png rename to public/images/pokemon/icons/3/264.png diff --git a/public/images/pokemon/icons/264s.png b/public/images/pokemon/icons/3/264s.png similarity index 100% rename from public/images/pokemon/icons/264s.png rename to public/images/pokemon/icons/3/264s.png diff --git a/public/images/pokemon/icons/265.png b/public/images/pokemon/icons/3/265.png similarity index 100% rename from public/images/pokemon/icons/265.png rename to public/images/pokemon/icons/3/265.png diff --git a/public/images/pokemon/icons/265s.png b/public/images/pokemon/icons/3/265s.png similarity index 100% rename from public/images/pokemon/icons/265s.png rename to public/images/pokemon/icons/3/265s.png diff --git a/public/images/pokemon/icons/266.png b/public/images/pokemon/icons/3/266.png similarity index 100% rename from public/images/pokemon/icons/266.png rename to public/images/pokemon/icons/3/266.png diff --git a/public/images/pokemon/icons/266s.png b/public/images/pokemon/icons/3/266s.png similarity index 100% rename from public/images/pokemon/icons/266s.png rename to public/images/pokemon/icons/3/266s.png diff --git a/public/images/pokemon/icons/267.png b/public/images/pokemon/icons/3/267.png similarity index 100% rename from public/images/pokemon/icons/267.png rename to public/images/pokemon/icons/3/267.png diff --git a/public/images/pokemon/icons/267s.png b/public/images/pokemon/icons/3/267s.png similarity index 100% rename from public/images/pokemon/icons/267s.png rename to public/images/pokemon/icons/3/267s.png diff --git a/public/images/pokemon/icons/268.png b/public/images/pokemon/icons/3/268.png similarity index 100% rename from public/images/pokemon/icons/268.png rename to public/images/pokemon/icons/3/268.png diff --git a/public/images/pokemon/icons/268s.png b/public/images/pokemon/icons/3/268s.png similarity index 100% rename from public/images/pokemon/icons/268s.png rename to public/images/pokemon/icons/3/268s.png diff --git a/public/images/pokemon/icons/269.png b/public/images/pokemon/icons/3/269.png similarity index 100% rename from public/images/pokemon/icons/269.png rename to public/images/pokemon/icons/3/269.png diff --git a/public/images/pokemon/icons/269s.png b/public/images/pokemon/icons/3/269s.png similarity index 100% rename from public/images/pokemon/icons/269s.png rename to public/images/pokemon/icons/3/269s.png diff --git a/public/images/pokemon/icons/270.png b/public/images/pokemon/icons/3/270.png similarity index 100% rename from public/images/pokemon/icons/270.png rename to public/images/pokemon/icons/3/270.png diff --git a/public/images/pokemon/icons/270s.png b/public/images/pokemon/icons/3/270s.png similarity index 100% rename from public/images/pokemon/icons/270s.png rename to public/images/pokemon/icons/3/270s.png diff --git a/public/images/pokemon/icons/271.png b/public/images/pokemon/icons/3/271.png similarity index 100% rename from public/images/pokemon/icons/271.png rename to public/images/pokemon/icons/3/271.png diff --git a/public/images/pokemon/icons/271s.png b/public/images/pokemon/icons/3/271s.png similarity index 100% rename from public/images/pokemon/icons/271s.png rename to public/images/pokemon/icons/3/271s.png diff --git a/public/images/pokemon/icons/272.png b/public/images/pokemon/icons/3/272.png similarity index 100% rename from public/images/pokemon/icons/272.png rename to public/images/pokemon/icons/3/272.png diff --git a/public/images/pokemon/icons/272s.png b/public/images/pokemon/icons/3/272s.png similarity index 100% rename from public/images/pokemon/icons/272s.png rename to public/images/pokemon/icons/3/272s.png diff --git a/public/images/pokemon/icons/273.png b/public/images/pokemon/icons/3/273.png similarity index 100% rename from public/images/pokemon/icons/273.png rename to public/images/pokemon/icons/3/273.png diff --git a/public/images/pokemon/icons/273s.png b/public/images/pokemon/icons/3/273s.png similarity index 100% rename from public/images/pokemon/icons/273s.png rename to public/images/pokemon/icons/3/273s.png diff --git a/public/images/pokemon/icons/274.png b/public/images/pokemon/icons/3/274.png similarity index 100% rename from public/images/pokemon/icons/274.png rename to public/images/pokemon/icons/3/274.png diff --git a/public/images/pokemon/icons/274s.png b/public/images/pokemon/icons/3/274s.png similarity index 100% rename from public/images/pokemon/icons/274s.png rename to public/images/pokemon/icons/3/274s.png diff --git a/public/images/pokemon/icons/275.png b/public/images/pokemon/icons/3/275.png similarity index 100% rename from public/images/pokemon/icons/275.png rename to public/images/pokemon/icons/3/275.png diff --git a/public/images/pokemon/icons/275s.png b/public/images/pokemon/icons/3/275s.png similarity index 100% rename from public/images/pokemon/icons/275s.png rename to public/images/pokemon/icons/3/275s.png diff --git a/public/images/pokemon/icons/276.png b/public/images/pokemon/icons/3/276.png similarity index 100% rename from public/images/pokemon/icons/276.png rename to public/images/pokemon/icons/3/276.png diff --git a/public/images/pokemon/icons/276s.png b/public/images/pokemon/icons/3/276s.png similarity index 100% rename from public/images/pokemon/icons/276s.png rename to public/images/pokemon/icons/3/276s.png diff --git a/public/images/pokemon/icons/277.png b/public/images/pokemon/icons/3/277.png similarity index 100% rename from public/images/pokemon/icons/277.png rename to public/images/pokemon/icons/3/277.png diff --git a/public/images/pokemon/icons/277s.png b/public/images/pokemon/icons/3/277s.png similarity index 100% rename from public/images/pokemon/icons/277s.png rename to public/images/pokemon/icons/3/277s.png diff --git a/public/images/pokemon/icons/278.png b/public/images/pokemon/icons/3/278.png similarity index 100% rename from public/images/pokemon/icons/278.png rename to public/images/pokemon/icons/3/278.png diff --git a/public/images/pokemon/icons/278s.png b/public/images/pokemon/icons/3/278s.png similarity index 100% rename from public/images/pokemon/icons/278s.png rename to public/images/pokemon/icons/3/278s.png diff --git a/public/images/pokemon/icons/279.png b/public/images/pokemon/icons/3/279.png similarity index 100% rename from public/images/pokemon/icons/279.png rename to public/images/pokemon/icons/3/279.png diff --git a/public/images/pokemon/icons/279s.png b/public/images/pokemon/icons/3/279s.png similarity index 100% rename from public/images/pokemon/icons/279s.png rename to public/images/pokemon/icons/3/279s.png diff --git a/public/images/pokemon/icons/280.png b/public/images/pokemon/icons/3/280.png similarity index 100% rename from public/images/pokemon/icons/280.png rename to public/images/pokemon/icons/3/280.png diff --git a/public/images/pokemon/icons/280s.png b/public/images/pokemon/icons/3/280s.png similarity index 100% rename from public/images/pokemon/icons/280s.png rename to public/images/pokemon/icons/3/280s.png diff --git a/public/images/pokemon/icons/281.png b/public/images/pokemon/icons/3/281.png similarity index 100% rename from public/images/pokemon/icons/281.png rename to public/images/pokemon/icons/3/281.png diff --git a/public/images/pokemon/icons/281s.png b/public/images/pokemon/icons/3/281s.png similarity index 100% rename from public/images/pokemon/icons/281s.png rename to public/images/pokemon/icons/3/281s.png diff --git a/public/images/pokemon/icons/282-mega.png b/public/images/pokemon/icons/3/282-mega.png similarity index 100% rename from public/images/pokemon/icons/282-mega.png rename to public/images/pokemon/icons/3/282-mega.png diff --git a/public/images/pokemon/icons/282.png b/public/images/pokemon/icons/3/282.png similarity index 100% rename from public/images/pokemon/icons/282.png rename to public/images/pokemon/icons/3/282.png diff --git a/public/images/pokemon/icons/282s-mega.png b/public/images/pokemon/icons/3/282s-mega.png similarity index 100% rename from public/images/pokemon/icons/282s-mega.png rename to public/images/pokemon/icons/3/282s-mega.png diff --git a/public/images/pokemon/icons/282s.png b/public/images/pokemon/icons/3/282s.png similarity index 100% rename from public/images/pokemon/icons/282s.png rename to public/images/pokemon/icons/3/282s.png diff --git a/public/images/pokemon/icons/283.png b/public/images/pokemon/icons/3/283.png similarity index 100% rename from public/images/pokemon/icons/283.png rename to public/images/pokemon/icons/3/283.png diff --git a/public/images/pokemon/icons/283s.png b/public/images/pokemon/icons/3/283s.png similarity index 100% rename from public/images/pokemon/icons/283s.png rename to public/images/pokemon/icons/3/283s.png diff --git a/public/images/pokemon/icons/284.png b/public/images/pokemon/icons/3/284.png similarity index 100% rename from public/images/pokemon/icons/284.png rename to public/images/pokemon/icons/3/284.png diff --git a/public/images/pokemon/icons/284s.png b/public/images/pokemon/icons/3/284s.png similarity index 100% rename from public/images/pokemon/icons/284s.png rename to public/images/pokemon/icons/3/284s.png diff --git a/public/images/pokemon/icons/285.png b/public/images/pokemon/icons/3/285.png similarity index 100% rename from public/images/pokemon/icons/285.png rename to public/images/pokemon/icons/3/285.png diff --git a/public/images/pokemon/icons/285s.png b/public/images/pokemon/icons/3/285s.png similarity index 100% rename from public/images/pokemon/icons/285s.png rename to public/images/pokemon/icons/3/285s.png diff --git a/public/images/pokemon/icons/286.png b/public/images/pokemon/icons/3/286.png similarity index 100% rename from public/images/pokemon/icons/286.png rename to public/images/pokemon/icons/3/286.png diff --git a/public/images/pokemon/icons/286s.png b/public/images/pokemon/icons/3/286s.png similarity index 100% rename from public/images/pokemon/icons/286s.png rename to public/images/pokemon/icons/3/286s.png diff --git a/public/images/pokemon/icons/287.png b/public/images/pokemon/icons/3/287.png similarity index 100% rename from public/images/pokemon/icons/287.png rename to public/images/pokemon/icons/3/287.png diff --git a/public/images/pokemon/icons/287s.png b/public/images/pokemon/icons/3/287s.png similarity index 100% rename from public/images/pokemon/icons/287s.png rename to public/images/pokemon/icons/3/287s.png diff --git a/public/images/pokemon/icons/288.png b/public/images/pokemon/icons/3/288.png similarity index 100% rename from public/images/pokemon/icons/288.png rename to public/images/pokemon/icons/3/288.png diff --git a/public/images/pokemon/icons/288s.png b/public/images/pokemon/icons/3/288s.png similarity index 100% rename from public/images/pokemon/icons/288s.png rename to public/images/pokemon/icons/3/288s.png diff --git a/public/images/pokemon/icons/289.png b/public/images/pokemon/icons/3/289.png similarity index 100% rename from public/images/pokemon/icons/289.png rename to public/images/pokemon/icons/3/289.png diff --git a/public/images/pokemon/icons/289s.png b/public/images/pokemon/icons/3/289s.png similarity index 100% rename from public/images/pokemon/icons/289s.png rename to public/images/pokemon/icons/3/289s.png diff --git a/public/images/pokemon/icons/290.png b/public/images/pokemon/icons/3/290.png similarity index 100% rename from public/images/pokemon/icons/290.png rename to public/images/pokemon/icons/3/290.png diff --git a/public/images/pokemon/icons/290s.png b/public/images/pokemon/icons/3/290s.png similarity index 100% rename from public/images/pokemon/icons/290s.png rename to public/images/pokemon/icons/3/290s.png diff --git a/public/images/pokemon/icons/291.png b/public/images/pokemon/icons/3/291.png similarity index 100% rename from public/images/pokemon/icons/291.png rename to public/images/pokemon/icons/3/291.png diff --git a/public/images/pokemon/icons/291s.png b/public/images/pokemon/icons/3/291s.png similarity index 100% rename from public/images/pokemon/icons/291s.png rename to public/images/pokemon/icons/3/291s.png diff --git a/public/images/pokemon/icons/292.png b/public/images/pokemon/icons/3/292.png similarity index 100% rename from public/images/pokemon/icons/292.png rename to public/images/pokemon/icons/3/292.png diff --git a/public/images/pokemon/icons/292s.png b/public/images/pokemon/icons/3/292s.png similarity index 100% rename from public/images/pokemon/icons/292s.png rename to public/images/pokemon/icons/3/292s.png diff --git a/public/images/pokemon/icons/293.png b/public/images/pokemon/icons/3/293.png similarity index 100% rename from public/images/pokemon/icons/293.png rename to public/images/pokemon/icons/3/293.png diff --git a/public/images/pokemon/icons/293s.png b/public/images/pokemon/icons/3/293s.png similarity index 100% rename from public/images/pokemon/icons/293s.png rename to public/images/pokemon/icons/3/293s.png diff --git a/public/images/pokemon/icons/294.png b/public/images/pokemon/icons/3/294.png similarity index 100% rename from public/images/pokemon/icons/294.png rename to public/images/pokemon/icons/3/294.png diff --git a/public/images/pokemon/icons/294s.png b/public/images/pokemon/icons/3/294s.png similarity index 100% rename from public/images/pokemon/icons/294s.png rename to public/images/pokemon/icons/3/294s.png diff --git a/public/images/pokemon/icons/295.png b/public/images/pokemon/icons/3/295.png similarity index 100% rename from public/images/pokemon/icons/295.png rename to public/images/pokemon/icons/3/295.png diff --git a/public/images/pokemon/icons/295s.png b/public/images/pokemon/icons/3/295s.png similarity index 100% rename from public/images/pokemon/icons/295s.png rename to public/images/pokemon/icons/3/295s.png diff --git a/public/images/pokemon/icons/296.png b/public/images/pokemon/icons/3/296.png similarity index 100% rename from public/images/pokemon/icons/296.png rename to public/images/pokemon/icons/3/296.png diff --git a/public/images/pokemon/icons/296s.png b/public/images/pokemon/icons/3/296s.png similarity index 100% rename from public/images/pokemon/icons/296s.png rename to public/images/pokemon/icons/3/296s.png diff --git a/public/images/pokemon/icons/297.png b/public/images/pokemon/icons/3/297.png similarity index 100% rename from public/images/pokemon/icons/297.png rename to public/images/pokemon/icons/3/297.png diff --git a/public/images/pokemon/icons/297s.png b/public/images/pokemon/icons/3/297s.png similarity index 100% rename from public/images/pokemon/icons/297s.png rename to public/images/pokemon/icons/3/297s.png diff --git a/public/images/pokemon/icons/298.png b/public/images/pokemon/icons/3/298.png similarity index 100% rename from public/images/pokemon/icons/298.png rename to public/images/pokemon/icons/3/298.png diff --git a/public/images/pokemon/icons/298s.png b/public/images/pokemon/icons/3/298s.png similarity index 100% rename from public/images/pokemon/icons/298s.png rename to public/images/pokemon/icons/3/298s.png diff --git a/public/images/pokemon/icons/299.png b/public/images/pokemon/icons/3/299.png similarity index 100% rename from public/images/pokemon/icons/299.png rename to public/images/pokemon/icons/3/299.png diff --git a/public/images/pokemon/icons/299s.png b/public/images/pokemon/icons/3/299s.png similarity index 100% rename from public/images/pokemon/icons/299s.png rename to public/images/pokemon/icons/3/299s.png diff --git a/public/images/pokemon/icons/300.png b/public/images/pokemon/icons/3/300.png similarity index 100% rename from public/images/pokemon/icons/300.png rename to public/images/pokemon/icons/3/300.png diff --git a/public/images/pokemon/icons/300s.png b/public/images/pokemon/icons/3/300s.png similarity index 100% rename from public/images/pokemon/icons/300s.png rename to public/images/pokemon/icons/3/300s.png diff --git a/public/images/pokemon/icons/301.png b/public/images/pokemon/icons/3/301.png similarity index 100% rename from public/images/pokemon/icons/301.png rename to public/images/pokemon/icons/3/301.png diff --git a/public/images/pokemon/icons/301s.png b/public/images/pokemon/icons/3/301s.png similarity index 100% rename from public/images/pokemon/icons/301s.png rename to public/images/pokemon/icons/3/301s.png diff --git a/public/images/pokemon/icons/302-mega.png b/public/images/pokemon/icons/3/302-mega.png similarity index 100% rename from public/images/pokemon/icons/302-mega.png rename to public/images/pokemon/icons/3/302-mega.png diff --git a/public/images/pokemon/icons/302.png b/public/images/pokemon/icons/3/302.png similarity index 100% rename from public/images/pokemon/icons/302.png rename to public/images/pokemon/icons/3/302.png diff --git a/public/images/pokemon/icons/302s-mega.png b/public/images/pokemon/icons/3/302s-mega.png similarity index 100% rename from public/images/pokemon/icons/302s-mega.png rename to public/images/pokemon/icons/3/302s-mega.png diff --git a/public/images/pokemon/icons/302s.png b/public/images/pokemon/icons/3/302s.png similarity index 100% rename from public/images/pokemon/icons/302s.png rename to public/images/pokemon/icons/3/302s.png diff --git a/public/images/pokemon/icons/303-mega.png b/public/images/pokemon/icons/3/303-mega.png similarity index 100% rename from public/images/pokemon/icons/303-mega.png rename to public/images/pokemon/icons/3/303-mega.png diff --git a/public/images/pokemon/icons/303.png b/public/images/pokemon/icons/3/303.png similarity index 100% rename from public/images/pokemon/icons/303.png rename to public/images/pokemon/icons/3/303.png diff --git a/public/images/pokemon/icons/303s-mega.png b/public/images/pokemon/icons/3/303s-mega.png similarity index 100% rename from public/images/pokemon/icons/303s-mega.png rename to public/images/pokemon/icons/3/303s-mega.png diff --git a/public/images/pokemon/icons/303s.png b/public/images/pokemon/icons/3/303s.png similarity index 100% rename from public/images/pokemon/icons/303s.png rename to public/images/pokemon/icons/3/303s.png diff --git a/public/images/pokemon/icons/304.png b/public/images/pokemon/icons/3/304.png similarity index 100% rename from public/images/pokemon/icons/304.png rename to public/images/pokemon/icons/3/304.png diff --git a/public/images/pokemon/icons/304s.png b/public/images/pokemon/icons/3/304s.png similarity index 100% rename from public/images/pokemon/icons/304s.png rename to public/images/pokemon/icons/3/304s.png diff --git a/public/images/pokemon/icons/305.png b/public/images/pokemon/icons/3/305.png similarity index 100% rename from public/images/pokemon/icons/305.png rename to public/images/pokemon/icons/3/305.png diff --git a/public/images/pokemon/icons/305s.png b/public/images/pokemon/icons/3/305s.png similarity index 100% rename from public/images/pokemon/icons/305s.png rename to public/images/pokemon/icons/3/305s.png diff --git a/public/images/pokemon/icons/306-mega.png b/public/images/pokemon/icons/3/306-mega.png similarity index 100% rename from public/images/pokemon/icons/306-mega.png rename to public/images/pokemon/icons/3/306-mega.png diff --git a/public/images/pokemon/icons/306.png b/public/images/pokemon/icons/3/306.png similarity index 100% rename from public/images/pokemon/icons/306.png rename to public/images/pokemon/icons/3/306.png diff --git a/public/images/pokemon/icons/306s-mega.png b/public/images/pokemon/icons/3/306s-mega.png similarity index 100% rename from public/images/pokemon/icons/306s-mega.png rename to public/images/pokemon/icons/3/306s-mega.png diff --git a/public/images/pokemon/icons/306s.png b/public/images/pokemon/icons/3/306s.png similarity index 100% rename from public/images/pokemon/icons/306s.png rename to public/images/pokemon/icons/3/306s.png diff --git a/public/images/pokemon/icons/307.png b/public/images/pokemon/icons/3/307.png similarity index 100% rename from public/images/pokemon/icons/307.png rename to public/images/pokemon/icons/3/307.png diff --git a/public/images/pokemon/icons/307s.png b/public/images/pokemon/icons/3/307s.png similarity index 100% rename from public/images/pokemon/icons/307s.png rename to public/images/pokemon/icons/3/307s.png diff --git a/public/images/pokemon/icons/308-mega.png b/public/images/pokemon/icons/3/308-mega.png similarity index 100% rename from public/images/pokemon/icons/308-mega.png rename to public/images/pokemon/icons/3/308-mega.png diff --git a/public/images/pokemon/icons/308.png b/public/images/pokemon/icons/3/308.png similarity index 100% rename from public/images/pokemon/icons/308.png rename to public/images/pokemon/icons/3/308.png diff --git a/public/images/pokemon/icons/308s-mega.png b/public/images/pokemon/icons/3/308s-mega.png similarity index 100% rename from public/images/pokemon/icons/308s-mega.png rename to public/images/pokemon/icons/3/308s-mega.png diff --git a/public/images/pokemon/icons/308s.png b/public/images/pokemon/icons/3/308s.png similarity index 100% rename from public/images/pokemon/icons/308s.png rename to public/images/pokemon/icons/3/308s.png diff --git a/public/images/pokemon/icons/309.png b/public/images/pokemon/icons/3/309.png similarity index 100% rename from public/images/pokemon/icons/309.png rename to public/images/pokemon/icons/3/309.png diff --git a/public/images/pokemon/icons/309s.png b/public/images/pokemon/icons/3/309s.png similarity index 100% rename from public/images/pokemon/icons/309s.png rename to public/images/pokemon/icons/3/309s.png diff --git a/public/images/pokemon/icons/310-mega.png b/public/images/pokemon/icons/3/310-mega.png similarity index 100% rename from public/images/pokemon/icons/310-mega.png rename to public/images/pokemon/icons/3/310-mega.png diff --git a/public/images/pokemon/icons/310.png b/public/images/pokemon/icons/3/310.png similarity index 100% rename from public/images/pokemon/icons/310.png rename to public/images/pokemon/icons/3/310.png diff --git a/public/images/pokemon/icons/310s-mega.png b/public/images/pokemon/icons/3/310s-mega.png similarity index 100% rename from public/images/pokemon/icons/310s-mega.png rename to public/images/pokemon/icons/3/310s-mega.png diff --git a/public/images/pokemon/icons/310s.png b/public/images/pokemon/icons/3/310s.png similarity index 100% rename from public/images/pokemon/icons/310s.png rename to public/images/pokemon/icons/3/310s.png diff --git a/public/images/pokemon/icons/311.png b/public/images/pokemon/icons/3/311.png similarity index 100% rename from public/images/pokemon/icons/311.png rename to public/images/pokemon/icons/3/311.png diff --git a/public/images/pokemon/icons/311s.png b/public/images/pokemon/icons/3/311s.png similarity index 100% rename from public/images/pokemon/icons/311s.png rename to public/images/pokemon/icons/3/311s.png diff --git a/public/images/pokemon/icons/312.png b/public/images/pokemon/icons/3/312.png similarity index 100% rename from public/images/pokemon/icons/312.png rename to public/images/pokemon/icons/3/312.png diff --git a/public/images/pokemon/icons/312s.png b/public/images/pokemon/icons/3/312s.png similarity index 100% rename from public/images/pokemon/icons/312s.png rename to public/images/pokemon/icons/3/312s.png diff --git a/public/images/pokemon/icons/313.png b/public/images/pokemon/icons/3/313.png similarity index 100% rename from public/images/pokemon/icons/313.png rename to public/images/pokemon/icons/3/313.png diff --git a/public/images/pokemon/icons/313s.png b/public/images/pokemon/icons/3/313s.png similarity index 100% rename from public/images/pokemon/icons/313s.png rename to public/images/pokemon/icons/3/313s.png diff --git a/public/images/pokemon/icons/314.png b/public/images/pokemon/icons/3/314.png similarity index 100% rename from public/images/pokemon/icons/314.png rename to public/images/pokemon/icons/3/314.png diff --git a/public/images/pokemon/icons/314s.png b/public/images/pokemon/icons/3/314s.png similarity index 100% rename from public/images/pokemon/icons/314s.png rename to public/images/pokemon/icons/3/314s.png diff --git a/public/images/pokemon/icons/315.png b/public/images/pokemon/icons/3/315.png similarity index 100% rename from public/images/pokemon/icons/315.png rename to public/images/pokemon/icons/3/315.png diff --git a/public/images/pokemon/icons/315s.png b/public/images/pokemon/icons/3/315s.png similarity index 100% rename from public/images/pokemon/icons/315s.png rename to public/images/pokemon/icons/3/315s.png diff --git a/public/images/pokemon/icons/316.png b/public/images/pokemon/icons/3/316.png similarity index 100% rename from public/images/pokemon/icons/316.png rename to public/images/pokemon/icons/3/316.png diff --git a/public/images/pokemon/icons/316s.png b/public/images/pokemon/icons/3/316s.png similarity index 100% rename from public/images/pokemon/icons/316s.png rename to public/images/pokemon/icons/3/316s.png diff --git a/public/images/pokemon/icons/317.png b/public/images/pokemon/icons/3/317.png similarity index 100% rename from public/images/pokemon/icons/317.png rename to public/images/pokemon/icons/3/317.png diff --git a/public/images/pokemon/icons/317s.png b/public/images/pokemon/icons/3/317s.png similarity index 100% rename from public/images/pokemon/icons/317s.png rename to public/images/pokemon/icons/3/317s.png diff --git a/public/images/pokemon/icons/318.png b/public/images/pokemon/icons/3/318.png similarity index 100% rename from public/images/pokemon/icons/318.png rename to public/images/pokemon/icons/3/318.png diff --git a/public/images/pokemon/icons/318s.png b/public/images/pokemon/icons/3/318s.png similarity index 100% rename from public/images/pokemon/icons/318s.png rename to public/images/pokemon/icons/3/318s.png diff --git a/public/images/pokemon/icons/319-mega.png b/public/images/pokemon/icons/3/319-mega.png similarity index 100% rename from public/images/pokemon/icons/319-mega.png rename to public/images/pokemon/icons/3/319-mega.png diff --git a/public/images/pokemon/icons/319.png b/public/images/pokemon/icons/3/319.png similarity index 100% rename from public/images/pokemon/icons/319.png rename to public/images/pokemon/icons/3/319.png diff --git a/public/images/pokemon/icons/319s-mega.png b/public/images/pokemon/icons/3/319s-mega.png similarity index 100% rename from public/images/pokemon/icons/319s-mega.png rename to public/images/pokemon/icons/3/319s-mega.png diff --git a/public/images/pokemon/icons/319s.png b/public/images/pokemon/icons/3/319s.png similarity index 100% rename from public/images/pokemon/icons/319s.png rename to public/images/pokemon/icons/3/319s.png diff --git a/public/images/pokemon/icons/320.png b/public/images/pokemon/icons/3/320.png similarity index 100% rename from public/images/pokemon/icons/320.png rename to public/images/pokemon/icons/3/320.png diff --git a/public/images/pokemon/icons/320s.png b/public/images/pokemon/icons/3/320s.png similarity index 100% rename from public/images/pokemon/icons/320s.png rename to public/images/pokemon/icons/3/320s.png diff --git a/public/images/pokemon/icons/321.png b/public/images/pokemon/icons/3/321.png similarity index 100% rename from public/images/pokemon/icons/321.png rename to public/images/pokemon/icons/3/321.png diff --git a/public/images/pokemon/icons/321s.png b/public/images/pokemon/icons/3/321s.png similarity index 100% rename from public/images/pokemon/icons/321s.png rename to public/images/pokemon/icons/3/321s.png diff --git a/public/images/pokemon/icons/322.png b/public/images/pokemon/icons/3/322.png similarity index 100% rename from public/images/pokemon/icons/322.png rename to public/images/pokemon/icons/3/322.png diff --git a/public/images/pokemon/icons/322s.png b/public/images/pokemon/icons/3/322s.png similarity index 100% rename from public/images/pokemon/icons/322s.png rename to public/images/pokemon/icons/3/322s.png diff --git a/public/images/pokemon/icons/323-mega.png b/public/images/pokemon/icons/3/323-mega.png similarity index 100% rename from public/images/pokemon/icons/323-mega.png rename to public/images/pokemon/icons/3/323-mega.png diff --git a/public/images/pokemon/icons/323.png b/public/images/pokemon/icons/3/323.png similarity index 100% rename from public/images/pokemon/icons/323.png rename to public/images/pokemon/icons/3/323.png diff --git a/public/images/pokemon/icons/323s-mega.png b/public/images/pokemon/icons/3/323s-mega.png similarity index 100% rename from public/images/pokemon/icons/323s-mega.png rename to public/images/pokemon/icons/3/323s-mega.png diff --git a/public/images/pokemon/icons/323s.png b/public/images/pokemon/icons/3/323s.png similarity index 100% rename from public/images/pokemon/icons/323s.png rename to public/images/pokemon/icons/3/323s.png diff --git a/public/images/pokemon/icons/324.png b/public/images/pokemon/icons/3/324.png similarity index 100% rename from public/images/pokemon/icons/324.png rename to public/images/pokemon/icons/3/324.png diff --git a/public/images/pokemon/icons/324s.png b/public/images/pokemon/icons/3/324s.png similarity index 100% rename from public/images/pokemon/icons/324s.png rename to public/images/pokemon/icons/3/324s.png diff --git a/public/images/pokemon/icons/325.png b/public/images/pokemon/icons/3/325.png similarity index 100% rename from public/images/pokemon/icons/325.png rename to public/images/pokemon/icons/3/325.png diff --git a/public/images/pokemon/icons/325s.png b/public/images/pokemon/icons/3/325s.png similarity index 100% rename from public/images/pokemon/icons/325s.png rename to public/images/pokemon/icons/3/325s.png diff --git a/public/images/pokemon/icons/326.png b/public/images/pokemon/icons/3/326.png similarity index 100% rename from public/images/pokemon/icons/326.png rename to public/images/pokemon/icons/3/326.png diff --git a/public/images/pokemon/icons/326s.png b/public/images/pokemon/icons/3/326s.png similarity index 100% rename from public/images/pokemon/icons/326s.png rename to public/images/pokemon/icons/3/326s.png diff --git a/public/images/pokemon/icons/327.png b/public/images/pokemon/icons/3/327.png similarity index 100% rename from public/images/pokemon/icons/327.png rename to public/images/pokemon/icons/3/327.png diff --git a/public/images/pokemon/icons/327s.png b/public/images/pokemon/icons/3/327s.png similarity index 100% rename from public/images/pokemon/icons/327s.png rename to public/images/pokemon/icons/3/327s.png diff --git a/public/images/pokemon/icons/328.png b/public/images/pokemon/icons/3/328.png similarity index 100% rename from public/images/pokemon/icons/328.png rename to public/images/pokemon/icons/3/328.png diff --git a/public/images/pokemon/icons/328s.png b/public/images/pokemon/icons/3/328s.png similarity index 100% rename from public/images/pokemon/icons/328s.png rename to public/images/pokemon/icons/3/328s.png diff --git a/public/images/pokemon/icons/329.png b/public/images/pokemon/icons/3/329.png similarity index 100% rename from public/images/pokemon/icons/329.png rename to public/images/pokemon/icons/3/329.png diff --git a/public/images/pokemon/icons/329s.png b/public/images/pokemon/icons/3/329s.png similarity index 100% rename from public/images/pokemon/icons/329s.png rename to public/images/pokemon/icons/3/329s.png diff --git a/public/images/pokemon/icons/330.png b/public/images/pokemon/icons/3/330.png similarity index 100% rename from public/images/pokemon/icons/330.png rename to public/images/pokemon/icons/3/330.png diff --git a/public/images/pokemon/icons/330s.png b/public/images/pokemon/icons/3/330s.png similarity index 100% rename from public/images/pokemon/icons/330s.png rename to public/images/pokemon/icons/3/330s.png diff --git a/public/images/pokemon/icons/331.png b/public/images/pokemon/icons/3/331.png similarity index 100% rename from public/images/pokemon/icons/331.png rename to public/images/pokemon/icons/3/331.png diff --git a/public/images/pokemon/icons/331s.png b/public/images/pokemon/icons/3/331s.png similarity index 100% rename from public/images/pokemon/icons/331s.png rename to public/images/pokemon/icons/3/331s.png diff --git a/public/images/pokemon/icons/332.png b/public/images/pokemon/icons/3/332.png similarity index 100% rename from public/images/pokemon/icons/332.png rename to public/images/pokemon/icons/3/332.png diff --git a/public/images/pokemon/icons/332s.png b/public/images/pokemon/icons/3/332s.png similarity index 100% rename from public/images/pokemon/icons/332s.png rename to public/images/pokemon/icons/3/332s.png diff --git a/public/images/pokemon/icons/333.png b/public/images/pokemon/icons/3/333.png similarity index 100% rename from public/images/pokemon/icons/333.png rename to public/images/pokemon/icons/3/333.png diff --git a/public/images/pokemon/icons/333s.png b/public/images/pokemon/icons/3/333s.png similarity index 100% rename from public/images/pokemon/icons/333s.png rename to public/images/pokemon/icons/3/333s.png diff --git a/public/images/pokemon/icons/334-mega.png b/public/images/pokemon/icons/3/334-mega.png similarity index 100% rename from public/images/pokemon/icons/334-mega.png rename to public/images/pokemon/icons/3/334-mega.png diff --git a/public/images/pokemon/icons/334.png b/public/images/pokemon/icons/3/334.png similarity index 100% rename from public/images/pokemon/icons/334.png rename to public/images/pokemon/icons/3/334.png diff --git a/public/images/pokemon/icons/334s-mega.png b/public/images/pokemon/icons/3/334s-mega.png similarity index 100% rename from public/images/pokemon/icons/334s-mega.png rename to public/images/pokemon/icons/3/334s-mega.png diff --git a/public/images/pokemon/icons/334s.png b/public/images/pokemon/icons/3/334s.png similarity index 100% rename from public/images/pokemon/icons/334s.png rename to public/images/pokemon/icons/3/334s.png diff --git a/public/images/pokemon/icons/335.png b/public/images/pokemon/icons/3/335.png similarity index 100% rename from public/images/pokemon/icons/335.png rename to public/images/pokemon/icons/3/335.png diff --git a/public/images/pokemon/icons/335s.png b/public/images/pokemon/icons/3/335s.png similarity index 100% rename from public/images/pokemon/icons/335s.png rename to public/images/pokemon/icons/3/335s.png diff --git a/public/images/pokemon/icons/336.png b/public/images/pokemon/icons/3/336.png similarity index 100% rename from public/images/pokemon/icons/336.png rename to public/images/pokemon/icons/3/336.png diff --git a/public/images/pokemon/icons/336s.png b/public/images/pokemon/icons/3/336s.png similarity index 100% rename from public/images/pokemon/icons/336s.png rename to public/images/pokemon/icons/3/336s.png diff --git a/public/images/pokemon/icons/337.png b/public/images/pokemon/icons/3/337.png similarity index 100% rename from public/images/pokemon/icons/337.png rename to public/images/pokemon/icons/3/337.png diff --git a/public/images/pokemon/icons/337s.png b/public/images/pokemon/icons/3/337s.png similarity index 100% rename from public/images/pokemon/icons/337s.png rename to public/images/pokemon/icons/3/337s.png diff --git a/public/images/pokemon/icons/338.png b/public/images/pokemon/icons/3/338.png similarity index 100% rename from public/images/pokemon/icons/338.png rename to public/images/pokemon/icons/3/338.png diff --git a/public/images/pokemon/icons/338s.png b/public/images/pokemon/icons/3/338s.png similarity index 100% rename from public/images/pokemon/icons/338s.png rename to public/images/pokemon/icons/3/338s.png diff --git a/public/images/pokemon/icons/339.png b/public/images/pokemon/icons/3/339.png similarity index 100% rename from public/images/pokemon/icons/339.png rename to public/images/pokemon/icons/3/339.png diff --git a/public/images/pokemon/icons/339s.png b/public/images/pokemon/icons/3/339s.png similarity index 100% rename from public/images/pokemon/icons/339s.png rename to public/images/pokemon/icons/3/339s.png diff --git a/public/images/pokemon/icons/340.png b/public/images/pokemon/icons/3/340.png similarity index 100% rename from public/images/pokemon/icons/340.png rename to public/images/pokemon/icons/3/340.png diff --git a/public/images/pokemon/icons/340s.png b/public/images/pokemon/icons/3/340s.png similarity index 100% rename from public/images/pokemon/icons/340s.png rename to public/images/pokemon/icons/3/340s.png diff --git a/public/images/pokemon/icons/341.png b/public/images/pokemon/icons/3/341.png similarity index 100% rename from public/images/pokemon/icons/341.png rename to public/images/pokemon/icons/3/341.png diff --git a/public/images/pokemon/icons/341s.png b/public/images/pokemon/icons/3/341s.png similarity index 100% rename from public/images/pokemon/icons/341s.png rename to public/images/pokemon/icons/3/341s.png diff --git a/public/images/pokemon/icons/342.png b/public/images/pokemon/icons/3/342.png similarity index 100% rename from public/images/pokemon/icons/342.png rename to public/images/pokemon/icons/3/342.png diff --git a/public/images/pokemon/icons/342s.png b/public/images/pokemon/icons/3/342s.png similarity index 100% rename from public/images/pokemon/icons/342s.png rename to public/images/pokemon/icons/3/342s.png diff --git a/public/images/pokemon/icons/343.png b/public/images/pokemon/icons/3/343.png similarity index 100% rename from public/images/pokemon/icons/343.png rename to public/images/pokemon/icons/3/343.png diff --git a/public/images/pokemon/icons/343s.png b/public/images/pokemon/icons/3/343s.png similarity index 100% rename from public/images/pokemon/icons/343s.png rename to public/images/pokemon/icons/3/343s.png diff --git a/public/images/pokemon/icons/344.png b/public/images/pokemon/icons/3/344.png similarity index 100% rename from public/images/pokemon/icons/344.png rename to public/images/pokemon/icons/3/344.png diff --git a/public/images/pokemon/icons/344s.png b/public/images/pokemon/icons/3/344s.png similarity index 100% rename from public/images/pokemon/icons/344s.png rename to public/images/pokemon/icons/3/344s.png diff --git a/public/images/pokemon/icons/345.png b/public/images/pokemon/icons/3/345.png similarity index 100% rename from public/images/pokemon/icons/345.png rename to public/images/pokemon/icons/3/345.png diff --git a/public/images/pokemon/icons/345s.png b/public/images/pokemon/icons/3/345s.png similarity index 100% rename from public/images/pokemon/icons/345s.png rename to public/images/pokemon/icons/3/345s.png diff --git a/public/images/pokemon/icons/346.png b/public/images/pokemon/icons/3/346.png similarity index 100% rename from public/images/pokemon/icons/346.png rename to public/images/pokemon/icons/3/346.png diff --git a/public/images/pokemon/icons/346s.png b/public/images/pokemon/icons/3/346s.png similarity index 100% rename from public/images/pokemon/icons/346s.png rename to public/images/pokemon/icons/3/346s.png diff --git a/public/images/pokemon/icons/347.png b/public/images/pokemon/icons/3/347.png similarity index 100% rename from public/images/pokemon/icons/347.png rename to public/images/pokemon/icons/3/347.png diff --git a/public/images/pokemon/icons/347s.png b/public/images/pokemon/icons/3/347s.png similarity index 100% rename from public/images/pokemon/icons/347s.png rename to public/images/pokemon/icons/3/347s.png diff --git a/public/images/pokemon/icons/348.png b/public/images/pokemon/icons/3/348.png similarity index 100% rename from public/images/pokemon/icons/348.png rename to public/images/pokemon/icons/3/348.png diff --git a/public/images/pokemon/icons/348s.png b/public/images/pokemon/icons/3/348s.png similarity index 100% rename from public/images/pokemon/icons/348s.png rename to public/images/pokemon/icons/3/348s.png diff --git a/public/images/pokemon/icons/349.png b/public/images/pokemon/icons/3/349.png similarity index 100% rename from public/images/pokemon/icons/349.png rename to public/images/pokemon/icons/3/349.png diff --git a/public/images/pokemon/icons/349s.png b/public/images/pokemon/icons/3/349s.png similarity index 100% rename from public/images/pokemon/icons/349s.png rename to public/images/pokemon/icons/3/349s.png diff --git a/public/images/pokemon/icons/350.png b/public/images/pokemon/icons/3/350.png similarity index 100% rename from public/images/pokemon/icons/350.png rename to public/images/pokemon/icons/3/350.png diff --git a/public/images/pokemon/icons/350s.png b/public/images/pokemon/icons/3/350s.png similarity index 100% rename from public/images/pokemon/icons/350s.png rename to public/images/pokemon/icons/3/350s.png diff --git a/public/images/pokemon/icons/351-rainy.png b/public/images/pokemon/icons/3/351-rainy.png similarity index 100% rename from public/images/pokemon/icons/351-rainy.png rename to public/images/pokemon/icons/3/351-rainy.png diff --git a/public/images/pokemon/icons/351-snowy.png b/public/images/pokemon/icons/3/351-snowy.png similarity index 100% rename from public/images/pokemon/icons/351-snowy.png rename to public/images/pokemon/icons/3/351-snowy.png diff --git a/public/images/pokemon/icons/351-sunny.png b/public/images/pokemon/icons/3/351-sunny.png similarity index 100% rename from public/images/pokemon/icons/351-sunny.png rename to public/images/pokemon/icons/3/351-sunny.png diff --git a/public/images/pokemon/icons/351.png b/public/images/pokemon/icons/3/351.png similarity index 100% rename from public/images/pokemon/icons/351.png rename to public/images/pokemon/icons/3/351.png diff --git a/public/images/pokemon/icons/351s-rainy.png b/public/images/pokemon/icons/3/351s-rainy.png similarity index 100% rename from public/images/pokemon/icons/351s-rainy.png rename to public/images/pokemon/icons/3/351s-rainy.png diff --git a/public/images/pokemon/icons/351s-snowy.png b/public/images/pokemon/icons/3/351s-snowy.png similarity index 100% rename from public/images/pokemon/icons/351s-snowy.png rename to public/images/pokemon/icons/3/351s-snowy.png diff --git a/public/images/pokemon/icons/351s-sunny.png b/public/images/pokemon/icons/3/351s-sunny.png similarity index 100% rename from public/images/pokemon/icons/351s-sunny.png rename to public/images/pokemon/icons/3/351s-sunny.png diff --git a/public/images/pokemon/icons/351s.png b/public/images/pokemon/icons/3/351s.png similarity index 100% rename from public/images/pokemon/icons/351s.png rename to public/images/pokemon/icons/3/351s.png diff --git a/public/images/pokemon/icons/352.png b/public/images/pokemon/icons/3/352.png similarity index 100% rename from public/images/pokemon/icons/352.png rename to public/images/pokemon/icons/3/352.png diff --git a/public/images/pokemon/icons/352s.png b/public/images/pokemon/icons/3/352s.png similarity index 100% rename from public/images/pokemon/icons/352s.png rename to public/images/pokemon/icons/3/352s.png diff --git a/public/images/pokemon/icons/353.png b/public/images/pokemon/icons/3/353.png similarity index 100% rename from public/images/pokemon/icons/353.png rename to public/images/pokemon/icons/3/353.png diff --git a/public/images/pokemon/icons/353s.png b/public/images/pokemon/icons/3/353s.png similarity index 100% rename from public/images/pokemon/icons/353s.png rename to public/images/pokemon/icons/3/353s.png diff --git a/public/images/pokemon/icons/354-mega.png b/public/images/pokemon/icons/3/354-mega.png similarity index 100% rename from public/images/pokemon/icons/354-mega.png rename to public/images/pokemon/icons/3/354-mega.png diff --git a/public/images/pokemon/icons/354.png b/public/images/pokemon/icons/3/354.png similarity index 100% rename from public/images/pokemon/icons/354.png rename to public/images/pokemon/icons/3/354.png diff --git a/public/images/pokemon/icons/354s-mega.png b/public/images/pokemon/icons/3/354s-mega.png similarity index 100% rename from public/images/pokemon/icons/354s-mega.png rename to public/images/pokemon/icons/3/354s-mega.png diff --git a/public/images/pokemon/icons/354s.png b/public/images/pokemon/icons/3/354s.png similarity index 100% rename from public/images/pokemon/icons/354s.png rename to public/images/pokemon/icons/3/354s.png diff --git a/public/images/pokemon/icons/355.png b/public/images/pokemon/icons/3/355.png similarity index 100% rename from public/images/pokemon/icons/355.png rename to public/images/pokemon/icons/3/355.png diff --git a/public/images/pokemon/icons/355s.png b/public/images/pokemon/icons/3/355s.png similarity index 100% rename from public/images/pokemon/icons/355s.png rename to public/images/pokemon/icons/3/355s.png diff --git a/public/images/pokemon/icons/356.png b/public/images/pokemon/icons/3/356.png similarity index 100% rename from public/images/pokemon/icons/356.png rename to public/images/pokemon/icons/3/356.png diff --git a/public/images/pokemon/icons/356s.png b/public/images/pokemon/icons/3/356s.png similarity index 100% rename from public/images/pokemon/icons/356s.png rename to public/images/pokemon/icons/3/356s.png diff --git a/public/images/pokemon/icons/357.png b/public/images/pokemon/icons/3/357.png similarity index 100% rename from public/images/pokemon/icons/357.png rename to public/images/pokemon/icons/3/357.png diff --git a/public/images/pokemon/icons/357s.png b/public/images/pokemon/icons/3/357s.png similarity index 100% rename from public/images/pokemon/icons/357s.png rename to public/images/pokemon/icons/3/357s.png diff --git a/public/images/pokemon/icons/358.png b/public/images/pokemon/icons/3/358.png similarity index 100% rename from public/images/pokemon/icons/358.png rename to public/images/pokemon/icons/3/358.png diff --git a/public/images/pokemon/icons/358s.png b/public/images/pokemon/icons/3/358s.png similarity index 100% rename from public/images/pokemon/icons/358s.png rename to public/images/pokemon/icons/3/358s.png diff --git a/public/images/pokemon/icons/359-mega.png b/public/images/pokemon/icons/3/359-mega.png similarity index 100% rename from public/images/pokemon/icons/359-mega.png rename to public/images/pokemon/icons/3/359-mega.png diff --git a/public/images/pokemon/icons/359.png b/public/images/pokemon/icons/3/359.png similarity index 100% rename from public/images/pokemon/icons/359.png rename to public/images/pokemon/icons/3/359.png diff --git a/public/images/pokemon/icons/359s-mega.png b/public/images/pokemon/icons/3/359s-mega.png similarity index 100% rename from public/images/pokemon/icons/359s-mega.png rename to public/images/pokemon/icons/3/359s-mega.png diff --git a/public/images/pokemon/icons/359s.png b/public/images/pokemon/icons/3/359s.png similarity index 100% rename from public/images/pokemon/icons/359s.png rename to public/images/pokemon/icons/3/359s.png diff --git a/public/images/pokemon/icons/360.png b/public/images/pokemon/icons/3/360.png similarity index 100% rename from public/images/pokemon/icons/360.png rename to public/images/pokemon/icons/3/360.png diff --git a/public/images/pokemon/icons/360s.png b/public/images/pokemon/icons/3/360s.png similarity index 100% rename from public/images/pokemon/icons/360s.png rename to public/images/pokemon/icons/3/360s.png diff --git a/public/images/pokemon/icons/361.png b/public/images/pokemon/icons/3/361.png similarity index 100% rename from public/images/pokemon/icons/361.png rename to public/images/pokemon/icons/3/361.png diff --git a/public/images/pokemon/icons/361s.png b/public/images/pokemon/icons/3/361s.png similarity index 100% rename from public/images/pokemon/icons/361s.png rename to public/images/pokemon/icons/3/361s.png diff --git a/public/images/pokemon/icons/362-mega.png b/public/images/pokemon/icons/3/362-mega.png similarity index 100% rename from public/images/pokemon/icons/362-mega.png rename to public/images/pokemon/icons/3/362-mega.png diff --git a/public/images/pokemon/icons/362.png b/public/images/pokemon/icons/3/362.png similarity index 100% rename from public/images/pokemon/icons/362.png rename to public/images/pokemon/icons/3/362.png diff --git a/public/images/pokemon/icons/362s-mega.png b/public/images/pokemon/icons/3/362s-mega.png similarity index 100% rename from public/images/pokemon/icons/362s-mega.png rename to public/images/pokemon/icons/3/362s-mega.png diff --git a/public/images/pokemon/icons/362s.png b/public/images/pokemon/icons/3/362s.png similarity index 100% rename from public/images/pokemon/icons/362s.png rename to public/images/pokemon/icons/3/362s.png diff --git a/public/images/pokemon/icons/363.png b/public/images/pokemon/icons/3/363.png similarity index 100% rename from public/images/pokemon/icons/363.png rename to public/images/pokemon/icons/3/363.png diff --git a/public/images/pokemon/icons/363s.png b/public/images/pokemon/icons/3/363s.png similarity index 100% rename from public/images/pokemon/icons/363s.png rename to public/images/pokemon/icons/3/363s.png diff --git a/public/images/pokemon/icons/364.png b/public/images/pokemon/icons/3/364.png similarity index 100% rename from public/images/pokemon/icons/364.png rename to public/images/pokemon/icons/3/364.png diff --git a/public/images/pokemon/icons/364s.png b/public/images/pokemon/icons/3/364s.png similarity index 100% rename from public/images/pokemon/icons/364s.png rename to public/images/pokemon/icons/3/364s.png diff --git a/public/images/pokemon/icons/365.png b/public/images/pokemon/icons/3/365.png similarity index 100% rename from public/images/pokemon/icons/365.png rename to public/images/pokemon/icons/3/365.png diff --git a/public/images/pokemon/icons/365s.png b/public/images/pokemon/icons/3/365s.png similarity index 100% rename from public/images/pokemon/icons/365s.png rename to public/images/pokemon/icons/3/365s.png diff --git a/public/images/pokemon/icons/366.png b/public/images/pokemon/icons/3/366.png similarity index 100% rename from public/images/pokemon/icons/366.png rename to public/images/pokemon/icons/3/366.png diff --git a/public/images/pokemon/icons/366s.png b/public/images/pokemon/icons/3/366s.png similarity index 100% rename from public/images/pokemon/icons/366s.png rename to public/images/pokemon/icons/3/366s.png diff --git a/public/images/pokemon/icons/367.png b/public/images/pokemon/icons/3/367.png similarity index 100% rename from public/images/pokemon/icons/367.png rename to public/images/pokemon/icons/3/367.png diff --git a/public/images/pokemon/icons/367s.png b/public/images/pokemon/icons/3/367s.png similarity index 100% rename from public/images/pokemon/icons/367s.png rename to public/images/pokemon/icons/3/367s.png diff --git a/public/images/pokemon/icons/368.png b/public/images/pokemon/icons/3/368.png similarity index 100% rename from public/images/pokemon/icons/368.png rename to public/images/pokemon/icons/3/368.png diff --git a/public/images/pokemon/icons/368s.png b/public/images/pokemon/icons/3/368s.png similarity index 100% rename from public/images/pokemon/icons/368s.png rename to public/images/pokemon/icons/3/368s.png diff --git a/public/images/pokemon/icons/369.png b/public/images/pokemon/icons/3/369.png similarity index 100% rename from public/images/pokemon/icons/369.png rename to public/images/pokemon/icons/3/369.png diff --git a/public/images/pokemon/icons/369s.png b/public/images/pokemon/icons/3/369s.png similarity index 100% rename from public/images/pokemon/icons/369s.png rename to public/images/pokemon/icons/3/369s.png diff --git a/public/images/pokemon/icons/370.png b/public/images/pokemon/icons/3/370.png similarity index 100% rename from public/images/pokemon/icons/370.png rename to public/images/pokemon/icons/3/370.png diff --git a/public/images/pokemon/icons/370s.png b/public/images/pokemon/icons/3/370s.png similarity index 100% rename from public/images/pokemon/icons/370s.png rename to public/images/pokemon/icons/3/370s.png diff --git a/public/images/pokemon/icons/371.png b/public/images/pokemon/icons/3/371.png similarity index 100% rename from public/images/pokemon/icons/371.png rename to public/images/pokemon/icons/3/371.png diff --git a/public/images/pokemon/icons/371s.png b/public/images/pokemon/icons/3/371s.png similarity index 100% rename from public/images/pokemon/icons/371s.png rename to public/images/pokemon/icons/3/371s.png diff --git a/public/images/pokemon/icons/372.png b/public/images/pokemon/icons/3/372.png similarity index 100% rename from public/images/pokemon/icons/372.png rename to public/images/pokemon/icons/3/372.png diff --git a/public/images/pokemon/icons/372s.png b/public/images/pokemon/icons/3/372s.png similarity index 100% rename from public/images/pokemon/icons/372s.png rename to public/images/pokemon/icons/3/372s.png diff --git a/public/images/pokemon/icons/373-mega.png b/public/images/pokemon/icons/3/373-mega.png similarity index 100% rename from public/images/pokemon/icons/373-mega.png rename to public/images/pokemon/icons/3/373-mega.png diff --git a/public/images/pokemon/icons/373.png b/public/images/pokemon/icons/3/373.png similarity index 100% rename from public/images/pokemon/icons/373.png rename to public/images/pokemon/icons/3/373.png diff --git a/public/images/pokemon/icons/373s-mega.png b/public/images/pokemon/icons/3/373s-mega.png similarity index 100% rename from public/images/pokemon/icons/373s-mega.png rename to public/images/pokemon/icons/3/373s-mega.png diff --git a/public/images/pokemon/icons/373s.png b/public/images/pokemon/icons/3/373s.png similarity index 100% rename from public/images/pokemon/icons/373s.png rename to public/images/pokemon/icons/3/373s.png diff --git a/public/images/pokemon/icons/374.png b/public/images/pokemon/icons/3/374.png similarity index 100% rename from public/images/pokemon/icons/374.png rename to public/images/pokemon/icons/3/374.png diff --git a/public/images/pokemon/icons/374s.png b/public/images/pokemon/icons/3/374s.png similarity index 100% rename from public/images/pokemon/icons/374s.png rename to public/images/pokemon/icons/3/374s.png diff --git a/public/images/pokemon/icons/375.png b/public/images/pokemon/icons/3/375.png similarity index 100% rename from public/images/pokemon/icons/375.png rename to public/images/pokemon/icons/3/375.png diff --git a/public/images/pokemon/icons/375s.png b/public/images/pokemon/icons/3/375s.png similarity index 100% rename from public/images/pokemon/icons/375s.png rename to public/images/pokemon/icons/3/375s.png diff --git a/public/images/pokemon/icons/376-mega.png b/public/images/pokemon/icons/3/376-mega.png similarity index 100% rename from public/images/pokemon/icons/376-mega.png rename to public/images/pokemon/icons/3/376-mega.png diff --git a/public/images/pokemon/icons/376.png b/public/images/pokemon/icons/3/376.png similarity index 100% rename from public/images/pokemon/icons/376.png rename to public/images/pokemon/icons/3/376.png diff --git a/public/images/pokemon/icons/376s-mega.png b/public/images/pokemon/icons/3/376s-mega.png similarity index 100% rename from public/images/pokemon/icons/376s-mega.png rename to public/images/pokemon/icons/3/376s-mega.png diff --git a/public/images/pokemon/icons/376s.png b/public/images/pokemon/icons/3/376s.png similarity index 100% rename from public/images/pokemon/icons/376s.png rename to public/images/pokemon/icons/3/376s.png diff --git a/public/images/pokemon/icons/377.png b/public/images/pokemon/icons/3/377.png similarity index 100% rename from public/images/pokemon/icons/377.png rename to public/images/pokemon/icons/3/377.png diff --git a/public/images/pokemon/icons/377s.png b/public/images/pokemon/icons/3/377s.png similarity index 100% rename from public/images/pokemon/icons/377s.png rename to public/images/pokemon/icons/3/377s.png diff --git a/public/images/pokemon/icons/378.png b/public/images/pokemon/icons/3/378.png similarity index 100% rename from public/images/pokemon/icons/378.png rename to public/images/pokemon/icons/3/378.png diff --git a/public/images/pokemon/icons/378s.png b/public/images/pokemon/icons/3/378s.png similarity index 100% rename from public/images/pokemon/icons/378s.png rename to public/images/pokemon/icons/3/378s.png diff --git a/public/images/pokemon/icons/379.png b/public/images/pokemon/icons/3/379.png similarity index 100% rename from public/images/pokemon/icons/379.png rename to public/images/pokemon/icons/3/379.png diff --git a/public/images/pokemon/icons/379s.png b/public/images/pokemon/icons/3/379s.png similarity index 100% rename from public/images/pokemon/icons/379s.png rename to public/images/pokemon/icons/3/379s.png diff --git a/public/images/pokemon/icons/380-mega.png b/public/images/pokemon/icons/3/380-mega.png similarity index 100% rename from public/images/pokemon/icons/380-mega.png rename to public/images/pokemon/icons/3/380-mega.png diff --git a/public/images/pokemon/icons/380.png b/public/images/pokemon/icons/3/380.png similarity index 100% rename from public/images/pokemon/icons/380.png rename to public/images/pokemon/icons/3/380.png diff --git a/public/images/pokemon/icons/380s-mega.png b/public/images/pokemon/icons/3/380s-mega.png similarity index 100% rename from public/images/pokemon/icons/380s-mega.png rename to public/images/pokemon/icons/3/380s-mega.png diff --git a/public/images/pokemon/icons/380s.png b/public/images/pokemon/icons/3/380s.png similarity index 100% rename from public/images/pokemon/icons/380s.png rename to public/images/pokemon/icons/3/380s.png diff --git a/public/images/pokemon/icons/381-mega.png b/public/images/pokemon/icons/3/381-mega.png similarity index 100% rename from public/images/pokemon/icons/381-mega.png rename to public/images/pokemon/icons/3/381-mega.png diff --git a/public/images/pokemon/icons/381.png b/public/images/pokemon/icons/3/381.png similarity index 100% rename from public/images/pokemon/icons/381.png rename to public/images/pokemon/icons/3/381.png diff --git a/public/images/pokemon/icons/381s-mega.png b/public/images/pokemon/icons/3/381s-mega.png similarity index 100% rename from public/images/pokemon/icons/381s-mega.png rename to public/images/pokemon/icons/3/381s-mega.png diff --git a/public/images/pokemon/icons/381s.png b/public/images/pokemon/icons/3/381s.png similarity index 100% rename from public/images/pokemon/icons/381s.png rename to public/images/pokemon/icons/3/381s.png diff --git a/public/images/pokemon/icons/382-primal.png b/public/images/pokemon/icons/3/382-primal.png similarity index 100% rename from public/images/pokemon/icons/382-primal.png rename to public/images/pokemon/icons/3/382-primal.png diff --git a/public/images/pokemon/icons/382.png b/public/images/pokemon/icons/3/382.png similarity index 100% rename from public/images/pokemon/icons/382.png rename to public/images/pokemon/icons/3/382.png diff --git a/public/images/pokemon/icons/382s-primal.png b/public/images/pokemon/icons/3/382s-primal.png similarity index 100% rename from public/images/pokemon/icons/382s-primal.png rename to public/images/pokemon/icons/3/382s-primal.png diff --git a/public/images/pokemon/icons/382s.png b/public/images/pokemon/icons/3/382s.png similarity index 100% rename from public/images/pokemon/icons/382s.png rename to public/images/pokemon/icons/3/382s.png diff --git a/public/images/pokemon/icons/383-primal.png b/public/images/pokemon/icons/3/383-primal.png similarity index 100% rename from public/images/pokemon/icons/383-primal.png rename to public/images/pokemon/icons/3/383-primal.png diff --git a/public/images/pokemon/icons/383.png b/public/images/pokemon/icons/3/383.png similarity index 100% rename from public/images/pokemon/icons/383.png rename to public/images/pokemon/icons/3/383.png diff --git a/public/images/pokemon/icons/383s-primal.png b/public/images/pokemon/icons/3/383s-primal.png similarity index 100% rename from public/images/pokemon/icons/383s-primal.png rename to public/images/pokemon/icons/3/383s-primal.png diff --git a/public/images/pokemon/icons/383s.png b/public/images/pokemon/icons/3/383s.png similarity index 100% rename from public/images/pokemon/icons/383s.png rename to public/images/pokemon/icons/3/383s.png diff --git a/public/images/pokemon/icons/384-mega.png b/public/images/pokemon/icons/3/384-mega.png similarity index 100% rename from public/images/pokemon/icons/384-mega.png rename to public/images/pokemon/icons/3/384-mega.png diff --git a/public/images/pokemon/icons/384.png b/public/images/pokemon/icons/3/384.png similarity index 100% rename from public/images/pokemon/icons/384.png rename to public/images/pokemon/icons/3/384.png diff --git a/public/images/pokemon/icons/384s-mega.png b/public/images/pokemon/icons/3/384s-mega.png similarity index 100% rename from public/images/pokemon/icons/384s-mega.png rename to public/images/pokemon/icons/3/384s-mega.png diff --git a/public/images/pokemon/icons/384s.png b/public/images/pokemon/icons/3/384s.png similarity index 100% rename from public/images/pokemon/icons/384s.png rename to public/images/pokemon/icons/3/384s.png diff --git a/public/images/pokemon/icons/385.png b/public/images/pokemon/icons/3/385.png similarity index 100% rename from public/images/pokemon/icons/385.png rename to public/images/pokemon/icons/3/385.png diff --git a/public/images/pokemon/icons/385s.png b/public/images/pokemon/icons/3/385s.png similarity index 100% rename from public/images/pokemon/icons/385s.png rename to public/images/pokemon/icons/3/385s.png diff --git a/public/images/pokemon/icons/386-attack.png b/public/images/pokemon/icons/3/386-attack.png similarity index 100% rename from public/images/pokemon/icons/386-attack.png rename to public/images/pokemon/icons/3/386-attack.png diff --git a/public/images/pokemon/icons/386-defense.png b/public/images/pokemon/icons/3/386-defense.png similarity index 100% rename from public/images/pokemon/icons/386-defense.png rename to public/images/pokemon/icons/3/386-defense.png diff --git a/public/images/pokemon/icons/386-speed.png b/public/images/pokemon/icons/3/386-speed.png similarity index 100% rename from public/images/pokemon/icons/386-speed.png rename to public/images/pokemon/icons/3/386-speed.png diff --git a/public/images/pokemon/icons/386.png b/public/images/pokemon/icons/3/386.png similarity index 100% rename from public/images/pokemon/icons/386.png rename to public/images/pokemon/icons/3/386.png diff --git a/public/images/pokemon/icons/386s-attack.png b/public/images/pokemon/icons/3/386s-attack.png similarity index 100% rename from public/images/pokemon/icons/386s-attack.png rename to public/images/pokemon/icons/3/386s-attack.png diff --git a/public/images/pokemon/icons/386s-defense.png b/public/images/pokemon/icons/3/386s-defense.png similarity index 100% rename from public/images/pokemon/icons/386s-defense.png rename to public/images/pokemon/icons/3/386s-defense.png diff --git a/public/images/pokemon/icons/386s-speed.png b/public/images/pokemon/icons/3/386s-speed.png similarity index 100% rename from public/images/pokemon/icons/386s-speed.png rename to public/images/pokemon/icons/3/386s-speed.png diff --git a/public/images/pokemon/icons/386s.png b/public/images/pokemon/icons/3/386s.png similarity index 100% rename from public/images/pokemon/icons/386s.png rename to public/images/pokemon/icons/3/386s.png diff --git a/public/images/pokemon/icons/3/icons.bat b/public/images/pokemon/icons/3/icons.bat new file mode 100644 index 000000000..dacb13bba --- /dev/null +++ b/public/images/pokemon/icons/3/icons.bat @@ -0,0 +1 @@ +cmd /c TexturePacker ./ ../configuration.tps --sheet ../../../pokemon_icons_3.png --data ../../../pokemon_icons_3.json --replace .png= \ No newline at end of file diff --git a/public/images/pokemon/icons/387.png b/public/images/pokemon/icons/4/387.png similarity index 100% rename from public/images/pokemon/icons/387.png rename to public/images/pokemon/icons/4/387.png diff --git a/public/images/pokemon/icons/387s.png b/public/images/pokemon/icons/4/387s.png similarity index 100% rename from public/images/pokemon/icons/387s.png rename to public/images/pokemon/icons/4/387s.png diff --git a/public/images/pokemon/icons/388.png b/public/images/pokemon/icons/4/388.png similarity index 100% rename from public/images/pokemon/icons/388.png rename to public/images/pokemon/icons/4/388.png diff --git a/public/images/pokemon/icons/388s.png b/public/images/pokemon/icons/4/388s.png similarity index 100% rename from public/images/pokemon/icons/388s.png rename to public/images/pokemon/icons/4/388s.png diff --git a/public/images/pokemon/icons/389.png b/public/images/pokemon/icons/4/389.png similarity index 100% rename from public/images/pokemon/icons/389.png rename to public/images/pokemon/icons/4/389.png diff --git a/public/images/pokemon/icons/389s.png b/public/images/pokemon/icons/4/389s.png similarity index 100% rename from public/images/pokemon/icons/389s.png rename to public/images/pokemon/icons/4/389s.png diff --git a/public/images/pokemon/icons/390.png b/public/images/pokemon/icons/4/390.png similarity index 100% rename from public/images/pokemon/icons/390.png rename to public/images/pokemon/icons/4/390.png diff --git a/public/images/pokemon/icons/390s.png b/public/images/pokemon/icons/4/390s.png similarity index 100% rename from public/images/pokemon/icons/390s.png rename to public/images/pokemon/icons/4/390s.png diff --git a/public/images/pokemon/icons/391.png b/public/images/pokemon/icons/4/391.png similarity index 100% rename from public/images/pokemon/icons/391.png rename to public/images/pokemon/icons/4/391.png diff --git a/public/images/pokemon/icons/391s.png b/public/images/pokemon/icons/4/391s.png similarity index 100% rename from public/images/pokemon/icons/391s.png rename to public/images/pokemon/icons/4/391s.png diff --git a/public/images/pokemon/icons/392.png b/public/images/pokemon/icons/4/392.png similarity index 100% rename from public/images/pokemon/icons/392.png rename to public/images/pokemon/icons/4/392.png diff --git a/public/images/pokemon/icons/392s.png b/public/images/pokemon/icons/4/392s.png similarity index 100% rename from public/images/pokemon/icons/392s.png rename to public/images/pokemon/icons/4/392s.png diff --git a/public/images/pokemon/icons/393.png b/public/images/pokemon/icons/4/393.png similarity index 100% rename from public/images/pokemon/icons/393.png rename to public/images/pokemon/icons/4/393.png diff --git a/public/images/pokemon/icons/393s.png b/public/images/pokemon/icons/4/393s.png similarity index 100% rename from public/images/pokemon/icons/393s.png rename to public/images/pokemon/icons/4/393s.png diff --git a/public/images/pokemon/icons/394.png b/public/images/pokemon/icons/4/394.png similarity index 100% rename from public/images/pokemon/icons/394.png rename to public/images/pokemon/icons/4/394.png diff --git a/public/images/pokemon/icons/394s.png b/public/images/pokemon/icons/4/394s.png similarity index 100% rename from public/images/pokemon/icons/394s.png rename to public/images/pokemon/icons/4/394s.png diff --git a/public/images/pokemon/icons/395.png b/public/images/pokemon/icons/4/395.png similarity index 100% rename from public/images/pokemon/icons/395.png rename to public/images/pokemon/icons/4/395.png diff --git a/public/images/pokemon/icons/395s.png b/public/images/pokemon/icons/4/395s.png similarity index 100% rename from public/images/pokemon/icons/395s.png rename to public/images/pokemon/icons/4/395s.png diff --git a/public/images/pokemon/icons/396.png b/public/images/pokemon/icons/4/396.png similarity index 100% rename from public/images/pokemon/icons/396.png rename to public/images/pokemon/icons/4/396.png diff --git a/public/images/pokemon/icons/396s.png b/public/images/pokemon/icons/4/396s.png similarity index 100% rename from public/images/pokemon/icons/396s.png rename to public/images/pokemon/icons/4/396s.png diff --git a/public/images/pokemon/icons/397.png b/public/images/pokemon/icons/4/397.png similarity index 100% rename from public/images/pokemon/icons/397.png rename to public/images/pokemon/icons/4/397.png diff --git a/public/images/pokemon/icons/397s.png b/public/images/pokemon/icons/4/397s.png similarity index 100% rename from public/images/pokemon/icons/397s.png rename to public/images/pokemon/icons/4/397s.png diff --git a/public/images/pokemon/icons/398.png b/public/images/pokemon/icons/4/398.png similarity index 100% rename from public/images/pokemon/icons/398.png rename to public/images/pokemon/icons/4/398.png diff --git a/public/images/pokemon/icons/398s.png b/public/images/pokemon/icons/4/398s.png similarity index 100% rename from public/images/pokemon/icons/398s.png rename to public/images/pokemon/icons/4/398s.png diff --git a/public/images/pokemon/icons/399.png b/public/images/pokemon/icons/4/399.png similarity index 100% rename from public/images/pokemon/icons/399.png rename to public/images/pokemon/icons/4/399.png diff --git a/public/images/pokemon/icons/399s.png b/public/images/pokemon/icons/4/399s.png similarity index 100% rename from public/images/pokemon/icons/399s.png rename to public/images/pokemon/icons/4/399s.png diff --git a/public/images/pokemon/icons/400.png b/public/images/pokemon/icons/4/400.png similarity index 100% rename from public/images/pokemon/icons/400.png rename to public/images/pokemon/icons/4/400.png diff --git a/public/images/pokemon/icons/400s.png b/public/images/pokemon/icons/4/400s.png similarity index 100% rename from public/images/pokemon/icons/400s.png rename to public/images/pokemon/icons/4/400s.png diff --git a/public/images/pokemon/icons/401.png b/public/images/pokemon/icons/4/401.png similarity index 100% rename from public/images/pokemon/icons/401.png rename to public/images/pokemon/icons/4/401.png diff --git a/public/images/pokemon/icons/401s.png b/public/images/pokemon/icons/4/401s.png similarity index 100% rename from public/images/pokemon/icons/401s.png rename to public/images/pokemon/icons/4/401s.png diff --git a/public/images/pokemon/icons/402.png b/public/images/pokemon/icons/4/402.png similarity index 100% rename from public/images/pokemon/icons/402.png rename to public/images/pokemon/icons/4/402.png diff --git a/public/images/pokemon/icons/402s.png b/public/images/pokemon/icons/4/402s.png similarity index 100% rename from public/images/pokemon/icons/402s.png rename to public/images/pokemon/icons/4/402s.png diff --git a/public/images/pokemon/icons/403.png b/public/images/pokemon/icons/4/403.png similarity index 100% rename from public/images/pokemon/icons/403.png rename to public/images/pokemon/icons/4/403.png diff --git a/public/images/pokemon/icons/403s.png b/public/images/pokemon/icons/4/403s.png similarity index 100% rename from public/images/pokemon/icons/403s.png rename to public/images/pokemon/icons/4/403s.png diff --git a/public/images/pokemon/icons/404.png b/public/images/pokemon/icons/4/404.png similarity index 100% rename from public/images/pokemon/icons/404.png rename to public/images/pokemon/icons/4/404.png diff --git a/public/images/pokemon/icons/404s.png b/public/images/pokemon/icons/4/404s.png similarity index 100% rename from public/images/pokemon/icons/404s.png rename to public/images/pokemon/icons/4/404s.png diff --git a/public/images/pokemon/icons/405.png b/public/images/pokemon/icons/4/405.png similarity index 100% rename from public/images/pokemon/icons/405.png rename to public/images/pokemon/icons/4/405.png diff --git a/public/images/pokemon/icons/405s.png b/public/images/pokemon/icons/4/405s.png similarity index 100% rename from public/images/pokemon/icons/405s.png rename to public/images/pokemon/icons/4/405s.png diff --git a/public/images/pokemon/icons/406.png b/public/images/pokemon/icons/4/406.png similarity index 100% rename from public/images/pokemon/icons/406.png rename to public/images/pokemon/icons/4/406.png diff --git a/public/images/pokemon/icons/406s.png b/public/images/pokemon/icons/4/406s.png similarity index 100% rename from public/images/pokemon/icons/406s.png rename to public/images/pokemon/icons/4/406s.png diff --git a/public/images/pokemon/icons/407.png b/public/images/pokemon/icons/4/407.png similarity index 100% rename from public/images/pokemon/icons/407.png rename to public/images/pokemon/icons/4/407.png diff --git a/public/images/pokemon/icons/407s.png b/public/images/pokemon/icons/4/407s.png similarity index 100% rename from public/images/pokemon/icons/407s.png rename to public/images/pokemon/icons/4/407s.png diff --git a/public/images/pokemon/icons/408.png b/public/images/pokemon/icons/4/408.png similarity index 100% rename from public/images/pokemon/icons/408.png rename to public/images/pokemon/icons/4/408.png diff --git a/public/images/pokemon/icons/408s.png b/public/images/pokemon/icons/4/408s.png similarity index 100% rename from public/images/pokemon/icons/408s.png rename to public/images/pokemon/icons/4/408s.png diff --git a/public/images/pokemon/icons/409.png b/public/images/pokemon/icons/4/409.png similarity index 100% rename from public/images/pokemon/icons/409.png rename to public/images/pokemon/icons/4/409.png diff --git a/public/images/pokemon/icons/409s.png b/public/images/pokemon/icons/4/409s.png similarity index 100% rename from public/images/pokemon/icons/409s.png rename to public/images/pokemon/icons/4/409s.png diff --git a/public/images/pokemon/icons/410.png b/public/images/pokemon/icons/4/410.png similarity index 100% rename from public/images/pokemon/icons/410.png rename to public/images/pokemon/icons/4/410.png diff --git a/public/images/pokemon/icons/410s.png b/public/images/pokemon/icons/4/410s.png similarity index 100% rename from public/images/pokemon/icons/410s.png rename to public/images/pokemon/icons/4/410s.png diff --git a/public/images/pokemon/icons/411.png b/public/images/pokemon/icons/4/411.png similarity index 100% rename from public/images/pokemon/icons/411.png rename to public/images/pokemon/icons/4/411.png diff --git a/public/images/pokemon/icons/411s.png b/public/images/pokemon/icons/4/411s.png similarity index 100% rename from public/images/pokemon/icons/411s.png rename to public/images/pokemon/icons/4/411s.png diff --git a/public/images/pokemon/icons/412-plant.png b/public/images/pokemon/icons/4/412-plant.png similarity index 100% rename from public/images/pokemon/icons/412-plant.png rename to public/images/pokemon/icons/4/412-plant.png diff --git a/public/images/pokemon/icons/412-sandy.png b/public/images/pokemon/icons/4/412-sandy.png similarity index 100% rename from public/images/pokemon/icons/412-sandy.png rename to public/images/pokemon/icons/4/412-sandy.png diff --git a/public/images/pokemon/icons/412-trash.png b/public/images/pokemon/icons/4/412-trash.png similarity index 100% rename from public/images/pokemon/icons/412-trash.png rename to public/images/pokemon/icons/4/412-trash.png diff --git a/public/images/pokemon/icons/412s-plant.png b/public/images/pokemon/icons/4/412s-plant.png similarity index 100% rename from public/images/pokemon/icons/412s-plant.png rename to public/images/pokemon/icons/4/412s-plant.png diff --git a/public/images/pokemon/icons/412s-sandy.png b/public/images/pokemon/icons/4/412s-sandy.png similarity index 100% rename from public/images/pokemon/icons/412s-sandy.png rename to public/images/pokemon/icons/4/412s-sandy.png diff --git a/public/images/pokemon/icons/412s-trash.png b/public/images/pokemon/icons/4/412s-trash.png similarity index 100% rename from public/images/pokemon/icons/412s-trash.png rename to public/images/pokemon/icons/4/412s-trash.png diff --git a/public/images/pokemon/icons/413-plant.png b/public/images/pokemon/icons/4/413-plant.png similarity index 100% rename from public/images/pokemon/icons/413-plant.png rename to public/images/pokemon/icons/4/413-plant.png diff --git a/public/images/pokemon/icons/413-sandy.png b/public/images/pokemon/icons/4/413-sandy.png similarity index 100% rename from public/images/pokemon/icons/413-sandy.png rename to public/images/pokemon/icons/4/413-sandy.png diff --git a/public/images/pokemon/icons/413-trash.png b/public/images/pokemon/icons/4/413-trash.png similarity index 100% rename from public/images/pokemon/icons/413-trash.png rename to public/images/pokemon/icons/4/413-trash.png diff --git a/public/images/pokemon/icons/413s-plant.png b/public/images/pokemon/icons/4/413s-plant.png similarity index 100% rename from public/images/pokemon/icons/413s-plant.png rename to public/images/pokemon/icons/4/413s-plant.png diff --git a/public/images/pokemon/icons/413s-sandy.png b/public/images/pokemon/icons/4/413s-sandy.png similarity index 100% rename from public/images/pokemon/icons/413s-sandy.png rename to public/images/pokemon/icons/4/413s-sandy.png diff --git a/public/images/pokemon/icons/413s-trash.png b/public/images/pokemon/icons/4/413s-trash.png similarity index 100% rename from public/images/pokemon/icons/413s-trash.png rename to public/images/pokemon/icons/4/413s-trash.png diff --git a/public/images/pokemon/icons/414.png b/public/images/pokemon/icons/4/414.png similarity index 100% rename from public/images/pokemon/icons/414.png rename to public/images/pokemon/icons/4/414.png diff --git a/public/images/pokemon/icons/414s.png b/public/images/pokemon/icons/4/414s.png similarity index 100% rename from public/images/pokemon/icons/414s.png rename to public/images/pokemon/icons/4/414s.png diff --git a/public/images/pokemon/icons/415.png b/public/images/pokemon/icons/4/415.png similarity index 100% rename from public/images/pokemon/icons/415.png rename to public/images/pokemon/icons/4/415.png diff --git a/public/images/pokemon/icons/415s.png b/public/images/pokemon/icons/4/415s.png similarity index 100% rename from public/images/pokemon/icons/415s.png rename to public/images/pokemon/icons/4/415s.png diff --git a/public/images/pokemon/icons/416.png b/public/images/pokemon/icons/4/416.png similarity index 100% rename from public/images/pokemon/icons/416.png rename to public/images/pokemon/icons/4/416.png diff --git a/public/images/pokemon/icons/416s.png b/public/images/pokemon/icons/4/416s.png similarity index 100% rename from public/images/pokemon/icons/416s.png rename to public/images/pokemon/icons/4/416s.png diff --git a/public/images/pokemon/icons/417.png b/public/images/pokemon/icons/4/417.png similarity index 100% rename from public/images/pokemon/icons/417.png rename to public/images/pokemon/icons/4/417.png diff --git a/public/images/pokemon/icons/417s.png b/public/images/pokemon/icons/4/417s.png similarity index 100% rename from public/images/pokemon/icons/417s.png rename to public/images/pokemon/icons/4/417s.png diff --git a/public/images/pokemon/icons/418.png b/public/images/pokemon/icons/4/418.png similarity index 100% rename from public/images/pokemon/icons/418.png rename to public/images/pokemon/icons/4/418.png diff --git a/public/images/pokemon/icons/418s.png b/public/images/pokemon/icons/4/418s.png similarity index 100% rename from public/images/pokemon/icons/418s.png rename to public/images/pokemon/icons/4/418s.png diff --git a/public/images/pokemon/icons/419.png b/public/images/pokemon/icons/4/419.png similarity index 100% rename from public/images/pokemon/icons/419.png rename to public/images/pokemon/icons/4/419.png diff --git a/public/images/pokemon/icons/419s.png b/public/images/pokemon/icons/4/419s.png similarity index 100% rename from public/images/pokemon/icons/419s.png rename to public/images/pokemon/icons/4/419s.png diff --git a/public/images/pokemon/icons/420.png b/public/images/pokemon/icons/4/420.png similarity index 100% rename from public/images/pokemon/icons/420.png rename to public/images/pokemon/icons/4/420.png diff --git a/public/images/pokemon/icons/420s.png b/public/images/pokemon/icons/4/420s.png similarity index 100% rename from public/images/pokemon/icons/420s.png rename to public/images/pokemon/icons/4/420s.png diff --git a/public/images/pokemon/icons/421-overcast.png b/public/images/pokemon/icons/4/421-overcast.png similarity index 100% rename from public/images/pokemon/icons/421-overcast.png rename to public/images/pokemon/icons/4/421-overcast.png diff --git a/public/images/pokemon/icons/421-sunshine.png b/public/images/pokemon/icons/4/421-sunshine.png similarity index 100% rename from public/images/pokemon/icons/421-sunshine.png rename to public/images/pokemon/icons/4/421-sunshine.png diff --git a/public/images/pokemon/icons/421s-overcast.png b/public/images/pokemon/icons/4/421s-overcast.png similarity index 100% rename from public/images/pokemon/icons/421s-overcast.png rename to public/images/pokemon/icons/4/421s-overcast.png diff --git a/public/images/pokemon/icons/421s-sunshine.png b/public/images/pokemon/icons/4/421s-sunshine.png similarity index 100% rename from public/images/pokemon/icons/421s-sunshine.png rename to public/images/pokemon/icons/4/421s-sunshine.png diff --git a/public/images/pokemon/icons/422-east.png b/public/images/pokemon/icons/4/422-east.png similarity index 100% rename from public/images/pokemon/icons/422-east.png rename to public/images/pokemon/icons/4/422-east.png diff --git a/public/images/pokemon/icons/422-west.png b/public/images/pokemon/icons/4/422-west.png similarity index 100% rename from public/images/pokemon/icons/422-west.png rename to public/images/pokemon/icons/4/422-west.png diff --git a/public/images/pokemon/icons/422s-east.png b/public/images/pokemon/icons/4/422s-east.png similarity index 100% rename from public/images/pokemon/icons/422s-east.png rename to public/images/pokemon/icons/4/422s-east.png diff --git a/public/images/pokemon/icons/422s-west.png b/public/images/pokemon/icons/4/422s-west.png similarity index 100% rename from public/images/pokemon/icons/422s-west.png rename to public/images/pokemon/icons/4/422s-west.png diff --git a/public/images/pokemon/icons/423-east.png b/public/images/pokemon/icons/4/423-east.png similarity index 100% rename from public/images/pokemon/icons/423-east.png rename to public/images/pokemon/icons/4/423-east.png diff --git a/public/images/pokemon/icons/423-west.png b/public/images/pokemon/icons/4/423-west.png similarity index 100% rename from public/images/pokemon/icons/423-west.png rename to public/images/pokemon/icons/4/423-west.png diff --git a/public/images/pokemon/icons/423s-east.png b/public/images/pokemon/icons/4/423s-east.png similarity index 100% rename from public/images/pokemon/icons/423s-east.png rename to public/images/pokemon/icons/4/423s-east.png diff --git a/public/images/pokemon/icons/423s-west.png b/public/images/pokemon/icons/4/423s-west.png similarity index 100% rename from public/images/pokemon/icons/423s-west.png rename to public/images/pokemon/icons/4/423s-west.png diff --git a/public/images/pokemon/icons/424.png b/public/images/pokemon/icons/4/424.png similarity index 100% rename from public/images/pokemon/icons/424.png rename to public/images/pokemon/icons/4/424.png diff --git a/public/images/pokemon/icons/424s.png b/public/images/pokemon/icons/4/424s.png similarity index 100% rename from public/images/pokemon/icons/424s.png rename to public/images/pokemon/icons/4/424s.png diff --git a/public/images/pokemon/icons/425.png b/public/images/pokemon/icons/4/425.png similarity index 100% rename from public/images/pokemon/icons/425.png rename to public/images/pokemon/icons/4/425.png diff --git a/public/images/pokemon/icons/425s.png b/public/images/pokemon/icons/4/425s.png similarity index 100% rename from public/images/pokemon/icons/425s.png rename to public/images/pokemon/icons/4/425s.png diff --git a/public/images/pokemon/icons/426.png b/public/images/pokemon/icons/4/426.png similarity index 100% rename from public/images/pokemon/icons/426.png rename to public/images/pokemon/icons/4/426.png diff --git a/public/images/pokemon/icons/426s.png b/public/images/pokemon/icons/4/426s.png similarity index 100% rename from public/images/pokemon/icons/426s.png rename to public/images/pokemon/icons/4/426s.png diff --git a/public/images/pokemon/icons/427.png b/public/images/pokemon/icons/4/427.png similarity index 100% rename from public/images/pokemon/icons/427.png rename to public/images/pokemon/icons/4/427.png diff --git a/public/images/pokemon/icons/427s.png b/public/images/pokemon/icons/4/427s.png similarity index 100% rename from public/images/pokemon/icons/427s.png rename to public/images/pokemon/icons/4/427s.png diff --git a/public/images/pokemon/icons/428-mega.png b/public/images/pokemon/icons/4/428-mega.png similarity index 100% rename from public/images/pokemon/icons/428-mega.png rename to public/images/pokemon/icons/4/428-mega.png diff --git a/public/images/pokemon/icons/428.png b/public/images/pokemon/icons/4/428.png similarity index 100% rename from public/images/pokemon/icons/428.png rename to public/images/pokemon/icons/4/428.png diff --git a/public/images/pokemon/icons/428s-mega.png b/public/images/pokemon/icons/4/428s-mega.png similarity index 100% rename from public/images/pokemon/icons/428s-mega.png rename to public/images/pokemon/icons/4/428s-mega.png diff --git a/public/images/pokemon/icons/428s.png b/public/images/pokemon/icons/4/428s.png similarity index 100% rename from public/images/pokemon/icons/428s.png rename to public/images/pokemon/icons/4/428s.png diff --git a/public/images/pokemon/icons/429.png b/public/images/pokemon/icons/4/429.png similarity index 100% rename from public/images/pokemon/icons/429.png rename to public/images/pokemon/icons/4/429.png diff --git a/public/images/pokemon/icons/429s.png b/public/images/pokemon/icons/4/429s.png similarity index 100% rename from public/images/pokemon/icons/429s.png rename to public/images/pokemon/icons/4/429s.png diff --git a/public/images/pokemon/icons/430.png b/public/images/pokemon/icons/4/430.png similarity index 100% rename from public/images/pokemon/icons/430.png rename to public/images/pokemon/icons/4/430.png diff --git a/public/images/pokemon/icons/430s.png b/public/images/pokemon/icons/4/430s.png similarity index 100% rename from public/images/pokemon/icons/430s.png rename to public/images/pokemon/icons/4/430s.png diff --git a/public/images/pokemon/icons/431.png b/public/images/pokemon/icons/4/431.png similarity index 100% rename from public/images/pokemon/icons/431.png rename to public/images/pokemon/icons/4/431.png diff --git a/public/images/pokemon/icons/431s.png b/public/images/pokemon/icons/4/431s.png similarity index 100% rename from public/images/pokemon/icons/431s.png rename to public/images/pokemon/icons/4/431s.png diff --git a/public/images/pokemon/icons/432.png b/public/images/pokemon/icons/4/432.png similarity index 100% rename from public/images/pokemon/icons/432.png rename to public/images/pokemon/icons/4/432.png diff --git a/public/images/pokemon/icons/432s.png b/public/images/pokemon/icons/4/432s.png similarity index 100% rename from public/images/pokemon/icons/432s.png rename to public/images/pokemon/icons/4/432s.png diff --git a/public/images/pokemon/icons/433.png b/public/images/pokemon/icons/4/433.png similarity index 100% rename from public/images/pokemon/icons/433.png rename to public/images/pokemon/icons/4/433.png diff --git a/public/images/pokemon/icons/433s.png b/public/images/pokemon/icons/4/433s.png similarity index 100% rename from public/images/pokemon/icons/433s.png rename to public/images/pokemon/icons/4/433s.png diff --git a/public/images/pokemon/icons/434.png b/public/images/pokemon/icons/4/434.png similarity index 100% rename from public/images/pokemon/icons/434.png rename to public/images/pokemon/icons/4/434.png diff --git a/public/images/pokemon/icons/434s.png b/public/images/pokemon/icons/4/434s.png similarity index 100% rename from public/images/pokemon/icons/434s.png rename to public/images/pokemon/icons/4/434s.png diff --git a/public/images/pokemon/icons/435.png b/public/images/pokemon/icons/4/435.png similarity index 100% rename from public/images/pokemon/icons/435.png rename to public/images/pokemon/icons/4/435.png diff --git a/public/images/pokemon/icons/435s.png b/public/images/pokemon/icons/4/435s.png similarity index 100% rename from public/images/pokemon/icons/435s.png rename to public/images/pokemon/icons/4/435s.png diff --git a/public/images/pokemon/icons/436.png b/public/images/pokemon/icons/4/436.png similarity index 100% rename from public/images/pokemon/icons/436.png rename to public/images/pokemon/icons/4/436.png diff --git a/public/images/pokemon/icons/436s.png b/public/images/pokemon/icons/4/436s.png similarity index 100% rename from public/images/pokemon/icons/436s.png rename to public/images/pokemon/icons/4/436s.png diff --git a/public/images/pokemon/icons/437.png b/public/images/pokemon/icons/4/437.png similarity index 100% rename from public/images/pokemon/icons/437.png rename to public/images/pokemon/icons/4/437.png diff --git a/public/images/pokemon/icons/437s.png b/public/images/pokemon/icons/4/437s.png similarity index 100% rename from public/images/pokemon/icons/437s.png rename to public/images/pokemon/icons/4/437s.png diff --git a/public/images/pokemon/icons/438.png b/public/images/pokemon/icons/4/438.png similarity index 100% rename from public/images/pokemon/icons/438.png rename to public/images/pokemon/icons/4/438.png diff --git a/public/images/pokemon/icons/438s.png b/public/images/pokemon/icons/4/438s.png similarity index 100% rename from public/images/pokemon/icons/438s.png rename to public/images/pokemon/icons/4/438s.png diff --git a/public/images/pokemon/icons/439.png b/public/images/pokemon/icons/4/439.png similarity index 100% rename from public/images/pokemon/icons/439.png rename to public/images/pokemon/icons/4/439.png diff --git a/public/images/pokemon/icons/439s.png b/public/images/pokemon/icons/4/439s.png similarity index 100% rename from public/images/pokemon/icons/439s.png rename to public/images/pokemon/icons/4/439s.png diff --git a/public/images/pokemon/icons/440.png b/public/images/pokemon/icons/4/440.png similarity index 100% rename from public/images/pokemon/icons/440.png rename to public/images/pokemon/icons/4/440.png diff --git a/public/images/pokemon/icons/440s.png b/public/images/pokemon/icons/4/440s.png similarity index 100% rename from public/images/pokemon/icons/440s.png rename to public/images/pokemon/icons/4/440s.png diff --git a/public/images/pokemon/icons/441.png b/public/images/pokemon/icons/4/441.png similarity index 100% rename from public/images/pokemon/icons/441.png rename to public/images/pokemon/icons/4/441.png diff --git a/public/images/pokemon/icons/441s.png b/public/images/pokemon/icons/4/441s.png similarity index 100% rename from public/images/pokemon/icons/441s.png rename to public/images/pokemon/icons/4/441s.png diff --git a/public/images/pokemon/icons/442.png b/public/images/pokemon/icons/4/442.png similarity index 100% rename from public/images/pokemon/icons/442.png rename to public/images/pokemon/icons/4/442.png diff --git a/public/images/pokemon/icons/442s.png b/public/images/pokemon/icons/4/442s.png similarity index 100% rename from public/images/pokemon/icons/442s.png rename to public/images/pokemon/icons/4/442s.png diff --git a/public/images/pokemon/icons/443.png b/public/images/pokemon/icons/4/443.png similarity index 100% rename from public/images/pokemon/icons/443.png rename to public/images/pokemon/icons/4/443.png diff --git a/public/images/pokemon/icons/443s.png b/public/images/pokemon/icons/4/443s.png similarity index 100% rename from public/images/pokemon/icons/443s.png rename to public/images/pokemon/icons/4/443s.png diff --git a/public/images/pokemon/icons/444.png b/public/images/pokemon/icons/4/444.png similarity index 100% rename from public/images/pokemon/icons/444.png rename to public/images/pokemon/icons/4/444.png diff --git a/public/images/pokemon/icons/444s.png b/public/images/pokemon/icons/4/444s.png similarity index 100% rename from public/images/pokemon/icons/444s.png rename to public/images/pokemon/icons/4/444s.png diff --git a/public/images/pokemon/icons/445-mega.png b/public/images/pokemon/icons/4/445-mega.png similarity index 100% rename from public/images/pokemon/icons/445-mega.png rename to public/images/pokemon/icons/4/445-mega.png diff --git a/public/images/pokemon/icons/445.png b/public/images/pokemon/icons/4/445.png similarity index 100% rename from public/images/pokemon/icons/445.png rename to public/images/pokemon/icons/4/445.png diff --git a/public/images/pokemon/icons/445s-mega.png b/public/images/pokemon/icons/4/445s-mega.png similarity index 100% rename from public/images/pokemon/icons/445s-mega.png rename to public/images/pokemon/icons/4/445s-mega.png diff --git a/public/images/pokemon/icons/445s.png b/public/images/pokemon/icons/4/445s.png similarity index 100% rename from public/images/pokemon/icons/445s.png rename to public/images/pokemon/icons/4/445s.png diff --git a/public/images/pokemon/icons/446.png b/public/images/pokemon/icons/4/446.png similarity index 100% rename from public/images/pokemon/icons/446.png rename to public/images/pokemon/icons/4/446.png diff --git a/public/images/pokemon/icons/446s.png b/public/images/pokemon/icons/4/446s.png similarity index 100% rename from public/images/pokemon/icons/446s.png rename to public/images/pokemon/icons/4/446s.png diff --git a/public/images/pokemon/icons/447.png b/public/images/pokemon/icons/4/447.png similarity index 100% rename from public/images/pokemon/icons/447.png rename to public/images/pokemon/icons/4/447.png diff --git a/public/images/pokemon/icons/447s.png b/public/images/pokemon/icons/4/447s.png similarity index 100% rename from public/images/pokemon/icons/447s.png rename to public/images/pokemon/icons/4/447s.png diff --git a/public/images/pokemon/icons/448-mega.png b/public/images/pokemon/icons/4/448-mega.png similarity index 100% rename from public/images/pokemon/icons/448-mega.png rename to public/images/pokemon/icons/4/448-mega.png diff --git a/public/images/pokemon/icons/448.png b/public/images/pokemon/icons/4/448.png similarity index 100% rename from public/images/pokemon/icons/448.png rename to public/images/pokemon/icons/4/448.png diff --git a/public/images/pokemon/icons/448s-mega.png b/public/images/pokemon/icons/4/448s-mega.png similarity index 100% rename from public/images/pokemon/icons/448s-mega.png rename to public/images/pokemon/icons/4/448s-mega.png diff --git a/public/images/pokemon/icons/448s.png b/public/images/pokemon/icons/4/448s.png similarity index 100% rename from public/images/pokemon/icons/448s.png rename to public/images/pokemon/icons/4/448s.png diff --git a/public/images/pokemon/icons/449-f.png b/public/images/pokemon/icons/4/449-f.png similarity index 100% rename from public/images/pokemon/icons/449-f.png rename to public/images/pokemon/icons/4/449-f.png diff --git a/public/images/pokemon/icons/449.png b/public/images/pokemon/icons/4/449.png similarity index 100% rename from public/images/pokemon/icons/449.png rename to public/images/pokemon/icons/4/449.png diff --git a/public/images/pokemon/icons/449s-f.png b/public/images/pokemon/icons/4/449s-f.png similarity index 100% rename from public/images/pokemon/icons/449s-f.png rename to public/images/pokemon/icons/4/449s-f.png diff --git a/public/images/pokemon/icons/449s.png b/public/images/pokemon/icons/4/449s.png similarity index 100% rename from public/images/pokemon/icons/449s.png rename to public/images/pokemon/icons/4/449s.png diff --git a/public/images/pokemon/icons/450-f.png b/public/images/pokemon/icons/4/450-f.png similarity index 100% rename from public/images/pokemon/icons/450-f.png rename to public/images/pokemon/icons/4/450-f.png diff --git a/public/images/pokemon/icons/450.png b/public/images/pokemon/icons/4/450.png similarity index 100% rename from public/images/pokemon/icons/450.png rename to public/images/pokemon/icons/4/450.png diff --git a/public/images/pokemon/icons/450s-f.png b/public/images/pokemon/icons/4/450s-f.png similarity index 100% rename from public/images/pokemon/icons/450s-f.png rename to public/images/pokemon/icons/4/450s-f.png diff --git a/public/images/pokemon/icons/450s.png b/public/images/pokemon/icons/4/450s.png similarity index 100% rename from public/images/pokemon/icons/450s.png rename to public/images/pokemon/icons/4/450s.png diff --git a/public/images/pokemon/icons/451.png b/public/images/pokemon/icons/4/451.png similarity index 100% rename from public/images/pokemon/icons/451.png rename to public/images/pokemon/icons/4/451.png diff --git a/public/images/pokemon/icons/451s.png b/public/images/pokemon/icons/4/451s.png similarity index 100% rename from public/images/pokemon/icons/451s.png rename to public/images/pokemon/icons/4/451s.png diff --git a/public/images/pokemon/icons/452.png b/public/images/pokemon/icons/4/452.png similarity index 100% rename from public/images/pokemon/icons/452.png rename to public/images/pokemon/icons/4/452.png diff --git a/public/images/pokemon/icons/452s.png b/public/images/pokemon/icons/4/452s.png similarity index 100% rename from public/images/pokemon/icons/452s.png rename to public/images/pokemon/icons/4/452s.png diff --git a/public/images/pokemon/icons/453.png b/public/images/pokemon/icons/4/453.png similarity index 100% rename from public/images/pokemon/icons/453.png rename to public/images/pokemon/icons/4/453.png diff --git a/public/images/pokemon/icons/453s.png b/public/images/pokemon/icons/4/453s.png similarity index 100% rename from public/images/pokemon/icons/453s.png rename to public/images/pokemon/icons/4/453s.png diff --git a/public/images/pokemon/icons/454.png b/public/images/pokemon/icons/4/454.png similarity index 100% rename from public/images/pokemon/icons/454.png rename to public/images/pokemon/icons/4/454.png diff --git a/public/images/pokemon/icons/454s.png b/public/images/pokemon/icons/4/454s.png similarity index 100% rename from public/images/pokemon/icons/454s.png rename to public/images/pokemon/icons/4/454s.png diff --git a/public/images/pokemon/icons/455.png b/public/images/pokemon/icons/4/455.png similarity index 100% rename from public/images/pokemon/icons/455.png rename to public/images/pokemon/icons/4/455.png diff --git a/public/images/pokemon/icons/455s.png b/public/images/pokemon/icons/4/455s.png similarity index 100% rename from public/images/pokemon/icons/455s.png rename to public/images/pokemon/icons/4/455s.png diff --git a/public/images/pokemon/icons/456.png b/public/images/pokemon/icons/4/456.png similarity index 100% rename from public/images/pokemon/icons/456.png rename to public/images/pokemon/icons/4/456.png diff --git a/public/images/pokemon/icons/456s.png b/public/images/pokemon/icons/4/456s.png similarity index 100% rename from public/images/pokemon/icons/456s.png rename to public/images/pokemon/icons/4/456s.png diff --git a/public/images/pokemon/icons/457.png b/public/images/pokemon/icons/4/457.png similarity index 100% rename from public/images/pokemon/icons/457.png rename to public/images/pokemon/icons/4/457.png diff --git a/public/images/pokemon/icons/457s.png b/public/images/pokemon/icons/4/457s.png similarity index 100% rename from public/images/pokemon/icons/457s.png rename to public/images/pokemon/icons/4/457s.png diff --git a/public/images/pokemon/icons/458.png b/public/images/pokemon/icons/4/458.png similarity index 100% rename from public/images/pokemon/icons/458.png rename to public/images/pokemon/icons/4/458.png diff --git a/public/images/pokemon/icons/458s.png b/public/images/pokemon/icons/4/458s.png similarity index 100% rename from public/images/pokemon/icons/458s.png rename to public/images/pokemon/icons/4/458s.png diff --git a/public/images/pokemon/icons/459.png b/public/images/pokemon/icons/4/459.png similarity index 100% rename from public/images/pokemon/icons/459.png rename to public/images/pokemon/icons/4/459.png diff --git a/public/images/pokemon/icons/459s.png b/public/images/pokemon/icons/4/459s.png similarity index 100% rename from public/images/pokemon/icons/459s.png rename to public/images/pokemon/icons/4/459s.png diff --git a/public/images/pokemon/icons/460-mega.png b/public/images/pokemon/icons/4/460-mega.png similarity index 100% rename from public/images/pokemon/icons/460-mega.png rename to public/images/pokemon/icons/4/460-mega.png diff --git a/public/images/pokemon/icons/460.png b/public/images/pokemon/icons/4/460.png similarity index 100% rename from public/images/pokemon/icons/460.png rename to public/images/pokemon/icons/4/460.png diff --git a/public/images/pokemon/icons/460s-mega.png b/public/images/pokemon/icons/4/460s-mega.png similarity index 100% rename from public/images/pokemon/icons/460s-mega.png rename to public/images/pokemon/icons/4/460s-mega.png diff --git a/public/images/pokemon/icons/460s.png b/public/images/pokemon/icons/4/460s.png similarity index 100% rename from public/images/pokemon/icons/460s.png rename to public/images/pokemon/icons/4/460s.png diff --git a/public/images/pokemon/icons/461.png b/public/images/pokemon/icons/4/461.png similarity index 100% rename from public/images/pokemon/icons/461.png rename to public/images/pokemon/icons/4/461.png diff --git a/public/images/pokemon/icons/461s.png b/public/images/pokemon/icons/4/461s.png similarity index 100% rename from public/images/pokemon/icons/461s.png rename to public/images/pokemon/icons/4/461s.png diff --git a/public/images/pokemon/icons/462.png b/public/images/pokemon/icons/4/462.png similarity index 100% rename from public/images/pokemon/icons/462.png rename to public/images/pokemon/icons/4/462.png diff --git a/public/images/pokemon/icons/462s.png b/public/images/pokemon/icons/4/462s.png similarity index 100% rename from public/images/pokemon/icons/462s.png rename to public/images/pokemon/icons/4/462s.png diff --git a/public/images/pokemon/icons/463.png b/public/images/pokemon/icons/4/463.png similarity index 100% rename from public/images/pokemon/icons/463.png rename to public/images/pokemon/icons/4/463.png diff --git a/public/images/pokemon/icons/463s.png b/public/images/pokemon/icons/4/463s.png similarity index 100% rename from public/images/pokemon/icons/463s.png rename to public/images/pokemon/icons/4/463s.png diff --git a/public/images/pokemon/icons/464.png b/public/images/pokemon/icons/4/464.png similarity index 100% rename from public/images/pokemon/icons/464.png rename to public/images/pokemon/icons/4/464.png diff --git a/public/images/pokemon/icons/464s.png b/public/images/pokemon/icons/4/464s.png similarity index 100% rename from public/images/pokemon/icons/464s.png rename to public/images/pokemon/icons/4/464s.png diff --git a/public/images/pokemon/icons/465.png b/public/images/pokemon/icons/4/465.png similarity index 100% rename from public/images/pokemon/icons/465.png rename to public/images/pokemon/icons/4/465.png diff --git a/public/images/pokemon/icons/465s.png b/public/images/pokemon/icons/4/465s.png similarity index 100% rename from public/images/pokemon/icons/465s.png rename to public/images/pokemon/icons/4/465s.png diff --git a/public/images/pokemon/icons/466.png b/public/images/pokemon/icons/4/466.png similarity index 100% rename from public/images/pokemon/icons/466.png rename to public/images/pokemon/icons/4/466.png diff --git a/public/images/pokemon/icons/466s.png b/public/images/pokemon/icons/4/466s.png similarity index 100% rename from public/images/pokemon/icons/466s.png rename to public/images/pokemon/icons/4/466s.png diff --git a/public/images/pokemon/icons/467.png b/public/images/pokemon/icons/4/467.png similarity index 100% rename from public/images/pokemon/icons/467.png rename to public/images/pokemon/icons/4/467.png diff --git a/public/images/pokemon/icons/467s.png b/public/images/pokemon/icons/4/467s.png similarity index 100% rename from public/images/pokemon/icons/467s.png rename to public/images/pokemon/icons/4/467s.png diff --git a/public/images/pokemon/icons/468.png b/public/images/pokemon/icons/4/468.png similarity index 100% rename from public/images/pokemon/icons/468.png rename to public/images/pokemon/icons/4/468.png diff --git a/public/images/pokemon/icons/468s.png b/public/images/pokemon/icons/4/468s.png similarity index 100% rename from public/images/pokemon/icons/468s.png rename to public/images/pokemon/icons/4/468s.png diff --git a/public/images/pokemon/icons/469.png b/public/images/pokemon/icons/4/469.png similarity index 100% rename from public/images/pokemon/icons/469.png rename to public/images/pokemon/icons/4/469.png diff --git a/public/images/pokemon/icons/469s.png b/public/images/pokemon/icons/4/469s.png similarity index 100% rename from public/images/pokemon/icons/469s.png rename to public/images/pokemon/icons/4/469s.png diff --git a/public/images/pokemon/icons/470.png b/public/images/pokemon/icons/4/470.png similarity index 100% rename from public/images/pokemon/icons/470.png rename to public/images/pokemon/icons/4/470.png diff --git a/public/images/pokemon/icons/470s.png b/public/images/pokemon/icons/4/470s.png similarity index 100% rename from public/images/pokemon/icons/470s.png rename to public/images/pokemon/icons/4/470s.png diff --git a/public/images/pokemon/icons/471.png b/public/images/pokemon/icons/4/471.png similarity index 100% rename from public/images/pokemon/icons/471.png rename to public/images/pokemon/icons/4/471.png diff --git a/public/images/pokemon/icons/471s.png b/public/images/pokemon/icons/4/471s.png similarity index 100% rename from public/images/pokemon/icons/471s.png rename to public/images/pokemon/icons/4/471s.png diff --git a/public/images/pokemon/icons/472.png b/public/images/pokemon/icons/4/472.png similarity index 100% rename from public/images/pokemon/icons/472.png rename to public/images/pokemon/icons/4/472.png diff --git a/public/images/pokemon/icons/472s.png b/public/images/pokemon/icons/4/472s.png similarity index 100% rename from public/images/pokemon/icons/472s.png rename to public/images/pokemon/icons/4/472s.png diff --git a/public/images/pokemon/icons/473.png b/public/images/pokemon/icons/4/473.png similarity index 100% rename from public/images/pokemon/icons/473.png rename to public/images/pokemon/icons/4/473.png diff --git a/public/images/pokemon/icons/473s.png b/public/images/pokemon/icons/4/473s.png similarity index 100% rename from public/images/pokemon/icons/473s.png rename to public/images/pokemon/icons/4/473s.png diff --git a/public/images/pokemon/icons/474.png b/public/images/pokemon/icons/4/474.png similarity index 100% rename from public/images/pokemon/icons/474.png rename to public/images/pokemon/icons/4/474.png diff --git a/public/images/pokemon/icons/474s.png b/public/images/pokemon/icons/4/474s.png similarity index 100% rename from public/images/pokemon/icons/474s.png rename to public/images/pokemon/icons/4/474s.png diff --git a/public/images/pokemon/icons/475-mega.png b/public/images/pokemon/icons/4/475-mega.png similarity index 100% rename from public/images/pokemon/icons/475-mega.png rename to public/images/pokemon/icons/4/475-mega.png diff --git a/public/images/pokemon/icons/475.png b/public/images/pokemon/icons/4/475.png similarity index 100% rename from public/images/pokemon/icons/475.png rename to public/images/pokemon/icons/4/475.png diff --git a/public/images/pokemon/icons/475s-mega.png b/public/images/pokemon/icons/4/475s-mega.png similarity index 100% rename from public/images/pokemon/icons/475s-mega.png rename to public/images/pokemon/icons/4/475s-mega.png diff --git a/public/images/pokemon/icons/475s.png b/public/images/pokemon/icons/4/475s.png similarity index 100% rename from public/images/pokemon/icons/475s.png rename to public/images/pokemon/icons/4/475s.png diff --git a/public/images/pokemon/icons/476.png b/public/images/pokemon/icons/4/476.png similarity index 100% rename from public/images/pokemon/icons/476.png rename to public/images/pokemon/icons/4/476.png diff --git a/public/images/pokemon/icons/476s.png b/public/images/pokemon/icons/4/476s.png similarity index 100% rename from public/images/pokemon/icons/476s.png rename to public/images/pokemon/icons/4/476s.png diff --git a/public/images/pokemon/icons/477.png b/public/images/pokemon/icons/4/477.png similarity index 100% rename from public/images/pokemon/icons/477.png rename to public/images/pokemon/icons/4/477.png diff --git a/public/images/pokemon/icons/4/477s.png b/public/images/pokemon/icons/4/477s.png new file mode 100644 index 000000000..bd1ec0751 Binary files /dev/null and b/public/images/pokemon/icons/4/477s.png differ diff --git a/public/images/pokemon/icons/478.png b/public/images/pokemon/icons/4/478.png similarity index 100% rename from public/images/pokemon/icons/478.png rename to public/images/pokemon/icons/4/478.png diff --git a/public/images/pokemon/icons/478s.png b/public/images/pokemon/icons/4/478s.png similarity index 100% rename from public/images/pokemon/icons/478s.png rename to public/images/pokemon/icons/4/478s.png diff --git a/public/images/pokemon/icons/479-fan.png b/public/images/pokemon/icons/4/479-fan.png similarity index 100% rename from public/images/pokemon/icons/479-fan.png rename to public/images/pokemon/icons/4/479-fan.png diff --git a/public/images/pokemon/icons/479-frost.png b/public/images/pokemon/icons/4/479-frost.png similarity index 100% rename from public/images/pokemon/icons/479-frost.png rename to public/images/pokemon/icons/4/479-frost.png diff --git a/public/images/pokemon/icons/479-heat.png b/public/images/pokemon/icons/4/479-heat.png similarity index 100% rename from public/images/pokemon/icons/479-heat.png rename to public/images/pokemon/icons/4/479-heat.png diff --git a/public/images/pokemon/icons/479-mow.png b/public/images/pokemon/icons/4/479-mow.png similarity index 100% rename from public/images/pokemon/icons/479-mow.png rename to public/images/pokemon/icons/4/479-mow.png diff --git a/public/images/pokemon/icons/479-wash.png b/public/images/pokemon/icons/4/479-wash.png similarity index 100% rename from public/images/pokemon/icons/479-wash.png rename to public/images/pokemon/icons/4/479-wash.png diff --git a/public/images/pokemon/icons/479.png b/public/images/pokemon/icons/4/479.png similarity index 100% rename from public/images/pokemon/icons/479.png rename to public/images/pokemon/icons/4/479.png diff --git a/public/images/pokemon/icons/479s-fan.png b/public/images/pokemon/icons/4/479s-fan.png similarity index 100% rename from public/images/pokemon/icons/479s-fan.png rename to public/images/pokemon/icons/4/479s-fan.png diff --git a/public/images/pokemon/icons/479s-frost.png b/public/images/pokemon/icons/4/479s-frost.png similarity index 100% rename from public/images/pokemon/icons/479s-frost.png rename to public/images/pokemon/icons/4/479s-frost.png diff --git a/public/images/pokemon/icons/479s-heat.png b/public/images/pokemon/icons/4/479s-heat.png similarity index 100% rename from public/images/pokemon/icons/479s-heat.png rename to public/images/pokemon/icons/4/479s-heat.png diff --git a/public/images/pokemon/icons/479s-mow.png b/public/images/pokemon/icons/4/479s-mow.png similarity index 100% rename from public/images/pokemon/icons/479s-mow.png rename to public/images/pokemon/icons/4/479s-mow.png diff --git a/public/images/pokemon/icons/479s-wash.png b/public/images/pokemon/icons/4/479s-wash.png similarity index 100% rename from public/images/pokemon/icons/479s-wash.png rename to public/images/pokemon/icons/4/479s-wash.png diff --git a/public/images/pokemon/icons/479s.png b/public/images/pokemon/icons/4/479s.png similarity index 100% rename from public/images/pokemon/icons/479s.png rename to public/images/pokemon/icons/4/479s.png diff --git a/public/images/pokemon/icons/480.png b/public/images/pokemon/icons/4/480.png similarity index 100% rename from public/images/pokemon/icons/480.png rename to public/images/pokemon/icons/4/480.png diff --git a/public/images/pokemon/icons/480s.png b/public/images/pokemon/icons/4/480s.png similarity index 100% rename from public/images/pokemon/icons/480s.png rename to public/images/pokemon/icons/4/480s.png diff --git a/public/images/pokemon/icons/481.png b/public/images/pokemon/icons/4/481.png similarity index 100% rename from public/images/pokemon/icons/481.png rename to public/images/pokemon/icons/4/481.png diff --git a/public/images/pokemon/icons/481s.png b/public/images/pokemon/icons/4/481s.png similarity index 100% rename from public/images/pokemon/icons/481s.png rename to public/images/pokemon/icons/4/481s.png diff --git a/public/images/pokemon/icons/482.png b/public/images/pokemon/icons/4/482.png similarity index 100% rename from public/images/pokemon/icons/482.png rename to public/images/pokemon/icons/4/482.png diff --git a/public/images/pokemon/icons/482s.png b/public/images/pokemon/icons/4/482s.png similarity index 100% rename from public/images/pokemon/icons/482s.png rename to public/images/pokemon/icons/4/482s.png diff --git a/public/images/pokemon/icons/483-origin.png b/public/images/pokemon/icons/4/483-origin.png similarity index 100% rename from public/images/pokemon/icons/483-origin.png rename to public/images/pokemon/icons/4/483-origin.png diff --git a/public/images/pokemon/icons/483.png b/public/images/pokemon/icons/4/483.png similarity index 100% rename from public/images/pokemon/icons/483.png rename to public/images/pokemon/icons/4/483.png diff --git a/public/images/pokemon/icons/483s-origin.png b/public/images/pokemon/icons/4/483s-origin.png similarity index 100% rename from public/images/pokemon/icons/483s-origin.png rename to public/images/pokemon/icons/4/483s-origin.png diff --git a/public/images/pokemon/icons/483s.png b/public/images/pokemon/icons/4/483s.png similarity index 100% rename from public/images/pokemon/icons/483s.png rename to public/images/pokemon/icons/4/483s.png diff --git a/public/images/pokemon/icons/484-origin.png b/public/images/pokemon/icons/4/484-origin.png similarity index 100% rename from public/images/pokemon/icons/484-origin.png rename to public/images/pokemon/icons/4/484-origin.png diff --git a/public/images/pokemon/icons/484.png b/public/images/pokemon/icons/4/484.png similarity index 100% rename from public/images/pokemon/icons/484.png rename to public/images/pokemon/icons/4/484.png diff --git a/public/images/pokemon/icons/484s-origin.png b/public/images/pokemon/icons/4/484s-origin.png similarity index 100% rename from public/images/pokemon/icons/484s-origin.png rename to public/images/pokemon/icons/4/484s-origin.png diff --git a/public/images/pokemon/icons/484s.png b/public/images/pokemon/icons/4/484s.png similarity index 100% rename from public/images/pokemon/icons/484s.png rename to public/images/pokemon/icons/4/484s.png diff --git a/public/images/pokemon/icons/485.png b/public/images/pokemon/icons/4/485.png similarity index 100% rename from public/images/pokemon/icons/485.png rename to public/images/pokemon/icons/4/485.png diff --git a/public/images/pokemon/icons/485s.png b/public/images/pokemon/icons/4/485s.png similarity index 100% rename from public/images/pokemon/icons/485s.png rename to public/images/pokemon/icons/4/485s.png diff --git a/public/images/pokemon/icons/486.png b/public/images/pokemon/icons/4/486.png similarity index 100% rename from public/images/pokemon/icons/486.png rename to public/images/pokemon/icons/4/486.png diff --git a/public/images/pokemon/icons/486s.png b/public/images/pokemon/icons/4/486s.png similarity index 100% rename from public/images/pokemon/icons/486s.png rename to public/images/pokemon/icons/4/486s.png diff --git a/public/images/pokemon/icons/487-altered.png b/public/images/pokemon/icons/4/487-altered.png similarity index 100% rename from public/images/pokemon/icons/487-altered.png rename to public/images/pokemon/icons/4/487-altered.png diff --git a/public/images/pokemon/icons/487-origin.png b/public/images/pokemon/icons/4/487-origin.png similarity index 100% rename from public/images/pokemon/icons/487-origin.png rename to public/images/pokemon/icons/4/487-origin.png diff --git a/public/images/pokemon/icons/487s-altered.png b/public/images/pokemon/icons/4/487s-altered.png similarity index 100% rename from public/images/pokemon/icons/487s-altered.png rename to public/images/pokemon/icons/4/487s-altered.png diff --git a/public/images/pokemon/icons/487s-origin.png b/public/images/pokemon/icons/4/487s-origin.png similarity index 100% rename from public/images/pokemon/icons/487s-origin.png rename to public/images/pokemon/icons/4/487s-origin.png diff --git a/public/images/pokemon/icons/488.png b/public/images/pokemon/icons/4/488.png similarity index 100% rename from public/images/pokemon/icons/488.png rename to public/images/pokemon/icons/4/488.png diff --git a/public/images/pokemon/icons/488s.png b/public/images/pokemon/icons/4/488s.png similarity index 100% rename from public/images/pokemon/icons/488s.png rename to public/images/pokemon/icons/4/488s.png diff --git a/public/images/pokemon/icons/489.png b/public/images/pokemon/icons/4/489.png similarity index 100% rename from public/images/pokemon/icons/489.png rename to public/images/pokemon/icons/4/489.png diff --git a/public/images/pokemon/icons/489s.png b/public/images/pokemon/icons/4/489s.png similarity index 100% rename from public/images/pokemon/icons/489s.png rename to public/images/pokemon/icons/4/489s.png diff --git a/public/images/pokemon/icons/490.png b/public/images/pokemon/icons/4/490.png similarity index 100% rename from public/images/pokemon/icons/490.png rename to public/images/pokemon/icons/4/490.png diff --git a/public/images/pokemon/icons/490s.png b/public/images/pokemon/icons/4/490s.png similarity index 100% rename from public/images/pokemon/icons/490s.png rename to public/images/pokemon/icons/4/490s.png diff --git a/public/images/pokemon/icons/491.png b/public/images/pokemon/icons/4/491.png similarity index 100% rename from public/images/pokemon/icons/491.png rename to public/images/pokemon/icons/4/491.png diff --git a/public/images/pokemon/icons/491s.png b/public/images/pokemon/icons/4/491s.png similarity index 100% rename from public/images/pokemon/icons/491s.png rename to public/images/pokemon/icons/4/491s.png diff --git a/public/images/pokemon/icons/492-land.png b/public/images/pokemon/icons/4/492-land.png similarity index 100% rename from public/images/pokemon/icons/492-land.png rename to public/images/pokemon/icons/4/492-land.png diff --git a/public/images/pokemon/icons/492-sky.png b/public/images/pokemon/icons/4/492-sky.png similarity index 100% rename from public/images/pokemon/icons/492-sky.png rename to public/images/pokemon/icons/4/492-sky.png diff --git a/public/images/pokemon/icons/492s-land.png b/public/images/pokemon/icons/4/492s-land.png similarity index 100% rename from public/images/pokemon/icons/492s-land.png rename to public/images/pokemon/icons/4/492s-land.png diff --git a/public/images/pokemon/icons/492s-sky.png b/public/images/pokemon/icons/4/492s-sky.png similarity index 100% rename from public/images/pokemon/icons/492s-sky.png rename to public/images/pokemon/icons/4/492s-sky.png diff --git a/public/images/pokemon/icons/493-bug.png b/public/images/pokemon/icons/4/493-bug.png similarity index 100% rename from public/images/pokemon/icons/493-bug.png rename to public/images/pokemon/icons/4/493-bug.png diff --git a/public/images/pokemon/icons/493-dark.png b/public/images/pokemon/icons/4/493-dark.png similarity index 100% rename from public/images/pokemon/icons/493-dark.png rename to public/images/pokemon/icons/4/493-dark.png diff --git a/public/images/pokemon/icons/493-dragon.png b/public/images/pokemon/icons/4/493-dragon.png similarity index 100% rename from public/images/pokemon/icons/493-dragon.png rename to public/images/pokemon/icons/4/493-dragon.png diff --git a/public/images/pokemon/icons/493-electric.png b/public/images/pokemon/icons/4/493-electric.png similarity index 100% rename from public/images/pokemon/icons/493-electric.png rename to public/images/pokemon/icons/4/493-electric.png diff --git a/public/images/pokemon/icons/493-fairy.png b/public/images/pokemon/icons/4/493-fairy.png similarity index 100% rename from public/images/pokemon/icons/493-fairy.png rename to public/images/pokemon/icons/4/493-fairy.png diff --git a/public/images/pokemon/icons/493-fighting.png b/public/images/pokemon/icons/4/493-fighting.png similarity index 100% rename from public/images/pokemon/icons/493-fighting.png rename to public/images/pokemon/icons/4/493-fighting.png diff --git a/public/images/pokemon/icons/493-fire.png b/public/images/pokemon/icons/4/493-fire.png similarity index 100% rename from public/images/pokemon/icons/493-fire.png rename to public/images/pokemon/icons/4/493-fire.png diff --git a/public/images/pokemon/icons/493-flying.png b/public/images/pokemon/icons/4/493-flying.png similarity index 100% rename from public/images/pokemon/icons/493-flying.png rename to public/images/pokemon/icons/4/493-flying.png diff --git a/public/images/pokemon/icons/493-ghost.png b/public/images/pokemon/icons/4/493-ghost.png similarity index 100% rename from public/images/pokemon/icons/493-ghost.png rename to public/images/pokemon/icons/4/493-ghost.png diff --git a/public/images/pokemon/icons/493-grass.png b/public/images/pokemon/icons/4/493-grass.png similarity index 100% rename from public/images/pokemon/icons/493-grass.png rename to public/images/pokemon/icons/4/493-grass.png diff --git a/public/images/pokemon/icons/493-ground.png b/public/images/pokemon/icons/4/493-ground.png similarity index 100% rename from public/images/pokemon/icons/493-ground.png rename to public/images/pokemon/icons/4/493-ground.png diff --git a/public/images/pokemon/icons/493-ice.png b/public/images/pokemon/icons/4/493-ice.png similarity index 100% rename from public/images/pokemon/icons/493-ice.png rename to public/images/pokemon/icons/4/493-ice.png diff --git a/public/images/pokemon/icons/493-normal.png b/public/images/pokemon/icons/4/493-normal.png similarity index 100% rename from public/images/pokemon/icons/493-normal.png rename to public/images/pokemon/icons/4/493-normal.png diff --git a/public/images/pokemon/icons/493-poison.png b/public/images/pokemon/icons/4/493-poison.png similarity index 100% rename from public/images/pokemon/icons/493-poison.png rename to public/images/pokemon/icons/4/493-poison.png diff --git a/public/images/pokemon/icons/493-psychic.png b/public/images/pokemon/icons/4/493-psychic.png similarity index 100% rename from public/images/pokemon/icons/493-psychic.png rename to public/images/pokemon/icons/4/493-psychic.png diff --git a/public/images/pokemon/icons/493-rock.png b/public/images/pokemon/icons/4/493-rock.png similarity index 100% rename from public/images/pokemon/icons/493-rock.png rename to public/images/pokemon/icons/4/493-rock.png diff --git a/public/images/pokemon/icons/493-steel.png b/public/images/pokemon/icons/4/493-steel.png similarity index 100% rename from public/images/pokemon/icons/493-steel.png rename to public/images/pokemon/icons/4/493-steel.png diff --git a/public/images/pokemon/icons/493-unknown.png b/public/images/pokemon/icons/4/493-unknown.png similarity index 100% rename from public/images/pokemon/icons/493-unknown.png rename to public/images/pokemon/icons/4/493-unknown.png diff --git a/public/images/pokemon/icons/493-water.png b/public/images/pokemon/icons/4/493-water.png similarity index 100% rename from public/images/pokemon/icons/493-water.png rename to public/images/pokemon/icons/4/493-water.png diff --git a/public/images/pokemon/icons/493s-bug.png b/public/images/pokemon/icons/4/493s-bug.png similarity index 100% rename from public/images/pokemon/icons/493s-bug.png rename to public/images/pokemon/icons/4/493s-bug.png diff --git a/public/images/pokemon/icons/493s-dark.png b/public/images/pokemon/icons/4/493s-dark.png similarity index 100% rename from public/images/pokemon/icons/493s-dark.png rename to public/images/pokemon/icons/4/493s-dark.png diff --git a/public/images/pokemon/icons/493s-dragon.png b/public/images/pokemon/icons/4/493s-dragon.png similarity index 100% rename from public/images/pokemon/icons/493s-dragon.png rename to public/images/pokemon/icons/4/493s-dragon.png diff --git a/public/images/pokemon/icons/493s-electric.png b/public/images/pokemon/icons/4/493s-electric.png similarity index 100% rename from public/images/pokemon/icons/493s-electric.png rename to public/images/pokemon/icons/4/493s-electric.png diff --git a/public/images/pokemon/icons/493s-fairy.png b/public/images/pokemon/icons/4/493s-fairy.png similarity index 100% rename from public/images/pokemon/icons/493s-fairy.png rename to public/images/pokemon/icons/4/493s-fairy.png diff --git a/public/images/pokemon/icons/493s-fighting.png b/public/images/pokemon/icons/4/493s-fighting.png similarity index 100% rename from public/images/pokemon/icons/493s-fighting.png rename to public/images/pokemon/icons/4/493s-fighting.png diff --git a/public/images/pokemon/icons/493s-fire.png b/public/images/pokemon/icons/4/493s-fire.png similarity index 100% rename from public/images/pokemon/icons/493s-fire.png rename to public/images/pokemon/icons/4/493s-fire.png diff --git a/public/images/pokemon/icons/493s-flying.png b/public/images/pokemon/icons/4/493s-flying.png similarity index 100% rename from public/images/pokemon/icons/493s-flying.png rename to public/images/pokemon/icons/4/493s-flying.png diff --git a/public/images/pokemon/icons/493s-ghost.png b/public/images/pokemon/icons/4/493s-ghost.png similarity index 100% rename from public/images/pokemon/icons/493s-ghost.png rename to public/images/pokemon/icons/4/493s-ghost.png diff --git a/public/images/pokemon/icons/493s-grass.png b/public/images/pokemon/icons/4/493s-grass.png similarity index 100% rename from public/images/pokemon/icons/493s-grass.png rename to public/images/pokemon/icons/4/493s-grass.png diff --git a/public/images/pokemon/icons/493s-ground.png b/public/images/pokemon/icons/4/493s-ground.png similarity index 100% rename from public/images/pokemon/icons/493s-ground.png rename to public/images/pokemon/icons/4/493s-ground.png diff --git a/public/images/pokemon/icons/493s-ice.png b/public/images/pokemon/icons/4/493s-ice.png similarity index 100% rename from public/images/pokemon/icons/493s-ice.png rename to public/images/pokemon/icons/4/493s-ice.png diff --git a/public/images/pokemon/icons/493s-normal.png b/public/images/pokemon/icons/4/493s-normal.png similarity index 100% rename from public/images/pokemon/icons/493s-normal.png rename to public/images/pokemon/icons/4/493s-normal.png diff --git a/public/images/pokemon/icons/493s-poison.png b/public/images/pokemon/icons/4/493s-poison.png similarity index 100% rename from public/images/pokemon/icons/493s-poison.png rename to public/images/pokemon/icons/4/493s-poison.png diff --git a/public/images/pokemon/icons/493s-psychic.png b/public/images/pokemon/icons/4/493s-psychic.png similarity index 100% rename from public/images/pokemon/icons/493s-psychic.png rename to public/images/pokemon/icons/4/493s-psychic.png diff --git a/public/images/pokemon/icons/493s-rock.png b/public/images/pokemon/icons/4/493s-rock.png similarity index 100% rename from public/images/pokemon/icons/493s-rock.png rename to public/images/pokemon/icons/4/493s-rock.png diff --git a/public/images/pokemon/icons/493s-steel.png b/public/images/pokemon/icons/4/493s-steel.png similarity index 100% rename from public/images/pokemon/icons/493s-steel.png rename to public/images/pokemon/icons/4/493s-steel.png diff --git a/public/images/pokemon/icons/493s-unknown.png b/public/images/pokemon/icons/4/493s-unknown.png similarity index 100% rename from public/images/pokemon/icons/493s-unknown.png rename to public/images/pokemon/icons/4/493s-unknown.png diff --git a/public/images/pokemon/icons/493s-water.png b/public/images/pokemon/icons/4/493s-water.png similarity index 100% rename from public/images/pokemon/icons/493s-water.png rename to public/images/pokemon/icons/4/493s-water.png diff --git a/public/images/pokemon/icons/494.png b/public/images/pokemon/icons/4/494.png similarity index 100% rename from public/images/pokemon/icons/494.png rename to public/images/pokemon/icons/4/494.png diff --git a/public/images/pokemon/icons/494s.png b/public/images/pokemon/icons/4/494s.png similarity index 100% rename from public/images/pokemon/icons/494s.png rename to public/images/pokemon/icons/4/494s.png diff --git a/public/images/pokemon/icons/4/icons.bat b/public/images/pokemon/icons/4/icons.bat new file mode 100644 index 000000000..820f29f25 --- /dev/null +++ b/public/images/pokemon/icons/4/icons.bat @@ -0,0 +1 @@ +cmd /c TexturePacker ./ ../configuration.tps --sheet ../../../pokemon_icons_4.png --data ../../../pokemon_icons_4.json --replace .png= \ No newline at end of file diff --git a/public/images/pokemon/icons/477s.png b/public/images/pokemon/icons/477s.png deleted file mode 100644 index 358b11ad8..000000000 Binary files a/public/images/pokemon/icons/477s.png and /dev/null differ diff --git a/public/images/pokemon/icons/495.png b/public/images/pokemon/icons/5/495.png similarity index 100% rename from public/images/pokemon/icons/495.png rename to public/images/pokemon/icons/5/495.png diff --git a/public/images/pokemon/icons/495s.png b/public/images/pokemon/icons/5/495s.png similarity index 100% rename from public/images/pokemon/icons/495s.png rename to public/images/pokemon/icons/5/495s.png diff --git a/public/images/pokemon/icons/496.png b/public/images/pokemon/icons/5/496.png similarity index 100% rename from public/images/pokemon/icons/496.png rename to public/images/pokemon/icons/5/496.png diff --git a/public/images/pokemon/icons/496s.png b/public/images/pokemon/icons/5/496s.png similarity index 100% rename from public/images/pokemon/icons/496s.png rename to public/images/pokemon/icons/5/496s.png diff --git a/public/images/pokemon/icons/497.png b/public/images/pokemon/icons/5/497.png similarity index 100% rename from public/images/pokemon/icons/497.png rename to public/images/pokemon/icons/5/497.png diff --git a/public/images/pokemon/icons/497s.png b/public/images/pokemon/icons/5/497s.png similarity index 100% rename from public/images/pokemon/icons/497s.png rename to public/images/pokemon/icons/5/497s.png diff --git a/public/images/pokemon/icons/498.png b/public/images/pokemon/icons/5/498.png similarity index 100% rename from public/images/pokemon/icons/498.png rename to public/images/pokemon/icons/5/498.png diff --git a/public/images/pokemon/icons/498s.png b/public/images/pokemon/icons/5/498s.png similarity index 100% rename from public/images/pokemon/icons/498s.png rename to public/images/pokemon/icons/5/498s.png diff --git a/public/images/pokemon/icons/499.png b/public/images/pokemon/icons/5/499.png similarity index 100% rename from public/images/pokemon/icons/499.png rename to public/images/pokemon/icons/5/499.png diff --git a/public/images/pokemon/icons/499s.png b/public/images/pokemon/icons/5/499s.png similarity index 100% rename from public/images/pokemon/icons/499s.png rename to public/images/pokemon/icons/5/499s.png diff --git a/public/images/pokemon/icons/500.png b/public/images/pokemon/icons/5/500.png similarity index 100% rename from public/images/pokemon/icons/500.png rename to public/images/pokemon/icons/5/500.png diff --git a/public/images/pokemon/icons/500s.png b/public/images/pokemon/icons/5/500s.png similarity index 100% rename from public/images/pokemon/icons/500s.png rename to public/images/pokemon/icons/5/500s.png diff --git a/public/images/pokemon/icons/501.png b/public/images/pokemon/icons/5/501.png similarity index 100% rename from public/images/pokemon/icons/501.png rename to public/images/pokemon/icons/5/501.png diff --git a/public/images/pokemon/icons/501s.png b/public/images/pokemon/icons/5/501s.png similarity index 100% rename from public/images/pokemon/icons/501s.png rename to public/images/pokemon/icons/5/501s.png diff --git a/public/images/pokemon/icons/502.png b/public/images/pokemon/icons/5/502.png similarity index 100% rename from public/images/pokemon/icons/502.png rename to public/images/pokemon/icons/5/502.png diff --git a/public/images/pokemon/icons/502s.png b/public/images/pokemon/icons/5/502s.png similarity index 100% rename from public/images/pokemon/icons/502s.png rename to public/images/pokemon/icons/5/502s.png diff --git a/public/images/pokemon/icons/503.png b/public/images/pokemon/icons/5/503.png similarity index 100% rename from public/images/pokemon/icons/503.png rename to public/images/pokemon/icons/5/503.png diff --git a/public/images/pokemon/icons/503s.png b/public/images/pokemon/icons/5/503s.png similarity index 100% rename from public/images/pokemon/icons/503s.png rename to public/images/pokemon/icons/5/503s.png diff --git a/public/images/pokemon/icons/504.png b/public/images/pokemon/icons/5/504.png similarity index 100% rename from public/images/pokemon/icons/504.png rename to public/images/pokemon/icons/5/504.png diff --git a/public/images/pokemon/icons/504s.png b/public/images/pokemon/icons/5/504s.png similarity index 100% rename from public/images/pokemon/icons/504s.png rename to public/images/pokemon/icons/5/504s.png diff --git a/public/images/pokemon/icons/505.png b/public/images/pokemon/icons/5/505.png similarity index 100% rename from public/images/pokemon/icons/505.png rename to public/images/pokemon/icons/5/505.png diff --git a/public/images/pokemon/icons/505s.png b/public/images/pokemon/icons/5/505s.png similarity index 100% rename from public/images/pokemon/icons/505s.png rename to public/images/pokemon/icons/5/505s.png diff --git a/public/images/pokemon/icons/506.png b/public/images/pokemon/icons/5/506.png similarity index 100% rename from public/images/pokemon/icons/506.png rename to public/images/pokemon/icons/5/506.png diff --git a/public/images/pokemon/icons/506s.png b/public/images/pokemon/icons/5/506s.png similarity index 100% rename from public/images/pokemon/icons/506s.png rename to public/images/pokemon/icons/5/506s.png diff --git a/public/images/pokemon/icons/507.png b/public/images/pokemon/icons/5/507.png similarity index 100% rename from public/images/pokemon/icons/507.png rename to public/images/pokemon/icons/5/507.png diff --git a/public/images/pokemon/icons/507s.png b/public/images/pokemon/icons/5/507s.png similarity index 100% rename from public/images/pokemon/icons/507s.png rename to public/images/pokemon/icons/5/507s.png diff --git a/public/images/pokemon/icons/508.png b/public/images/pokemon/icons/5/508.png similarity index 100% rename from public/images/pokemon/icons/508.png rename to public/images/pokemon/icons/5/508.png diff --git a/public/images/pokemon/icons/508s.png b/public/images/pokemon/icons/5/508s.png similarity index 100% rename from public/images/pokemon/icons/508s.png rename to public/images/pokemon/icons/5/508s.png diff --git a/public/images/pokemon/icons/509.png b/public/images/pokemon/icons/5/509.png similarity index 100% rename from public/images/pokemon/icons/509.png rename to public/images/pokemon/icons/5/509.png diff --git a/public/images/pokemon/icons/509s.png b/public/images/pokemon/icons/5/509s.png similarity index 100% rename from public/images/pokemon/icons/509s.png rename to public/images/pokemon/icons/5/509s.png diff --git a/public/images/pokemon/icons/510.png b/public/images/pokemon/icons/5/510.png similarity index 100% rename from public/images/pokemon/icons/510.png rename to public/images/pokemon/icons/5/510.png diff --git a/public/images/pokemon/icons/510s.png b/public/images/pokemon/icons/5/510s.png similarity index 100% rename from public/images/pokemon/icons/510s.png rename to public/images/pokemon/icons/5/510s.png diff --git a/public/images/pokemon/icons/511.png b/public/images/pokemon/icons/5/511.png similarity index 100% rename from public/images/pokemon/icons/511.png rename to public/images/pokemon/icons/5/511.png diff --git a/public/images/pokemon/icons/511s.png b/public/images/pokemon/icons/5/511s.png similarity index 100% rename from public/images/pokemon/icons/511s.png rename to public/images/pokemon/icons/5/511s.png diff --git a/public/images/pokemon/icons/512.png b/public/images/pokemon/icons/5/512.png similarity index 100% rename from public/images/pokemon/icons/512.png rename to public/images/pokemon/icons/5/512.png diff --git a/public/images/pokemon/icons/512s.png b/public/images/pokemon/icons/5/512s.png similarity index 100% rename from public/images/pokemon/icons/512s.png rename to public/images/pokemon/icons/5/512s.png diff --git a/public/images/pokemon/icons/513.png b/public/images/pokemon/icons/5/513.png similarity index 100% rename from public/images/pokemon/icons/513.png rename to public/images/pokemon/icons/5/513.png diff --git a/public/images/pokemon/icons/513s.png b/public/images/pokemon/icons/5/513s.png similarity index 100% rename from public/images/pokemon/icons/513s.png rename to public/images/pokemon/icons/5/513s.png diff --git a/public/images/pokemon/icons/514.png b/public/images/pokemon/icons/5/514.png similarity index 100% rename from public/images/pokemon/icons/514.png rename to public/images/pokemon/icons/5/514.png diff --git a/public/images/pokemon/icons/514s.png b/public/images/pokemon/icons/5/514s.png similarity index 100% rename from public/images/pokemon/icons/514s.png rename to public/images/pokemon/icons/5/514s.png diff --git a/public/images/pokemon/icons/515.png b/public/images/pokemon/icons/5/515.png similarity index 100% rename from public/images/pokemon/icons/515.png rename to public/images/pokemon/icons/5/515.png diff --git a/public/images/pokemon/icons/515s.png b/public/images/pokemon/icons/5/515s.png similarity index 100% rename from public/images/pokemon/icons/515s.png rename to public/images/pokemon/icons/5/515s.png diff --git a/public/images/pokemon/icons/516.png b/public/images/pokemon/icons/5/516.png similarity index 100% rename from public/images/pokemon/icons/516.png rename to public/images/pokemon/icons/5/516.png diff --git a/public/images/pokemon/icons/516s.png b/public/images/pokemon/icons/5/516s.png similarity index 100% rename from public/images/pokemon/icons/516s.png rename to public/images/pokemon/icons/5/516s.png diff --git a/public/images/pokemon/icons/517.png b/public/images/pokemon/icons/5/517.png similarity index 100% rename from public/images/pokemon/icons/517.png rename to public/images/pokemon/icons/5/517.png diff --git a/public/images/pokemon/icons/517s.png b/public/images/pokemon/icons/5/517s.png similarity index 100% rename from public/images/pokemon/icons/517s.png rename to public/images/pokemon/icons/5/517s.png diff --git a/public/images/pokemon/icons/518.png b/public/images/pokemon/icons/5/518.png similarity index 100% rename from public/images/pokemon/icons/518.png rename to public/images/pokemon/icons/5/518.png diff --git a/public/images/pokemon/icons/518s.png b/public/images/pokemon/icons/5/518s.png similarity index 100% rename from public/images/pokemon/icons/518s.png rename to public/images/pokemon/icons/5/518s.png diff --git a/public/images/pokemon/icons/519.png b/public/images/pokemon/icons/5/519.png similarity index 100% rename from public/images/pokemon/icons/519.png rename to public/images/pokemon/icons/5/519.png diff --git a/public/images/pokemon/icons/519s.png b/public/images/pokemon/icons/5/519s.png similarity index 100% rename from public/images/pokemon/icons/519s.png rename to public/images/pokemon/icons/5/519s.png diff --git a/public/images/pokemon/icons/520.png b/public/images/pokemon/icons/5/520.png similarity index 100% rename from public/images/pokemon/icons/520.png rename to public/images/pokemon/icons/5/520.png diff --git a/public/images/pokemon/icons/520s.png b/public/images/pokemon/icons/5/520s.png similarity index 100% rename from public/images/pokemon/icons/520s.png rename to public/images/pokemon/icons/5/520s.png diff --git a/public/images/pokemon/icons/521-f.png b/public/images/pokemon/icons/5/521-f.png similarity index 100% rename from public/images/pokemon/icons/521-f.png rename to public/images/pokemon/icons/5/521-f.png diff --git a/public/images/pokemon/icons/521.png b/public/images/pokemon/icons/5/521.png similarity index 100% rename from public/images/pokemon/icons/521.png rename to public/images/pokemon/icons/5/521.png diff --git a/public/images/pokemon/icons/521s-f.png b/public/images/pokemon/icons/5/521s-f.png similarity index 100% rename from public/images/pokemon/icons/521s-f.png rename to public/images/pokemon/icons/5/521s-f.png diff --git a/public/images/pokemon/icons/521s.png b/public/images/pokemon/icons/5/521s.png similarity index 100% rename from public/images/pokemon/icons/521s.png rename to public/images/pokemon/icons/5/521s.png diff --git a/public/images/pokemon/icons/522.png b/public/images/pokemon/icons/5/522.png similarity index 100% rename from public/images/pokemon/icons/522.png rename to public/images/pokemon/icons/5/522.png diff --git a/public/images/pokemon/icons/522s.png b/public/images/pokemon/icons/5/522s.png similarity index 100% rename from public/images/pokemon/icons/522s.png rename to public/images/pokemon/icons/5/522s.png diff --git a/public/images/pokemon/icons/523.png b/public/images/pokemon/icons/5/523.png similarity index 100% rename from public/images/pokemon/icons/523.png rename to public/images/pokemon/icons/5/523.png diff --git a/public/images/pokemon/icons/523s.png b/public/images/pokemon/icons/5/523s.png similarity index 100% rename from public/images/pokemon/icons/523s.png rename to public/images/pokemon/icons/5/523s.png diff --git a/public/images/pokemon/icons/524.png b/public/images/pokemon/icons/5/524.png similarity index 100% rename from public/images/pokemon/icons/524.png rename to public/images/pokemon/icons/5/524.png diff --git a/public/images/pokemon/icons/524s.png b/public/images/pokemon/icons/5/524s.png similarity index 100% rename from public/images/pokemon/icons/524s.png rename to public/images/pokemon/icons/5/524s.png diff --git a/public/images/pokemon/icons/525.png b/public/images/pokemon/icons/5/525.png similarity index 100% rename from public/images/pokemon/icons/525.png rename to public/images/pokemon/icons/5/525.png diff --git a/public/images/pokemon/icons/525s.png b/public/images/pokemon/icons/5/525s.png similarity index 100% rename from public/images/pokemon/icons/525s.png rename to public/images/pokemon/icons/5/525s.png diff --git a/public/images/pokemon/icons/526.png b/public/images/pokemon/icons/5/526.png similarity index 100% rename from public/images/pokemon/icons/526.png rename to public/images/pokemon/icons/5/526.png diff --git a/public/images/pokemon/icons/526s.png b/public/images/pokemon/icons/5/526s.png similarity index 100% rename from public/images/pokemon/icons/526s.png rename to public/images/pokemon/icons/5/526s.png diff --git a/public/images/pokemon/icons/527.png b/public/images/pokemon/icons/5/527.png similarity index 100% rename from public/images/pokemon/icons/527.png rename to public/images/pokemon/icons/5/527.png diff --git a/public/images/pokemon/icons/527s.png b/public/images/pokemon/icons/5/527s.png similarity index 100% rename from public/images/pokemon/icons/527s.png rename to public/images/pokemon/icons/5/527s.png diff --git a/public/images/pokemon/icons/528.png b/public/images/pokemon/icons/5/528.png similarity index 100% rename from public/images/pokemon/icons/528.png rename to public/images/pokemon/icons/5/528.png diff --git a/public/images/pokemon/icons/528s.png b/public/images/pokemon/icons/5/528s.png similarity index 100% rename from public/images/pokemon/icons/528s.png rename to public/images/pokemon/icons/5/528s.png diff --git a/public/images/pokemon/icons/529.png b/public/images/pokemon/icons/5/529.png similarity index 100% rename from public/images/pokemon/icons/529.png rename to public/images/pokemon/icons/5/529.png diff --git a/public/images/pokemon/icons/529s.png b/public/images/pokemon/icons/5/529s.png similarity index 100% rename from public/images/pokemon/icons/529s.png rename to public/images/pokemon/icons/5/529s.png diff --git a/public/images/pokemon/icons/530.png b/public/images/pokemon/icons/5/530.png similarity index 100% rename from public/images/pokemon/icons/530.png rename to public/images/pokemon/icons/5/530.png diff --git a/public/images/pokemon/icons/530s.png b/public/images/pokemon/icons/5/530s.png similarity index 100% rename from public/images/pokemon/icons/530s.png rename to public/images/pokemon/icons/5/530s.png diff --git a/public/images/pokemon/icons/531-mega.png b/public/images/pokemon/icons/5/531-mega.png similarity index 100% rename from public/images/pokemon/icons/531-mega.png rename to public/images/pokemon/icons/5/531-mega.png diff --git a/public/images/pokemon/icons/531.png b/public/images/pokemon/icons/5/531.png similarity index 100% rename from public/images/pokemon/icons/531.png rename to public/images/pokemon/icons/5/531.png diff --git a/public/images/pokemon/icons/531s-mega.png b/public/images/pokemon/icons/5/531s-mega.png similarity index 100% rename from public/images/pokemon/icons/531s-mega.png rename to public/images/pokemon/icons/5/531s-mega.png diff --git a/public/images/pokemon/icons/531s.png b/public/images/pokemon/icons/5/531s.png similarity index 100% rename from public/images/pokemon/icons/531s.png rename to public/images/pokemon/icons/5/531s.png diff --git a/public/images/pokemon/icons/532.png b/public/images/pokemon/icons/5/532.png similarity index 100% rename from public/images/pokemon/icons/532.png rename to public/images/pokemon/icons/5/532.png diff --git a/public/images/pokemon/icons/532s.png b/public/images/pokemon/icons/5/532s.png similarity index 100% rename from public/images/pokemon/icons/532s.png rename to public/images/pokemon/icons/5/532s.png diff --git a/public/images/pokemon/icons/533.png b/public/images/pokemon/icons/5/533.png similarity index 100% rename from public/images/pokemon/icons/533.png rename to public/images/pokemon/icons/5/533.png diff --git a/public/images/pokemon/icons/533s.png b/public/images/pokemon/icons/5/533s.png similarity index 100% rename from public/images/pokemon/icons/533s.png rename to public/images/pokemon/icons/5/533s.png diff --git a/public/images/pokemon/icons/534.png b/public/images/pokemon/icons/5/534.png similarity index 100% rename from public/images/pokemon/icons/534.png rename to public/images/pokemon/icons/5/534.png diff --git a/public/images/pokemon/icons/534s.png b/public/images/pokemon/icons/5/534s.png similarity index 100% rename from public/images/pokemon/icons/534s.png rename to public/images/pokemon/icons/5/534s.png diff --git a/public/images/pokemon/icons/535.png b/public/images/pokemon/icons/5/535.png similarity index 100% rename from public/images/pokemon/icons/535.png rename to public/images/pokemon/icons/5/535.png diff --git a/public/images/pokemon/icons/535s.png b/public/images/pokemon/icons/5/535s.png similarity index 100% rename from public/images/pokemon/icons/535s.png rename to public/images/pokemon/icons/5/535s.png diff --git a/public/images/pokemon/icons/536.png b/public/images/pokemon/icons/5/536.png similarity index 100% rename from public/images/pokemon/icons/536.png rename to public/images/pokemon/icons/5/536.png diff --git a/public/images/pokemon/icons/536s.png b/public/images/pokemon/icons/5/536s.png similarity index 100% rename from public/images/pokemon/icons/536s.png rename to public/images/pokemon/icons/5/536s.png diff --git a/public/images/pokemon/icons/537.png b/public/images/pokemon/icons/5/537.png similarity index 100% rename from public/images/pokemon/icons/537.png rename to public/images/pokemon/icons/5/537.png diff --git a/public/images/pokemon/icons/537s.png b/public/images/pokemon/icons/5/537s.png similarity index 100% rename from public/images/pokemon/icons/537s.png rename to public/images/pokemon/icons/5/537s.png diff --git a/public/images/pokemon/icons/538.png b/public/images/pokemon/icons/5/538.png similarity index 100% rename from public/images/pokemon/icons/538.png rename to public/images/pokemon/icons/5/538.png diff --git a/public/images/pokemon/icons/538s.png b/public/images/pokemon/icons/5/538s.png similarity index 100% rename from public/images/pokemon/icons/538s.png rename to public/images/pokemon/icons/5/538s.png diff --git a/public/images/pokemon/icons/539.png b/public/images/pokemon/icons/5/539.png similarity index 100% rename from public/images/pokemon/icons/539.png rename to public/images/pokemon/icons/5/539.png diff --git a/public/images/pokemon/icons/539s.png b/public/images/pokemon/icons/5/539s.png similarity index 100% rename from public/images/pokemon/icons/539s.png rename to public/images/pokemon/icons/5/539s.png diff --git a/public/images/pokemon/icons/540.png b/public/images/pokemon/icons/5/540.png similarity index 100% rename from public/images/pokemon/icons/540.png rename to public/images/pokemon/icons/5/540.png diff --git a/public/images/pokemon/icons/540s.png b/public/images/pokemon/icons/5/540s.png similarity index 100% rename from public/images/pokemon/icons/540s.png rename to public/images/pokemon/icons/5/540s.png diff --git a/public/images/pokemon/icons/541.png b/public/images/pokemon/icons/5/541.png similarity index 100% rename from public/images/pokemon/icons/541.png rename to public/images/pokemon/icons/5/541.png diff --git a/public/images/pokemon/icons/541s.png b/public/images/pokemon/icons/5/541s.png similarity index 100% rename from public/images/pokemon/icons/541s.png rename to public/images/pokemon/icons/5/541s.png diff --git a/public/images/pokemon/icons/542.png b/public/images/pokemon/icons/5/542.png similarity index 100% rename from public/images/pokemon/icons/542.png rename to public/images/pokemon/icons/5/542.png diff --git a/public/images/pokemon/icons/542s.png b/public/images/pokemon/icons/5/542s.png similarity index 100% rename from public/images/pokemon/icons/542s.png rename to public/images/pokemon/icons/5/542s.png diff --git a/public/images/pokemon/icons/543.png b/public/images/pokemon/icons/5/543.png similarity index 100% rename from public/images/pokemon/icons/543.png rename to public/images/pokemon/icons/5/543.png diff --git a/public/images/pokemon/icons/543s.png b/public/images/pokemon/icons/5/543s.png similarity index 100% rename from public/images/pokemon/icons/543s.png rename to public/images/pokemon/icons/5/543s.png diff --git a/public/images/pokemon/icons/544.png b/public/images/pokemon/icons/5/544.png similarity index 100% rename from public/images/pokemon/icons/544.png rename to public/images/pokemon/icons/5/544.png diff --git a/public/images/pokemon/icons/544s.png b/public/images/pokemon/icons/5/544s.png similarity index 100% rename from public/images/pokemon/icons/544s.png rename to public/images/pokemon/icons/5/544s.png diff --git a/public/images/pokemon/icons/545.png b/public/images/pokemon/icons/5/545.png similarity index 100% rename from public/images/pokemon/icons/545.png rename to public/images/pokemon/icons/5/545.png diff --git a/public/images/pokemon/icons/545s.png b/public/images/pokemon/icons/5/545s.png similarity index 100% rename from public/images/pokemon/icons/545s.png rename to public/images/pokemon/icons/5/545s.png diff --git a/public/images/pokemon/icons/546.png b/public/images/pokemon/icons/5/546.png similarity index 100% rename from public/images/pokemon/icons/546.png rename to public/images/pokemon/icons/5/546.png diff --git a/public/images/pokemon/icons/546s.png b/public/images/pokemon/icons/5/546s.png similarity index 100% rename from public/images/pokemon/icons/546s.png rename to public/images/pokemon/icons/5/546s.png diff --git a/public/images/pokemon/icons/547.png b/public/images/pokemon/icons/5/547.png similarity index 100% rename from public/images/pokemon/icons/547.png rename to public/images/pokemon/icons/5/547.png diff --git a/public/images/pokemon/icons/547s.png b/public/images/pokemon/icons/5/547s.png similarity index 100% rename from public/images/pokemon/icons/547s.png rename to public/images/pokemon/icons/5/547s.png diff --git a/public/images/pokemon/icons/548.png b/public/images/pokemon/icons/5/548.png similarity index 100% rename from public/images/pokemon/icons/548.png rename to public/images/pokemon/icons/5/548.png diff --git a/public/images/pokemon/icons/548s.png b/public/images/pokemon/icons/5/548s.png similarity index 100% rename from public/images/pokemon/icons/548s.png rename to public/images/pokemon/icons/5/548s.png diff --git a/public/images/pokemon/icons/549.png b/public/images/pokemon/icons/5/549.png similarity index 100% rename from public/images/pokemon/icons/549.png rename to public/images/pokemon/icons/5/549.png diff --git a/public/images/pokemon/icons/549s.png b/public/images/pokemon/icons/5/549s.png similarity index 100% rename from public/images/pokemon/icons/549s.png rename to public/images/pokemon/icons/5/549s.png diff --git a/public/images/pokemon/icons/550-blue-striped.png b/public/images/pokemon/icons/5/550-blue-striped.png similarity index 100% rename from public/images/pokemon/icons/550-blue-striped.png rename to public/images/pokemon/icons/5/550-blue-striped.png diff --git a/public/images/pokemon/icons/550-red-striped.png b/public/images/pokemon/icons/5/550-red-striped.png similarity index 100% rename from public/images/pokemon/icons/550-red-striped.png rename to public/images/pokemon/icons/5/550-red-striped.png diff --git a/public/images/pokemon/icons/550-white-striped.png b/public/images/pokemon/icons/5/550-white-striped.png similarity index 100% rename from public/images/pokemon/icons/550-white-striped.png rename to public/images/pokemon/icons/5/550-white-striped.png diff --git a/public/images/pokemon/icons/550s-blue-striped.png b/public/images/pokemon/icons/5/550s-blue-striped.png similarity index 100% rename from public/images/pokemon/icons/550s-blue-striped.png rename to public/images/pokemon/icons/5/550s-blue-striped.png diff --git a/public/images/pokemon/icons/550s-red-striped.png b/public/images/pokemon/icons/5/550s-red-striped.png similarity index 100% rename from public/images/pokemon/icons/550s-red-striped.png rename to public/images/pokemon/icons/5/550s-red-striped.png diff --git a/public/images/pokemon/icons/550s-white-striped.png b/public/images/pokemon/icons/5/550s-white-striped.png similarity index 100% rename from public/images/pokemon/icons/550s-white-striped.png rename to public/images/pokemon/icons/5/550s-white-striped.png diff --git a/public/images/pokemon/icons/551.png b/public/images/pokemon/icons/5/551.png similarity index 100% rename from public/images/pokemon/icons/551.png rename to public/images/pokemon/icons/5/551.png diff --git a/public/images/pokemon/icons/551s.png b/public/images/pokemon/icons/5/551s.png similarity index 100% rename from public/images/pokemon/icons/551s.png rename to public/images/pokemon/icons/5/551s.png diff --git a/public/images/pokemon/icons/552.png b/public/images/pokemon/icons/5/552.png similarity index 100% rename from public/images/pokemon/icons/552.png rename to public/images/pokemon/icons/5/552.png diff --git a/public/images/pokemon/icons/552s.png b/public/images/pokemon/icons/5/552s.png similarity index 100% rename from public/images/pokemon/icons/552s.png rename to public/images/pokemon/icons/5/552s.png diff --git a/public/images/pokemon/icons/553.png b/public/images/pokemon/icons/5/553.png similarity index 100% rename from public/images/pokemon/icons/553.png rename to public/images/pokemon/icons/5/553.png diff --git a/public/images/pokemon/icons/553s.png b/public/images/pokemon/icons/5/553s.png similarity index 100% rename from public/images/pokemon/icons/553s.png rename to public/images/pokemon/icons/5/553s.png diff --git a/public/images/pokemon/icons/554.png b/public/images/pokemon/icons/5/554.png similarity index 100% rename from public/images/pokemon/icons/554.png rename to public/images/pokemon/icons/5/554.png diff --git a/public/images/pokemon/icons/554s.png b/public/images/pokemon/icons/5/554s.png similarity index 100% rename from public/images/pokemon/icons/554s.png rename to public/images/pokemon/icons/5/554s.png diff --git a/public/images/pokemon/icons/555-zen.png b/public/images/pokemon/icons/5/555-zen.png similarity index 100% rename from public/images/pokemon/icons/555-zen.png rename to public/images/pokemon/icons/5/555-zen.png diff --git a/public/images/pokemon/icons/555.png b/public/images/pokemon/icons/5/555.png similarity index 100% rename from public/images/pokemon/icons/555.png rename to public/images/pokemon/icons/5/555.png diff --git a/public/images/pokemon/icons/555s-zen.png b/public/images/pokemon/icons/5/555s-zen.png similarity index 100% rename from public/images/pokemon/icons/555s-zen.png rename to public/images/pokemon/icons/5/555s-zen.png diff --git a/public/images/pokemon/icons/555s.png b/public/images/pokemon/icons/5/555s.png similarity index 100% rename from public/images/pokemon/icons/555s.png rename to public/images/pokemon/icons/5/555s.png diff --git a/public/images/pokemon/icons/556.png b/public/images/pokemon/icons/5/556.png similarity index 100% rename from public/images/pokemon/icons/556.png rename to public/images/pokemon/icons/5/556.png diff --git a/public/images/pokemon/icons/556s.png b/public/images/pokemon/icons/5/556s.png similarity index 100% rename from public/images/pokemon/icons/556s.png rename to public/images/pokemon/icons/5/556s.png diff --git a/public/images/pokemon/icons/557.png b/public/images/pokemon/icons/5/557.png similarity index 100% rename from public/images/pokemon/icons/557.png rename to public/images/pokemon/icons/5/557.png diff --git a/public/images/pokemon/icons/557s.png b/public/images/pokemon/icons/5/557s.png similarity index 100% rename from public/images/pokemon/icons/557s.png rename to public/images/pokemon/icons/5/557s.png diff --git a/public/images/pokemon/icons/558.png b/public/images/pokemon/icons/5/558.png similarity index 100% rename from public/images/pokemon/icons/558.png rename to public/images/pokemon/icons/5/558.png diff --git a/public/images/pokemon/icons/558s.png b/public/images/pokemon/icons/5/558s.png similarity index 100% rename from public/images/pokemon/icons/558s.png rename to public/images/pokemon/icons/5/558s.png diff --git a/public/images/pokemon/icons/559.png b/public/images/pokemon/icons/5/559.png similarity index 100% rename from public/images/pokemon/icons/559.png rename to public/images/pokemon/icons/5/559.png diff --git a/public/images/pokemon/icons/559s.png b/public/images/pokemon/icons/5/559s.png similarity index 100% rename from public/images/pokemon/icons/559s.png rename to public/images/pokemon/icons/5/559s.png diff --git a/public/images/pokemon/icons/560.png b/public/images/pokemon/icons/5/560.png similarity index 100% rename from public/images/pokemon/icons/560.png rename to public/images/pokemon/icons/5/560.png diff --git a/public/images/pokemon/icons/560s.png b/public/images/pokemon/icons/5/560s.png similarity index 100% rename from public/images/pokemon/icons/560s.png rename to public/images/pokemon/icons/5/560s.png diff --git a/public/images/pokemon/icons/561.png b/public/images/pokemon/icons/5/561.png similarity index 100% rename from public/images/pokemon/icons/561.png rename to public/images/pokemon/icons/5/561.png diff --git a/public/images/pokemon/icons/561s.png b/public/images/pokemon/icons/5/561s.png similarity index 100% rename from public/images/pokemon/icons/561s.png rename to public/images/pokemon/icons/5/561s.png diff --git a/public/images/pokemon/icons/562.png b/public/images/pokemon/icons/5/562.png similarity index 100% rename from public/images/pokemon/icons/562.png rename to public/images/pokemon/icons/5/562.png diff --git a/public/images/pokemon/icons/562s.png b/public/images/pokemon/icons/5/562s.png similarity index 100% rename from public/images/pokemon/icons/562s.png rename to public/images/pokemon/icons/5/562s.png diff --git a/public/images/pokemon/icons/563.png b/public/images/pokemon/icons/5/563.png similarity index 100% rename from public/images/pokemon/icons/563.png rename to public/images/pokemon/icons/5/563.png diff --git a/public/images/pokemon/icons/563s.png b/public/images/pokemon/icons/5/563s.png similarity index 100% rename from public/images/pokemon/icons/563s.png rename to public/images/pokemon/icons/5/563s.png diff --git a/public/images/pokemon/icons/564.png b/public/images/pokemon/icons/5/564.png similarity index 100% rename from public/images/pokemon/icons/564.png rename to public/images/pokemon/icons/5/564.png diff --git a/public/images/pokemon/icons/564s.png b/public/images/pokemon/icons/5/564s.png similarity index 100% rename from public/images/pokemon/icons/564s.png rename to public/images/pokemon/icons/5/564s.png diff --git a/public/images/pokemon/icons/565.png b/public/images/pokemon/icons/5/565.png similarity index 100% rename from public/images/pokemon/icons/565.png rename to public/images/pokemon/icons/5/565.png diff --git a/public/images/pokemon/icons/565s.png b/public/images/pokemon/icons/5/565s.png similarity index 100% rename from public/images/pokemon/icons/565s.png rename to public/images/pokemon/icons/5/565s.png diff --git a/public/images/pokemon/icons/566.png b/public/images/pokemon/icons/5/566.png similarity index 100% rename from public/images/pokemon/icons/566.png rename to public/images/pokemon/icons/5/566.png diff --git a/public/images/pokemon/icons/566s.png b/public/images/pokemon/icons/5/566s.png similarity index 100% rename from public/images/pokemon/icons/566s.png rename to public/images/pokemon/icons/5/566s.png diff --git a/public/images/pokemon/icons/567.png b/public/images/pokemon/icons/5/567.png similarity index 100% rename from public/images/pokemon/icons/567.png rename to public/images/pokemon/icons/5/567.png diff --git a/public/images/pokemon/icons/567s.png b/public/images/pokemon/icons/5/567s.png similarity index 100% rename from public/images/pokemon/icons/567s.png rename to public/images/pokemon/icons/5/567s.png diff --git a/public/images/pokemon/icons/568.png b/public/images/pokemon/icons/5/568.png similarity index 100% rename from public/images/pokemon/icons/568.png rename to public/images/pokemon/icons/5/568.png diff --git a/public/images/pokemon/icons/568s.png b/public/images/pokemon/icons/5/568s.png similarity index 100% rename from public/images/pokemon/icons/568s.png rename to public/images/pokemon/icons/5/568s.png diff --git a/public/images/pokemon/icons/569-gigantamax.png b/public/images/pokemon/icons/5/569-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/569-gigantamax.png rename to public/images/pokemon/icons/5/569-gigantamax.png diff --git a/public/images/pokemon/icons/569.png b/public/images/pokemon/icons/5/569.png similarity index 100% rename from public/images/pokemon/icons/569.png rename to public/images/pokemon/icons/5/569.png diff --git a/public/images/pokemon/icons/569s-gigantamax.png b/public/images/pokemon/icons/5/569s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/569s-gigantamax.png rename to public/images/pokemon/icons/5/569s-gigantamax.png diff --git a/public/images/pokemon/icons/569s.png b/public/images/pokemon/icons/5/569s.png similarity index 100% rename from public/images/pokemon/icons/569s.png rename to public/images/pokemon/icons/5/569s.png diff --git a/public/images/pokemon/icons/570.png b/public/images/pokemon/icons/5/570.png similarity index 100% rename from public/images/pokemon/icons/570.png rename to public/images/pokemon/icons/5/570.png diff --git a/public/images/pokemon/icons/570s.png b/public/images/pokemon/icons/5/570s.png similarity index 100% rename from public/images/pokemon/icons/570s.png rename to public/images/pokemon/icons/5/570s.png diff --git a/public/images/pokemon/icons/571.png b/public/images/pokemon/icons/5/571.png similarity index 100% rename from public/images/pokemon/icons/571.png rename to public/images/pokemon/icons/5/571.png diff --git a/public/images/pokemon/icons/571s.png b/public/images/pokemon/icons/5/571s.png similarity index 100% rename from public/images/pokemon/icons/571s.png rename to public/images/pokemon/icons/5/571s.png diff --git a/public/images/pokemon/icons/572.png b/public/images/pokemon/icons/5/572.png similarity index 100% rename from public/images/pokemon/icons/572.png rename to public/images/pokemon/icons/5/572.png diff --git a/public/images/pokemon/icons/572s.png b/public/images/pokemon/icons/5/572s.png similarity index 100% rename from public/images/pokemon/icons/572s.png rename to public/images/pokemon/icons/5/572s.png diff --git a/public/images/pokemon/icons/573.png b/public/images/pokemon/icons/5/573.png similarity index 100% rename from public/images/pokemon/icons/573.png rename to public/images/pokemon/icons/5/573.png diff --git a/public/images/pokemon/icons/573s.png b/public/images/pokemon/icons/5/573s.png similarity index 100% rename from public/images/pokemon/icons/573s.png rename to public/images/pokemon/icons/5/573s.png diff --git a/public/images/pokemon/icons/574.png b/public/images/pokemon/icons/5/574.png similarity index 100% rename from public/images/pokemon/icons/574.png rename to public/images/pokemon/icons/5/574.png diff --git a/public/images/pokemon/icons/574s.png b/public/images/pokemon/icons/5/574s.png similarity index 100% rename from public/images/pokemon/icons/574s.png rename to public/images/pokemon/icons/5/574s.png diff --git a/public/images/pokemon/icons/575.png b/public/images/pokemon/icons/5/575.png similarity index 100% rename from public/images/pokemon/icons/575.png rename to public/images/pokemon/icons/5/575.png diff --git a/public/images/pokemon/icons/575s.png b/public/images/pokemon/icons/5/575s.png similarity index 100% rename from public/images/pokemon/icons/575s.png rename to public/images/pokemon/icons/5/575s.png diff --git a/public/images/pokemon/icons/576.png b/public/images/pokemon/icons/5/576.png similarity index 100% rename from public/images/pokemon/icons/576.png rename to public/images/pokemon/icons/5/576.png diff --git a/public/images/pokemon/icons/576s.png b/public/images/pokemon/icons/5/576s.png similarity index 100% rename from public/images/pokemon/icons/576s.png rename to public/images/pokemon/icons/5/576s.png diff --git a/public/images/pokemon/icons/577.png b/public/images/pokemon/icons/5/577.png similarity index 100% rename from public/images/pokemon/icons/577.png rename to public/images/pokemon/icons/5/577.png diff --git a/public/images/pokemon/icons/577s.png b/public/images/pokemon/icons/5/577s.png similarity index 100% rename from public/images/pokemon/icons/577s.png rename to public/images/pokemon/icons/5/577s.png diff --git a/public/images/pokemon/icons/578.png b/public/images/pokemon/icons/5/578.png similarity index 100% rename from public/images/pokemon/icons/578.png rename to public/images/pokemon/icons/5/578.png diff --git a/public/images/pokemon/icons/578s.png b/public/images/pokemon/icons/5/578s.png similarity index 100% rename from public/images/pokemon/icons/578s.png rename to public/images/pokemon/icons/5/578s.png diff --git a/public/images/pokemon/icons/579.png b/public/images/pokemon/icons/5/579.png similarity index 100% rename from public/images/pokemon/icons/579.png rename to public/images/pokemon/icons/5/579.png diff --git a/public/images/pokemon/icons/579s.png b/public/images/pokemon/icons/5/579s.png similarity index 100% rename from public/images/pokemon/icons/579s.png rename to public/images/pokemon/icons/5/579s.png diff --git a/public/images/pokemon/icons/580.png b/public/images/pokemon/icons/5/580.png similarity index 100% rename from public/images/pokemon/icons/580.png rename to public/images/pokemon/icons/5/580.png diff --git a/public/images/pokemon/icons/580s.png b/public/images/pokemon/icons/5/580s.png similarity index 100% rename from public/images/pokemon/icons/580s.png rename to public/images/pokemon/icons/5/580s.png diff --git a/public/images/pokemon/icons/581.png b/public/images/pokemon/icons/5/581.png similarity index 100% rename from public/images/pokemon/icons/581.png rename to public/images/pokemon/icons/5/581.png diff --git a/public/images/pokemon/icons/581s.png b/public/images/pokemon/icons/5/581s.png similarity index 100% rename from public/images/pokemon/icons/581s.png rename to public/images/pokemon/icons/5/581s.png diff --git a/public/images/pokemon/icons/582.png b/public/images/pokemon/icons/5/582.png similarity index 100% rename from public/images/pokemon/icons/582.png rename to public/images/pokemon/icons/5/582.png diff --git a/public/images/pokemon/icons/582s.png b/public/images/pokemon/icons/5/582s.png similarity index 100% rename from public/images/pokemon/icons/582s.png rename to public/images/pokemon/icons/5/582s.png diff --git a/public/images/pokemon/icons/583.png b/public/images/pokemon/icons/5/583.png similarity index 100% rename from public/images/pokemon/icons/583.png rename to public/images/pokemon/icons/5/583.png diff --git a/public/images/pokemon/icons/583s.png b/public/images/pokemon/icons/5/583s.png similarity index 100% rename from public/images/pokemon/icons/583s.png rename to public/images/pokemon/icons/5/583s.png diff --git a/public/images/pokemon/icons/584.png b/public/images/pokemon/icons/5/584.png similarity index 100% rename from public/images/pokemon/icons/584.png rename to public/images/pokemon/icons/5/584.png diff --git a/public/images/pokemon/icons/584s.png b/public/images/pokemon/icons/5/584s.png similarity index 100% rename from public/images/pokemon/icons/584s.png rename to public/images/pokemon/icons/5/584s.png diff --git a/public/images/pokemon/icons/585-autumn.png b/public/images/pokemon/icons/5/585-autumn.png similarity index 100% rename from public/images/pokemon/icons/585-autumn.png rename to public/images/pokemon/icons/5/585-autumn.png diff --git a/public/images/pokemon/icons/585-spring.png b/public/images/pokemon/icons/5/585-spring.png similarity index 100% rename from public/images/pokemon/icons/585-spring.png rename to public/images/pokemon/icons/5/585-spring.png diff --git a/public/images/pokemon/icons/585-summer.png b/public/images/pokemon/icons/5/585-summer.png similarity index 100% rename from public/images/pokemon/icons/585-summer.png rename to public/images/pokemon/icons/5/585-summer.png diff --git a/public/images/pokemon/icons/585-winter.png b/public/images/pokemon/icons/5/585-winter.png similarity index 100% rename from public/images/pokemon/icons/585-winter.png rename to public/images/pokemon/icons/5/585-winter.png diff --git a/public/images/pokemon/icons/585s-autumn.png b/public/images/pokemon/icons/5/585s-autumn.png similarity index 100% rename from public/images/pokemon/icons/585s-autumn.png rename to public/images/pokemon/icons/5/585s-autumn.png diff --git a/public/images/pokemon/icons/585s-spring.png b/public/images/pokemon/icons/5/585s-spring.png similarity index 100% rename from public/images/pokemon/icons/585s-spring.png rename to public/images/pokemon/icons/5/585s-spring.png diff --git a/public/images/pokemon/icons/585s-summer.png b/public/images/pokemon/icons/5/585s-summer.png similarity index 100% rename from public/images/pokemon/icons/585s-summer.png rename to public/images/pokemon/icons/5/585s-summer.png diff --git a/public/images/pokemon/icons/585s-winter.png b/public/images/pokemon/icons/5/585s-winter.png similarity index 100% rename from public/images/pokemon/icons/585s-winter.png rename to public/images/pokemon/icons/5/585s-winter.png diff --git a/public/images/pokemon/icons/586-autumn.png b/public/images/pokemon/icons/5/586-autumn.png similarity index 100% rename from public/images/pokemon/icons/586-autumn.png rename to public/images/pokemon/icons/5/586-autumn.png diff --git a/public/images/pokemon/icons/586-spring.png b/public/images/pokemon/icons/5/586-spring.png similarity index 100% rename from public/images/pokemon/icons/586-spring.png rename to public/images/pokemon/icons/5/586-spring.png diff --git a/public/images/pokemon/icons/586-summer.png b/public/images/pokemon/icons/5/586-summer.png similarity index 100% rename from public/images/pokemon/icons/586-summer.png rename to public/images/pokemon/icons/5/586-summer.png diff --git a/public/images/pokemon/icons/586-winter.png b/public/images/pokemon/icons/5/586-winter.png similarity index 100% rename from public/images/pokemon/icons/586-winter.png rename to public/images/pokemon/icons/5/586-winter.png diff --git a/public/images/pokemon/icons/586s-autumn.png b/public/images/pokemon/icons/5/586s-autumn.png similarity index 100% rename from public/images/pokemon/icons/586s-autumn.png rename to public/images/pokemon/icons/5/586s-autumn.png diff --git a/public/images/pokemon/icons/586s-spring.png b/public/images/pokemon/icons/5/586s-spring.png similarity index 100% rename from public/images/pokemon/icons/586s-spring.png rename to public/images/pokemon/icons/5/586s-spring.png diff --git a/public/images/pokemon/icons/586s-summer.png b/public/images/pokemon/icons/5/586s-summer.png similarity index 100% rename from public/images/pokemon/icons/586s-summer.png rename to public/images/pokemon/icons/5/586s-summer.png diff --git a/public/images/pokemon/icons/586s-winter.png b/public/images/pokemon/icons/5/586s-winter.png similarity index 100% rename from public/images/pokemon/icons/586s-winter.png rename to public/images/pokemon/icons/5/586s-winter.png diff --git a/public/images/pokemon/icons/587.png b/public/images/pokemon/icons/5/587.png similarity index 100% rename from public/images/pokemon/icons/587.png rename to public/images/pokemon/icons/5/587.png diff --git a/public/images/pokemon/icons/587s.png b/public/images/pokemon/icons/5/587s.png similarity index 100% rename from public/images/pokemon/icons/587s.png rename to public/images/pokemon/icons/5/587s.png diff --git a/public/images/pokemon/icons/588.png b/public/images/pokemon/icons/5/588.png similarity index 100% rename from public/images/pokemon/icons/588.png rename to public/images/pokemon/icons/5/588.png diff --git a/public/images/pokemon/icons/588s.png b/public/images/pokemon/icons/5/588s.png similarity index 100% rename from public/images/pokemon/icons/588s.png rename to public/images/pokemon/icons/5/588s.png diff --git a/public/images/pokemon/icons/589.png b/public/images/pokemon/icons/5/589.png similarity index 100% rename from public/images/pokemon/icons/589.png rename to public/images/pokemon/icons/5/589.png diff --git a/public/images/pokemon/icons/589s.png b/public/images/pokemon/icons/5/589s.png similarity index 100% rename from public/images/pokemon/icons/589s.png rename to public/images/pokemon/icons/5/589s.png diff --git a/public/images/pokemon/icons/590.png b/public/images/pokemon/icons/5/590.png similarity index 100% rename from public/images/pokemon/icons/590.png rename to public/images/pokemon/icons/5/590.png diff --git a/public/images/pokemon/icons/590s.png b/public/images/pokemon/icons/5/590s.png similarity index 100% rename from public/images/pokemon/icons/590s.png rename to public/images/pokemon/icons/5/590s.png diff --git a/public/images/pokemon/icons/591.png b/public/images/pokemon/icons/5/591.png similarity index 100% rename from public/images/pokemon/icons/591.png rename to public/images/pokemon/icons/5/591.png diff --git a/public/images/pokemon/icons/591s.png b/public/images/pokemon/icons/5/591s.png similarity index 100% rename from public/images/pokemon/icons/591s.png rename to public/images/pokemon/icons/5/591s.png diff --git a/public/images/pokemon/icons/592-f.png b/public/images/pokemon/icons/5/592-f.png similarity index 100% rename from public/images/pokemon/icons/592-f.png rename to public/images/pokemon/icons/5/592-f.png diff --git a/public/images/pokemon/icons/592.png b/public/images/pokemon/icons/5/592.png similarity index 100% rename from public/images/pokemon/icons/592.png rename to public/images/pokemon/icons/5/592.png diff --git a/public/images/pokemon/icons/592s-f.png b/public/images/pokemon/icons/5/592s-f.png similarity index 100% rename from public/images/pokemon/icons/592s-f.png rename to public/images/pokemon/icons/5/592s-f.png diff --git a/public/images/pokemon/icons/592s.png b/public/images/pokemon/icons/5/592s.png similarity index 100% rename from public/images/pokemon/icons/592s.png rename to public/images/pokemon/icons/5/592s.png diff --git a/public/images/pokemon/icons/593-f.png b/public/images/pokemon/icons/5/593-f.png similarity index 100% rename from public/images/pokemon/icons/593-f.png rename to public/images/pokemon/icons/5/593-f.png diff --git a/public/images/pokemon/icons/593.png b/public/images/pokemon/icons/5/593.png similarity index 100% rename from public/images/pokemon/icons/593.png rename to public/images/pokemon/icons/5/593.png diff --git a/public/images/pokemon/icons/593s-f.png b/public/images/pokemon/icons/5/593s-f.png similarity index 100% rename from public/images/pokemon/icons/593s-f.png rename to public/images/pokemon/icons/5/593s-f.png diff --git a/public/images/pokemon/icons/593s.png b/public/images/pokemon/icons/5/593s.png similarity index 100% rename from public/images/pokemon/icons/593s.png rename to public/images/pokemon/icons/5/593s.png diff --git a/public/images/pokemon/icons/594.png b/public/images/pokemon/icons/5/594.png similarity index 100% rename from public/images/pokemon/icons/594.png rename to public/images/pokemon/icons/5/594.png diff --git a/public/images/pokemon/icons/594s.png b/public/images/pokemon/icons/5/594s.png similarity index 100% rename from public/images/pokemon/icons/594s.png rename to public/images/pokemon/icons/5/594s.png diff --git a/public/images/pokemon/icons/595.png b/public/images/pokemon/icons/5/595.png similarity index 100% rename from public/images/pokemon/icons/595.png rename to public/images/pokemon/icons/5/595.png diff --git a/public/images/pokemon/icons/595s.png b/public/images/pokemon/icons/5/595s.png similarity index 100% rename from public/images/pokemon/icons/595s.png rename to public/images/pokemon/icons/5/595s.png diff --git a/public/images/pokemon/icons/596.png b/public/images/pokemon/icons/5/596.png similarity index 100% rename from public/images/pokemon/icons/596.png rename to public/images/pokemon/icons/5/596.png diff --git a/public/images/pokemon/icons/596s.png b/public/images/pokemon/icons/5/596s.png similarity index 100% rename from public/images/pokemon/icons/596s.png rename to public/images/pokemon/icons/5/596s.png diff --git a/public/images/pokemon/icons/597.png b/public/images/pokemon/icons/5/597.png similarity index 100% rename from public/images/pokemon/icons/597.png rename to public/images/pokemon/icons/5/597.png diff --git a/public/images/pokemon/icons/597s.png b/public/images/pokemon/icons/5/597s.png similarity index 100% rename from public/images/pokemon/icons/597s.png rename to public/images/pokemon/icons/5/597s.png diff --git a/public/images/pokemon/icons/598.png b/public/images/pokemon/icons/5/598.png similarity index 100% rename from public/images/pokemon/icons/598.png rename to public/images/pokemon/icons/5/598.png diff --git a/public/images/pokemon/icons/598s.png b/public/images/pokemon/icons/5/598s.png similarity index 100% rename from public/images/pokemon/icons/598s.png rename to public/images/pokemon/icons/5/598s.png diff --git a/public/images/pokemon/icons/599.png b/public/images/pokemon/icons/5/599.png similarity index 100% rename from public/images/pokemon/icons/599.png rename to public/images/pokemon/icons/5/599.png diff --git a/public/images/pokemon/icons/599s.png b/public/images/pokemon/icons/5/599s.png similarity index 100% rename from public/images/pokemon/icons/599s.png rename to public/images/pokemon/icons/5/599s.png diff --git a/public/images/pokemon/icons/600.png b/public/images/pokemon/icons/5/600.png similarity index 100% rename from public/images/pokemon/icons/600.png rename to public/images/pokemon/icons/5/600.png diff --git a/public/images/pokemon/icons/600s.png b/public/images/pokemon/icons/5/600s.png similarity index 100% rename from public/images/pokemon/icons/600s.png rename to public/images/pokemon/icons/5/600s.png diff --git a/public/images/pokemon/icons/601.png b/public/images/pokemon/icons/5/601.png similarity index 100% rename from public/images/pokemon/icons/601.png rename to public/images/pokemon/icons/5/601.png diff --git a/public/images/pokemon/icons/601s.png b/public/images/pokemon/icons/5/601s.png similarity index 100% rename from public/images/pokemon/icons/601s.png rename to public/images/pokemon/icons/5/601s.png diff --git a/public/images/pokemon/icons/602.png b/public/images/pokemon/icons/5/602.png similarity index 100% rename from public/images/pokemon/icons/602.png rename to public/images/pokemon/icons/5/602.png diff --git a/public/images/pokemon/icons/602s.png b/public/images/pokemon/icons/5/602s.png similarity index 100% rename from public/images/pokemon/icons/602s.png rename to public/images/pokemon/icons/5/602s.png diff --git a/public/images/pokemon/icons/603.png b/public/images/pokemon/icons/5/603.png similarity index 100% rename from public/images/pokemon/icons/603.png rename to public/images/pokemon/icons/5/603.png diff --git a/public/images/pokemon/icons/603s.png b/public/images/pokemon/icons/5/603s.png similarity index 100% rename from public/images/pokemon/icons/603s.png rename to public/images/pokemon/icons/5/603s.png diff --git a/public/images/pokemon/icons/604.png b/public/images/pokemon/icons/5/604.png similarity index 100% rename from public/images/pokemon/icons/604.png rename to public/images/pokemon/icons/5/604.png diff --git a/public/images/pokemon/icons/604s.png b/public/images/pokemon/icons/5/604s.png similarity index 100% rename from public/images/pokemon/icons/604s.png rename to public/images/pokemon/icons/5/604s.png diff --git a/public/images/pokemon/icons/605.png b/public/images/pokemon/icons/5/605.png similarity index 100% rename from public/images/pokemon/icons/605.png rename to public/images/pokemon/icons/5/605.png diff --git a/public/images/pokemon/icons/605s.png b/public/images/pokemon/icons/5/605s.png similarity index 100% rename from public/images/pokemon/icons/605s.png rename to public/images/pokemon/icons/5/605s.png diff --git a/public/images/pokemon/icons/606.png b/public/images/pokemon/icons/5/606.png similarity index 100% rename from public/images/pokemon/icons/606.png rename to public/images/pokemon/icons/5/606.png diff --git a/public/images/pokemon/icons/606s.png b/public/images/pokemon/icons/5/606s.png similarity index 100% rename from public/images/pokemon/icons/606s.png rename to public/images/pokemon/icons/5/606s.png diff --git a/public/images/pokemon/icons/607.png b/public/images/pokemon/icons/5/607.png similarity index 100% rename from public/images/pokemon/icons/607.png rename to public/images/pokemon/icons/5/607.png diff --git a/public/images/pokemon/icons/607s.png b/public/images/pokemon/icons/5/607s.png similarity index 100% rename from public/images/pokemon/icons/607s.png rename to public/images/pokemon/icons/5/607s.png diff --git a/public/images/pokemon/icons/608.png b/public/images/pokemon/icons/5/608.png similarity index 100% rename from public/images/pokemon/icons/608.png rename to public/images/pokemon/icons/5/608.png diff --git a/public/images/pokemon/icons/608s.png b/public/images/pokemon/icons/5/608s.png similarity index 100% rename from public/images/pokemon/icons/608s.png rename to public/images/pokemon/icons/5/608s.png diff --git a/public/images/pokemon/icons/609.png b/public/images/pokemon/icons/5/609.png similarity index 100% rename from public/images/pokemon/icons/609.png rename to public/images/pokemon/icons/5/609.png diff --git a/public/images/pokemon/icons/609s.png b/public/images/pokemon/icons/5/609s.png similarity index 100% rename from public/images/pokemon/icons/609s.png rename to public/images/pokemon/icons/5/609s.png diff --git a/public/images/pokemon/icons/610.png b/public/images/pokemon/icons/5/610.png similarity index 100% rename from public/images/pokemon/icons/610.png rename to public/images/pokemon/icons/5/610.png diff --git a/public/images/pokemon/icons/610s.png b/public/images/pokemon/icons/5/610s.png similarity index 100% rename from public/images/pokemon/icons/610s.png rename to public/images/pokemon/icons/5/610s.png diff --git a/public/images/pokemon/icons/611.png b/public/images/pokemon/icons/5/611.png similarity index 100% rename from public/images/pokemon/icons/611.png rename to public/images/pokemon/icons/5/611.png diff --git a/public/images/pokemon/icons/611s.png b/public/images/pokemon/icons/5/611s.png similarity index 100% rename from public/images/pokemon/icons/611s.png rename to public/images/pokemon/icons/5/611s.png diff --git a/public/images/pokemon/icons/612.png b/public/images/pokemon/icons/5/612.png similarity index 100% rename from public/images/pokemon/icons/612.png rename to public/images/pokemon/icons/5/612.png diff --git a/public/images/pokemon/icons/612s.png b/public/images/pokemon/icons/5/612s.png similarity index 100% rename from public/images/pokemon/icons/612s.png rename to public/images/pokemon/icons/5/612s.png diff --git a/public/images/pokemon/icons/613.png b/public/images/pokemon/icons/5/613.png similarity index 100% rename from public/images/pokemon/icons/613.png rename to public/images/pokemon/icons/5/613.png diff --git a/public/images/pokemon/icons/613s.png b/public/images/pokemon/icons/5/613s.png similarity index 100% rename from public/images/pokemon/icons/613s.png rename to public/images/pokemon/icons/5/613s.png diff --git a/public/images/pokemon/icons/614.png b/public/images/pokemon/icons/5/614.png similarity index 100% rename from public/images/pokemon/icons/614.png rename to public/images/pokemon/icons/5/614.png diff --git a/public/images/pokemon/icons/614s.png b/public/images/pokemon/icons/5/614s.png similarity index 100% rename from public/images/pokemon/icons/614s.png rename to public/images/pokemon/icons/5/614s.png diff --git a/public/images/pokemon/icons/615.png b/public/images/pokemon/icons/5/615.png similarity index 100% rename from public/images/pokemon/icons/615.png rename to public/images/pokemon/icons/5/615.png diff --git a/public/images/pokemon/icons/615s.png b/public/images/pokemon/icons/5/615s.png similarity index 100% rename from public/images/pokemon/icons/615s.png rename to public/images/pokemon/icons/5/615s.png diff --git a/public/images/pokemon/icons/616.png b/public/images/pokemon/icons/5/616.png similarity index 100% rename from public/images/pokemon/icons/616.png rename to public/images/pokemon/icons/5/616.png diff --git a/public/images/pokemon/icons/616s.png b/public/images/pokemon/icons/5/616s.png similarity index 100% rename from public/images/pokemon/icons/616s.png rename to public/images/pokemon/icons/5/616s.png diff --git a/public/images/pokemon/icons/617.png b/public/images/pokemon/icons/5/617.png similarity index 100% rename from public/images/pokemon/icons/617.png rename to public/images/pokemon/icons/5/617.png diff --git a/public/images/pokemon/icons/617s.png b/public/images/pokemon/icons/5/617s.png similarity index 100% rename from public/images/pokemon/icons/617s.png rename to public/images/pokemon/icons/5/617s.png diff --git a/public/images/pokemon/icons/618.png b/public/images/pokemon/icons/5/618.png similarity index 100% rename from public/images/pokemon/icons/618.png rename to public/images/pokemon/icons/5/618.png diff --git a/public/images/pokemon/icons/618s.png b/public/images/pokemon/icons/5/618s.png similarity index 100% rename from public/images/pokemon/icons/618s.png rename to public/images/pokemon/icons/5/618s.png diff --git a/public/images/pokemon/icons/619.png b/public/images/pokemon/icons/5/619.png similarity index 100% rename from public/images/pokemon/icons/619.png rename to public/images/pokemon/icons/5/619.png diff --git a/public/images/pokemon/icons/619s.png b/public/images/pokemon/icons/5/619s.png similarity index 100% rename from public/images/pokemon/icons/619s.png rename to public/images/pokemon/icons/5/619s.png diff --git a/public/images/pokemon/icons/620.png b/public/images/pokemon/icons/5/620.png similarity index 100% rename from public/images/pokemon/icons/620.png rename to public/images/pokemon/icons/5/620.png diff --git a/public/images/pokemon/icons/620s.png b/public/images/pokemon/icons/5/620s.png similarity index 100% rename from public/images/pokemon/icons/620s.png rename to public/images/pokemon/icons/5/620s.png diff --git a/public/images/pokemon/icons/621.png b/public/images/pokemon/icons/5/621.png similarity index 100% rename from public/images/pokemon/icons/621.png rename to public/images/pokemon/icons/5/621.png diff --git a/public/images/pokemon/icons/621s.png b/public/images/pokemon/icons/5/621s.png similarity index 100% rename from public/images/pokemon/icons/621s.png rename to public/images/pokemon/icons/5/621s.png diff --git a/public/images/pokemon/icons/622.png b/public/images/pokemon/icons/5/622.png similarity index 100% rename from public/images/pokemon/icons/622.png rename to public/images/pokemon/icons/5/622.png diff --git a/public/images/pokemon/icons/622s.png b/public/images/pokemon/icons/5/622s.png similarity index 100% rename from public/images/pokemon/icons/622s.png rename to public/images/pokemon/icons/5/622s.png diff --git a/public/images/pokemon/icons/623.png b/public/images/pokemon/icons/5/623.png similarity index 100% rename from public/images/pokemon/icons/623.png rename to public/images/pokemon/icons/5/623.png diff --git a/public/images/pokemon/icons/623s.png b/public/images/pokemon/icons/5/623s.png similarity index 100% rename from public/images/pokemon/icons/623s.png rename to public/images/pokemon/icons/5/623s.png diff --git a/public/images/pokemon/icons/624.png b/public/images/pokemon/icons/5/624.png similarity index 100% rename from public/images/pokemon/icons/624.png rename to public/images/pokemon/icons/5/624.png diff --git a/public/images/pokemon/icons/624s.png b/public/images/pokemon/icons/5/624s.png similarity index 100% rename from public/images/pokemon/icons/624s.png rename to public/images/pokemon/icons/5/624s.png diff --git a/public/images/pokemon/icons/625.png b/public/images/pokemon/icons/5/625.png similarity index 100% rename from public/images/pokemon/icons/625.png rename to public/images/pokemon/icons/5/625.png diff --git a/public/images/pokemon/icons/625s.png b/public/images/pokemon/icons/5/625s.png similarity index 100% rename from public/images/pokemon/icons/625s.png rename to public/images/pokemon/icons/5/625s.png diff --git a/public/images/pokemon/icons/626.png b/public/images/pokemon/icons/5/626.png similarity index 100% rename from public/images/pokemon/icons/626.png rename to public/images/pokemon/icons/5/626.png diff --git a/public/images/pokemon/icons/626s.png b/public/images/pokemon/icons/5/626s.png similarity index 100% rename from public/images/pokemon/icons/626s.png rename to public/images/pokemon/icons/5/626s.png diff --git a/public/images/pokemon/icons/627.png b/public/images/pokemon/icons/5/627.png similarity index 100% rename from public/images/pokemon/icons/627.png rename to public/images/pokemon/icons/5/627.png diff --git a/public/images/pokemon/icons/627s.png b/public/images/pokemon/icons/5/627s.png similarity index 100% rename from public/images/pokemon/icons/627s.png rename to public/images/pokemon/icons/5/627s.png diff --git a/public/images/pokemon/icons/628.png b/public/images/pokemon/icons/5/628.png similarity index 100% rename from public/images/pokemon/icons/628.png rename to public/images/pokemon/icons/5/628.png diff --git a/public/images/pokemon/icons/628s.png b/public/images/pokemon/icons/5/628s.png similarity index 100% rename from public/images/pokemon/icons/628s.png rename to public/images/pokemon/icons/5/628s.png diff --git a/public/images/pokemon/icons/629.png b/public/images/pokemon/icons/5/629.png similarity index 100% rename from public/images/pokemon/icons/629.png rename to public/images/pokemon/icons/5/629.png diff --git a/public/images/pokemon/icons/629s.png b/public/images/pokemon/icons/5/629s.png similarity index 100% rename from public/images/pokemon/icons/629s.png rename to public/images/pokemon/icons/5/629s.png diff --git a/public/images/pokemon/icons/630.png b/public/images/pokemon/icons/5/630.png similarity index 100% rename from public/images/pokemon/icons/630.png rename to public/images/pokemon/icons/5/630.png diff --git a/public/images/pokemon/icons/630s.png b/public/images/pokemon/icons/5/630s.png similarity index 100% rename from public/images/pokemon/icons/630s.png rename to public/images/pokemon/icons/5/630s.png diff --git a/public/images/pokemon/icons/631.png b/public/images/pokemon/icons/5/631.png similarity index 100% rename from public/images/pokemon/icons/631.png rename to public/images/pokemon/icons/5/631.png diff --git a/public/images/pokemon/icons/631s.png b/public/images/pokemon/icons/5/631s.png similarity index 100% rename from public/images/pokemon/icons/631s.png rename to public/images/pokemon/icons/5/631s.png diff --git a/public/images/pokemon/icons/632.png b/public/images/pokemon/icons/5/632.png similarity index 100% rename from public/images/pokemon/icons/632.png rename to public/images/pokemon/icons/5/632.png diff --git a/public/images/pokemon/icons/632s.png b/public/images/pokemon/icons/5/632s.png similarity index 100% rename from public/images/pokemon/icons/632s.png rename to public/images/pokemon/icons/5/632s.png diff --git a/public/images/pokemon/icons/633.png b/public/images/pokemon/icons/5/633.png similarity index 100% rename from public/images/pokemon/icons/633.png rename to public/images/pokemon/icons/5/633.png diff --git a/public/images/pokemon/icons/633s.png b/public/images/pokemon/icons/5/633s.png similarity index 100% rename from public/images/pokemon/icons/633s.png rename to public/images/pokemon/icons/5/633s.png diff --git a/public/images/pokemon/icons/634.png b/public/images/pokemon/icons/5/634.png similarity index 100% rename from public/images/pokemon/icons/634.png rename to public/images/pokemon/icons/5/634.png diff --git a/public/images/pokemon/icons/634s.png b/public/images/pokemon/icons/5/634s.png similarity index 100% rename from public/images/pokemon/icons/634s.png rename to public/images/pokemon/icons/5/634s.png diff --git a/public/images/pokemon/icons/635.png b/public/images/pokemon/icons/5/635.png similarity index 100% rename from public/images/pokemon/icons/635.png rename to public/images/pokemon/icons/5/635.png diff --git a/public/images/pokemon/icons/635s.png b/public/images/pokemon/icons/5/635s.png similarity index 100% rename from public/images/pokemon/icons/635s.png rename to public/images/pokemon/icons/5/635s.png diff --git a/public/images/pokemon/icons/636.png b/public/images/pokemon/icons/5/636.png similarity index 100% rename from public/images/pokemon/icons/636.png rename to public/images/pokemon/icons/5/636.png diff --git a/public/images/pokemon/icons/636s.png b/public/images/pokemon/icons/5/636s.png similarity index 100% rename from public/images/pokemon/icons/636s.png rename to public/images/pokemon/icons/5/636s.png diff --git a/public/images/pokemon/icons/637.png b/public/images/pokemon/icons/5/637.png similarity index 100% rename from public/images/pokemon/icons/637.png rename to public/images/pokemon/icons/5/637.png diff --git a/public/images/pokemon/icons/637s.png b/public/images/pokemon/icons/5/637s.png similarity index 100% rename from public/images/pokemon/icons/637s.png rename to public/images/pokemon/icons/5/637s.png diff --git a/public/images/pokemon/icons/638.png b/public/images/pokemon/icons/5/638.png similarity index 100% rename from public/images/pokemon/icons/638.png rename to public/images/pokemon/icons/5/638.png diff --git a/public/images/pokemon/icons/638s.png b/public/images/pokemon/icons/5/638s.png similarity index 100% rename from public/images/pokemon/icons/638s.png rename to public/images/pokemon/icons/5/638s.png diff --git a/public/images/pokemon/icons/639.png b/public/images/pokemon/icons/5/639.png similarity index 100% rename from public/images/pokemon/icons/639.png rename to public/images/pokemon/icons/5/639.png diff --git a/public/images/pokemon/icons/639s.png b/public/images/pokemon/icons/5/639s.png similarity index 100% rename from public/images/pokemon/icons/639s.png rename to public/images/pokemon/icons/5/639s.png diff --git a/public/images/pokemon/icons/640.png b/public/images/pokemon/icons/5/640.png similarity index 100% rename from public/images/pokemon/icons/640.png rename to public/images/pokemon/icons/5/640.png diff --git a/public/images/pokemon/icons/640s.png b/public/images/pokemon/icons/5/640s.png similarity index 100% rename from public/images/pokemon/icons/640s.png rename to public/images/pokemon/icons/5/640s.png diff --git a/public/images/pokemon/icons/641-incarnate.png b/public/images/pokemon/icons/5/641-incarnate.png similarity index 100% rename from public/images/pokemon/icons/641-incarnate.png rename to public/images/pokemon/icons/5/641-incarnate.png diff --git a/public/images/pokemon/icons/641-therian.png b/public/images/pokemon/icons/5/641-therian.png similarity index 100% rename from public/images/pokemon/icons/641-therian.png rename to public/images/pokemon/icons/5/641-therian.png diff --git a/public/images/pokemon/icons/641s-incarnate.png b/public/images/pokemon/icons/5/641s-incarnate.png similarity index 100% rename from public/images/pokemon/icons/641s-incarnate.png rename to public/images/pokemon/icons/5/641s-incarnate.png diff --git a/public/images/pokemon/icons/641s-therian.png b/public/images/pokemon/icons/5/641s-therian.png similarity index 100% rename from public/images/pokemon/icons/641s-therian.png rename to public/images/pokemon/icons/5/641s-therian.png diff --git a/public/images/pokemon/icons/642-incarnate.png b/public/images/pokemon/icons/5/642-incarnate.png similarity index 100% rename from public/images/pokemon/icons/642-incarnate.png rename to public/images/pokemon/icons/5/642-incarnate.png diff --git a/public/images/pokemon/icons/642-therian.png b/public/images/pokemon/icons/5/642-therian.png similarity index 100% rename from public/images/pokemon/icons/642-therian.png rename to public/images/pokemon/icons/5/642-therian.png diff --git a/public/images/pokemon/icons/642s-incarnate.png b/public/images/pokemon/icons/5/642s-incarnate.png similarity index 100% rename from public/images/pokemon/icons/642s-incarnate.png rename to public/images/pokemon/icons/5/642s-incarnate.png diff --git a/public/images/pokemon/icons/642s-therian.png b/public/images/pokemon/icons/5/642s-therian.png similarity index 100% rename from public/images/pokemon/icons/642s-therian.png rename to public/images/pokemon/icons/5/642s-therian.png diff --git a/public/images/pokemon/icons/643.png b/public/images/pokemon/icons/5/643.png similarity index 100% rename from public/images/pokemon/icons/643.png rename to public/images/pokemon/icons/5/643.png diff --git a/public/images/pokemon/icons/643s.png b/public/images/pokemon/icons/5/643s.png similarity index 100% rename from public/images/pokemon/icons/643s.png rename to public/images/pokemon/icons/5/643s.png diff --git a/public/images/pokemon/icons/644.png b/public/images/pokemon/icons/5/644.png similarity index 100% rename from public/images/pokemon/icons/644.png rename to public/images/pokemon/icons/5/644.png diff --git a/public/images/pokemon/icons/644s.png b/public/images/pokemon/icons/5/644s.png similarity index 100% rename from public/images/pokemon/icons/644s.png rename to public/images/pokemon/icons/5/644s.png diff --git a/public/images/pokemon/icons/645-incarnate.png b/public/images/pokemon/icons/5/645-incarnate.png similarity index 100% rename from public/images/pokemon/icons/645-incarnate.png rename to public/images/pokemon/icons/5/645-incarnate.png diff --git a/public/images/pokemon/icons/645-therian.png b/public/images/pokemon/icons/5/645-therian.png similarity index 100% rename from public/images/pokemon/icons/645-therian.png rename to public/images/pokemon/icons/5/645-therian.png diff --git a/public/images/pokemon/icons/645s-incarnate.png b/public/images/pokemon/icons/5/645s-incarnate.png similarity index 100% rename from public/images/pokemon/icons/645s-incarnate.png rename to public/images/pokemon/icons/5/645s-incarnate.png diff --git a/public/images/pokemon/icons/645s-therian.png b/public/images/pokemon/icons/5/645s-therian.png similarity index 100% rename from public/images/pokemon/icons/645s-therian.png rename to public/images/pokemon/icons/5/645s-therian.png diff --git a/public/images/pokemon/icons/646-black.png b/public/images/pokemon/icons/5/646-black.png similarity index 100% rename from public/images/pokemon/icons/646-black.png rename to public/images/pokemon/icons/5/646-black.png diff --git a/public/images/pokemon/icons/646-white.png b/public/images/pokemon/icons/5/646-white.png similarity index 100% rename from public/images/pokemon/icons/646-white.png rename to public/images/pokemon/icons/5/646-white.png diff --git a/public/images/pokemon/icons/646.png b/public/images/pokemon/icons/5/646.png similarity index 100% rename from public/images/pokemon/icons/646.png rename to public/images/pokemon/icons/5/646.png diff --git a/public/images/pokemon/icons/646s-black.png b/public/images/pokemon/icons/5/646s-black.png similarity index 100% rename from public/images/pokemon/icons/646s-black.png rename to public/images/pokemon/icons/5/646s-black.png diff --git a/public/images/pokemon/icons/646s-white.png b/public/images/pokemon/icons/5/646s-white.png similarity index 100% rename from public/images/pokemon/icons/646s-white.png rename to public/images/pokemon/icons/5/646s-white.png diff --git a/public/images/pokemon/icons/646s.png b/public/images/pokemon/icons/5/646s.png similarity index 100% rename from public/images/pokemon/icons/646s.png rename to public/images/pokemon/icons/5/646s.png diff --git a/public/images/pokemon/icons/647-ordinary.png b/public/images/pokemon/icons/5/647-ordinary.png similarity index 100% rename from public/images/pokemon/icons/647-ordinary.png rename to public/images/pokemon/icons/5/647-ordinary.png diff --git a/public/images/pokemon/icons/647-resolute.png b/public/images/pokemon/icons/5/647-resolute.png similarity index 100% rename from public/images/pokemon/icons/647-resolute.png rename to public/images/pokemon/icons/5/647-resolute.png diff --git a/public/images/pokemon/icons/647s-ordinary.png b/public/images/pokemon/icons/5/647s-ordinary.png similarity index 100% rename from public/images/pokemon/icons/647s-ordinary.png rename to public/images/pokemon/icons/5/647s-ordinary.png diff --git a/public/images/pokemon/icons/647s-resolute.png b/public/images/pokemon/icons/5/647s-resolute.png similarity index 100% rename from public/images/pokemon/icons/647s-resolute.png rename to public/images/pokemon/icons/5/647s-resolute.png diff --git a/public/images/pokemon/icons/648-aria.png b/public/images/pokemon/icons/5/648-aria.png similarity index 100% rename from public/images/pokemon/icons/648-aria.png rename to public/images/pokemon/icons/5/648-aria.png diff --git a/public/images/pokemon/icons/648-pirouette.png b/public/images/pokemon/icons/5/648-pirouette.png similarity index 100% rename from public/images/pokemon/icons/648-pirouette.png rename to public/images/pokemon/icons/5/648-pirouette.png diff --git a/public/images/pokemon/icons/648s-aria.png b/public/images/pokemon/icons/5/648s-aria.png similarity index 100% rename from public/images/pokemon/icons/648s-aria.png rename to public/images/pokemon/icons/5/648s-aria.png diff --git a/public/images/pokemon/icons/648s-pirouette.png b/public/images/pokemon/icons/5/648s-pirouette.png similarity index 100% rename from public/images/pokemon/icons/648s-pirouette.png rename to public/images/pokemon/icons/5/648s-pirouette.png diff --git a/public/images/pokemon/icons/649-burn.png b/public/images/pokemon/icons/5/649-burn.png similarity index 100% rename from public/images/pokemon/icons/649-burn.png rename to public/images/pokemon/icons/5/649-burn.png diff --git a/public/images/pokemon/icons/649-chill.png b/public/images/pokemon/icons/5/649-chill.png similarity index 100% rename from public/images/pokemon/icons/649-chill.png rename to public/images/pokemon/icons/5/649-chill.png diff --git a/public/images/pokemon/icons/649-douse.png b/public/images/pokemon/icons/5/649-douse.png similarity index 100% rename from public/images/pokemon/icons/649-douse.png rename to public/images/pokemon/icons/5/649-douse.png diff --git a/public/images/pokemon/icons/649-shock.png b/public/images/pokemon/icons/5/649-shock.png similarity index 100% rename from public/images/pokemon/icons/649-shock.png rename to public/images/pokemon/icons/5/649-shock.png diff --git a/public/images/pokemon/icons/649.png b/public/images/pokemon/icons/5/649.png similarity index 100% rename from public/images/pokemon/icons/649.png rename to public/images/pokemon/icons/5/649.png diff --git a/public/images/pokemon/icons/649s-burn.png b/public/images/pokemon/icons/5/649s-burn.png similarity index 100% rename from public/images/pokemon/icons/649s-burn.png rename to public/images/pokemon/icons/5/649s-burn.png diff --git a/public/images/pokemon/icons/649s-chill.png b/public/images/pokemon/icons/5/649s-chill.png similarity index 100% rename from public/images/pokemon/icons/649s-chill.png rename to public/images/pokemon/icons/5/649s-chill.png diff --git a/public/images/pokemon/icons/649s-douse.png b/public/images/pokemon/icons/5/649s-douse.png similarity index 100% rename from public/images/pokemon/icons/649s-douse.png rename to public/images/pokemon/icons/5/649s-douse.png diff --git a/public/images/pokemon/icons/649s-shock.png b/public/images/pokemon/icons/5/649s-shock.png similarity index 100% rename from public/images/pokemon/icons/649s-shock.png rename to public/images/pokemon/icons/5/649s-shock.png diff --git a/public/images/pokemon/icons/649s.png b/public/images/pokemon/icons/5/649s.png similarity index 100% rename from public/images/pokemon/icons/649s.png rename to public/images/pokemon/icons/5/649s.png diff --git a/public/images/pokemon/icons/5/icons.bat b/public/images/pokemon/icons/5/icons.bat new file mode 100644 index 000000000..d03190061 --- /dev/null +++ b/public/images/pokemon/icons/5/icons.bat @@ -0,0 +1 @@ +cmd /c TexturePacker ./ ../configuration.tps --sheet ../../../pokemon_icons_5.png --data ../../../pokemon_icons_5.json --replace .png= \ No newline at end of file diff --git a/public/images/pokemon/icons/2670.png b/public/images/pokemon/icons/6/2670.png similarity index 100% rename from public/images/pokemon/icons/2670.png rename to public/images/pokemon/icons/6/2670.png diff --git a/public/images/pokemon/icons/2670s.png b/public/images/pokemon/icons/6/2670s.png similarity index 100% rename from public/images/pokemon/icons/2670s.png rename to public/images/pokemon/icons/6/2670s.png diff --git a/public/images/pokemon/icons/650.png b/public/images/pokemon/icons/6/650.png similarity index 100% rename from public/images/pokemon/icons/650.png rename to public/images/pokemon/icons/6/650.png diff --git a/public/images/pokemon/icons/650s.png b/public/images/pokemon/icons/6/650s.png similarity index 100% rename from public/images/pokemon/icons/650s.png rename to public/images/pokemon/icons/6/650s.png diff --git a/public/images/pokemon/icons/651.png b/public/images/pokemon/icons/6/651.png similarity index 100% rename from public/images/pokemon/icons/651.png rename to public/images/pokemon/icons/6/651.png diff --git a/public/images/pokemon/icons/651s.png b/public/images/pokemon/icons/6/651s.png similarity index 100% rename from public/images/pokemon/icons/651s.png rename to public/images/pokemon/icons/6/651s.png diff --git a/public/images/pokemon/icons/652.png b/public/images/pokemon/icons/6/652.png similarity index 100% rename from public/images/pokemon/icons/652.png rename to public/images/pokemon/icons/6/652.png diff --git a/public/images/pokemon/icons/652s.png b/public/images/pokemon/icons/6/652s.png similarity index 100% rename from public/images/pokemon/icons/652s.png rename to public/images/pokemon/icons/6/652s.png diff --git a/public/images/pokemon/icons/653.png b/public/images/pokemon/icons/6/653.png similarity index 100% rename from public/images/pokemon/icons/653.png rename to public/images/pokemon/icons/6/653.png diff --git a/public/images/pokemon/icons/653s.png b/public/images/pokemon/icons/6/653s.png similarity index 100% rename from public/images/pokemon/icons/653s.png rename to public/images/pokemon/icons/6/653s.png diff --git a/public/images/pokemon/icons/654.png b/public/images/pokemon/icons/6/654.png similarity index 100% rename from public/images/pokemon/icons/654.png rename to public/images/pokemon/icons/6/654.png diff --git a/public/images/pokemon/icons/654s.png b/public/images/pokemon/icons/6/654s.png similarity index 100% rename from public/images/pokemon/icons/654s.png rename to public/images/pokemon/icons/6/654s.png diff --git a/public/images/pokemon/icons/655.png b/public/images/pokemon/icons/6/655.png similarity index 100% rename from public/images/pokemon/icons/655.png rename to public/images/pokemon/icons/6/655.png diff --git a/public/images/pokemon/icons/655s.png b/public/images/pokemon/icons/6/655s.png similarity index 100% rename from public/images/pokemon/icons/655s.png rename to public/images/pokemon/icons/6/655s.png diff --git a/public/images/pokemon/icons/656.png b/public/images/pokemon/icons/6/656.png similarity index 100% rename from public/images/pokemon/icons/656.png rename to public/images/pokemon/icons/6/656.png diff --git a/public/images/pokemon/icons/656s.png b/public/images/pokemon/icons/6/656s.png similarity index 100% rename from public/images/pokemon/icons/656s.png rename to public/images/pokemon/icons/6/656s.png diff --git a/public/images/pokemon/icons/657.png b/public/images/pokemon/icons/6/657.png similarity index 100% rename from public/images/pokemon/icons/657.png rename to public/images/pokemon/icons/6/657.png diff --git a/public/images/pokemon/icons/657s.png b/public/images/pokemon/icons/6/657s.png similarity index 100% rename from public/images/pokemon/icons/657s.png rename to public/images/pokemon/icons/6/657s.png diff --git a/public/images/pokemon/icons/658-ash.png b/public/images/pokemon/icons/6/658-ash.png similarity index 100% rename from public/images/pokemon/icons/658-ash.png rename to public/images/pokemon/icons/6/658-ash.png diff --git a/public/images/pokemon/icons/658.png b/public/images/pokemon/icons/6/658.png similarity index 100% rename from public/images/pokemon/icons/658.png rename to public/images/pokemon/icons/6/658.png diff --git a/public/images/pokemon/icons/658s-ash.png b/public/images/pokemon/icons/6/658s-ash.png similarity index 100% rename from public/images/pokemon/icons/658s-ash.png rename to public/images/pokemon/icons/6/658s-ash.png diff --git a/public/images/pokemon/icons/658s.png b/public/images/pokemon/icons/6/658s.png similarity index 100% rename from public/images/pokemon/icons/658s.png rename to public/images/pokemon/icons/6/658s.png diff --git a/public/images/pokemon/icons/659.png b/public/images/pokemon/icons/6/659.png similarity index 100% rename from public/images/pokemon/icons/659.png rename to public/images/pokemon/icons/6/659.png diff --git a/public/images/pokemon/icons/659s.png b/public/images/pokemon/icons/6/659s.png similarity index 100% rename from public/images/pokemon/icons/659s.png rename to public/images/pokemon/icons/6/659s.png diff --git a/public/images/pokemon/icons/660.png b/public/images/pokemon/icons/6/660.png similarity index 100% rename from public/images/pokemon/icons/660.png rename to public/images/pokemon/icons/6/660.png diff --git a/public/images/pokemon/icons/660s.png b/public/images/pokemon/icons/6/660s.png similarity index 100% rename from public/images/pokemon/icons/660s.png rename to public/images/pokemon/icons/6/660s.png diff --git a/public/images/pokemon/icons/661.png b/public/images/pokemon/icons/6/661.png similarity index 100% rename from public/images/pokemon/icons/661.png rename to public/images/pokemon/icons/6/661.png diff --git a/public/images/pokemon/icons/661s.png b/public/images/pokemon/icons/6/661s.png similarity index 100% rename from public/images/pokemon/icons/661s.png rename to public/images/pokemon/icons/6/661s.png diff --git a/public/images/pokemon/icons/662.png b/public/images/pokemon/icons/6/662.png similarity index 100% rename from public/images/pokemon/icons/662.png rename to public/images/pokemon/icons/6/662.png diff --git a/public/images/pokemon/icons/662s.png b/public/images/pokemon/icons/6/662s.png similarity index 100% rename from public/images/pokemon/icons/662s.png rename to public/images/pokemon/icons/6/662s.png diff --git a/public/images/pokemon/icons/663.png b/public/images/pokemon/icons/6/663.png similarity index 100% rename from public/images/pokemon/icons/663.png rename to public/images/pokemon/icons/6/663.png diff --git a/public/images/pokemon/icons/663s.png b/public/images/pokemon/icons/6/663s.png similarity index 100% rename from public/images/pokemon/icons/663s.png rename to public/images/pokemon/icons/6/663s.png diff --git a/public/images/pokemon/icons/664.png b/public/images/pokemon/icons/6/664.png similarity index 100% rename from public/images/pokemon/icons/664.png rename to public/images/pokemon/icons/6/664.png diff --git a/public/images/pokemon/icons/664s.png b/public/images/pokemon/icons/6/664s.png similarity index 100% rename from public/images/pokemon/icons/664s.png rename to public/images/pokemon/icons/6/664s.png diff --git a/public/images/pokemon/icons/665.png b/public/images/pokemon/icons/6/665.png similarity index 100% rename from public/images/pokemon/icons/665.png rename to public/images/pokemon/icons/6/665.png diff --git a/public/images/pokemon/icons/665s.png b/public/images/pokemon/icons/6/665s.png similarity index 100% rename from public/images/pokemon/icons/665s.png rename to public/images/pokemon/icons/6/665s.png diff --git a/public/images/pokemon/icons/666-archipelago.png b/public/images/pokemon/icons/6/666-archipelago.png similarity index 100% rename from public/images/pokemon/icons/666-archipelago.png rename to public/images/pokemon/icons/6/666-archipelago.png diff --git a/public/images/pokemon/icons/666-continental.png b/public/images/pokemon/icons/6/666-continental.png similarity index 100% rename from public/images/pokemon/icons/666-continental.png rename to public/images/pokemon/icons/6/666-continental.png diff --git a/public/images/pokemon/icons/666-elegant.png b/public/images/pokemon/icons/6/666-elegant.png similarity index 100% rename from public/images/pokemon/icons/666-elegant.png rename to public/images/pokemon/icons/6/666-elegant.png diff --git a/public/images/pokemon/icons/666-fancy.png b/public/images/pokemon/icons/6/666-fancy.png similarity index 100% rename from public/images/pokemon/icons/666-fancy.png rename to public/images/pokemon/icons/6/666-fancy.png diff --git a/public/images/pokemon/icons/666-garden.png b/public/images/pokemon/icons/6/666-garden.png similarity index 100% rename from public/images/pokemon/icons/666-garden.png rename to public/images/pokemon/icons/6/666-garden.png diff --git a/public/images/pokemon/icons/666-high-plains.png b/public/images/pokemon/icons/6/666-high-plains.png similarity index 100% rename from public/images/pokemon/icons/666-high-plains.png rename to public/images/pokemon/icons/6/666-high-plains.png diff --git a/public/images/pokemon/icons/666-icy-snow.png b/public/images/pokemon/icons/6/666-icy-snow.png similarity index 100% rename from public/images/pokemon/icons/666-icy-snow.png rename to public/images/pokemon/icons/6/666-icy-snow.png diff --git a/public/images/pokemon/icons/666-jungle.png b/public/images/pokemon/icons/6/666-jungle.png similarity index 100% rename from public/images/pokemon/icons/666-jungle.png rename to public/images/pokemon/icons/6/666-jungle.png diff --git a/public/images/pokemon/icons/666-marine.png b/public/images/pokemon/icons/6/666-marine.png similarity index 100% rename from public/images/pokemon/icons/666-marine.png rename to public/images/pokemon/icons/6/666-marine.png diff --git a/public/images/pokemon/icons/666-meadow.png b/public/images/pokemon/icons/6/666-meadow.png similarity index 100% rename from public/images/pokemon/icons/666-meadow.png rename to public/images/pokemon/icons/6/666-meadow.png diff --git a/public/images/pokemon/icons/666-modern.png b/public/images/pokemon/icons/6/666-modern.png similarity index 100% rename from public/images/pokemon/icons/666-modern.png rename to public/images/pokemon/icons/6/666-modern.png diff --git a/public/images/pokemon/icons/666-monsoon.png b/public/images/pokemon/icons/6/666-monsoon.png similarity index 100% rename from public/images/pokemon/icons/666-monsoon.png rename to public/images/pokemon/icons/6/666-monsoon.png diff --git a/public/images/pokemon/icons/666-ocean.png b/public/images/pokemon/icons/6/666-ocean.png similarity index 100% rename from public/images/pokemon/icons/666-ocean.png rename to public/images/pokemon/icons/6/666-ocean.png diff --git a/public/images/pokemon/icons/666-poke-ball.png b/public/images/pokemon/icons/6/666-poke-ball.png similarity index 100% rename from public/images/pokemon/icons/666-poke-ball.png rename to public/images/pokemon/icons/6/666-poke-ball.png diff --git a/public/images/pokemon/icons/666-polar.png b/public/images/pokemon/icons/6/666-polar.png similarity index 100% rename from public/images/pokemon/icons/666-polar.png rename to public/images/pokemon/icons/6/666-polar.png diff --git a/public/images/pokemon/icons/666-river.png b/public/images/pokemon/icons/6/666-river.png similarity index 100% rename from public/images/pokemon/icons/666-river.png rename to public/images/pokemon/icons/6/666-river.png diff --git a/public/images/pokemon/icons/666-sandstorm.png b/public/images/pokemon/icons/6/666-sandstorm.png similarity index 100% rename from public/images/pokemon/icons/666-sandstorm.png rename to public/images/pokemon/icons/6/666-sandstorm.png diff --git a/public/images/pokemon/icons/666-savanna.png b/public/images/pokemon/icons/6/666-savanna.png similarity index 100% rename from public/images/pokemon/icons/666-savanna.png rename to public/images/pokemon/icons/6/666-savanna.png diff --git a/public/images/pokemon/icons/666-sun.png b/public/images/pokemon/icons/6/666-sun.png similarity index 100% rename from public/images/pokemon/icons/666-sun.png rename to public/images/pokemon/icons/6/666-sun.png diff --git a/public/images/pokemon/icons/666-tundra.png b/public/images/pokemon/icons/6/666-tundra.png similarity index 100% rename from public/images/pokemon/icons/666-tundra.png rename to public/images/pokemon/icons/6/666-tundra.png diff --git a/public/images/pokemon/icons/666s-archipelago.png b/public/images/pokemon/icons/6/666s-archipelago.png similarity index 100% rename from public/images/pokemon/icons/666s-archipelago.png rename to public/images/pokemon/icons/6/666s-archipelago.png diff --git a/public/images/pokemon/icons/666s-continental.png b/public/images/pokemon/icons/6/666s-continental.png similarity index 100% rename from public/images/pokemon/icons/666s-continental.png rename to public/images/pokemon/icons/6/666s-continental.png diff --git a/public/images/pokemon/icons/666s-elegant.png b/public/images/pokemon/icons/6/666s-elegant.png similarity index 100% rename from public/images/pokemon/icons/666s-elegant.png rename to public/images/pokemon/icons/6/666s-elegant.png diff --git a/public/images/pokemon/icons/666s-fancy.png b/public/images/pokemon/icons/6/666s-fancy.png similarity index 100% rename from public/images/pokemon/icons/666s-fancy.png rename to public/images/pokemon/icons/6/666s-fancy.png diff --git a/public/images/pokemon/icons/666s-garden.png b/public/images/pokemon/icons/6/666s-garden.png similarity index 100% rename from public/images/pokemon/icons/666s-garden.png rename to public/images/pokemon/icons/6/666s-garden.png diff --git a/public/images/pokemon/icons/666s-high-plains.png b/public/images/pokemon/icons/6/666s-high-plains.png similarity index 100% rename from public/images/pokemon/icons/666s-high-plains.png rename to public/images/pokemon/icons/6/666s-high-plains.png diff --git a/public/images/pokemon/icons/666s-icy-snow.png b/public/images/pokemon/icons/6/666s-icy-snow.png similarity index 100% rename from public/images/pokemon/icons/666s-icy-snow.png rename to public/images/pokemon/icons/6/666s-icy-snow.png diff --git a/public/images/pokemon/icons/666s-jungle.png b/public/images/pokemon/icons/6/666s-jungle.png similarity index 100% rename from public/images/pokemon/icons/666s-jungle.png rename to public/images/pokemon/icons/6/666s-jungle.png diff --git a/public/images/pokemon/icons/666s-marine.png b/public/images/pokemon/icons/6/666s-marine.png similarity index 100% rename from public/images/pokemon/icons/666s-marine.png rename to public/images/pokemon/icons/6/666s-marine.png diff --git a/public/images/pokemon/icons/666s-meadow.png b/public/images/pokemon/icons/6/666s-meadow.png similarity index 100% rename from public/images/pokemon/icons/666s-meadow.png rename to public/images/pokemon/icons/6/666s-meadow.png diff --git a/public/images/pokemon/icons/666s-modern.png b/public/images/pokemon/icons/6/666s-modern.png similarity index 100% rename from public/images/pokemon/icons/666s-modern.png rename to public/images/pokemon/icons/6/666s-modern.png diff --git a/public/images/pokemon/icons/666s-monsoon.png b/public/images/pokemon/icons/6/666s-monsoon.png similarity index 100% rename from public/images/pokemon/icons/666s-monsoon.png rename to public/images/pokemon/icons/6/666s-monsoon.png diff --git a/public/images/pokemon/icons/666s-ocean.png b/public/images/pokemon/icons/6/666s-ocean.png similarity index 100% rename from public/images/pokemon/icons/666s-ocean.png rename to public/images/pokemon/icons/6/666s-ocean.png diff --git a/public/images/pokemon/icons/666s-poke-ball.png b/public/images/pokemon/icons/6/666s-poke-ball.png similarity index 100% rename from public/images/pokemon/icons/666s-poke-ball.png rename to public/images/pokemon/icons/6/666s-poke-ball.png diff --git a/public/images/pokemon/icons/666s-polar.png b/public/images/pokemon/icons/6/666s-polar.png similarity index 100% rename from public/images/pokemon/icons/666s-polar.png rename to public/images/pokemon/icons/6/666s-polar.png diff --git a/public/images/pokemon/icons/666s-river.png b/public/images/pokemon/icons/6/666s-river.png similarity index 100% rename from public/images/pokemon/icons/666s-river.png rename to public/images/pokemon/icons/6/666s-river.png diff --git a/public/images/pokemon/icons/666s-sandstorm.png b/public/images/pokemon/icons/6/666s-sandstorm.png similarity index 100% rename from public/images/pokemon/icons/666s-sandstorm.png rename to public/images/pokemon/icons/6/666s-sandstorm.png diff --git a/public/images/pokemon/icons/666s-savanna.png b/public/images/pokemon/icons/6/666s-savanna.png similarity index 100% rename from public/images/pokemon/icons/666s-savanna.png rename to public/images/pokemon/icons/6/666s-savanna.png diff --git a/public/images/pokemon/icons/666s-sun.png b/public/images/pokemon/icons/6/666s-sun.png similarity index 100% rename from public/images/pokemon/icons/666s-sun.png rename to public/images/pokemon/icons/6/666s-sun.png diff --git a/public/images/pokemon/icons/666s-tundra.png b/public/images/pokemon/icons/6/666s-tundra.png similarity index 100% rename from public/images/pokemon/icons/666s-tundra.png rename to public/images/pokemon/icons/6/666s-tundra.png diff --git a/public/images/pokemon/icons/667.png b/public/images/pokemon/icons/6/667.png similarity index 100% rename from public/images/pokemon/icons/667.png rename to public/images/pokemon/icons/6/667.png diff --git a/public/images/pokemon/icons/667s.png b/public/images/pokemon/icons/6/667s.png similarity index 100% rename from public/images/pokemon/icons/667s.png rename to public/images/pokemon/icons/6/667s.png diff --git a/public/images/pokemon/icons/668-f.png b/public/images/pokemon/icons/6/668-f.png similarity index 100% rename from public/images/pokemon/icons/668-f.png rename to public/images/pokemon/icons/6/668-f.png diff --git a/public/images/pokemon/icons/668.png b/public/images/pokemon/icons/6/668.png similarity index 100% rename from public/images/pokemon/icons/668.png rename to public/images/pokemon/icons/6/668.png diff --git a/public/images/pokemon/icons/668s-f.png b/public/images/pokemon/icons/6/668s-f.png similarity index 100% rename from public/images/pokemon/icons/668s-f.png rename to public/images/pokemon/icons/6/668s-f.png diff --git a/public/images/pokemon/icons/668s.png b/public/images/pokemon/icons/6/668s.png similarity index 100% rename from public/images/pokemon/icons/668s.png rename to public/images/pokemon/icons/6/668s.png diff --git a/public/images/pokemon/icons/669-blue.png b/public/images/pokemon/icons/6/669-blue.png similarity index 100% rename from public/images/pokemon/icons/669-blue.png rename to public/images/pokemon/icons/6/669-blue.png diff --git a/public/images/pokemon/icons/669-orange.png b/public/images/pokemon/icons/6/669-orange.png similarity index 100% rename from public/images/pokemon/icons/669-orange.png rename to public/images/pokemon/icons/6/669-orange.png diff --git a/public/images/pokemon/icons/669-red.png b/public/images/pokemon/icons/6/669-red.png similarity index 100% rename from public/images/pokemon/icons/669-red.png rename to public/images/pokemon/icons/6/669-red.png diff --git a/public/images/pokemon/icons/669-white.png b/public/images/pokemon/icons/6/669-white.png similarity index 100% rename from public/images/pokemon/icons/669-white.png rename to public/images/pokemon/icons/6/669-white.png diff --git a/public/images/pokemon/icons/669-yellow.png b/public/images/pokemon/icons/6/669-yellow.png similarity index 100% rename from public/images/pokemon/icons/669-yellow.png rename to public/images/pokemon/icons/6/669-yellow.png diff --git a/public/images/pokemon/icons/669s-blue.png b/public/images/pokemon/icons/6/669s-blue.png similarity index 100% rename from public/images/pokemon/icons/669s-blue.png rename to public/images/pokemon/icons/6/669s-blue.png diff --git a/public/images/pokemon/icons/669s-orange.png b/public/images/pokemon/icons/6/669s-orange.png similarity index 100% rename from public/images/pokemon/icons/669s-orange.png rename to public/images/pokemon/icons/6/669s-orange.png diff --git a/public/images/pokemon/icons/669s-red.png b/public/images/pokemon/icons/6/669s-red.png similarity index 100% rename from public/images/pokemon/icons/669s-red.png rename to public/images/pokemon/icons/6/669s-red.png diff --git a/public/images/pokemon/icons/669s-white.png b/public/images/pokemon/icons/6/669s-white.png similarity index 100% rename from public/images/pokemon/icons/669s-white.png rename to public/images/pokemon/icons/6/669s-white.png diff --git a/public/images/pokemon/icons/669s-yellow.png b/public/images/pokemon/icons/6/669s-yellow.png similarity index 100% rename from public/images/pokemon/icons/669s-yellow.png rename to public/images/pokemon/icons/6/669s-yellow.png diff --git a/public/images/pokemon/icons/670-blue.png b/public/images/pokemon/icons/6/670-blue.png similarity index 100% rename from public/images/pokemon/icons/670-blue.png rename to public/images/pokemon/icons/6/670-blue.png diff --git a/public/images/pokemon/icons/670-orange.png b/public/images/pokemon/icons/6/670-orange.png similarity index 100% rename from public/images/pokemon/icons/670-orange.png rename to public/images/pokemon/icons/6/670-orange.png diff --git a/public/images/pokemon/icons/670-red.png b/public/images/pokemon/icons/6/670-red.png similarity index 100% rename from public/images/pokemon/icons/670-red.png rename to public/images/pokemon/icons/6/670-red.png diff --git a/public/images/pokemon/icons/670-white.png b/public/images/pokemon/icons/6/670-white.png similarity index 100% rename from public/images/pokemon/icons/670-white.png rename to public/images/pokemon/icons/6/670-white.png diff --git a/public/images/pokemon/icons/670-yellow.png b/public/images/pokemon/icons/6/670-yellow.png similarity index 100% rename from public/images/pokemon/icons/670-yellow.png rename to public/images/pokemon/icons/6/670-yellow.png diff --git a/public/images/pokemon/icons/670s-blue.png b/public/images/pokemon/icons/6/670s-blue.png similarity index 100% rename from public/images/pokemon/icons/670s-blue.png rename to public/images/pokemon/icons/6/670s-blue.png diff --git a/public/images/pokemon/icons/670s-orange.png b/public/images/pokemon/icons/6/670s-orange.png similarity index 100% rename from public/images/pokemon/icons/670s-orange.png rename to public/images/pokemon/icons/6/670s-orange.png diff --git a/public/images/pokemon/icons/670s-red.png b/public/images/pokemon/icons/6/670s-red.png similarity index 100% rename from public/images/pokemon/icons/670s-red.png rename to public/images/pokemon/icons/6/670s-red.png diff --git a/public/images/pokemon/icons/670s-white.png b/public/images/pokemon/icons/6/670s-white.png similarity index 100% rename from public/images/pokemon/icons/670s-white.png rename to public/images/pokemon/icons/6/670s-white.png diff --git a/public/images/pokemon/icons/670s-yellow.png b/public/images/pokemon/icons/6/670s-yellow.png similarity index 100% rename from public/images/pokemon/icons/670s-yellow.png rename to public/images/pokemon/icons/6/670s-yellow.png diff --git a/public/images/pokemon/icons/671-blue.png b/public/images/pokemon/icons/6/671-blue.png similarity index 100% rename from public/images/pokemon/icons/671-blue.png rename to public/images/pokemon/icons/6/671-blue.png diff --git a/public/images/pokemon/icons/671-orange.png b/public/images/pokemon/icons/6/671-orange.png similarity index 100% rename from public/images/pokemon/icons/671-orange.png rename to public/images/pokemon/icons/6/671-orange.png diff --git a/public/images/pokemon/icons/671-red.png b/public/images/pokemon/icons/6/671-red.png similarity index 100% rename from public/images/pokemon/icons/671-red.png rename to public/images/pokemon/icons/6/671-red.png diff --git a/public/images/pokemon/icons/671-white.png b/public/images/pokemon/icons/6/671-white.png similarity index 100% rename from public/images/pokemon/icons/671-white.png rename to public/images/pokemon/icons/6/671-white.png diff --git a/public/images/pokemon/icons/671-yellow.png b/public/images/pokemon/icons/6/671-yellow.png similarity index 100% rename from public/images/pokemon/icons/671-yellow.png rename to public/images/pokemon/icons/6/671-yellow.png diff --git a/public/images/pokemon/icons/671s-blue.png b/public/images/pokemon/icons/6/671s-blue.png similarity index 100% rename from public/images/pokemon/icons/671s-blue.png rename to public/images/pokemon/icons/6/671s-blue.png diff --git a/public/images/pokemon/icons/671s-orange.png b/public/images/pokemon/icons/6/671s-orange.png similarity index 100% rename from public/images/pokemon/icons/671s-orange.png rename to public/images/pokemon/icons/6/671s-orange.png diff --git a/public/images/pokemon/icons/671s-red.png b/public/images/pokemon/icons/6/671s-red.png similarity index 100% rename from public/images/pokemon/icons/671s-red.png rename to public/images/pokemon/icons/6/671s-red.png diff --git a/public/images/pokemon/icons/671s-white.png b/public/images/pokemon/icons/6/671s-white.png similarity index 100% rename from public/images/pokemon/icons/671s-white.png rename to public/images/pokemon/icons/6/671s-white.png diff --git a/public/images/pokemon/icons/671s-yellow.png b/public/images/pokemon/icons/6/671s-yellow.png similarity index 100% rename from public/images/pokemon/icons/671s-yellow.png rename to public/images/pokemon/icons/6/671s-yellow.png diff --git a/public/images/pokemon/icons/672.png b/public/images/pokemon/icons/6/672.png similarity index 100% rename from public/images/pokemon/icons/672.png rename to public/images/pokemon/icons/6/672.png diff --git a/public/images/pokemon/icons/672s.png b/public/images/pokemon/icons/6/672s.png similarity index 100% rename from public/images/pokemon/icons/672s.png rename to public/images/pokemon/icons/6/672s.png diff --git a/public/images/pokemon/icons/673.png b/public/images/pokemon/icons/6/673.png similarity index 100% rename from public/images/pokemon/icons/673.png rename to public/images/pokemon/icons/6/673.png diff --git a/public/images/pokemon/icons/673s.png b/public/images/pokemon/icons/6/673s.png similarity index 100% rename from public/images/pokemon/icons/673s.png rename to public/images/pokemon/icons/6/673s.png diff --git a/public/images/pokemon/icons/674.png b/public/images/pokemon/icons/6/674.png similarity index 100% rename from public/images/pokemon/icons/674.png rename to public/images/pokemon/icons/6/674.png diff --git a/public/images/pokemon/icons/674s.png b/public/images/pokemon/icons/6/674s.png similarity index 100% rename from public/images/pokemon/icons/674s.png rename to public/images/pokemon/icons/6/674s.png diff --git a/public/images/pokemon/icons/675.png b/public/images/pokemon/icons/6/675.png similarity index 100% rename from public/images/pokemon/icons/675.png rename to public/images/pokemon/icons/6/675.png diff --git a/public/images/pokemon/icons/675s.png b/public/images/pokemon/icons/6/675s.png similarity index 100% rename from public/images/pokemon/icons/675s.png rename to public/images/pokemon/icons/6/675s.png diff --git a/public/images/pokemon/icons/676-dandy.png b/public/images/pokemon/icons/6/676-dandy.png similarity index 100% rename from public/images/pokemon/icons/676-dandy.png rename to public/images/pokemon/icons/6/676-dandy.png diff --git a/public/images/pokemon/icons/676-debutante.png b/public/images/pokemon/icons/6/676-debutante.png similarity index 100% rename from public/images/pokemon/icons/676-debutante.png rename to public/images/pokemon/icons/6/676-debutante.png diff --git a/public/images/pokemon/icons/676-diamond.png b/public/images/pokemon/icons/6/676-diamond.png similarity index 100% rename from public/images/pokemon/icons/676-diamond.png rename to public/images/pokemon/icons/6/676-diamond.png diff --git a/public/images/pokemon/icons/676-heart.png b/public/images/pokemon/icons/6/676-heart.png similarity index 100% rename from public/images/pokemon/icons/676-heart.png rename to public/images/pokemon/icons/6/676-heart.png diff --git a/public/images/pokemon/icons/676-kabuki.png b/public/images/pokemon/icons/6/676-kabuki.png similarity index 100% rename from public/images/pokemon/icons/676-kabuki.png rename to public/images/pokemon/icons/6/676-kabuki.png diff --git a/public/images/pokemon/icons/676-la-reine.png b/public/images/pokemon/icons/6/676-la-reine.png similarity index 100% rename from public/images/pokemon/icons/676-la-reine.png rename to public/images/pokemon/icons/6/676-la-reine.png diff --git a/public/images/pokemon/icons/676-matron.png b/public/images/pokemon/icons/6/676-matron.png similarity index 100% rename from public/images/pokemon/icons/676-matron.png rename to public/images/pokemon/icons/6/676-matron.png diff --git a/public/images/pokemon/icons/676-pharaoh.png b/public/images/pokemon/icons/6/676-pharaoh.png similarity index 100% rename from public/images/pokemon/icons/676-pharaoh.png rename to public/images/pokemon/icons/6/676-pharaoh.png diff --git a/public/images/pokemon/icons/676-star.png b/public/images/pokemon/icons/6/676-star.png similarity index 100% rename from public/images/pokemon/icons/676-star.png rename to public/images/pokemon/icons/6/676-star.png diff --git a/public/images/pokemon/icons/676.png b/public/images/pokemon/icons/6/676.png similarity index 100% rename from public/images/pokemon/icons/676.png rename to public/images/pokemon/icons/6/676.png diff --git a/public/images/pokemon/icons/676s-dandy.png b/public/images/pokemon/icons/6/676s-dandy.png similarity index 100% rename from public/images/pokemon/icons/676s-dandy.png rename to public/images/pokemon/icons/6/676s-dandy.png diff --git a/public/images/pokemon/icons/676s-debutante.png b/public/images/pokemon/icons/6/676s-debutante.png similarity index 100% rename from public/images/pokemon/icons/676s-debutante.png rename to public/images/pokemon/icons/6/676s-debutante.png diff --git a/public/images/pokemon/icons/676s-diamond.png b/public/images/pokemon/icons/6/676s-diamond.png similarity index 100% rename from public/images/pokemon/icons/676s-diamond.png rename to public/images/pokemon/icons/6/676s-diamond.png diff --git a/public/images/pokemon/icons/676s-heart.png b/public/images/pokemon/icons/6/676s-heart.png similarity index 100% rename from public/images/pokemon/icons/676s-heart.png rename to public/images/pokemon/icons/6/676s-heart.png diff --git a/public/images/pokemon/icons/676s-kabuki.png b/public/images/pokemon/icons/6/676s-kabuki.png similarity index 100% rename from public/images/pokemon/icons/676s-kabuki.png rename to public/images/pokemon/icons/6/676s-kabuki.png diff --git a/public/images/pokemon/icons/676s-la-reine.png b/public/images/pokemon/icons/6/676s-la-reine.png similarity index 100% rename from public/images/pokemon/icons/676s-la-reine.png rename to public/images/pokemon/icons/6/676s-la-reine.png diff --git a/public/images/pokemon/icons/676s-matron.png b/public/images/pokemon/icons/6/676s-matron.png similarity index 100% rename from public/images/pokemon/icons/676s-matron.png rename to public/images/pokemon/icons/6/676s-matron.png diff --git a/public/images/pokemon/icons/676s-pharaoh.png b/public/images/pokemon/icons/6/676s-pharaoh.png similarity index 100% rename from public/images/pokemon/icons/676s-pharaoh.png rename to public/images/pokemon/icons/6/676s-pharaoh.png diff --git a/public/images/pokemon/icons/676s-star.png b/public/images/pokemon/icons/6/676s-star.png similarity index 100% rename from public/images/pokemon/icons/676s-star.png rename to public/images/pokemon/icons/6/676s-star.png diff --git a/public/images/pokemon/icons/676s.png b/public/images/pokemon/icons/6/676s.png similarity index 100% rename from public/images/pokemon/icons/676s.png rename to public/images/pokemon/icons/6/676s.png diff --git a/public/images/pokemon/icons/677.png b/public/images/pokemon/icons/6/677.png similarity index 100% rename from public/images/pokemon/icons/677.png rename to public/images/pokemon/icons/6/677.png diff --git a/public/images/pokemon/icons/677s.png b/public/images/pokemon/icons/6/677s.png similarity index 100% rename from public/images/pokemon/icons/677s.png rename to public/images/pokemon/icons/6/677s.png diff --git a/public/images/pokemon/icons/678-female.png b/public/images/pokemon/icons/6/678-female.png similarity index 100% rename from public/images/pokemon/icons/678-female.png rename to public/images/pokemon/icons/6/678-female.png diff --git a/public/images/pokemon/icons/678.png b/public/images/pokemon/icons/6/678.png similarity index 100% rename from public/images/pokemon/icons/678.png rename to public/images/pokemon/icons/6/678.png diff --git a/public/images/pokemon/icons/678s-female.png b/public/images/pokemon/icons/6/678s-female.png similarity index 100% rename from public/images/pokemon/icons/678s-female.png rename to public/images/pokemon/icons/6/678s-female.png diff --git a/public/images/pokemon/icons/678s.png b/public/images/pokemon/icons/6/678s.png similarity index 100% rename from public/images/pokemon/icons/678s.png rename to public/images/pokemon/icons/6/678s.png diff --git a/public/images/pokemon/icons/679.png b/public/images/pokemon/icons/6/679.png similarity index 100% rename from public/images/pokemon/icons/679.png rename to public/images/pokemon/icons/6/679.png diff --git a/public/images/pokemon/icons/679s.png b/public/images/pokemon/icons/6/679s.png similarity index 100% rename from public/images/pokemon/icons/679s.png rename to public/images/pokemon/icons/6/679s.png diff --git a/public/images/pokemon/icons/680.png b/public/images/pokemon/icons/6/680.png similarity index 100% rename from public/images/pokemon/icons/680.png rename to public/images/pokemon/icons/6/680.png diff --git a/public/images/pokemon/icons/680s.png b/public/images/pokemon/icons/6/680s.png similarity index 100% rename from public/images/pokemon/icons/680s.png rename to public/images/pokemon/icons/6/680s.png diff --git a/public/images/pokemon/icons/681-blade.png b/public/images/pokemon/icons/6/681-blade.png similarity index 100% rename from public/images/pokemon/icons/681-blade.png rename to public/images/pokemon/icons/6/681-blade.png diff --git a/public/images/pokemon/icons/681.png b/public/images/pokemon/icons/6/681.png similarity index 100% rename from public/images/pokemon/icons/681.png rename to public/images/pokemon/icons/6/681.png diff --git a/public/images/pokemon/icons/681s-blade.png b/public/images/pokemon/icons/6/681s-blade.png similarity index 100% rename from public/images/pokemon/icons/681s-blade.png rename to public/images/pokemon/icons/6/681s-blade.png diff --git a/public/images/pokemon/icons/681s.png b/public/images/pokemon/icons/6/681s.png similarity index 100% rename from public/images/pokemon/icons/681s.png rename to public/images/pokemon/icons/6/681s.png diff --git a/public/images/pokemon/icons/682.png b/public/images/pokemon/icons/6/682.png similarity index 100% rename from public/images/pokemon/icons/682.png rename to public/images/pokemon/icons/6/682.png diff --git a/public/images/pokemon/icons/682s.png b/public/images/pokemon/icons/6/682s.png similarity index 100% rename from public/images/pokemon/icons/682s.png rename to public/images/pokemon/icons/6/682s.png diff --git a/public/images/pokemon/icons/683.png b/public/images/pokemon/icons/6/683.png similarity index 100% rename from public/images/pokemon/icons/683.png rename to public/images/pokemon/icons/6/683.png diff --git a/public/images/pokemon/icons/683s.png b/public/images/pokemon/icons/6/683s.png similarity index 100% rename from public/images/pokemon/icons/683s.png rename to public/images/pokemon/icons/6/683s.png diff --git a/public/images/pokemon/icons/684.png b/public/images/pokemon/icons/6/684.png similarity index 100% rename from public/images/pokemon/icons/684.png rename to public/images/pokemon/icons/6/684.png diff --git a/public/images/pokemon/icons/684s.png b/public/images/pokemon/icons/6/684s.png similarity index 100% rename from public/images/pokemon/icons/684s.png rename to public/images/pokemon/icons/6/684s.png diff --git a/public/images/pokemon/icons/685.png b/public/images/pokemon/icons/6/685.png similarity index 100% rename from public/images/pokemon/icons/685.png rename to public/images/pokemon/icons/6/685.png diff --git a/public/images/pokemon/icons/685s.png b/public/images/pokemon/icons/6/685s.png similarity index 100% rename from public/images/pokemon/icons/685s.png rename to public/images/pokemon/icons/6/685s.png diff --git a/public/images/pokemon/icons/686.png b/public/images/pokemon/icons/6/686.png similarity index 100% rename from public/images/pokemon/icons/686.png rename to public/images/pokemon/icons/6/686.png diff --git a/public/images/pokemon/icons/686s.png b/public/images/pokemon/icons/6/686s.png similarity index 100% rename from public/images/pokemon/icons/686s.png rename to public/images/pokemon/icons/6/686s.png diff --git a/public/images/pokemon/icons/687.png b/public/images/pokemon/icons/6/687.png similarity index 100% rename from public/images/pokemon/icons/687.png rename to public/images/pokemon/icons/6/687.png diff --git a/public/images/pokemon/icons/687s.png b/public/images/pokemon/icons/6/687s.png similarity index 100% rename from public/images/pokemon/icons/687s.png rename to public/images/pokemon/icons/6/687s.png diff --git a/public/images/pokemon/icons/688.png b/public/images/pokemon/icons/6/688.png similarity index 100% rename from public/images/pokemon/icons/688.png rename to public/images/pokemon/icons/6/688.png diff --git a/public/images/pokemon/icons/688s.png b/public/images/pokemon/icons/6/688s.png similarity index 100% rename from public/images/pokemon/icons/688s.png rename to public/images/pokemon/icons/6/688s.png diff --git a/public/images/pokemon/icons/689.png b/public/images/pokemon/icons/6/689.png similarity index 100% rename from public/images/pokemon/icons/689.png rename to public/images/pokemon/icons/6/689.png diff --git a/public/images/pokemon/icons/689s.png b/public/images/pokemon/icons/6/689s.png similarity index 100% rename from public/images/pokemon/icons/689s.png rename to public/images/pokemon/icons/6/689s.png diff --git a/public/images/pokemon/icons/690.png b/public/images/pokemon/icons/6/690.png similarity index 100% rename from public/images/pokemon/icons/690.png rename to public/images/pokemon/icons/6/690.png diff --git a/public/images/pokemon/icons/690s.png b/public/images/pokemon/icons/6/690s.png similarity index 100% rename from public/images/pokemon/icons/690s.png rename to public/images/pokemon/icons/6/690s.png diff --git a/public/images/pokemon/icons/691.png b/public/images/pokemon/icons/6/691.png similarity index 100% rename from public/images/pokemon/icons/691.png rename to public/images/pokemon/icons/6/691.png diff --git a/public/images/pokemon/icons/691s.png b/public/images/pokemon/icons/6/691s.png similarity index 100% rename from public/images/pokemon/icons/691s.png rename to public/images/pokemon/icons/6/691s.png diff --git a/public/images/pokemon/icons/692.png b/public/images/pokemon/icons/6/692.png similarity index 100% rename from public/images/pokemon/icons/692.png rename to public/images/pokemon/icons/6/692.png diff --git a/public/images/pokemon/icons/692s.png b/public/images/pokemon/icons/6/692s.png similarity index 100% rename from public/images/pokemon/icons/692s.png rename to public/images/pokemon/icons/6/692s.png diff --git a/public/images/pokemon/icons/693.png b/public/images/pokemon/icons/6/693.png similarity index 100% rename from public/images/pokemon/icons/693.png rename to public/images/pokemon/icons/6/693.png diff --git a/public/images/pokemon/icons/693s.png b/public/images/pokemon/icons/6/693s.png similarity index 100% rename from public/images/pokemon/icons/693s.png rename to public/images/pokemon/icons/6/693s.png diff --git a/public/images/pokemon/icons/694.png b/public/images/pokemon/icons/6/694.png similarity index 100% rename from public/images/pokemon/icons/694.png rename to public/images/pokemon/icons/6/694.png diff --git a/public/images/pokemon/icons/694s.png b/public/images/pokemon/icons/6/694s.png similarity index 100% rename from public/images/pokemon/icons/694s.png rename to public/images/pokemon/icons/6/694s.png diff --git a/public/images/pokemon/icons/695.png b/public/images/pokemon/icons/6/695.png similarity index 100% rename from public/images/pokemon/icons/695.png rename to public/images/pokemon/icons/6/695.png diff --git a/public/images/pokemon/icons/695s.png b/public/images/pokemon/icons/6/695s.png similarity index 100% rename from public/images/pokemon/icons/695s.png rename to public/images/pokemon/icons/6/695s.png diff --git a/public/images/pokemon/icons/696.png b/public/images/pokemon/icons/6/696.png similarity index 100% rename from public/images/pokemon/icons/696.png rename to public/images/pokemon/icons/6/696.png diff --git a/public/images/pokemon/icons/696s.png b/public/images/pokemon/icons/6/696s.png similarity index 100% rename from public/images/pokemon/icons/696s.png rename to public/images/pokemon/icons/6/696s.png diff --git a/public/images/pokemon/icons/697.png b/public/images/pokemon/icons/6/697.png similarity index 100% rename from public/images/pokemon/icons/697.png rename to public/images/pokemon/icons/6/697.png diff --git a/public/images/pokemon/icons/697s.png b/public/images/pokemon/icons/6/697s.png similarity index 100% rename from public/images/pokemon/icons/697s.png rename to public/images/pokemon/icons/6/697s.png diff --git a/public/images/pokemon/icons/698.png b/public/images/pokemon/icons/6/698.png similarity index 100% rename from public/images/pokemon/icons/698.png rename to public/images/pokemon/icons/6/698.png diff --git a/public/images/pokemon/icons/698s.png b/public/images/pokemon/icons/6/698s.png similarity index 100% rename from public/images/pokemon/icons/698s.png rename to public/images/pokemon/icons/6/698s.png diff --git a/public/images/pokemon/icons/699.png b/public/images/pokemon/icons/6/699.png similarity index 100% rename from public/images/pokemon/icons/699.png rename to public/images/pokemon/icons/6/699.png diff --git a/public/images/pokemon/icons/699s.png b/public/images/pokemon/icons/6/699s.png similarity index 100% rename from public/images/pokemon/icons/699s.png rename to public/images/pokemon/icons/6/699s.png diff --git a/public/images/pokemon/icons/700.png b/public/images/pokemon/icons/6/700.png similarity index 100% rename from public/images/pokemon/icons/700.png rename to public/images/pokemon/icons/6/700.png diff --git a/public/images/pokemon/icons/700s.png b/public/images/pokemon/icons/6/700s.png similarity index 100% rename from public/images/pokemon/icons/700s.png rename to public/images/pokemon/icons/6/700s.png diff --git a/public/images/pokemon/icons/701.png b/public/images/pokemon/icons/6/701.png similarity index 100% rename from public/images/pokemon/icons/701.png rename to public/images/pokemon/icons/6/701.png diff --git a/public/images/pokemon/icons/701s.png b/public/images/pokemon/icons/6/701s.png similarity index 100% rename from public/images/pokemon/icons/701s.png rename to public/images/pokemon/icons/6/701s.png diff --git a/public/images/pokemon/icons/702.png b/public/images/pokemon/icons/6/702.png similarity index 100% rename from public/images/pokemon/icons/702.png rename to public/images/pokemon/icons/6/702.png diff --git a/public/images/pokemon/icons/702s.png b/public/images/pokemon/icons/6/702s.png similarity index 100% rename from public/images/pokemon/icons/702s.png rename to public/images/pokemon/icons/6/702s.png diff --git a/public/images/pokemon/icons/703.png b/public/images/pokemon/icons/6/703.png similarity index 100% rename from public/images/pokemon/icons/703.png rename to public/images/pokemon/icons/6/703.png diff --git a/public/images/pokemon/icons/703s.png b/public/images/pokemon/icons/6/703s.png similarity index 100% rename from public/images/pokemon/icons/703s.png rename to public/images/pokemon/icons/6/703s.png diff --git a/public/images/pokemon/icons/704.png b/public/images/pokemon/icons/6/704.png similarity index 100% rename from public/images/pokemon/icons/704.png rename to public/images/pokemon/icons/6/704.png diff --git a/public/images/pokemon/icons/704s.png b/public/images/pokemon/icons/6/704s.png similarity index 100% rename from public/images/pokemon/icons/704s.png rename to public/images/pokemon/icons/6/704s.png diff --git a/public/images/pokemon/icons/705.png b/public/images/pokemon/icons/6/705.png similarity index 100% rename from public/images/pokemon/icons/705.png rename to public/images/pokemon/icons/6/705.png diff --git a/public/images/pokemon/icons/705s.png b/public/images/pokemon/icons/6/705s.png similarity index 100% rename from public/images/pokemon/icons/705s.png rename to public/images/pokemon/icons/6/705s.png diff --git a/public/images/pokemon/icons/706.png b/public/images/pokemon/icons/6/706.png similarity index 100% rename from public/images/pokemon/icons/706.png rename to public/images/pokemon/icons/6/706.png diff --git a/public/images/pokemon/icons/706s.png b/public/images/pokemon/icons/6/706s.png similarity index 100% rename from public/images/pokemon/icons/706s.png rename to public/images/pokemon/icons/6/706s.png diff --git a/public/images/pokemon/icons/707.png b/public/images/pokemon/icons/6/707.png similarity index 100% rename from public/images/pokemon/icons/707.png rename to public/images/pokemon/icons/6/707.png diff --git a/public/images/pokemon/icons/707s.png b/public/images/pokemon/icons/6/707s.png similarity index 100% rename from public/images/pokemon/icons/707s.png rename to public/images/pokemon/icons/6/707s.png diff --git a/public/images/pokemon/icons/708.png b/public/images/pokemon/icons/6/708.png similarity index 100% rename from public/images/pokemon/icons/708.png rename to public/images/pokemon/icons/6/708.png diff --git a/public/images/pokemon/icons/708s.png b/public/images/pokemon/icons/6/708s.png similarity index 100% rename from public/images/pokemon/icons/708s.png rename to public/images/pokemon/icons/6/708s.png diff --git a/public/images/pokemon/icons/709.png b/public/images/pokemon/icons/6/709.png similarity index 100% rename from public/images/pokemon/icons/709.png rename to public/images/pokemon/icons/6/709.png diff --git a/public/images/pokemon/icons/709s.png b/public/images/pokemon/icons/6/709s.png similarity index 100% rename from public/images/pokemon/icons/709s.png rename to public/images/pokemon/icons/6/709s.png diff --git a/public/images/pokemon/icons/710-large.png b/public/images/pokemon/icons/6/710-large.png similarity index 100% rename from public/images/pokemon/icons/710-large.png rename to public/images/pokemon/icons/6/710-large.png diff --git a/public/images/pokemon/icons/710-small.png b/public/images/pokemon/icons/6/710-small.png similarity index 100% rename from public/images/pokemon/icons/710-small.png rename to public/images/pokemon/icons/6/710-small.png diff --git a/public/images/pokemon/icons/710-super.png b/public/images/pokemon/icons/6/710-super.png similarity index 100% rename from public/images/pokemon/icons/710-super.png rename to public/images/pokemon/icons/6/710-super.png diff --git a/public/images/pokemon/icons/710.png b/public/images/pokemon/icons/6/710.png similarity index 100% rename from public/images/pokemon/icons/710.png rename to public/images/pokemon/icons/6/710.png diff --git a/public/images/pokemon/icons/710s-large.png b/public/images/pokemon/icons/6/710s-large.png similarity index 100% rename from public/images/pokemon/icons/710s-large.png rename to public/images/pokemon/icons/6/710s-large.png diff --git a/public/images/pokemon/icons/710s-small.png b/public/images/pokemon/icons/6/710s-small.png similarity index 100% rename from public/images/pokemon/icons/710s-small.png rename to public/images/pokemon/icons/6/710s-small.png diff --git a/public/images/pokemon/icons/710s-super.png b/public/images/pokemon/icons/6/710s-super.png similarity index 100% rename from public/images/pokemon/icons/710s-super.png rename to public/images/pokemon/icons/6/710s-super.png diff --git a/public/images/pokemon/icons/710s.png b/public/images/pokemon/icons/6/710s.png similarity index 100% rename from public/images/pokemon/icons/710s.png rename to public/images/pokemon/icons/6/710s.png diff --git a/public/images/pokemon/icons/711-large.png b/public/images/pokemon/icons/6/711-large.png similarity index 100% rename from public/images/pokemon/icons/711-large.png rename to public/images/pokemon/icons/6/711-large.png diff --git a/public/images/pokemon/icons/711-small.png b/public/images/pokemon/icons/6/711-small.png similarity index 100% rename from public/images/pokemon/icons/711-small.png rename to public/images/pokemon/icons/6/711-small.png diff --git a/public/images/pokemon/icons/711-super.png b/public/images/pokemon/icons/6/711-super.png similarity index 100% rename from public/images/pokemon/icons/711-super.png rename to public/images/pokemon/icons/6/711-super.png diff --git a/public/images/pokemon/icons/711.png b/public/images/pokemon/icons/6/711.png similarity index 100% rename from public/images/pokemon/icons/711.png rename to public/images/pokemon/icons/6/711.png diff --git a/public/images/pokemon/icons/711s-large.png b/public/images/pokemon/icons/6/711s-large.png similarity index 100% rename from public/images/pokemon/icons/711s-large.png rename to public/images/pokemon/icons/6/711s-large.png diff --git a/public/images/pokemon/icons/711s-small.png b/public/images/pokemon/icons/6/711s-small.png similarity index 100% rename from public/images/pokemon/icons/711s-small.png rename to public/images/pokemon/icons/6/711s-small.png diff --git a/public/images/pokemon/icons/711s-super.png b/public/images/pokemon/icons/6/711s-super.png similarity index 100% rename from public/images/pokemon/icons/711s-super.png rename to public/images/pokemon/icons/6/711s-super.png diff --git a/public/images/pokemon/icons/711s.png b/public/images/pokemon/icons/6/711s.png similarity index 100% rename from public/images/pokemon/icons/711s.png rename to public/images/pokemon/icons/6/711s.png diff --git a/public/images/pokemon/icons/712.png b/public/images/pokemon/icons/6/712.png similarity index 100% rename from public/images/pokemon/icons/712.png rename to public/images/pokemon/icons/6/712.png diff --git a/public/images/pokemon/icons/712s.png b/public/images/pokemon/icons/6/712s.png similarity index 100% rename from public/images/pokemon/icons/712s.png rename to public/images/pokemon/icons/6/712s.png diff --git a/public/images/pokemon/icons/713.png b/public/images/pokemon/icons/6/713.png similarity index 100% rename from public/images/pokemon/icons/713.png rename to public/images/pokemon/icons/6/713.png diff --git a/public/images/pokemon/icons/713s.png b/public/images/pokemon/icons/6/713s.png similarity index 100% rename from public/images/pokemon/icons/713s.png rename to public/images/pokemon/icons/6/713s.png diff --git a/public/images/pokemon/icons/714.png b/public/images/pokemon/icons/6/714.png similarity index 100% rename from public/images/pokemon/icons/714.png rename to public/images/pokemon/icons/6/714.png diff --git a/public/images/pokemon/icons/714s.png b/public/images/pokemon/icons/6/714s.png similarity index 100% rename from public/images/pokemon/icons/714s.png rename to public/images/pokemon/icons/6/714s.png diff --git a/public/images/pokemon/icons/715.png b/public/images/pokemon/icons/6/715.png similarity index 100% rename from public/images/pokemon/icons/715.png rename to public/images/pokemon/icons/6/715.png diff --git a/public/images/pokemon/icons/715s.png b/public/images/pokemon/icons/6/715s.png similarity index 100% rename from public/images/pokemon/icons/715s.png rename to public/images/pokemon/icons/6/715s.png diff --git a/public/images/pokemon/icons/6/716-active.png b/public/images/pokemon/icons/6/716-active.png new file mode 100644 index 000000000..1cf8dfa0c Binary files /dev/null and b/public/images/pokemon/icons/6/716-active.png differ diff --git a/public/images/pokemon/icons/716-neutral.png b/public/images/pokemon/icons/6/716-neutral.png similarity index 100% rename from public/images/pokemon/icons/716-neutral.png rename to public/images/pokemon/icons/6/716-neutral.png diff --git a/public/images/pokemon/icons/6/716s-active.png b/public/images/pokemon/icons/6/716s-active.png new file mode 100644 index 000000000..342af7e23 Binary files /dev/null and b/public/images/pokemon/icons/6/716s-active.png differ diff --git a/public/images/pokemon/icons/716s-neutral.png b/public/images/pokemon/icons/6/716s-neutral.png similarity index 100% rename from public/images/pokemon/icons/716s-neutral.png rename to public/images/pokemon/icons/6/716s-neutral.png diff --git a/public/images/pokemon/icons/717.png b/public/images/pokemon/icons/6/717.png similarity index 100% rename from public/images/pokemon/icons/717.png rename to public/images/pokemon/icons/6/717.png diff --git a/public/images/pokemon/icons/717s.png b/public/images/pokemon/icons/6/717s.png similarity index 100% rename from public/images/pokemon/icons/717s.png rename to public/images/pokemon/icons/6/717s.png diff --git a/public/images/pokemon/icons/718-10.png b/public/images/pokemon/icons/6/718-10.png similarity index 100% rename from public/images/pokemon/icons/718-10.png rename to public/images/pokemon/icons/6/718-10.png diff --git a/public/images/pokemon/icons/718-complete.png b/public/images/pokemon/icons/6/718-complete.png similarity index 100% rename from public/images/pokemon/icons/718-complete.png rename to public/images/pokemon/icons/6/718-complete.png diff --git a/public/images/pokemon/icons/718.png b/public/images/pokemon/icons/6/718.png similarity index 100% rename from public/images/pokemon/icons/718.png rename to public/images/pokemon/icons/6/718.png diff --git a/public/images/pokemon/icons/718s-10.png b/public/images/pokemon/icons/6/718s-10.png similarity index 100% rename from public/images/pokemon/icons/718s-10.png rename to public/images/pokemon/icons/6/718s-10.png diff --git a/public/images/pokemon/icons/718s-complete.png b/public/images/pokemon/icons/6/718s-complete.png similarity index 100% rename from public/images/pokemon/icons/718s-complete.png rename to public/images/pokemon/icons/6/718s-complete.png diff --git a/public/images/pokemon/icons/718s.png b/public/images/pokemon/icons/6/718s.png similarity index 100% rename from public/images/pokemon/icons/718s.png rename to public/images/pokemon/icons/6/718s.png diff --git a/public/images/pokemon/icons/719-mega.png b/public/images/pokemon/icons/6/719-mega.png similarity index 100% rename from public/images/pokemon/icons/719-mega.png rename to public/images/pokemon/icons/6/719-mega.png diff --git a/public/images/pokemon/icons/719.png b/public/images/pokemon/icons/6/719.png similarity index 100% rename from public/images/pokemon/icons/719.png rename to public/images/pokemon/icons/6/719.png diff --git a/public/images/pokemon/icons/719s-mega.png b/public/images/pokemon/icons/6/719s-mega.png similarity index 100% rename from public/images/pokemon/icons/719s-mega.png rename to public/images/pokemon/icons/6/719s-mega.png diff --git a/public/images/pokemon/icons/719s.png b/public/images/pokemon/icons/6/719s.png similarity index 100% rename from public/images/pokemon/icons/719s.png rename to public/images/pokemon/icons/6/719s.png diff --git a/public/images/pokemon/icons/720-unbound.png b/public/images/pokemon/icons/6/720-unbound.png similarity index 100% rename from public/images/pokemon/icons/720-unbound.png rename to public/images/pokemon/icons/6/720-unbound.png diff --git a/public/images/pokemon/icons/720.png b/public/images/pokemon/icons/6/720.png similarity index 100% rename from public/images/pokemon/icons/720.png rename to public/images/pokemon/icons/6/720.png diff --git a/public/images/pokemon/icons/720s-unbound.png b/public/images/pokemon/icons/6/720s-unbound.png similarity index 100% rename from public/images/pokemon/icons/720s-unbound.png rename to public/images/pokemon/icons/6/720s-unbound.png diff --git a/public/images/pokemon/icons/720s.png b/public/images/pokemon/icons/6/720s.png similarity index 100% rename from public/images/pokemon/icons/720s.png rename to public/images/pokemon/icons/6/720s.png diff --git a/public/images/pokemon/icons/721.png b/public/images/pokemon/icons/6/721.png similarity index 100% rename from public/images/pokemon/icons/721.png rename to public/images/pokemon/icons/6/721.png diff --git a/public/images/pokemon/icons/721s.png b/public/images/pokemon/icons/6/721s.png similarity index 100% rename from public/images/pokemon/icons/721s.png rename to public/images/pokemon/icons/6/721s.png diff --git a/public/images/pokemon/icons/6/icons.bat b/public/images/pokemon/icons/6/icons.bat new file mode 100644 index 000000000..6f19e3482 --- /dev/null +++ b/public/images/pokemon/icons/6/icons.bat @@ -0,0 +1 @@ +cmd /c TexturePacker ./ ../configuration.tps --sheet ../../../pokemon_icons_6.png --data ../../../pokemon_icons_6.json --replace .png= \ No newline at end of file diff --git a/public/images/pokemon/icons/2019.png b/public/images/pokemon/icons/7/2019.png similarity index 100% rename from public/images/pokemon/icons/2019.png rename to public/images/pokemon/icons/7/2019.png diff --git a/public/images/pokemon/icons/2019s.png b/public/images/pokemon/icons/7/2019s.png similarity index 100% rename from public/images/pokemon/icons/2019s.png rename to public/images/pokemon/icons/7/2019s.png diff --git a/public/images/pokemon/icons/2020.png b/public/images/pokemon/icons/7/2020.png similarity index 100% rename from public/images/pokemon/icons/2020.png rename to public/images/pokemon/icons/7/2020.png diff --git a/public/images/pokemon/icons/2020s.png b/public/images/pokemon/icons/7/2020s.png similarity index 100% rename from public/images/pokemon/icons/2020s.png rename to public/images/pokemon/icons/7/2020s.png diff --git a/public/images/pokemon/icons/2026.png b/public/images/pokemon/icons/7/2026.png similarity index 100% rename from public/images/pokemon/icons/2026.png rename to public/images/pokemon/icons/7/2026.png diff --git a/public/images/pokemon/icons/2026s.png b/public/images/pokemon/icons/7/2026s.png similarity index 100% rename from public/images/pokemon/icons/2026s.png rename to public/images/pokemon/icons/7/2026s.png diff --git a/public/images/pokemon/icons/2027.png b/public/images/pokemon/icons/7/2027.png similarity index 100% rename from public/images/pokemon/icons/2027.png rename to public/images/pokemon/icons/7/2027.png diff --git a/public/images/pokemon/icons/2027s.png b/public/images/pokemon/icons/7/2027s.png similarity index 100% rename from public/images/pokemon/icons/2027s.png rename to public/images/pokemon/icons/7/2027s.png diff --git a/public/images/pokemon/icons/2028.png b/public/images/pokemon/icons/7/2028.png similarity index 100% rename from public/images/pokemon/icons/2028.png rename to public/images/pokemon/icons/7/2028.png diff --git a/public/images/pokemon/icons/2028s.png b/public/images/pokemon/icons/7/2028s.png similarity index 100% rename from public/images/pokemon/icons/2028s.png rename to public/images/pokemon/icons/7/2028s.png diff --git a/public/images/pokemon/icons/2037.png b/public/images/pokemon/icons/7/2037.png similarity index 100% rename from public/images/pokemon/icons/2037.png rename to public/images/pokemon/icons/7/2037.png diff --git a/public/images/pokemon/icons/2037s.png b/public/images/pokemon/icons/7/2037s.png similarity index 100% rename from public/images/pokemon/icons/2037s.png rename to public/images/pokemon/icons/7/2037s.png diff --git a/public/images/pokemon/icons/2038.png b/public/images/pokemon/icons/7/2038.png similarity index 100% rename from public/images/pokemon/icons/2038.png rename to public/images/pokemon/icons/7/2038.png diff --git a/public/images/pokemon/icons/2038s.png b/public/images/pokemon/icons/7/2038s.png similarity index 100% rename from public/images/pokemon/icons/2038s.png rename to public/images/pokemon/icons/7/2038s.png diff --git a/public/images/pokemon/icons/2050.png b/public/images/pokemon/icons/7/2050.png similarity index 100% rename from public/images/pokemon/icons/2050.png rename to public/images/pokemon/icons/7/2050.png diff --git a/public/images/pokemon/icons/2050s.png b/public/images/pokemon/icons/7/2050s.png similarity index 100% rename from public/images/pokemon/icons/2050s.png rename to public/images/pokemon/icons/7/2050s.png diff --git a/public/images/pokemon/icons/2051.png b/public/images/pokemon/icons/7/2051.png similarity index 100% rename from public/images/pokemon/icons/2051.png rename to public/images/pokemon/icons/7/2051.png diff --git a/public/images/pokemon/icons/2051s.png b/public/images/pokemon/icons/7/2051s.png similarity index 100% rename from public/images/pokemon/icons/2051s.png rename to public/images/pokemon/icons/7/2051s.png diff --git a/public/images/pokemon/icons/2052.png b/public/images/pokemon/icons/7/2052.png similarity index 100% rename from public/images/pokemon/icons/2052.png rename to public/images/pokemon/icons/7/2052.png diff --git a/public/images/pokemon/icons/2052s.png b/public/images/pokemon/icons/7/2052s.png similarity index 100% rename from public/images/pokemon/icons/2052s.png rename to public/images/pokemon/icons/7/2052s.png diff --git a/public/images/pokemon/icons/2053.png b/public/images/pokemon/icons/7/2053.png similarity index 100% rename from public/images/pokemon/icons/2053.png rename to public/images/pokemon/icons/7/2053.png diff --git a/public/images/pokemon/icons/2053s.png b/public/images/pokemon/icons/7/2053s.png similarity index 100% rename from public/images/pokemon/icons/2053s.png rename to public/images/pokemon/icons/7/2053s.png diff --git a/public/images/pokemon/icons/2074.png b/public/images/pokemon/icons/7/2074.png similarity index 100% rename from public/images/pokemon/icons/2074.png rename to public/images/pokemon/icons/7/2074.png diff --git a/public/images/pokemon/icons/2074s.png b/public/images/pokemon/icons/7/2074s.png similarity index 100% rename from public/images/pokemon/icons/2074s.png rename to public/images/pokemon/icons/7/2074s.png diff --git a/public/images/pokemon/icons/2075.png b/public/images/pokemon/icons/7/2075.png similarity index 100% rename from public/images/pokemon/icons/2075.png rename to public/images/pokemon/icons/7/2075.png diff --git a/public/images/pokemon/icons/2075s.png b/public/images/pokemon/icons/7/2075s.png similarity index 100% rename from public/images/pokemon/icons/2075s.png rename to public/images/pokemon/icons/7/2075s.png diff --git a/public/images/pokemon/icons/2076.png b/public/images/pokemon/icons/7/2076.png similarity index 100% rename from public/images/pokemon/icons/2076.png rename to public/images/pokemon/icons/7/2076.png diff --git a/public/images/pokemon/icons/2076s.png b/public/images/pokemon/icons/7/2076s.png similarity index 100% rename from public/images/pokemon/icons/2076s.png rename to public/images/pokemon/icons/7/2076s.png diff --git a/public/images/pokemon/icons/2088.png b/public/images/pokemon/icons/7/2088.png similarity index 100% rename from public/images/pokemon/icons/2088.png rename to public/images/pokemon/icons/7/2088.png diff --git a/public/images/pokemon/icons/2088s.png b/public/images/pokemon/icons/7/2088s.png similarity index 100% rename from public/images/pokemon/icons/2088s.png rename to public/images/pokemon/icons/7/2088s.png diff --git a/public/images/pokemon/icons/2089.png b/public/images/pokemon/icons/7/2089.png similarity index 100% rename from public/images/pokemon/icons/2089.png rename to public/images/pokemon/icons/7/2089.png diff --git a/public/images/pokemon/icons/2089s.png b/public/images/pokemon/icons/7/2089s.png similarity index 100% rename from public/images/pokemon/icons/2089s.png rename to public/images/pokemon/icons/7/2089s.png diff --git a/public/images/pokemon/icons/2103.png b/public/images/pokemon/icons/7/2103.png similarity index 100% rename from public/images/pokemon/icons/2103.png rename to public/images/pokemon/icons/7/2103.png diff --git a/public/images/pokemon/icons/2103s.png b/public/images/pokemon/icons/7/2103s.png similarity index 100% rename from public/images/pokemon/icons/2103s.png rename to public/images/pokemon/icons/7/2103s.png diff --git a/public/images/pokemon/icons/2105.png b/public/images/pokemon/icons/7/2105.png similarity index 100% rename from public/images/pokemon/icons/2105.png rename to public/images/pokemon/icons/7/2105.png diff --git a/public/images/pokemon/icons/2105s.png b/public/images/pokemon/icons/7/2105s.png similarity index 100% rename from public/images/pokemon/icons/2105s.png rename to public/images/pokemon/icons/7/2105s.png diff --git a/public/images/pokemon/icons/722.png b/public/images/pokemon/icons/7/722.png similarity index 100% rename from public/images/pokemon/icons/722.png rename to public/images/pokemon/icons/7/722.png diff --git a/public/images/pokemon/icons/722s.png b/public/images/pokemon/icons/7/722s.png similarity index 100% rename from public/images/pokemon/icons/722s.png rename to public/images/pokemon/icons/7/722s.png diff --git a/public/images/pokemon/icons/723.png b/public/images/pokemon/icons/7/723.png similarity index 100% rename from public/images/pokemon/icons/723.png rename to public/images/pokemon/icons/7/723.png diff --git a/public/images/pokemon/icons/723s.png b/public/images/pokemon/icons/7/723s.png similarity index 100% rename from public/images/pokemon/icons/723s.png rename to public/images/pokemon/icons/7/723s.png diff --git a/public/images/pokemon/icons/724.png b/public/images/pokemon/icons/7/724.png similarity index 100% rename from public/images/pokemon/icons/724.png rename to public/images/pokemon/icons/7/724.png diff --git a/public/images/pokemon/icons/724s.png b/public/images/pokemon/icons/7/724s.png similarity index 100% rename from public/images/pokemon/icons/724s.png rename to public/images/pokemon/icons/7/724s.png diff --git a/public/images/pokemon/icons/725.png b/public/images/pokemon/icons/7/725.png similarity index 100% rename from public/images/pokemon/icons/725.png rename to public/images/pokemon/icons/7/725.png diff --git a/public/images/pokemon/icons/725s.png b/public/images/pokemon/icons/7/725s.png similarity index 100% rename from public/images/pokemon/icons/725s.png rename to public/images/pokemon/icons/7/725s.png diff --git a/public/images/pokemon/icons/726.png b/public/images/pokemon/icons/7/726.png similarity index 100% rename from public/images/pokemon/icons/726.png rename to public/images/pokemon/icons/7/726.png diff --git a/public/images/pokemon/icons/726s.png b/public/images/pokemon/icons/7/726s.png similarity index 100% rename from public/images/pokemon/icons/726s.png rename to public/images/pokemon/icons/7/726s.png diff --git a/public/images/pokemon/icons/727.png b/public/images/pokemon/icons/7/727.png similarity index 100% rename from public/images/pokemon/icons/727.png rename to public/images/pokemon/icons/7/727.png diff --git a/public/images/pokemon/icons/727s.png b/public/images/pokemon/icons/7/727s.png similarity index 100% rename from public/images/pokemon/icons/727s.png rename to public/images/pokemon/icons/7/727s.png diff --git a/public/images/pokemon/icons/728.png b/public/images/pokemon/icons/7/728.png similarity index 100% rename from public/images/pokemon/icons/728.png rename to public/images/pokemon/icons/7/728.png diff --git a/public/images/pokemon/icons/728s.png b/public/images/pokemon/icons/7/728s.png similarity index 100% rename from public/images/pokemon/icons/728s.png rename to public/images/pokemon/icons/7/728s.png diff --git a/public/images/pokemon/icons/729.png b/public/images/pokemon/icons/7/729.png similarity index 100% rename from public/images/pokemon/icons/729.png rename to public/images/pokemon/icons/7/729.png diff --git a/public/images/pokemon/icons/729s.png b/public/images/pokemon/icons/7/729s.png similarity index 100% rename from public/images/pokemon/icons/729s.png rename to public/images/pokemon/icons/7/729s.png diff --git a/public/images/pokemon/icons/730.png b/public/images/pokemon/icons/7/730.png similarity index 100% rename from public/images/pokemon/icons/730.png rename to public/images/pokemon/icons/7/730.png diff --git a/public/images/pokemon/icons/730s.png b/public/images/pokemon/icons/7/730s.png similarity index 100% rename from public/images/pokemon/icons/730s.png rename to public/images/pokemon/icons/7/730s.png diff --git a/public/images/pokemon/icons/731.png b/public/images/pokemon/icons/7/731.png similarity index 100% rename from public/images/pokemon/icons/731.png rename to public/images/pokemon/icons/7/731.png diff --git a/public/images/pokemon/icons/731s.png b/public/images/pokemon/icons/7/731s.png similarity index 100% rename from public/images/pokemon/icons/731s.png rename to public/images/pokemon/icons/7/731s.png diff --git a/public/images/pokemon/icons/732.png b/public/images/pokemon/icons/7/732.png similarity index 100% rename from public/images/pokemon/icons/732.png rename to public/images/pokemon/icons/7/732.png diff --git a/public/images/pokemon/icons/732s.png b/public/images/pokemon/icons/7/732s.png similarity index 100% rename from public/images/pokemon/icons/732s.png rename to public/images/pokemon/icons/7/732s.png diff --git a/public/images/pokemon/icons/733.png b/public/images/pokemon/icons/7/733.png similarity index 100% rename from public/images/pokemon/icons/733.png rename to public/images/pokemon/icons/7/733.png diff --git a/public/images/pokemon/icons/733s.png b/public/images/pokemon/icons/7/733s.png similarity index 100% rename from public/images/pokemon/icons/733s.png rename to public/images/pokemon/icons/7/733s.png diff --git a/public/images/pokemon/icons/734.png b/public/images/pokemon/icons/7/734.png similarity index 100% rename from public/images/pokemon/icons/734.png rename to public/images/pokemon/icons/7/734.png diff --git a/public/images/pokemon/icons/734s.png b/public/images/pokemon/icons/7/734s.png similarity index 100% rename from public/images/pokemon/icons/734s.png rename to public/images/pokemon/icons/7/734s.png diff --git a/public/images/pokemon/icons/735.png b/public/images/pokemon/icons/7/735.png similarity index 100% rename from public/images/pokemon/icons/735.png rename to public/images/pokemon/icons/7/735.png diff --git a/public/images/pokemon/icons/735s.png b/public/images/pokemon/icons/7/735s.png similarity index 100% rename from public/images/pokemon/icons/735s.png rename to public/images/pokemon/icons/7/735s.png diff --git a/public/images/pokemon/icons/736.png b/public/images/pokemon/icons/7/736.png similarity index 100% rename from public/images/pokemon/icons/736.png rename to public/images/pokemon/icons/7/736.png diff --git a/public/images/pokemon/icons/736s.png b/public/images/pokemon/icons/7/736s.png similarity index 100% rename from public/images/pokemon/icons/736s.png rename to public/images/pokemon/icons/7/736s.png diff --git a/public/images/pokemon/icons/737.png b/public/images/pokemon/icons/7/737.png similarity index 100% rename from public/images/pokemon/icons/737.png rename to public/images/pokemon/icons/7/737.png diff --git a/public/images/pokemon/icons/737s.png b/public/images/pokemon/icons/7/737s.png similarity index 100% rename from public/images/pokemon/icons/737s.png rename to public/images/pokemon/icons/7/737s.png diff --git a/public/images/pokemon/icons/738.png b/public/images/pokemon/icons/7/738.png similarity index 100% rename from public/images/pokemon/icons/738.png rename to public/images/pokemon/icons/7/738.png diff --git a/public/images/pokemon/icons/738s.png b/public/images/pokemon/icons/7/738s.png similarity index 100% rename from public/images/pokemon/icons/738s.png rename to public/images/pokemon/icons/7/738s.png diff --git a/public/images/pokemon/icons/739.png b/public/images/pokemon/icons/7/739.png similarity index 100% rename from public/images/pokemon/icons/739.png rename to public/images/pokemon/icons/7/739.png diff --git a/public/images/pokemon/icons/739s.png b/public/images/pokemon/icons/7/739s.png similarity index 100% rename from public/images/pokemon/icons/739s.png rename to public/images/pokemon/icons/7/739s.png diff --git a/public/images/pokemon/icons/740.png b/public/images/pokemon/icons/7/740.png similarity index 100% rename from public/images/pokemon/icons/740.png rename to public/images/pokemon/icons/7/740.png diff --git a/public/images/pokemon/icons/740s.png b/public/images/pokemon/icons/7/740s.png similarity index 100% rename from public/images/pokemon/icons/740s.png rename to public/images/pokemon/icons/7/740s.png diff --git a/public/images/pokemon/icons/741-pau.png b/public/images/pokemon/icons/7/741-pau.png similarity index 100% rename from public/images/pokemon/icons/741-pau.png rename to public/images/pokemon/icons/7/741-pau.png diff --git a/public/images/pokemon/icons/741-pompom.png b/public/images/pokemon/icons/7/741-pompom.png similarity index 100% rename from public/images/pokemon/icons/741-pompom.png rename to public/images/pokemon/icons/7/741-pompom.png diff --git a/public/images/pokemon/icons/741-sensu.png b/public/images/pokemon/icons/7/741-sensu.png similarity index 100% rename from public/images/pokemon/icons/741-sensu.png rename to public/images/pokemon/icons/7/741-sensu.png diff --git a/public/images/pokemon/icons/741.png b/public/images/pokemon/icons/7/741.png similarity index 100% rename from public/images/pokemon/icons/741.png rename to public/images/pokemon/icons/7/741.png diff --git a/public/images/pokemon/icons/741s-pau.png b/public/images/pokemon/icons/7/741s-pau.png similarity index 100% rename from public/images/pokemon/icons/741s-pau.png rename to public/images/pokemon/icons/7/741s-pau.png diff --git a/public/images/pokemon/icons/741s-pompom.png b/public/images/pokemon/icons/7/741s-pompom.png similarity index 100% rename from public/images/pokemon/icons/741s-pompom.png rename to public/images/pokemon/icons/7/741s-pompom.png diff --git a/public/images/pokemon/icons/741s-sensu.png b/public/images/pokemon/icons/7/741s-sensu.png similarity index 100% rename from public/images/pokemon/icons/741s-sensu.png rename to public/images/pokemon/icons/7/741s-sensu.png diff --git a/public/images/pokemon/icons/741s.png b/public/images/pokemon/icons/7/741s.png similarity index 100% rename from public/images/pokemon/icons/741s.png rename to public/images/pokemon/icons/7/741s.png diff --git a/public/images/pokemon/icons/742.png b/public/images/pokemon/icons/7/742.png similarity index 100% rename from public/images/pokemon/icons/742.png rename to public/images/pokemon/icons/7/742.png diff --git a/public/images/pokemon/icons/742s.png b/public/images/pokemon/icons/7/742s.png similarity index 100% rename from public/images/pokemon/icons/742s.png rename to public/images/pokemon/icons/7/742s.png diff --git a/public/images/pokemon/icons/743.png b/public/images/pokemon/icons/7/743.png similarity index 100% rename from public/images/pokemon/icons/743.png rename to public/images/pokemon/icons/7/743.png diff --git a/public/images/pokemon/icons/743s.png b/public/images/pokemon/icons/7/743s.png similarity index 100% rename from public/images/pokemon/icons/743s.png rename to public/images/pokemon/icons/7/743s.png diff --git a/public/images/pokemon/icons/744.png b/public/images/pokemon/icons/7/744.png similarity index 100% rename from public/images/pokemon/icons/744.png rename to public/images/pokemon/icons/7/744.png diff --git a/public/images/pokemon/icons/744s.png b/public/images/pokemon/icons/7/744s.png similarity index 100% rename from public/images/pokemon/icons/744s.png rename to public/images/pokemon/icons/7/744s.png diff --git a/public/images/pokemon/icons/745-dusk.png b/public/images/pokemon/icons/7/745-dusk.png similarity index 100% rename from public/images/pokemon/icons/745-dusk.png rename to public/images/pokemon/icons/7/745-dusk.png diff --git a/public/images/pokemon/icons/745-midnight.png b/public/images/pokemon/icons/7/745-midnight.png similarity index 100% rename from public/images/pokemon/icons/745-midnight.png rename to public/images/pokemon/icons/7/745-midnight.png diff --git a/public/images/pokemon/icons/745.png b/public/images/pokemon/icons/7/745.png similarity index 100% rename from public/images/pokemon/icons/745.png rename to public/images/pokemon/icons/7/745.png diff --git a/public/images/pokemon/icons/745s-dusk.png b/public/images/pokemon/icons/7/745s-dusk.png similarity index 100% rename from public/images/pokemon/icons/745s-dusk.png rename to public/images/pokemon/icons/7/745s-dusk.png diff --git a/public/images/pokemon/icons/745s-midnight.png b/public/images/pokemon/icons/7/745s-midnight.png similarity index 100% rename from public/images/pokemon/icons/745s-midnight.png rename to public/images/pokemon/icons/7/745s-midnight.png diff --git a/public/images/pokemon/icons/745s.png b/public/images/pokemon/icons/7/745s.png similarity index 100% rename from public/images/pokemon/icons/745s.png rename to public/images/pokemon/icons/7/745s.png diff --git a/public/images/pokemon/icons/746-school.png b/public/images/pokemon/icons/7/746-school.png similarity index 100% rename from public/images/pokemon/icons/746-school.png rename to public/images/pokemon/icons/7/746-school.png diff --git a/public/images/pokemon/icons/746.png b/public/images/pokemon/icons/7/746.png similarity index 100% rename from public/images/pokemon/icons/746.png rename to public/images/pokemon/icons/7/746.png diff --git a/public/images/pokemon/icons/746s-school.png b/public/images/pokemon/icons/7/746s-school.png similarity index 100% rename from public/images/pokemon/icons/746s-school.png rename to public/images/pokemon/icons/7/746s-school.png diff --git a/public/images/pokemon/icons/746s.png b/public/images/pokemon/icons/7/746s.png similarity index 100% rename from public/images/pokemon/icons/746s.png rename to public/images/pokemon/icons/7/746s.png diff --git a/public/images/pokemon/icons/747.png b/public/images/pokemon/icons/7/747.png similarity index 100% rename from public/images/pokemon/icons/747.png rename to public/images/pokemon/icons/7/747.png diff --git a/public/images/pokemon/icons/747s.png b/public/images/pokemon/icons/7/747s.png similarity index 100% rename from public/images/pokemon/icons/747s.png rename to public/images/pokemon/icons/7/747s.png diff --git a/public/images/pokemon/icons/748.png b/public/images/pokemon/icons/7/748.png similarity index 100% rename from public/images/pokemon/icons/748.png rename to public/images/pokemon/icons/7/748.png diff --git a/public/images/pokemon/icons/748s.png b/public/images/pokemon/icons/7/748s.png similarity index 100% rename from public/images/pokemon/icons/748s.png rename to public/images/pokemon/icons/7/748s.png diff --git a/public/images/pokemon/icons/749.png b/public/images/pokemon/icons/7/749.png similarity index 100% rename from public/images/pokemon/icons/749.png rename to public/images/pokemon/icons/7/749.png diff --git a/public/images/pokemon/icons/749s.png b/public/images/pokemon/icons/7/749s.png similarity index 100% rename from public/images/pokemon/icons/749s.png rename to public/images/pokemon/icons/7/749s.png diff --git a/public/images/pokemon/icons/750.png b/public/images/pokemon/icons/7/750.png similarity index 100% rename from public/images/pokemon/icons/750.png rename to public/images/pokemon/icons/7/750.png diff --git a/public/images/pokemon/icons/750s.png b/public/images/pokemon/icons/7/750s.png similarity index 100% rename from public/images/pokemon/icons/750s.png rename to public/images/pokemon/icons/7/750s.png diff --git a/public/images/pokemon/icons/751.png b/public/images/pokemon/icons/7/751.png similarity index 100% rename from public/images/pokemon/icons/751.png rename to public/images/pokemon/icons/7/751.png diff --git a/public/images/pokemon/icons/751s.png b/public/images/pokemon/icons/7/751s.png similarity index 100% rename from public/images/pokemon/icons/751s.png rename to public/images/pokemon/icons/7/751s.png diff --git a/public/images/pokemon/icons/752.png b/public/images/pokemon/icons/7/752.png similarity index 100% rename from public/images/pokemon/icons/752.png rename to public/images/pokemon/icons/7/752.png diff --git a/public/images/pokemon/icons/752s.png b/public/images/pokemon/icons/7/752s.png similarity index 100% rename from public/images/pokemon/icons/752s.png rename to public/images/pokemon/icons/7/752s.png diff --git a/public/images/pokemon/icons/753.png b/public/images/pokemon/icons/7/753.png similarity index 100% rename from public/images/pokemon/icons/753.png rename to public/images/pokemon/icons/7/753.png diff --git a/public/images/pokemon/icons/753s.png b/public/images/pokemon/icons/7/753s.png similarity index 100% rename from public/images/pokemon/icons/753s.png rename to public/images/pokemon/icons/7/753s.png diff --git a/public/images/pokemon/icons/754.png b/public/images/pokemon/icons/7/754.png similarity index 100% rename from public/images/pokemon/icons/754.png rename to public/images/pokemon/icons/7/754.png diff --git a/public/images/pokemon/icons/754s.png b/public/images/pokemon/icons/7/754s.png similarity index 100% rename from public/images/pokemon/icons/754s.png rename to public/images/pokemon/icons/7/754s.png diff --git a/public/images/pokemon/icons/755.png b/public/images/pokemon/icons/7/755.png similarity index 100% rename from public/images/pokemon/icons/755.png rename to public/images/pokemon/icons/7/755.png diff --git a/public/images/pokemon/icons/755s.png b/public/images/pokemon/icons/7/755s.png similarity index 100% rename from public/images/pokemon/icons/755s.png rename to public/images/pokemon/icons/7/755s.png diff --git a/public/images/pokemon/icons/756.png b/public/images/pokemon/icons/7/756.png similarity index 100% rename from public/images/pokemon/icons/756.png rename to public/images/pokemon/icons/7/756.png diff --git a/public/images/pokemon/icons/756s.png b/public/images/pokemon/icons/7/756s.png similarity index 100% rename from public/images/pokemon/icons/756s.png rename to public/images/pokemon/icons/7/756s.png diff --git a/public/images/pokemon/icons/757.png b/public/images/pokemon/icons/7/757.png similarity index 100% rename from public/images/pokemon/icons/757.png rename to public/images/pokemon/icons/7/757.png diff --git a/public/images/pokemon/icons/757s.png b/public/images/pokemon/icons/7/757s.png similarity index 100% rename from public/images/pokemon/icons/757s.png rename to public/images/pokemon/icons/7/757s.png diff --git a/public/images/pokemon/icons/758.png b/public/images/pokemon/icons/7/758.png similarity index 100% rename from public/images/pokemon/icons/758.png rename to public/images/pokemon/icons/7/758.png diff --git a/public/images/pokemon/icons/758s.png b/public/images/pokemon/icons/7/758s.png similarity index 100% rename from public/images/pokemon/icons/758s.png rename to public/images/pokemon/icons/7/758s.png diff --git a/public/images/pokemon/icons/759.png b/public/images/pokemon/icons/7/759.png similarity index 100% rename from public/images/pokemon/icons/759.png rename to public/images/pokemon/icons/7/759.png diff --git a/public/images/pokemon/icons/759s.png b/public/images/pokemon/icons/7/759s.png similarity index 100% rename from public/images/pokemon/icons/759s.png rename to public/images/pokemon/icons/7/759s.png diff --git a/public/images/pokemon/icons/760.png b/public/images/pokemon/icons/7/760.png similarity index 100% rename from public/images/pokemon/icons/760.png rename to public/images/pokemon/icons/7/760.png diff --git a/public/images/pokemon/icons/760s.png b/public/images/pokemon/icons/7/760s.png similarity index 100% rename from public/images/pokemon/icons/760s.png rename to public/images/pokemon/icons/7/760s.png diff --git a/public/images/pokemon/icons/761.png b/public/images/pokemon/icons/7/761.png similarity index 100% rename from public/images/pokemon/icons/761.png rename to public/images/pokemon/icons/7/761.png diff --git a/public/images/pokemon/icons/761s.png b/public/images/pokemon/icons/7/761s.png similarity index 100% rename from public/images/pokemon/icons/761s.png rename to public/images/pokemon/icons/7/761s.png diff --git a/public/images/pokemon/icons/762.png b/public/images/pokemon/icons/7/762.png similarity index 100% rename from public/images/pokemon/icons/762.png rename to public/images/pokemon/icons/7/762.png diff --git a/public/images/pokemon/icons/762s.png b/public/images/pokemon/icons/7/762s.png similarity index 100% rename from public/images/pokemon/icons/762s.png rename to public/images/pokemon/icons/7/762s.png diff --git a/public/images/pokemon/icons/763.png b/public/images/pokemon/icons/7/763.png similarity index 100% rename from public/images/pokemon/icons/763.png rename to public/images/pokemon/icons/7/763.png diff --git a/public/images/pokemon/icons/763s.png b/public/images/pokemon/icons/7/763s.png similarity index 100% rename from public/images/pokemon/icons/763s.png rename to public/images/pokemon/icons/7/763s.png diff --git a/public/images/pokemon/icons/764.png b/public/images/pokemon/icons/7/764.png similarity index 100% rename from public/images/pokemon/icons/764.png rename to public/images/pokemon/icons/7/764.png diff --git a/public/images/pokemon/icons/764s.png b/public/images/pokemon/icons/7/764s.png similarity index 100% rename from public/images/pokemon/icons/764s.png rename to public/images/pokemon/icons/7/764s.png diff --git a/public/images/pokemon/icons/765.png b/public/images/pokemon/icons/7/765.png similarity index 100% rename from public/images/pokemon/icons/765.png rename to public/images/pokemon/icons/7/765.png diff --git a/public/images/pokemon/icons/765s.png b/public/images/pokemon/icons/7/765s.png similarity index 100% rename from public/images/pokemon/icons/765s.png rename to public/images/pokemon/icons/7/765s.png diff --git a/public/images/pokemon/icons/766.png b/public/images/pokemon/icons/7/766.png similarity index 100% rename from public/images/pokemon/icons/766.png rename to public/images/pokemon/icons/7/766.png diff --git a/public/images/pokemon/icons/766s.png b/public/images/pokemon/icons/7/766s.png similarity index 100% rename from public/images/pokemon/icons/766s.png rename to public/images/pokemon/icons/7/766s.png diff --git a/public/images/pokemon/icons/767.png b/public/images/pokemon/icons/7/767.png similarity index 100% rename from public/images/pokemon/icons/767.png rename to public/images/pokemon/icons/7/767.png diff --git a/public/images/pokemon/icons/767s.png b/public/images/pokemon/icons/7/767s.png similarity index 100% rename from public/images/pokemon/icons/767s.png rename to public/images/pokemon/icons/7/767s.png diff --git a/public/images/pokemon/icons/768.png b/public/images/pokemon/icons/7/768.png similarity index 100% rename from public/images/pokemon/icons/768.png rename to public/images/pokemon/icons/7/768.png diff --git a/public/images/pokemon/icons/768s.png b/public/images/pokemon/icons/7/768s.png similarity index 100% rename from public/images/pokemon/icons/768s.png rename to public/images/pokemon/icons/7/768s.png diff --git a/public/images/pokemon/icons/769.png b/public/images/pokemon/icons/7/769.png similarity index 100% rename from public/images/pokemon/icons/769.png rename to public/images/pokemon/icons/7/769.png diff --git a/public/images/pokemon/icons/769s.png b/public/images/pokemon/icons/7/769s.png similarity index 100% rename from public/images/pokemon/icons/769s.png rename to public/images/pokemon/icons/7/769s.png diff --git a/public/images/pokemon/icons/770.png b/public/images/pokemon/icons/7/770.png similarity index 100% rename from public/images/pokemon/icons/770.png rename to public/images/pokemon/icons/7/770.png diff --git a/public/images/pokemon/icons/770s.png b/public/images/pokemon/icons/7/770s.png similarity index 100% rename from public/images/pokemon/icons/770s.png rename to public/images/pokemon/icons/7/770s.png diff --git a/public/images/pokemon/icons/771.png b/public/images/pokemon/icons/7/771.png similarity index 100% rename from public/images/pokemon/icons/771.png rename to public/images/pokemon/icons/7/771.png diff --git a/public/images/pokemon/icons/771s.png b/public/images/pokemon/icons/7/771s.png similarity index 100% rename from public/images/pokemon/icons/771s.png rename to public/images/pokemon/icons/7/771s.png diff --git a/public/images/pokemon/icons/772.png b/public/images/pokemon/icons/7/772.png similarity index 100% rename from public/images/pokemon/icons/772.png rename to public/images/pokemon/icons/7/772.png diff --git a/public/images/pokemon/icons/772s.png b/public/images/pokemon/icons/7/772s.png similarity index 100% rename from public/images/pokemon/icons/772s.png rename to public/images/pokemon/icons/7/772s.png diff --git a/public/images/pokemon/icons/773-bug.png b/public/images/pokemon/icons/7/773-bug.png similarity index 100% rename from public/images/pokemon/icons/773-bug.png rename to public/images/pokemon/icons/7/773-bug.png diff --git a/public/images/pokemon/icons/773-dark.png b/public/images/pokemon/icons/7/773-dark.png similarity index 100% rename from public/images/pokemon/icons/773-dark.png rename to public/images/pokemon/icons/7/773-dark.png diff --git a/public/images/pokemon/icons/773-dragon.png b/public/images/pokemon/icons/7/773-dragon.png similarity index 100% rename from public/images/pokemon/icons/773-dragon.png rename to public/images/pokemon/icons/7/773-dragon.png diff --git a/public/images/pokemon/icons/773-electric.png b/public/images/pokemon/icons/7/773-electric.png similarity index 100% rename from public/images/pokemon/icons/773-electric.png rename to public/images/pokemon/icons/7/773-electric.png diff --git a/public/images/pokemon/icons/773-fairy.png b/public/images/pokemon/icons/7/773-fairy.png similarity index 100% rename from public/images/pokemon/icons/773-fairy.png rename to public/images/pokemon/icons/7/773-fairy.png diff --git a/public/images/pokemon/icons/773-fighting.png b/public/images/pokemon/icons/7/773-fighting.png similarity index 100% rename from public/images/pokemon/icons/773-fighting.png rename to public/images/pokemon/icons/7/773-fighting.png diff --git a/public/images/pokemon/icons/773-fire.png b/public/images/pokemon/icons/7/773-fire.png similarity index 100% rename from public/images/pokemon/icons/773-fire.png rename to public/images/pokemon/icons/7/773-fire.png diff --git a/public/images/pokemon/icons/773-flying.png b/public/images/pokemon/icons/7/773-flying.png similarity index 100% rename from public/images/pokemon/icons/773-flying.png rename to public/images/pokemon/icons/7/773-flying.png diff --git a/public/images/pokemon/icons/773-ghost.png b/public/images/pokemon/icons/7/773-ghost.png similarity index 100% rename from public/images/pokemon/icons/773-ghost.png rename to public/images/pokemon/icons/7/773-ghost.png diff --git a/public/images/pokemon/icons/773-grass.png b/public/images/pokemon/icons/7/773-grass.png similarity index 100% rename from public/images/pokemon/icons/773-grass.png rename to public/images/pokemon/icons/7/773-grass.png diff --git a/public/images/pokemon/icons/773-ground.png b/public/images/pokemon/icons/7/773-ground.png similarity index 100% rename from public/images/pokemon/icons/773-ground.png rename to public/images/pokemon/icons/7/773-ground.png diff --git a/public/images/pokemon/icons/773-ice.png b/public/images/pokemon/icons/7/773-ice.png similarity index 100% rename from public/images/pokemon/icons/773-ice.png rename to public/images/pokemon/icons/7/773-ice.png diff --git a/public/images/pokemon/icons/773-poison.png b/public/images/pokemon/icons/7/773-poison.png similarity index 100% rename from public/images/pokemon/icons/773-poison.png rename to public/images/pokemon/icons/7/773-poison.png diff --git a/public/images/pokemon/icons/773-psychic.png b/public/images/pokemon/icons/7/773-psychic.png similarity index 100% rename from public/images/pokemon/icons/773-psychic.png rename to public/images/pokemon/icons/7/773-psychic.png diff --git a/public/images/pokemon/icons/773-rock.png b/public/images/pokemon/icons/7/773-rock.png similarity index 100% rename from public/images/pokemon/icons/773-rock.png rename to public/images/pokemon/icons/7/773-rock.png diff --git a/public/images/pokemon/icons/773-steel.png b/public/images/pokemon/icons/7/773-steel.png similarity index 100% rename from public/images/pokemon/icons/773-steel.png rename to public/images/pokemon/icons/7/773-steel.png diff --git a/public/images/pokemon/icons/773-water.png b/public/images/pokemon/icons/7/773-water.png similarity index 100% rename from public/images/pokemon/icons/773-water.png rename to public/images/pokemon/icons/7/773-water.png diff --git a/public/images/pokemon/icons/773.png b/public/images/pokemon/icons/7/773.png similarity index 100% rename from public/images/pokemon/icons/773.png rename to public/images/pokemon/icons/7/773.png diff --git a/public/images/pokemon/icons/773s-bug.png b/public/images/pokemon/icons/7/773s-bug.png similarity index 100% rename from public/images/pokemon/icons/773s-bug.png rename to public/images/pokemon/icons/7/773s-bug.png diff --git a/public/images/pokemon/icons/773s-dark.png b/public/images/pokemon/icons/7/773s-dark.png similarity index 100% rename from public/images/pokemon/icons/773s-dark.png rename to public/images/pokemon/icons/7/773s-dark.png diff --git a/public/images/pokemon/icons/773s-dragon.png b/public/images/pokemon/icons/7/773s-dragon.png similarity index 100% rename from public/images/pokemon/icons/773s-dragon.png rename to public/images/pokemon/icons/7/773s-dragon.png diff --git a/public/images/pokemon/icons/773s-electric.png b/public/images/pokemon/icons/7/773s-electric.png similarity index 100% rename from public/images/pokemon/icons/773s-electric.png rename to public/images/pokemon/icons/7/773s-electric.png diff --git a/public/images/pokemon/icons/773s-fairy.png b/public/images/pokemon/icons/7/773s-fairy.png similarity index 100% rename from public/images/pokemon/icons/773s-fairy.png rename to public/images/pokemon/icons/7/773s-fairy.png diff --git a/public/images/pokemon/icons/773s-fighting.png b/public/images/pokemon/icons/7/773s-fighting.png similarity index 100% rename from public/images/pokemon/icons/773s-fighting.png rename to public/images/pokemon/icons/7/773s-fighting.png diff --git a/public/images/pokemon/icons/773s-fire.png b/public/images/pokemon/icons/7/773s-fire.png similarity index 100% rename from public/images/pokemon/icons/773s-fire.png rename to public/images/pokemon/icons/7/773s-fire.png diff --git a/public/images/pokemon/icons/773s-flying.png b/public/images/pokemon/icons/7/773s-flying.png similarity index 100% rename from public/images/pokemon/icons/773s-flying.png rename to public/images/pokemon/icons/7/773s-flying.png diff --git a/public/images/pokemon/icons/773s-ghost.png b/public/images/pokemon/icons/7/773s-ghost.png similarity index 100% rename from public/images/pokemon/icons/773s-ghost.png rename to public/images/pokemon/icons/7/773s-ghost.png diff --git a/public/images/pokemon/icons/773s-grass.png b/public/images/pokemon/icons/7/773s-grass.png similarity index 100% rename from public/images/pokemon/icons/773s-grass.png rename to public/images/pokemon/icons/7/773s-grass.png diff --git a/public/images/pokemon/icons/773s-ground.png b/public/images/pokemon/icons/7/773s-ground.png similarity index 100% rename from public/images/pokemon/icons/773s-ground.png rename to public/images/pokemon/icons/7/773s-ground.png diff --git a/public/images/pokemon/icons/773s-ice.png b/public/images/pokemon/icons/7/773s-ice.png similarity index 100% rename from public/images/pokemon/icons/773s-ice.png rename to public/images/pokemon/icons/7/773s-ice.png diff --git a/public/images/pokemon/icons/773s-poison.png b/public/images/pokemon/icons/7/773s-poison.png similarity index 100% rename from public/images/pokemon/icons/773s-poison.png rename to public/images/pokemon/icons/7/773s-poison.png diff --git a/public/images/pokemon/icons/773s-psychic.png b/public/images/pokemon/icons/7/773s-psychic.png similarity index 100% rename from public/images/pokemon/icons/773s-psychic.png rename to public/images/pokemon/icons/7/773s-psychic.png diff --git a/public/images/pokemon/icons/773s-rock.png b/public/images/pokemon/icons/7/773s-rock.png similarity index 100% rename from public/images/pokemon/icons/773s-rock.png rename to public/images/pokemon/icons/7/773s-rock.png diff --git a/public/images/pokemon/icons/773s-steel.png b/public/images/pokemon/icons/7/773s-steel.png similarity index 100% rename from public/images/pokemon/icons/773s-steel.png rename to public/images/pokemon/icons/7/773s-steel.png diff --git a/public/images/pokemon/icons/773s-water.png b/public/images/pokemon/icons/7/773s-water.png similarity index 100% rename from public/images/pokemon/icons/773s-water.png rename to public/images/pokemon/icons/7/773s-water.png diff --git a/public/images/pokemon/icons/773s.png b/public/images/pokemon/icons/7/773s.png similarity index 100% rename from public/images/pokemon/icons/773s.png rename to public/images/pokemon/icons/7/773s.png diff --git a/public/images/pokemon/icons/774-blue.png b/public/images/pokemon/icons/7/774-blue.png similarity index 100% rename from public/images/pokemon/icons/774-blue.png rename to public/images/pokemon/icons/7/774-blue.png diff --git a/public/images/pokemon/icons/774-green.png b/public/images/pokemon/icons/7/774-green.png similarity index 100% rename from public/images/pokemon/icons/774-green.png rename to public/images/pokemon/icons/7/774-green.png diff --git a/public/images/pokemon/icons/774-indigo.png b/public/images/pokemon/icons/7/774-indigo.png similarity index 100% rename from public/images/pokemon/icons/774-indigo.png rename to public/images/pokemon/icons/7/774-indigo.png diff --git a/public/images/pokemon/icons/774-orange.png b/public/images/pokemon/icons/7/774-orange.png similarity index 100% rename from public/images/pokemon/icons/774-orange.png rename to public/images/pokemon/icons/7/774-orange.png diff --git a/public/images/pokemon/icons/774-red.png b/public/images/pokemon/icons/7/774-red.png similarity index 100% rename from public/images/pokemon/icons/774-red.png rename to public/images/pokemon/icons/7/774-red.png diff --git a/public/images/pokemon/icons/774-violet.png b/public/images/pokemon/icons/7/774-violet.png similarity index 100% rename from public/images/pokemon/icons/774-violet.png rename to public/images/pokemon/icons/7/774-violet.png diff --git a/public/images/pokemon/icons/774-yellow.png b/public/images/pokemon/icons/7/774-yellow.png similarity index 100% rename from public/images/pokemon/icons/774-yellow.png rename to public/images/pokemon/icons/7/774-yellow.png diff --git a/public/images/pokemon/icons/774.png b/public/images/pokemon/icons/7/774.png similarity index 100% rename from public/images/pokemon/icons/774.png rename to public/images/pokemon/icons/7/774.png diff --git a/public/images/pokemon/icons/774s-blue.png b/public/images/pokemon/icons/7/774s-blue.png similarity index 100% rename from public/images/pokemon/icons/774s-blue.png rename to public/images/pokemon/icons/7/774s-blue.png diff --git a/public/images/pokemon/icons/774s-green.png b/public/images/pokemon/icons/7/774s-green.png similarity index 100% rename from public/images/pokemon/icons/774s-green.png rename to public/images/pokemon/icons/7/774s-green.png diff --git a/public/images/pokemon/icons/774s-indigo.png b/public/images/pokemon/icons/7/774s-indigo.png similarity index 100% rename from public/images/pokemon/icons/774s-indigo.png rename to public/images/pokemon/icons/7/774s-indigo.png diff --git a/public/images/pokemon/icons/774s-orange.png b/public/images/pokemon/icons/7/774s-orange.png similarity index 100% rename from public/images/pokemon/icons/774s-orange.png rename to public/images/pokemon/icons/7/774s-orange.png diff --git a/public/images/pokemon/icons/774s-red.png b/public/images/pokemon/icons/7/774s-red.png similarity index 100% rename from public/images/pokemon/icons/774s-red.png rename to public/images/pokemon/icons/7/774s-red.png diff --git a/public/images/pokemon/icons/774s-violet.png b/public/images/pokemon/icons/7/774s-violet.png similarity index 100% rename from public/images/pokemon/icons/774s-violet.png rename to public/images/pokemon/icons/7/774s-violet.png diff --git a/public/images/pokemon/icons/774s-yellow.png b/public/images/pokemon/icons/7/774s-yellow.png similarity index 100% rename from public/images/pokemon/icons/774s-yellow.png rename to public/images/pokemon/icons/7/774s-yellow.png diff --git a/public/images/pokemon/icons/774s.png b/public/images/pokemon/icons/7/774s.png similarity index 100% rename from public/images/pokemon/icons/774s.png rename to public/images/pokemon/icons/7/774s.png diff --git a/public/images/pokemon/icons/775.png b/public/images/pokemon/icons/7/775.png similarity index 100% rename from public/images/pokemon/icons/775.png rename to public/images/pokemon/icons/7/775.png diff --git a/public/images/pokemon/icons/775s.png b/public/images/pokemon/icons/7/775s.png similarity index 100% rename from public/images/pokemon/icons/775s.png rename to public/images/pokemon/icons/7/775s.png diff --git a/public/images/pokemon/icons/776.png b/public/images/pokemon/icons/7/776.png similarity index 100% rename from public/images/pokemon/icons/776.png rename to public/images/pokemon/icons/7/776.png diff --git a/public/images/pokemon/icons/776s.png b/public/images/pokemon/icons/7/776s.png similarity index 100% rename from public/images/pokemon/icons/776s.png rename to public/images/pokemon/icons/7/776s.png diff --git a/public/images/pokemon/icons/777.png b/public/images/pokemon/icons/7/777.png similarity index 100% rename from public/images/pokemon/icons/777.png rename to public/images/pokemon/icons/7/777.png diff --git a/public/images/pokemon/icons/777s.png b/public/images/pokemon/icons/7/777s.png similarity index 100% rename from public/images/pokemon/icons/777s.png rename to public/images/pokemon/icons/7/777s.png diff --git a/public/images/pokemon/icons/778-busted.png b/public/images/pokemon/icons/7/778-busted.png similarity index 100% rename from public/images/pokemon/icons/778-busted.png rename to public/images/pokemon/icons/7/778-busted.png diff --git a/public/images/pokemon/icons/778.png b/public/images/pokemon/icons/7/778.png similarity index 100% rename from public/images/pokemon/icons/778.png rename to public/images/pokemon/icons/7/778.png diff --git a/public/images/pokemon/icons/778s-busted.png b/public/images/pokemon/icons/7/778s-busted.png similarity index 100% rename from public/images/pokemon/icons/778s-busted.png rename to public/images/pokemon/icons/7/778s-busted.png diff --git a/public/images/pokemon/icons/778s.png b/public/images/pokemon/icons/7/778s.png similarity index 100% rename from public/images/pokemon/icons/778s.png rename to public/images/pokemon/icons/7/778s.png diff --git a/public/images/pokemon/icons/779.png b/public/images/pokemon/icons/7/779.png similarity index 100% rename from public/images/pokemon/icons/779.png rename to public/images/pokemon/icons/7/779.png diff --git a/public/images/pokemon/icons/779s.png b/public/images/pokemon/icons/7/779s.png similarity index 100% rename from public/images/pokemon/icons/779s.png rename to public/images/pokemon/icons/7/779s.png diff --git a/public/images/pokemon/icons/780.png b/public/images/pokemon/icons/7/780.png similarity index 100% rename from public/images/pokemon/icons/780.png rename to public/images/pokemon/icons/7/780.png diff --git a/public/images/pokemon/icons/780s.png b/public/images/pokemon/icons/7/780s.png similarity index 100% rename from public/images/pokemon/icons/780s.png rename to public/images/pokemon/icons/7/780s.png diff --git a/public/images/pokemon/icons/781.png b/public/images/pokemon/icons/7/781.png similarity index 100% rename from public/images/pokemon/icons/781.png rename to public/images/pokemon/icons/7/781.png diff --git a/public/images/pokemon/icons/781s.png b/public/images/pokemon/icons/7/781s.png similarity index 100% rename from public/images/pokemon/icons/781s.png rename to public/images/pokemon/icons/7/781s.png diff --git a/public/images/pokemon/icons/782.png b/public/images/pokemon/icons/7/782.png similarity index 100% rename from public/images/pokemon/icons/782.png rename to public/images/pokemon/icons/7/782.png diff --git a/public/images/pokemon/icons/782s.png b/public/images/pokemon/icons/7/782s.png similarity index 100% rename from public/images/pokemon/icons/782s.png rename to public/images/pokemon/icons/7/782s.png diff --git a/public/images/pokemon/icons/783.png b/public/images/pokemon/icons/7/783.png similarity index 100% rename from public/images/pokemon/icons/783.png rename to public/images/pokemon/icons/7/783.png diff --git a/public/images/pokemon/icons/783s.png b/public/images/pokemon/icons/7/783s.png similarity index 100% rename from public/images/pokemon/icons/783s.png rename to public/images/pokemon/icons/7/783s.png diff --git a/public/images/pokemon/icons/784.png b/public/images/pokemon/icons/7/784.png similarity index 100% rename from public/images/pokemon/icons/784.png rename to public/images/pokemon/icons/7/784.png diff --git a/public/images/pokemon/icons/784s.png b/public/images/pokemon/icons/7/784s.png similarity index 100% rename from public/images/pokemon/icons/784s.png rename to public/images/pokemon/icons/7/784s.png diff --git a/public/images/pokemon/icons/785.png b/public/images/pokemon/icons/7/785.png similarity index 100% rename from public/images/pokemon/icons/785.png rename to public/images/pokemon/icons/7/785.png diff --git a/public/images/pokemon/icons/785s.png b/public/images/pokemon/icons/7/785s.png similarity index 100% rename from public/images/pokemon/icons/785s.png rename to public/images/pokemon/icons/7/785s.png diff --git a/public/images/pokemon/icons/786.png b/public/images/pokemon/icons/7/786.png similarity index 100% rename from public/images/pokemon/icons/786.png rename to public/images/pokemon/icons/7/786.png diff --git a/public/images/pokemon/icons/786s.png b/public/images/pokemon/icons/7/786s.png similarity index 100% rename from public/images/pokemon/icons/786s.png rename to public/images/pokemon/icons/7/786s.png diff --git a/public/images/pokemon/icons/787.png b/public/images/pokemon/icons/7/787.png similarity index 100% rename from public/images/pokemon/icons/787.png rename to public/images/pokemon/icons/7/787.png diff --git a/public/images/pokemon/icons/787s.png b/public/images/pokemon/icons/7/787s.png similarity index 100% rename from public/images/pokemon/icons/787s.png rename to public/images/pokemon/icons/7/787s.png diff --git a/public/images/pokemon/icons/788.png b/public/images/pokemon/icons/7/788.png similarity index 100% rename from public/images/pokemon/icons/788.png rename to public/images/pokemon/icons/7/788.png diff --git a/public/images/pokemon/icons/788s.png b/public/images/pokemon/icons/7/788s.png similarity index 100% rename from public/images/pokemon/icons/788s.png rename to public/images/pokemon/icons/7/788s.png diff --git a/public/images/pokemon/icons/789.png b/public/images/pokemon/icons/7/789.png similarity index 100% rename from public/images/pokemon/icons/789.png rename to public/images/pokemon/icons/7/789.png diff --git a/public/images/pokemon/icons/789s.png b/public/images/pokemon/icons/7/789s.png similarity index 100% rename from public/images/pokemon/icons/789s.png rename to public/images/pokemon/icons/7/789s.png diff --git a/public/images/pokemon/icons/790.png b/public/images/pokemon/icons/7/790.png similarity index 100% rename from public/images/pokemon/icons/790.png rename to public/images/pokemon/icons/7/790.png diff --git a/public/images/pokemon/icons/790s.png b/public/images/pokemon/icons/7/790s.png similarity index 100% rename from public/images/pokemon/icons/790s.png rename to public/images/pokemon/icons/7/790s.png diff --git a/public/images/pokemon/icons/791.png b/public/images/pokemon/icons/7/791.png similarity index 100% rename from public/images/pokemon/icons/791.png rename to public/images/pokemon/icons/7/791.png diff --git a/public/images/pokemon/icons/791s.png b/public/images/pokemon/icons/7/791s.png similarity index 100% rename from public/images/pokemon/icons/791s.png rename to public/images/pokemon/icons/7/791s.png diff --git a/public/images/pokemon/icons/792.png b/public/images/pokemon/icons/7/792.png similarity index 100% rename from public/images/pokemon/icons/792.png rename to public/images/pokemon/icons/7/792.png diff --git a/public/images/pokemon/icons/792s.png b/public/images/pokemon/icons/7/792s.png similarity index 100% rename from public/images/pokemon/icons/792s.png rename to public/images/pokemon/icons/7/792s.png diff --git a/public/images/pokemon/icons/793.png b/public/images/pokemon/icons/7/793.png similarity index 100% rename from public/images/pokemon/icons/793.png rename to public/images/pokemon/icons/7/793.png diff --git a/public/images/pokemon/icons/793s.png b/public/images/pokemon/icons/7/793s.png similarity index 100% rename from public/images/pokemon/icons/793s.png rename to public/images/pokemon/icons/7/793s.png diff --git a/public/images/pokemon/icons/794.png b/public/images/pokemon/icons/7/794.png similarity index 100% rename from public/images/pokemon/icons/794.png rename to public/images/pokemon/icons/7/794.png diff --git a/public/images/pokemon/icons/794s.png b/public/images/pokemon/icons/7/794s.png similarity index 100% rename from public/images/pokemon/icons/794s.png rename to public/images/pokemon/icons/7/794s.png diff --git a/public/images/pokemon/icons/795.png b/public/images/pokemon/icons/7/795.png similarity index 100% rename from public/images/pokemon/icons/795.png rename to public/images/pokemon/icons/7/795.png diff --git a/public/images/pokemon/icons/795s.png b/public/images/pokemon/icons/7/795s.png similarity index 100% rename from public/images/pokemon/icons/795s.png rename to public/images/pokemon/icons/7/795s.png diff --git a/public/images/pokemon/icons/796.png b/public/images/pokemon/icons/7/796.png similarity index 100% rename from public/images/pokemon/icons/796.png rename to public/images/pokemon/icons/7/796.png diff --git a/public/images/pokemon/icons/796s.png b/public/images/pokemon/icons/7/796s.png similarity index 100% rename from public/images/pokemon/icons/796s.png rename to public/images/pokemon/icons/7/796s.png diff --git a/public/images/pokemon/icons/797.png b/public/images/pokemon/icons/7/797.png similarity index 100% rename from public/images/pokemon/icons/797.png rename to public/images/pokemon/icons/7/797.png diff --git a/public/images/pokemon/icons/797s.png b/public/images/pokemon/icons/7/797s.png similarity index 100% rename from public/images/pokemon/icons/797s.png rename to public/images/pokemon/icons/7/797s.png diff --git a/public/images/pokemon/icons/798.png b/public/images/pokemon/icons/7/798.png similarity index 100% rename from public/images/pokemon/icons/798.png rename to public/images/pokemon/icons/7/798.png diff --git a/public/images/pokemon/icons/798s.png b/public/images/pokemon/icons/7/798s.png similarity index 100% rename from public/images/pokemon/icons/798s.png rename to public/images/pokemon/icons/7/798s.png diff --git a/public/images/pokemon/icons/799.png b/public/images/pokemon/icons/7/799.png similarity index 100% rename from public/images/pokemon/icons/799.png rename to public/images/pokemon/icons/7/799.png diff --git a/public/images/pokemon/icons/799s.png b/public/images/pokemon/icons/7/799s.png similarity index 100% rename from public/images/pokemon/icons/799s.png rename to public/images/pokemon/icons/7/799s.png diff --git a/public/images/pokemon/icons/800-dawn-wings.png b/public/images/pokemon/icons/7/800-dawn-wings.png similarity index 100% rename from public/images/pokemon/icons/800-dawn-wings.png rename to public/images/pokemon/icons/7/800-dawn-wings.png diff --git a/public/images/pokemon/icons/800-dusk-mane.png b/public/images/pokemon/icons/7/800-dusk-mane.png similarity index 100% rename from public/images/pokemon/icons/800-dusk-mane.png rename to public/images/pokemon/icons/7/800-dusk-mane.png diff --git a/public/images/pokemon/icons/800-ultra.png b/public/images/pokemon/icons/7/800-ultra.png similarity index 100% rename from public/images/pokemon/icons/800-ultra.png rename to public/images/pokemon/icons/7/800-ultra.png diff --git a/public/images/pokemon/icons/800.png b/public/images/pokemon/icons/7/800.png similarity index 100% rename from public/images/pokemon/icons/800.png rename to public/images/pokemon/icons/7/800.png diff --git a/public/images/pokemon/icons/800s-dawn-wings.png b/public/images/pokemon/icons/7/800s-dawn-wings.png similarity index 100% rename from public/images/pokemon/icons/800s-dawn-wings.png rename to public/images/pokemon/icons/7/800s-dawn-wings.png diff --git a/public/images/pokemon/icons/800s-dusk-mane.png b/public/images/pokemon/icons/7/800s-dusk-mane.png similarity index 100% rename from public/images/pokemon/icons/800s-dusk-mane.png rename to public/images/pokemon/icons/7/800s-dusk-mane.png diff --git a/public/images/pokemon/icons/800s-ultra.png b/public/images/pokemon/icons/7/800s-ultra.png similarity index 100% rename from public/images/pokemon/icons/800s-ultra.png rename to public/images/pokemon/icons/7/800s-ultra.png diff --git a/public/images/pokemon/icons/800s.png b/public/images/pokemon/icons/7/800s.png similarity index 100% rename from public/images/pokemon/icons/800s.png rename to public/images/pokemon/icons/7/800s.png diff --git a/public/images/pokemon/icons/801-original.png b/public/images/pokemon/icons/7/801-original.png similarity index 100% rename from public/images/pokemon/icons/801-original.png rename to public/images/pokemon/icons/7/801-original.png diff --git a/public/images/pokemon/icons/801.png b/public/images/pokemon/icons/7/801.png similarity index 100% rename from public/images/pokemon/icons/801.png rename to public/images/pokemon/icons/7/801.png diff --git a/public/images/pokemon/icons/801s-original.png b/public/images/pokemon/icons/7/801s-original.png similarity index 100% rename from public/images/pokemon/icons/801s-original.png rename to public/images/pokemon/icons/7/801s-original.png diff --git a/public/images/pokemon/icons/801s.png b/public/images/pokemon/icons/7/801s.png similarity index 100% rename from public/images/pokemon/icons/801s.png rename to public/images/pokemon/icons/7/801s.png diff --git a/public/images/pokemon/icons/802.png b/public/images/pokemon/icons/7/802.png similarity index 100% rename from public/images/pokemon/icons/802.png rename to public/images/pokemon/icons/7/802.png diff --git a/public/images/pokemon/icons/802s.png b/public/images/pokemon/icons/7/802s.png similarity index 100% rename from public/images/pokemon/icons/802s.png rename to public/images/pokemon/icons/7/802s.png diff --git a/public/images/pokemon/icons/803.png b/public/images/pokemon/icons/7/803.png similarity index 100% rename from public/images/pokemon/icons/803.png rename to public/images/pokemon/icons/7/803.png diff --git a/public/images/pokemon/icons/803s.png b/public/images/pokemon/icons/7/803s.png similarity index 100% rename from public/images/pokemon/icons/803s.png rename to public/images/pokemon/icons/7/803s.png diff --git a/public/images/pokemon/icons/804.png b/public/images/pokemon/icons/7/804.png similarity index 100% rename from public/images/pokemon/icons/804.png rename to public/images/pokemon/icons/7/804.png diff --git a/public/images/pokemon/icons/804s.png b/public/images/pokemon/icons/7/804s.png similarity index 100% rename from public/images/pokemon/icons/804s.png rename to public/images/pokemon/icons/7/804s.png diff --git a/public/images/pokemon/icons/805.png b/public/images/pokemon/icons/7/805.png similarity index 100% rename from public/images/pokemon/icons/805.png rename to public/images/pokemon/icons/7/805.png diff --git a/public/images/pokemon/icons/805s.png b/public/images/pokemon/icons/7/805s.png similarity index 100% rename from public/images/pokemon/icons/805s.png rename to public/images/pokemon/icons/7/805s.png diff --git a/public/images/pokemon/icons/806.png b/public/images/pokemon/icons/7/806.png similarity index 100% rename from public/images/pokemon/icons/806.png rename to public/images/pokemon/icons/7/806.png diff --git a/public/images/pokemon/icons/806s.png b/public/images/pokemon/icons/7/806s.png similarity index 100% rename from public/images/pokemon/icons/806s.png rename to public/images/pokemon/icons/7/806s.png diff --git a/public/images/pokemon/icons/807.png b/public/images/pokemon/icons/7/807.png similarity index 100% rename from public/images/pokemon/icons/807.png rename to public/images/pokemon/icons/7/807.png diff --git a/public/images/pokemon/icons/807s.png b/public/images/pokemon/icons/7/807s.png similarity index 100% rename from public/images/pokemon/icons/807s.png rename to public/images/pokemon/icons/7/807s.png diff --git a/public/images/pokemon/icons/808.png b/public/images/pokemon/icons/7/808.png similarity index 100% rename from public/images/pokemon/icons/808.png rename to public/images/pokemon/icons/7/808.png diff --git a/public/images/pokemon/icons/808s.png b/public/images/pokemon/icons/7/808s.png similarity index 100% rename from public/images/pokemon/icons/808s.png rename to public/images/pokemon/icons/7/808s.png diff --git a/public/images/pokemon/icons/809-gigantamax.png b/public/images/pokemon/icons/7/809-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/809-gigantamax.png rename to public/images/pokemon/icons/7/809-gigantamax.png diff --git a/public/images/pokemon/icons/809.png b/public/images/pokemon/icons/7/809.png similarity index 100% rename from public/images/pokemon/icons/809.png rename to public/images/pokemon/icons/7/809.png diff --git a/public/images/pokemon/icons/809s-gigantamax.png b/public/images/pokemon/icons/7/809s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/809s-gigantamax.png rename to public/images/pokemon/icons/7/809s-gigantamax.png diff --git a/public/images/pokemon/icons/809s.png b/public/images/pokemon/icons/7/809s.png similarity index 100% rename from public/images/pokemon/icons/809s.png rename to public/images/pokemon/icons/7/809s.png diff --git a/public/images/pokemon/icons/7/icons.bat b/public/images/pokemon/icons/7/icons.bat new file mode 100644 index 000000000..e54deb3a2 --- /dev/null +++ b/public/images/pokemon/icons/7/icons.bat @@ -0,0 +1 @@ +cmd /c TexturePacker ./ ../configuration.tps --sheet ../../../pokemon_icons_7.png --data ../../../pokemon_icons_7.json --replace .png= \ No newline at end of file diff --git a/public/images/pokemon/icons/4052.png b/public/images/pokemon/icons/8/4052.png similarity index 100% rename from public/images/pokemon/icons/4052.png rename to public/images/pokemon/icons/8/4052.png diff --git a/public/images/pokemon/icons/4052s.png b/public/images/pokemon/icons/8/4052s.png similarity index 100% rename from public/images/pokemon/icons/4052s.png rename to public/images/pokemon/icons/8/4052s.png diff --git a/public/images/pokemon/icons/4077.png b/public/images/pokemon/icons/8/4077.png similarity index 100% rename from public/images/pokemon/icons/4077.png rename to public/images/pokemon/icons/8/4077.png diff --git a/public/images/pokemon/icons/4077s.png b/public/images/pokemon/icons/8/4077s.png similarity index 100% rename from public/images/pokemon/icons/4077s.png rename to public/images/pokemon/icons/8/4077s.png diff --git a/public/images/pokemon/icons/4078.png b/public/images/pokemon/icons/8/4078.png similarity index 100% rename from public/images/pokemon/icons/4078.png rename to public/images/pokemon/icons/8/4078.png diff --git a/public/images/pokemon/icons/4078s.png b/public/images/pokemon/icons/8/4078s.png similarity index 100% rename from public/images/pokemon/icons/4078s.png rename to public/images/pokemon/icons/8/4078s.png diff --git a/public/images/pokemon/icons/4079.png b/public/images/pokemon/icons/8/4079.png similarity index 100% rename from public/images/pokemon/icons/4079.png rename to public/images/pokemon/icons/8/4079.png diff --git a/public/images/pokemon/icons/4079s.png b/public/images/pokemon/icons/8/4079s.png similarity index 100% rename from public/images/pokemon/icons/4079s.png rename to public/images/pokemon/icons/8/4079s.png diff --git a/public/images/pokemon/icons/4080.png b/public/images/pokemon/icons/8/4080.png similarity index 100% rename from public/images/pokemon/icons/4080.png rename to public/images/pokemon/icons/8/4080.png diff --git a/public/images/pokemon/icons/4080s.png b/public/images/pokemon/icons/8/4080s.png similarity index 100% rename from public/images/pokemon/icons/4080s.png rename to public/images/pokemon/icons/8/4080s.png diff --git a/public/images/pokemon/icons/4083.png b/public/images/pokemon/icons/8/4083.png similarity index 100% rename from public/images/pokemon/icons/4083.png rename to public/images/pokemon/icons/8/4083.png diff --git a/public/images/pokemon/icons/4083s.png b/public/images/pokemon/icons/8/4083s.png similarity index 100% rename from public/images/pokemon/icons/4083s.png rename to public/images/pokemon/icons/8/4083s.png diff --git a/public/images/pokemon/icons/4110.png b/public/images/pokemon/icons/8/4110.png similarity index 100% rename from public/images/pokemon/icons/4110.png rename to public/images/pokemon/icons/8/4110.png diff --git a/public/images/pokemon/icons/4110s.png b/public/images/pokemon/icons/8/4110s.png similarity index 100% rename from public/images/pokemon/icons/4110s.png rename to public/images/pokemon/icons/8/4110s.png diff --git a/public/images/pokemon/icons/4122.png b/public/images/pokemon/icons/8/4122.png similarity index 100% rename from public/images/pokemon/icons/4122.png rename to public/images/pokemon/icons/8/4122.png diff --git a/public/images/pokemon/icons/4122s.png b/public/images/pokemon/icons/8/4122s.png similarity index 100% rename from public/images/pokemon/icons/4122s.png rename to public/images/pokemon/icons/8/4122s.png diff --git a/public/images/pokemon/icons/4144.png b/public/images/pokemon/icons/8/4144.png similarity index 100% rename from public/images/pokemon/icons/4144.png rename to public/images/pokemon/icons/8/4144.png diff --git a/public/images/pokemon/icons/4144s.png b/public/images/pokemon/icons/8/4144s.png similarity index 100% rename from public/images/pokemon/icons/4144s.png rename to public/images/pokemon/icons/8/4144s.png diff --git a/public/images/pokemon/icons/4145.png b/public/images/pokemon/icons/8/4145.png similarity index 100% rename from public/images/pokemon/icons/4145.png rename to public/images/pokemon/icons/8/4145.png diff --git a/public/images/pokemon/icons/4145s.png b/public/images/pokemon/icons/8/4145s.png similarity index 100% rename from public/images/pokemon/icons/4145s.png rename to public/images/pokemon/icons/8/4145s.png diff --git a/public/images/pokemon/icons/4146.png b/public/images/pokemon/icons/8/4146.png similarity index 100% rename from public/images/pokemon/icons/4146.png rename to public/images/pokemon/icons/8/4146.png diff --git a/public/images/pokemon/icons/4146s.png b/public/images/pokemon/icons/8/4146s.png similarity index 100% rename from public/images/pokemon/icons/4146s.png rename to public/images/pokemon/icons/8/4146s.png diff --git a/public/images/pokemon/icons/4199.png b/public/images/pokemon/icons/8/4199.png similarity index 100% rename from public/images/pokemon/icons/4199.png rename to public/images/pokemon/icons/8/4199.png diff --git a/public/images/pokemon/icons/4199s.png b/public/images/pokemon/icons/8/4199s.png similarity index 100% rename from public/images/pokemon/icons/4199s.png rename to public/images/pokemon/icons/8/4199s.png diff --git a/public/images/pokemon/icons/4222.png b/public/images/pokemon/icons/8/4222.png similarity index 100% rename from public/images/pokemon/icons/4222.png rename to public/images/pokemon/icons/8/4222.png diff --git a/public/images/pokemon/icons/4222s.png b/public/images/pokemon/icons/8/4222s.png similarity index 100% rename from public/images/pokemon/icons/4222s.png rename to public/images/pokemon/icons/8/4222s.png diff --git a/public/images/pokemon/icons/4263.png b/public/images/pokemon/icons/8/4263.png similarity index 100% rename from public/images/pokemon/icons/4263.png rename to public/images/pokemon/icons/8/4263.png diff --git a/public/images/pokemon/icons/4263s.png b/public/images/pokemon/icons/8/4263s.png similarity index 100% rename from public/images/pokemon/icons/4263s.png rename to public/images/pokemon/icons/8/4263s.png diff --git a/public/images/pokemon/icons/4264.png b/public/images/pokemon/icons/8/4264.png similarity index 100% rename from public/images/pokemon/icons/4264.png rename to public/images/pokemon/icons/8/4264.png diff --git a/public/images/pokemon/icons/4264s.png b/public/images/pokemon/icons/8/4264s.png similarity index 100% rename from public/images/pokemon/icons/4264s.png rename to public/images/pokemon/icons/8/4264s.png diff --git a/public/images/pokemon/icons/4554.png b/public/images/pokemon/icons/8/4554.png similarity index 100% rename from public/images/pokemon/icons/4554.png rename to public/images/pokemon/icons/8/4554.png diff --git a/public/images/pokemon/icons/4554s.png b/public/images/pokemon/icons/8/4554s.png similarity index 100% rename from public/images/pokemon/icons/4554s.png rename to public/images/pokemon/icons/8/4554s.png diff --git a/public/images/pokemon/icons/4555-zen.png b/public/images/pokemon/icons/8/4555-zen.png similarity index 100% rename from public/images/pokemon/icons/4555-zen.png rename to public/images/pokemon/icons/8/4555-zen.png diff --git a/public/images/pokemon/icons/4555.png b/public/images/pokemon/icons/8/4555.png similarity index 100% rename from public/images/pokemon/icons/4555.png rename to public/images/pokemon/icons/8/4555.png diff --git a/public/images/pokemon/icons/4555s-zen.png b/public/images/pokemon/icons/8/4555s-zen.png similarity index 100% rename from public/images/pokemon/icons/4555s-zen.png rename to public/images/pokemon/icons/8/4555s-zen.png diff --git a/public/images/pokemon/icons/4555s.png b/public/images/pokemon/icons/8/4555s.png similarity index 100% rename from public/images/pokemon/icons/4555s.png rename to public/images/pokemon/icons/8/4555s.png diff --git a/public/images/pokemon/icons/4562.png b/public/images/pokemon/icons/8/4562.png similarity index 100% rename from public/images/pokemon/icons/4562.png rename to public/images/pokemon/icons/8/4562.png diff --git a/public/images/pokemon/icons/4562s.png b/public/images/pokemon/icons/8/4562s.png similarity index 100% rename from public/images/pokemon/icons/4562s.png rename to public/images/pokemon/icons/8/4562s.png diff --git a/public/images/pokemon/icons/4618.png b/public/images/pokemon/icons/8/4618.png similarity index 100% rename from public/images/pokemon/icons/4618.png rename to public/images/pokemon/icons/8/4618.png diff --git a/public/images/pokemon/icons/4618s.png b/public/images/pokemon/icons/8/4618s.png similarity index 100% rename from public/images/pokemon/icons/4618s.png rename to public/images/pokemon/icons/8/4618s.png diff --git a/public/images/pokemon/icons/6058.png b/public/images/pokemon/icons/8/6058.png similarity index 100% rename from public/images/pokemon/icons/6058.png rename to public/images/pokemon/icons/8/6058.png diff --git a/public/images/pokemon/icons/6058s.png b/public/images/pokemon/icons/8/6058s.png similarity index 100% rename from public/images/pokemon/icons/6058s.png rename to public/images/pokemon/icons/8/6058s.png diff --git a/public/images/pokemon/icons/6059.png b/public/images/pokemon/icons/8/6059.png similarity index 100% rename from public/images/pokemon/icons/6059.png rename to public/images/pokemon/icons/8/6059.png diff --git a/public/images/pokemon/icons/6059s.png b/public/images/pokemon/icons/8/6059s.png similarity index 100% rename from public/images/pokemon/icons/6059s.png rename to public/images/pokemon/icons/8/6059s.png diff --git a/public/images/pokemon/icons/6100.png b/public/images/pokemon/icons/8/6100.png similarity index 100% rename from public/images/pokemon/icons/6100.png rename to public/images/pokemon/icons/8/6100.png diff --git a/public/images/pokemon/icons/6100s.png b/public/images/pokemon/icons/8/6100s.png similarity index 100% rename from public/images/pokemon/icons/6100s.png rename to public/images/pokemon/icons/8/6100s.png diff --git a/public/images/pokemon/icons/6101.png b/public/images/pokemon/icons/8/6101.png similarity index 100% rename from public/images/pokemon/icons/6101.png rename to public/images/pokemon/icons/8/6101.png diff --git a/public/images/pokemon/icons/6101s.png b/public/images/pokemon/icons/8/6101s.png similarity index 100% rename from public/images/pokemon/icons/6101s.png rename to public/images/pokemon/icons/8/6101s.png diff --git a/public/images/pokemon/icons/6157.png b/public/images/pokemon/icons/8/6157.png similarity index 100% rename from public/images/pokemon/icons/6157.png rename to public/images/pokemon/icons/8/6157.png diff --git a/public/images/pokemon/icons/6157s.png b/public/images/pokemon/icons/8/6157s.png similarity index 100% rename from public/images/pokemon/icons/6157s.png rename to public/images/pokemon/icons/8/6157s.png diff --git a/public/images/pokemon/icons/6211.png b/public/images/pokemon/icons/8/6211.png similarity index 100% rename from public/images/pokemon/icons/6211.png rename to public/images/pokemon/icons/8/6211.png diff --git a/public/images/pokemon/icons/6211s.png b/public/images/pokemon/icons/8/6211s.png similarity index 100% rename from public/images/pokemon/icons/6211s.png rename to public/images/pokemon/icons/8/6211s.png diff --git a/public/images/pokemon/icons/6215.png b/public/images/pokemon/icons/8/6215.png similarity index 100% rename from public/images/pokemon/icons/6215.png rename to public/images/pokemon/icons/8/6215.png diff --git a/public/images/pokemon/icons/6215s.png b/public/images/pokemon/icons/8/6215s.png similarity index 100% rename from public/images/pokemon/icons/6215s.png rename to public/images/pokemon/icons/8/6215s.png diff --git a/public/images/pokemon/icons/6503.png b/public/images/pokemon/icons/8/6503.png similarity index 100% rename from public/images/pokemon/icons/6503.png rename to public/images/pokemon/icons/8/6503.png diff --git a/public/images/pokemon/icons/6503s.png b/public/images/pokemon/icons/8/6503s.png similarity index 100% rename from public/images/pokemon/icons/6503s.png rename to public/images/pokemon/icons/8/6503s.png diff --git a/public/images/pokemon/icons/6549.png b/public/images/pokemon/icons/8/6549.png similarity index 100% rename from public/images/pokemon/icons/6549.png rename to public/images/pokemon/icons/8/6549.png diff --git a/public/images/pokemon/icons/6549s.png b/public/images/pokemon/icons/8/6549s.png similarity index 100% rename from public/images/pokemon/icons/6549s.png rename to public/images/pokemon/icons/8/6549s.png diff --git a/public/images/pokemon/icons/6570.png b/public/images/pokemon/icons/8/6570.png similarity index 100% rename from public/images/pokemon/icons/6570.png rename to public/images/pokemon/icons/8/6570.png diff --git a/public/images/pokemon/icons/6570s.png b/public/images/pokemon/icons/8/6570s.png similarity index 100% rename from public/images/pokemon/icons/6570s.png rename to public/images/pokemon/icons/8/6570s.png diff --git a/public/images/pokemon/icons/6571.png b/public/images/pokemon/icons/8/6571.png similarity index 100% rename from public/images/pokemon/icons/6571.png rename to public/images/pokemon/icons/8/6571.png diff --git a/public/images/pokemon/icons/6571s.png b/public/images/pokemon/icons/8/6571s.png similarity index 100% rename from public/images/pokemon/icons/6571s.png rename to public/images/pokemon/icons/8/6571s.png diff --git a/public/images/pokemon/icons/6628.png b/public/images/pokemon/icons/8/6628.png similarity index 100% rename from public/images/pokemon/icons/6628.png rename to public/images/pokemon/icons/8/6628.png diff --git a/public/images/pokemon/icons/6628s.png b/public/images/pokemon/icons/8/6628s.png similarity index 100% rename from public/images/pokemon/icons/6628s.png rename to public/images/pokemon/icons/8/6628s.png diff --git a/public/images/pokemon/icons/6705.png b/public/images/pokemon/icons/8/6705.png similarity index 100% rename from public/images/pokemon/icons/6705.png rename to public/images/pokemon/icons/8/6705.png diff --git a/public/images/pokemon/icons/6705s.png b/public/images/pokemon/icons/8/6705s.png similarity index 100% rename from public/images/pokemon/icons/6705s.png rename to public/images/pokemon/icons/8/6705s.png diff --git a/public/images/pokemon/icons/6706.png b/public/images/pokemon/icons/8/6706.png similarity index 100% rename from public/images/pokemon/icons/6706.png rename to public/images/pokemon/icons/8/6706.png diff --git a/public/images/pokemon/icons/6706s.png b/public/images/pokemon/icons/8/6706s.png similarity index 100% rename from public/images/pokemon/icons/6706s.png rename to public/images/pokemon/icons/8/6706s.png diff --git a/public/images/pokemon/icons/6713.png b/public/images/pokemon/icons/8/6713.png similarity index 100% rename from public/images/pokemon/icons/6713.png rename to public/images/pokemon/icons/8/6713.png diff --git a/public/images/pokemon/icons/6713s.png b/public/images/pokemon/icons/8/6713s.png similarity index 100% rename from public/images/pokemon/icons/6713s.png rename to public/images/pokemon/icons/8/6713s.png diff --git a/public/images/pokemon/icons/6724.png b/public/images/pokemon/icons/8/6724.png similarity index 100% rename from public/images/pokemon/icons/6724.png rename to public/images/pokemon/icons/8/6724.png diff --git a/public/images/pokemon/icons/6724s.png b/public/images/pokemon/icons/8/6724s.png similarity index 100% rename from public/images/pokemon/icons/6724s.png rename to public/images/pokemon/icons/8/6724s.png diff --git a/public/images/pokemon/icons/8/716-active.png b/public/images/pokemon/icons/8/716-active.png new file mode 100644 index 000000000..1cf8dfa0c Binary files /dev/null and b/public/images/pokemon/icons/8/716-active.png differ diff --git a/public/images/pokemon/icons/8/716s-active.png b/public/images/pokemon/icons/8/716s-active.png new file mode 100644 index 000000000..342af7e23 Binary files /dev/null and b/public/images/pokemon/icons/8/716s-active.png differ diff --git a/public/images/pokemon/icons/810.png b/public/images/pokemon/icons/8/810.png similarity index 100% rename from public/images/pokemon/icons/810.png rename to public/images/pokemon/icons/8/810.png diff --git a/public/images/pokemon/icons/810s.png b/public/images/pokemon/icons/8/810s.png similarity index 100% rename from public/images/pokemon/icons/810s.png rename to public/images/pokemon/icons/8/810s.png diff --git a/public/images/pokemon/icons/811.png b/public/images/pokemon/icons/8/811.png similarity index 100% rename from public/images/pokemon/icons/811.png rename to public/images/pokemon/icons/8/811.png diff --git a/public/images/pokemon/icons/811s.png b/public/images/pokemon/icons/8/811s.png similarity index 100% rename from public/images/pokemon/icons/811s.png rename to public/images/pokemon/icons/8/811s.png diff --git a/public/images/pokemon/icons/812-gigantamax.png b/public/images/pokemon/icons/8/812-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/812-gigantamax.png rename to public/images/pokemon/icons/8/812-gigantamax.png diff --git a/public/images/pokemon/icons/812.png b/public/images/pokemon/icons/8/812.png similarity index 100% rename from public/images/pokemon/icons/812.png rename to public/images/pokemon/icons/8/812.png diff --git a/public/images/pokemon/icons/812s-gigantamax.png b/public/images/pokemon/icons/8/812s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/812s-gigantamax.png rename to public/images/pokemon/icons/8/812s-gigantamax.png diff --git a/public/images/pokemon/icons/812s.png b/public/images/pokemon/icons/8/812s.png similarity index 100% rename from public/images/pokemon/icons/812s.png rename to public/images/pokemon/icons/8/812s.png diff --git a/public/images/pokemon/icons/813.png b/public/images/pokemon/icons/8/813.png similarity index 100% rename from public/images/pokemon/icons/813.png rename to public/images/pokemon/icons/8/813.png diff --git a/public/images/pokemon/icons/813s.png b/public/images/pokemon/icons/8/813s.png similarity index 100% rename from public/images/pokemon/icons/813s.png rename to public/images/pokemon/icons/8/813s.png diff --git a/public/images/pokemon/icons/814.png b/public/images/pokemon/icons/8/814.png similarity index 100% rename from public/images/pokemon/icons/814.png rename to public/images/pokemon/icons/8/814.png diff --git a/public/images/pokemon/icons/814s.png b/public/images/pokemon/icons/8/814s.png similarity index 100% rename from public/images/pokemon/icons/814s.png rename to public/images/pokemon/icons/8/814s.png diff --git a/public/images/pokemon/icons/815-gigantamax.png b/public/images/pokemon/icons/8/815-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/815-gigantamax.png rename to public/images/pokemon/icons/8/815-gigantamax.png diff --git a/public/images/pokemon/icons/815.png b/public/images/pokemon/icons/8/815.png similarity index 100% rename from public/images/pokemon/icons/815.png rename to public/images/pokemon/icons/8/815.png diff --git a/public/images/pokemon/icons/815s-gigantamax.png b/public/images/pokemon/icons/8/815s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/815s-gigantamax.png rename to public/images/pokemon/icons/8/815s-gigantamax.png diff --git a/public/images/pokemon/icons/815s.png b/public/images/pokemon/icons/8/815s.png similarity index 100% rename from public/images/pokemon/icons/815s.png rename to public/images/pokemon/icons/8/815s.png diff --git a/public/images/pokemon/icons/816.png b/public/images/pokemon/icons/8/816.png similarity index 100% rename from public/images/pokemon/icons/816.png rename to public/images/pokemon/icons/8/816.png diff --git a/public/images/pokemon/icons/816s.png b/public/images/pokemon/icons/8/816s.png similarity index 100% rename from public/images/pokemon/icons/816s.png rename to public/images/pokemon/icons/8/816s.png diff --git a/public/images/pokemon/icons/817.png b/public/images/pokemon/icons/8/817.png similarity index 100% rename from public/images/pokemon/icons/817.png rename to public/images/pokemon/icons/8/817.png diff --git a/public/images/pokemon/icons/817s.png b/public/images/pokemon/icons/8/817s.png similarity index 100% rename from public/images/pokemon/icons/817s.png rename to public/images/pokemon/icons/8/817s.png diff --git a/public/images/pokemon/icons/818-gigantamax.png b/public/images/pokemon/icons/8/818-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/818-gigantamax.png rename to public/images/pokemon/icons/8/818-gigantamax.png diff --git a/public/images/pokemon/icons/818.png b/public/images/pokemon/icons/8/818.png similarity index 100% rename from public/images/pokemon/icons/818.png rename to public/images/pokemon/icons/8/818.png diff --git a/public/images/pokemon/icons/818s-gigantamax.png b/public/images/pokemon/icons/8/818s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/818s-gigantamax.png rename to public/images/pokemon/icons/8/818s-gigantamax.png diff --git a/public/images/pokemon/icons/818s.png b/public/images/pokemon/icons/8/818s.png similarity index 100% rename from public/images/pokemon/icons/818s.png rename to public/images/pokemon/icons/8/818s.png diff --git a/public/images/pokemon/icons/819.png b/public/images/pokemon/icons/8/819.png similarity index 100% rename from public/images/pokemon/icons/819.png rename to public/images/pokemon/icons/8/819.png diff --git a/public/images/pokemon/icons/819s.png b/public/images/pokemon/icons/8/819s.png similarity index 100% rename from public/images/pokemon/icons/819s.png rename to public/images/pokemon/icons/8/819s.png diff --git a/public/images/pokemon/icons/820.png b/public/images/pokemon/icons/8/820.png similarity index 100% rename from public/images/pokemon/icons/820.png rename to public/images/pokemon/icons/8/820.png diff --git a/public/images/pokemon/icons/820s.png b/public/images/pokemon/icons/8/820s.png similarity index 100% rename from public/images/pokemon/icons/820s.png rename to public/images/pokemon/icons/8/820s.png diff --git a/public/images/pokemon/icons/821.png b/public/images/pokemon/icons/8/821.png similarity index 100% rename from public/images/pokemon/icons/821.png rename to public/images/pokemon/icons/8/821.png diff --git a/public/images/pokemon/icons/821s.png b/public/images/pokemon/icons/8/821s.png similarity index 100% rename from public/images/pokemon/icons/821s.png rename to public/images/pokemon/icons/8/821s.png diff --git a/public/images/pokemon/icons/822.png b/public/images/pokemon/icons/8/822.png similarity index 100% rename from public/images/pokemon/icons/822.png rename to public/images/pokemon/icons/8/822.png diff --git a/public/images/pokemon/icons/822s.png b/public/images/pokemon/icons/8/822s.png similarity index 100% rename from public/images/pokemon/icons/822s.png rename to public/images/pokemon/icons/8/822s.png diff --git a/public/images/pokemon/icons/823-gigantamax.png b/public/images/pokemon/icons/8/823-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/823-gigantamax.png rename to public/images/pokemon/icons/8/823-gigantamax.png diff --git a/public/images/pokemon/icons/823.png b/public/images/pokemon/icons/8/823.png similarity index 100% rename from public/images/pokemon/icons/823.png rename to public/images/pokemon/icons/8/823.png diff --git a/public/images/pokemon/icons/823s-gigantamax.png b/public/images/pokemon/icons/8/823s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/823s-gigantamax.png rename to public/images/pokemon/icons/8/823s-gigantamax.png diff --git a/public/images/pokemon/icons/823s.png b/public/images/pokemon/icons/8/823s.png similarity index 100% rename from public/images/pokemon/icons/823s.png rename to public/images/pokemon/icons/8/823s.png diff --git a/public/images/pokemon/icons/824.png b/public/images/pokemon/icons/8/824.png similarity index 100% rename from public/images/pokemon/icons/824.png rename to public/images/pokemon/icons/8/824.png diff --git a/public/images/pokemon/icons/824s.png b/public/images/pokemon/icons/8/824s.png similarity index 100% rename from public/images/pokemon/icons/824s.png rename to public/images/pokemon/icons/8/824s.png diff --git a/public/images/pokemon/icons/825.png b/public/images/pokemon/icons/8/825.png similarity index 100% rename from public/images/pokemon/icons/825.png rename to public/images/pokemon/icons/8/825.png diff --git a/public/images/pokemon/icons/825s.png b/public/images/pokemon/icons/8/825s.png similarity index 100% rename from public/images/pokemon/icons/825s.png rename to public/images/pokemon/icons/8/825s.png diff --git a/public/images/pokemon/icons/826-gigantamax.png b/public/images/pokemon/icons/8/826-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/826-gigantamax.png rename to public/images/pokemon/icons/8/826-gigantamax.png diff --git a/public/images/pokemon/icons/826.png b/public/images/pokemon/icons/8/826.png similarity index 100% rename from public/images/pokemon/icons/826.png rename to public/images/pokemon/icons/8/826.png diff --git a/public/images/pokemon/icons/826s-gigantamax.png b/public/images/pokemon/icons/8/826s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/826s-gigantamax.png rename to public/images/pokemon/icons/8/826s-gigantamax.png diff --git a/public/images/pokemon/icons/826s.png b/public/images/pokemon/icons/8/826s.png similarity index 100% rename from public/images/pokemon/icons/826s.png rename to public/images/pokemon/icons/8/826s.png diff --git a/public/images/pokemon/icons/827.png b/public/images/pokemon/icons/8/827.png similarity index 100% rename from public/images/pokemon/icons/827.png rename to public/images/pokemon/icons/8/827.png diff --git a/public/images/pokemon/icons/827s.png b/public/images/pokemon/icons/8/827s.png similarity index 100% rename from public/images/pokemon/icons/827s.png rename to public/images/pokemon/icons/8/827s.png diff --git a/public/images/pokemon/icons/828.png b/public/images/pokemon/icons/8/828.png similarity index 100% rename from public/images/pokemon/icons/828.png rename to public/images/pokemon/icons/8/828.png diff --git a/public/images/pokemon/icons/828s.png b/public/images/pokemon/icons/8/828s.png similarity index 100% rename from public/images/pokemon/icons/828s.png rename to public/images/pokemon/icons/8/828s.png diff --git a/public/images/pokemon/icons/829.png b/public/images/pokemon/icons/8/829.png similarity index 100% rename from public/images/pokemon/icons/829.png rename to public/images/pokemon/icons/8/829.png diff --git a/public/images/pokemon/icons/829s.png b/public/images/pokemon/icons/8/829s.png similarity index 100% rename from public/images/pokemon/icons/829s.png rename to public/images/pokemon/icons/8/829s.png diff --git a/public/images/pokemon/icons/830.png b/public/images/pokemon/icons/8/830.png similarity index 100% rename from public/images/pokemon/icons/830.png rename to public/images/pokemon/icons/8/830.png diff --git a/public/images/pokemon/icons/830s.png b/public/images/pokemon/icons/8/830s.png similarity index 100% rename from public/images/pokemon/icons/830s.png rename to public/images/pokemon/icons/8/830s.png diff --git a/public/images/pokemon/icons/831.png b/public/images/pokemon/icons/8/831.png similarity index 100% rename from public/images/pokemon/icons/831.png rename to public/images/pokemon/icons/8/831.png diff --git a/public/images/pokemon/icons/831s.png b/public/images/pokemon/icons/8/831s.png similarity index 100% rename from public/images/pokemon/icons/831s.png rename to public/images/pokemon/icons/8/831s.png diff --git a/public/images/pokemon/icons/832.png b/public/images/pokemon/icons/8/832.png similarity index 100% rename from public/images/pokemon/icons/832.png rename to public/images/pokemon/icons/8/832.png diff --git a/public/images/pokemon/icons/832s.png b/public/images/pokemon/icons/8/832s.png similarity index 100% rename from public/images/pokemon/icons/832s.png rename to public/images/pokemon/icons/8/832s.png diff --git a/public/images/pokemon/icons/833.png b/public/images/pokemon/icons/8/833.png similarity index 100% rename from public/images/pokemon/icons/833.png rename to public/images/pokemon/icons/8/833.png diff --git a/public/images/pokemon/icons/833s.png b/public/images/pokemon/icons/8/833s.png similarity index 100% rename from public/images/pokemon/icons/833s.png rename to public/images/pokemon/icons/8/833s.png diff --git a/public/images/pokemon/icons/834-gigantamax.png b/public/images/pokemon/icons/8/834-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/834-gigantamax.png rename to public/images/pokemon/icons/8/834-gigantamax.png diff --git a/public/images/pokemon/icons/834.png b/public/images/pokemon/icons/8/834.png similarity index 100% rename from public/images/pokemon/icons/834.png rename to public/images/pokemon/icons/8/834.png diff --git a/public/images/pokemon/icons/834s-gigantamax.png b/public/images/pokemon/icons/8/834s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/834s-gigantamax.png rename to public/images/pokemon/icons/8/834s-gigantamax.png diff --git a/public/images/pokemon/icons/834s.png b/public/images/pokemon/icons/8/834s.png similarity index 100% rename from public/images/pokemon/icons/834s.png rename to public/images/pokemon/icons/8/834s.png diff --git a/public/images/pokemon/icons/835.png b/public/images/pokemon/icons/8/835.png similarity index 100% rename from public/images/pokemon/icons/835.png rename to public/images/pokemon/icons/8/835.png diff --git a/public/images/pokemon/icons/835s.png b/public/images/pokemon/icons/8/835s.png similarity index 100% rename from public/images/pokemon/icons/835s.png rename to public/images/pokemon/icons/8/835s.png diff --git a/public/images/pokemon/icons/836.png b/public/images/pokemon/icons/8/836.png similarity index 100% rename from public/images/pokemon/icons/836.png rename to public/images/pokemon/icons/8/836.png diff --git a/public/images/pokemon/icons/836s.png b/public/images/pokemon/icons/8/836s.png similarity index 100% rename from public/images/pokemon/icons/836s.png rename to public/images/pokemon/icons/8/836s.png diff --git a/public/images/pokemon/icons/837.png b/public/images/pokemon/icons/8/837.png similarity index 100% rename from public/images/pokemon/icons/837.png rename to public/images/pokemon/icons/8/837.png diff --git a/public/images/pokemon/icons/837s.png b/public/images/pokemon/icons/8/837s.png similarity index 100% rename from public/images/pokemon/icons/837s.png rename to public/images/pokemon/icons/8/837s.png diff --git a/public/images/pokemon/icons/838.png b/public/images/pokemon/icons/8/838.png similarity index 100% rename from public/images/pokemon/icons/838.png rename to public/images/pokemon/icons/8/838.png diff --git a/public/images/pokemon/icons/838s.png b/public/images/pokemon/icons/8/838s.png similarity index 100% rename from public/images/pokemon/icons/838s.png rename to public/images/pokemon/icons/8/838s.png diff --git a/public/images/pokemon/icons/839-gigantamax.png b/public/images/pokemon/icons/8/839-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/839-gigantamax.png rename to public/images/pokemon/icons/8/839-gigantamax.png diff --git a/public/images/pokemon/icons/839.png b/public/images/pokemon/icons/8/839.png similarity index 100% rename from public/images/pokemon/icons/839.png rename to public/images/pokemon/icons/8/839.png diff --git a/public/images/pokemon/icons/839s-gigantamax.png b/public/images/pokemon/icons/8/839s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/839s-gigantamax.png rename to public/images/pokemon/icons/8/839s-gigantamax.png diff --git a/public/images/pokemon/icons/839s.png b/public/images/pokemon/icons/8/839s.png similarity index 100% rename from public/images/pokemon/icons/839s.png rename to public/images/pokemon/icons/8/839s.png diff --git a/public/images/pokemon/icons/840.png b/public/images/pokemon/icons/8/840.png similarity index 100% rename from public/images/pokemon/icons/840.png rename to public/images/pokemon/icons/8/840.png diff --git a/public/images/pokemon/icons/840s.png b/public/images/pokemon/icons/8/840s.png similarity index 100% rename from public/images/pokemon/icons/840s.png rename to public/images/pokemon/icons/8/840s.png diff --git a/public/images/pokemon/icons/841-gigantamax.png b/public/images/pokemon/icons/8/841-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/841-gigantamax.png rename to public/images/pokemon/icons/8/841-gigantamax.png diff --git a/public/images/pokemon/icons/841.png b/public/images/pokemon/icons/8/841.png similarity index 100% rename from public/images/pokemon/icons/841.png rename to public/images/pokemon/icons/8/841.png diff --git a/public/images/pokemon/icons/841s-gigantamax.png b/public/images/pokemon/icons/8/841s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/841s-gigantamax.png rename to public/images/pokemon/icons/8/841s-gigantamax.png diff --git a/public/images/pokemon/icons/841s.png b/public/images/pokemon/icons/8/841s.png similarity index 100% rename from public/images/pokemon/icons/841s.png rename to public/images/pokemon/icons/8/841s.png diff --git a/public/images/pokemon/icons/842-gigantamax.png b/public/images/pokemon/icons/8/842-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/842-gigantamax.png rename to public/images/pokemon/icons/8/842-gigantamax.png diff --git a/public/images/pokemon/icons/842.png b/public/images/pokemon/icons/8/842.png similarity index 100% rename from public/images/pokemon/icons/842.png rename to public/images/pokemon/icons/8/842.png diff --git a/public/images/pokemon/icons/842s-gigantamax.png b/public/images/pokemon/icons/8/842s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/842s-gigantamax.png rename to public/images/pokemon/icons/8/842s-gigantamax.png diff --git a/public/images/pokemon/icons/842s.png b/public/images/pokemon/icons/8/842s.png similarity index 100% rename from public/images/pokemon/icons/842s.png rename to public/images/pokemon/icons/8/842s.png diff --git a/public/images/pokemon/icons/843.png b/public/images/pokemon/icons/8/843.png similarity index 100% rename from public/images/pokemon/icons/843.png rename to public/images/pokemon/icons/8/843.png diff --git a/public/images/pokemon/icons/843s.png b/public/images/pokemon/icons/8/843s.png similarity index 100% rename from public/images/pokemon/icons/843s.png rename to public/images/pokemon/icons/8/843s.png diff --git a/public/images/pokemon/icons/844-gigantamax.png b/public/images/pokemon/icons/8/844-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/844-gigantamax.png rename to public/images/pokemon/icons/8/844-gigantamax.png diff --git a/public/images/pokemon/icons/844.png b/public/images/pokemon/icons/8/844.png similarity index 100% rename from public/images/pokemon/icons/844.png rename to public/images/pokemon/icons/8/844.png diff --git a/public/images/pokemon/icons/844s-gigantamax.png b/public/images/pokemon/icons/8/844s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/844s-gigantamax.png rename to public/images/pokemon/icons/8/844s-gigantamax.png diff --git a/public/images/pokemon/icons/844s.png b/public/images/pokemon/icons/8/844s.png similarity index 100% rename from public/images/pokemon/icons/844s.png rename to public/images/pokemon/icons/8/844s.png diff --git a/public/images/pokemon/icons/845-gorging.png b/public/images/pokemon/icons/8/845-gorging.png similarity index 100% rename from public/images/pokemon/icons/845-gorging.png rename to public/images/pokemon/icons/8/845-gorging.png diff --git a/public/images/pokemon/icons/845-gulping.png b/public/images/pokemon/icons/8/845-gulping.png similarity index 100% rename from public/images/pokemon/icons/845-gulping.png rename to public/images/pokemon/icons/8/845-gulping.png diff --git a/public/images/pokemon/icons/845.png b/public/images/pokemon/icons/8/845.png similarity index 100% rename from public/images/pokemon/icons/845.png rename to public/images/pokemon/icons/8/845.png diff --git a/public/images/pokemon/icons/845s-gorging.png b/public/images/pokemon/icons/8/845s-gorging.png similarity index 100% rename from public/images/pokemon/icons/845s-gorging.png rename to public/images/pokemon/icons/8/845s-gorging.png diff --git a/public/images/pokemon/icons/845s-gulping.png b/public/images/pokemon/icons/8/845s-gulping.png similarity index 100% rename from public/images/pokemon/icons/845s-gulping.png rename to public/images/pokemon/icons/8/845s-gulping.png diff --git a/public/images/pokemon/icons/845s.png b/public/images/pokemon/icons/8/845s.png similarity index 100% rename from public/images/pokemon/icons/845s.png rename to public/images/pokemon/icons/8/845s.png diff --git a/public/images/pokemon/icons/846.png b/public/images/pokemon/icons/8/846.png similarity index 100% rename from public/images/pokemon/icons/846.png rename to public/images/pokemon/icons/8/846.png diff --git a/public/images/pokemon/icons/846s.png b/public/images/pokemon/icons/8/846s.png similarity index 100% rename from public/images/pokemon/icons/846s.png rename to public/images/pokemon/icons/8/846s.png diff --git a/public/images/pokemon/icons/847.png b/public/images/pokemon/icons/8/847.png similarity index 100% rename from public/images/pokemon/icons/847.png rename to public/images/pokemon/icons/8/847.png diff --git a/public/images/pokemon/icons/847s.png b/public/images/pokemon/icons/8/847s.png similarity index 100% rename from public/images/pokemon/icons/847s.png rename to public/images/pokemon/icons/8/847s.png diff --git a/public/images/pokemon/icons/848.png b/public/images/pokemon/icons/8/848.png similarity index 100% rename from public/images/pokemon/icons/848.png rename to public/images/pokemon/icons/8/848.png diff --git a/public/images/pokemon/icons/848s.png b/public/images/pokemon/icons/8/848s.png similarity index 100% rename from public/images/pokemon/icons/848s.png rename to public/images/pokemon/icons/8/848s.png diff --git a/public/images/pokemon/icons/849-gigantamax.png b/public/images/pokemon/icons/8/849-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/849-gigantamax.png rename to public/images/pokemon/icons/8/849-gigantamax.png diff --git a/public/images/pokemon/icons/849-lowkey.png b/public/images/pokemon/icons/8/849-lowkey.png similarity index 100% rename from public/images/pokemon/icons/849-lowkey.png rename to public/images/pokemon/icons/8/849-lowkey.png diff --git a/public/images/pokemon/icons/849.png b/public/images/pokemon/icons/8/849.png similarity index 100% rename from public/images/pokemon/icons/849.png rename to public/images/pokemon/icons/8/849.png diff --git a/public/images/pokemon/icons/849s-gigantamax.png b/public/images/pokemon/icons/8/849s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/849s-gigantamax.png rename to public/images/pokemon/icons/8/849s-gigantamax.png diff --git a/public/images/pokemon/icons/849s-lowkey.png b/public/images/pokemon/icons/8/849s-lowkey.png similarity index 100% rename from public/images/pokemon/icons/849s-lowkey.png rename to public/images/pokemon/icons/8/849s-lowkey.png diff --git a/public/images/pokemon/icons/849s.png b/public/images/pokemon/icons/8/849s.png similarity index 100% rename from public/images/pokemon/icons/849s.png rename to public/images/pokemon/icons/8/849s.png diff --git a/public/images/pokemon/icons/850.png b/public/images/pokemon/icons/8/850.png similarity index 100% rename from public/images/pokemon/icons/850.png rename to public/images/pokemon/icons/8/850.png diff --git a/public/images/pokemon/icons/850s.png b/public/images/pokemon/icons/8/850s.png similarity index 100% rename from public/images/pokemon/icons/850s.png rename to public/images/pokemon/icons/8/850s.png diff --git a/public/images/pokemon/icons/851-gigantamax.png b/public/images/pokemon/icons/8/851-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/851-gigantamax.png rename to public/images/pokemon/icons/8/851-gigantamax.png diff --git a/public/images/pokemon/icons/851.png b/public/images/pokemon/icons/8/851.png similarity index 100% rename from public/images/pokemon/icons/851.png rename to public/images/pokemon/icons/8/851.png diff --git a/public/images/pokemon/icons/851s-gigantamax.png b/public/images/pokemon/icons/8/851s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/851s-gigantamax.png rename to public/images/pokemon/icons/8/851s-gigantamax.png diff --git a/public/images/pokemon/icons/851s.png b/public/images/pokemon/icons/8/851s.png similarity index 100% rename from public/images/pokemon/icons/851s.png rename to public/images/pokemon/icons/8/851s.png diff --git a/public/images/pokemon/icons/852.png b/public/images/pokemon/icons/8/852.png similarity index 100% rename from public/images/pokemon/icons/852.png rename to public/images/pokemon/icons/8/852.png diff --git a/public/images/pokemon/icons/852s.png b/public/images/pokemon/icons/8/852s.png similarity index 100% rename from public/images/pokemon/icons/852s.png rename to public/images/pokemon/icons/8/852s.png diff --git a/public/images/pokemon/icons/853.png b/public/images/pokemon/icons/8/853.png similarity index 100% rename from public/images/pokemon/icons/853.png rename to public/images/pokemon/icons/8/853.png diff --git a/public/images/pokemon/icons/853s.png b/public/images/pokemon/icons/8/853s.png similarity index 100% rename from public/images/pokemon/icons/853s.png rename to public/images/pokemon/icons/8/853s.png diff --git a/public/images/pokemon/icons/854.png b/public/images/pokemon/icons/8/854.png similarity index 100% rename from public/images/pokemon/icons/854.png rename to public/images/pokemon/icons/8/854.png diff --git a/public/images/pokemon/icons/854s.png b/public/images/pokemon/icons/8/854s.png similarity index 100% rename from public/images/pokemon/icons/854s.png rename to public/images/pokemon/icons/8/854s.png diff --git a/public/images/pokemon/icons/855.png b/public/images/pokemon/icons/8/855.png similarity index 100% rename from public/images/pokemon/icons/855.png rename to public/images/pokemon/icons/8/855.png diff --git a/public/images/pokemon/icons/855s.png b/public/images/pokemon/icons/8/855s.png similarity index 100% rename from public/images/pokemon/icons/855s.png rename to public/images/pokemon/icons/8/855s.png diff --git a/public/images/pokemon/icons/856.png b/public/images/pokemon/icons/8/856.png similarity index 100% rename from public/images/pokemon/icons/856.png rename to public/images/pokemon/icons/8/856.png diff --git a/public/images/pokemon/icons/856s.png b/public/images/pokemon/icons/8/856s.png similarity index 100% rename from public/images/pokemon/icons/856s.png rename to public/images/pokemon/icons/8/856s.png diff --git a/public/images/pokemon/icons/857.png b/public/images/pokemon/icons/8/857.png similarity index 100% rename from public/images/pokemon/icons/857.png rename to public/images/pokemon/icons/8/857.png diff --git a/public/images/pokemon/icons/857s.png b/public/images/pokemon/icons/8/857s.png similarity index 100% rename from public/images/pokemon/icons/857s.png rename to public/images/pokemon/icons/8/857s.png diff --git a/public/images/pokemon/icons/858-gigantamax.png b/public/images/pokemon/icons/8/858-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/858-gigantamax.png rename to public/images/pokemon/icons/8/858-gigantamax.png diff --git a/public/images/pokemon/icons/858.png b/public/images/pokemon/icons/8/858.png similarity index 100% rename from public/images/pokemon/icons/858.png rename to public/images/pokemon/icons/8/858.png diff --git a/public/images/pokemon/icons/858s-gigantamax.png b/public/images/pokemon/icons/8/858s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/858s-gigantamax.png rename to public/images/pokemon/icons/8/858s-gigantamax.png diff --git a/public/images/pokemon/icons/858s.png b/public/images/pokemon/icons/8/858s.png similarity index 100% rename from public/images/pokemon/icons/858s.png rename to public/images/pokemon/icons/8/858s.png diff --git a/public/images/pokemon/icons/859.png b/public/images/pokemon/icons/8/859.png similarity index 100% rename from public/images/pokemon/icons/859.png rename to public/images/pokemon/icons/8/859.png diff --git a/public/images/pokemon/icons/859s.png b/public/images/pokemon/icons/8/859s.png similarity index 100% rename from public/images/pokemon/icons/859s.png rename to public/images/pokemon/icons/8/859s.png diff --git a/public/images/pokemon/icons/860.png b/public/images/pokemon/icons/8/860.png similarity index 100% rename from public/images/pokemon/icons/860.png rename to public/images/pokemon/icons/8/860.png diff --git a/public/images/pokemon/icons/860s.png b/public/images/pokemon/icons/8/860s.png similarity index 100% rename from public/images/pokemon/icons/860s.png rename to public/images/pokemon/icons/8/860s.png diff --git a/public/images/pokemon/icons/861-gigantamax.png b/public/images/pokemon/icons/8/861-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/861-gigantamax.png rename to public/images/pokemon/icons/8/861-gigantamax.png diff --git a/public/images/pokemon/icons/861.png b/public/images/pokemon/icons/8/861.png similarity index 100% rename from public/images/pokemon/icons/861.png rename to public/images/pokemon/icons/8/861.png diff --git a/public/images/pokemon/icons/861s-gigantamax.png b/public/images/pokemon/icons/8/861s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/861s-gigantamax.png rename to public/images/pokemon/icons/8/861s-gigantamax.png diff --git a/public/images/pokemon/icons/861s.png b/public/images/pokemon/icons/8/861s.png similarity index 100% rename from public/images/pokemon/icons/861s.png rename to public/images/pokemon/icons/8/861s.png diff --git a/public/images/pokemon/icons/862.png b/public/images/pokemon/icons/8/862.png similarity index 100% rename from public/images/pokemon/icons/862.png rename to public/images/pokemon/icons/8/862.png diff --git a/public/images/pokemon/icons/862s.png b/public/images/pokemon/icons/8/862s.png similarity index 100% rename from public/images/pokemon/icons/862s.png rename to public/images/pokemon/icons/8/862s.png diff --git a/public/images/pokemon/icons/863.png b/public/images/pokemon/icons/8/863.png similarity index 100% rename from public/images/pokemon/icons/863.png rename to public/images/pokemon/icons/8/863.png diff --git a/public/images/pokemon/icons/863s.png b/public/images/pokemon/icons/8/863s.png similarity index 100% rename from public/images/pokemon/icons/863s.png rename to public/images/pokemon/icons/8/863s.png diff --git a/public/images/pokemon/icons/864.png b/public/images/pokemon/icons/8/864.png similarity index 100% rename from public/images/pokemon/icons/864.png rename to public/images/pokemon/icons/8/864.png diff --git a/public/images/pokemon/icons/864s.png b/public/images/pokemon/icons/8/864s.png similarity index 100% rename from public/images/pokemon/icons/864s.png rename to public/images/pokemon/icons/8/864s.png diff --git a/public/images/pokemon/icons/865.png b/public/images/pokemon/icons/8/865.png similarity index 100% rename from public/images/pokemon/icons/865.png rename to public/images/pokemon/icons/8/865.png diff --git a/public/images/pokemon/icons/865s.png b/public/images/pokemon/icons/8/865s.png similarity index 100% rename from public/images/pokemon/icons/865s.png rename to public/images/pokemon/icons/8/865s.png diff --git a/public/images/pokemon/icons/866.png b/public/images/pokemon/icons/8/866.png similarity index 100% rename from public/images/pokemon/icons/866.png rename to public/images/pokemon/icons/8/866.png diff --git a/public/images/pokemon/icons/866s.png b/public/images/pokemon/icons/8/866s.png similarity index 100% rename from public/images/pokemon/icons/866s.png rename to public/images/pokemon/icons/8/866s.png diff --git a/public/images/pokemon/icons/867.png b/public/images/pokemon/icons/8/867.png similarity index 100% rename from public/images/pokemon/icons/867.png rename to public/images/pokemon/icons/8/867.png diff --git a/public/images/pokemon/icons/867s.png b/public/images/pokemon/icons/8/867s.png similarity index 100% rename from public/images/pokemon/icons/867s.png rename to public/images/pokemon/icons/8/867s.png diff --git a/public/images/pokemon/icons/868.png b/public/images/pokemon/icons/8/868.png similarity index 100% rename from public/images/pokemon/icons/868.png rename to public/images/pokemon/icons/8/868.png diff --git a/public/images/pokemon/icons/868s.png b/public/images/pokemon/icons/8/868s.png similarity index 100% rename from public/images/pokemon/icons/868s.png rename to public/images/pokemon/icons/8/868s.png diff --git a/public/images/pokemon/icons/869-caramel-swirl.png b/public/images/pokemon/icons/8/869-caramel-swirl.png similarity index 100% rename from public/images/pokemon/icons/869-caramel-swirl.png rename to public/images/pokemon/icons/8/869-caramel-swirl.png diff --git a/public/images/pokemon/icons/869-gigantamax.png b/public/images/pokemon/icons/8/869-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/869-gigantamax.png rename to public/images/pokemon/icons/8/869-gigantamax.png diff --git a/public/images/pokemon/icons/869-lemon-cream.png b/public/images/pokemon/icons/8/869-lemon-cream.png similarity index 100% rename from public/images/pokemon/icons/869-lemon-cream.png rename to public/images/pokemon/icons/8/869-lemon-cream.png diff --git a/public/images/pokemon/icons/869-matcha-cream.png b/public/images/pokemon/icons/8/869-matcha-cream.png similarity index 100% rename from public/images/pokemon/icons/869-matcha-cream.png rename to public/images/pokemon/icons/8/869-matcha-cream.png diff --git a/public/images/pokemon/icons/869-mint-cream.png b/public/images/pokemon/icons/8/869-mint-cream.png similarity index 100% rename from public/images/pokemon/icons/869-mint-cream.png rename to public/images/pokemon/icons/8/869-mint-cream.png diff --git a/public/images/pokemon/icons/869-rainbow-swirl.png b/public/images/pokemon/icons/8/869-rainbow-swirl.png similarity index 100% rename from public/images/pokemon/icons/869-rainbow-swirl.png rename to public/images/pokemon/icons/8/869-rainbow-swirl.png diff --git a/public/images/pokemon/icons/869-ruby-cream.png b/public/images/pokemon/icons/8/869-ruby-cream.png similarity index 100% rename from public/images/pokemon/icons/869-ruby-cream.png rename to public/images/pokemon/icons/8/869-ruby-cream.png diff --git a/public/images/pokemon/icons/869-ruby-swirl.png b/public/images/pokemon/icons/8/869-ruby-swirl.png similarity index 100% rename from public/images/pokemon/icons/869-ruby-swirl.png rename to public/images/pokemon/icons/8/869-ruby-swirl.png diff --git a/public/images/pokemon/icons/869-salted-cream.png b/public/images/pokemon/icons/8/869-salted-cream.png similarity index 100% rename from public/images/pokemon/icons/869-salted-cream.png rename to public/images/pokemon/icons/8/869-salted-cream.png diff --git a/public/images/pokemon/icons/869.png b/public/images/pokemon/icons/8/869.png similarity index 100% rename from public/images/pokemon/icons/869.png rename to public/images/pokemon/icons/8/869.png diff --git a/public/images/pokemon/icons/869s-caramel-swirl.png b/public/images/pokemon/icons/8/869s-caramel-swirl.png similarity index 100% rename from public/images/pokemon/icons/869s-caramel-swirl.png rename to public/images/pokemon/icons/8/869s-caramel-swirl.png diff --git a/public/images/pokemon/icons/869s-gigantamax.png b/public/images/pokemon/icons/8/869s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/869s-gigantamax.png rename to public/images/pokemon/icons/8/869s-gigantamax.png diff --git a/public/images/pokemon/icons/869s-lemon-cream.png b/public/images/pokemon/icons/8/869s-lemon-cream.png similarity index 100% rename from public/images/pokemon/icons/869s-lemon-cream.png rename to public/images/pokemon/icons/8/869s-lemon-cream.png diff --git a/public/images/pokemon/icons/869s-matcha-cream.png b/public/images/pokemon/icons/8/869s-matcha-cream.png similarity index 100% rename from public/images/pokemon/icons/869s-matcha-cream.png rename to public/images/pokemon/icons/8/869s-matcha-cream.png diff --git a/public/images/pokemon/icons/869s-mint-cream.png b/public/images/pokemon/icons/8/869s-mint-cream.png similarity index 100% rename from public/images/pokemon/icons/869s-mint-cream.png rename to public/images/pokemon/icons/8/869s-mint-cream.png diff --git a/public/images/pokemon/icons/869s-rainbow-swirl.png b/public/images/pokemon/icons/8/869s-rainbow-swirl.png similarity index 100% rename from public/images/pokemon/icons/869s-rainbow-swirl.png rename to public/images/pokemon/icons/8/869s-rainbow-swirl.png diff --git a/public/images/pokemon/icons/869s-ruby-cream.png b/public/images/pokemon/icons/8/869s-ruby-cream.png similarity index 100% rename from public/images/pokemon/icons/869s-ruby-cream.png rename to public/images/pokemon/icons/8/869s-ruby-cream.png diff --git a/public/images/pokemon/icons/869s-ruby-swirl.png b/public/images/pokemon/icons/8/869s-ruby-swirl.png similarity index 100% rename from public/images/pokemon/icons/869s-ruby-swirl.png rename to public/images/pokemon/icons/8/869s-ruby-swirl.png diff --git a/public/images/pokemon/icons/869s-salted-cream.png b/public/images/pokemon/icons/8/869s-salted-cream.png similarity index 100% rename from public/images/pokemon/icons/869s-salted-cream.png rename to public/images/pokemon/icons/8/869s-salted-cream.png diff --git a/public/images/pokemon/icons/869s.png b/public/images/pokemon/icons/8/869s.png similarity index 100% rename from public/images/pokemon/icons/869s.png rename to public/images/pokemon/icons/8/869s.png diff --git a/public/images/pokemon/icons/870.png b/public/images/pokemon/icons/8/870.png similarity index 100% rename from public/images/pokemon/icons/870.png rename to public/images/pokemon/icons/8/870.png diff --git a/public/images/pokemon/icons/870s.png b/public/images/pokemon/icons/8/870s.png similarity index 100% rename from public/images/pokemon/icons/870s.png rename to public/images/pokemon/icons/8/870s.png diff --git a/public/images/pokemon/icons/871.png b/public/images/pokemon/icons/8/871.png similarity index 100% rename from public/images/pokemon/icons/871.png rename to public/images/pokemon/icons/8/871.png diff --git a/public/images/pokemon/icons/871s.png b/public/images/pokemon/icons/8/871s.png similarity index 100% rename from public/images/pokemon/icons/871s.png rename to public/images/pokemon/icons/8/871s.png diff --git a/public/images/pokemon/icons/872.png b/public/images/pokemon/icons/8/872.png similarity index 100% rename from public/images/pokemon/icons/872.png rename to public/images/pokemon/icons/8/872.png diff --git a/public/images/pokemon/icons/872s.png b/public/images/pokemon/icons/8/872s.png similarity index 100% rename from public/images/pokemon/icons/872s.png rename to public/images/pokemon/icons/8/872s.png diff --git a/public/images/pokemon/icons/873.png b/public/images/pokemon/icons/8/873.png similarity index 100% rename from public/images/pokemon/icons/873.png rename to public/images/pokemon/icons/8/873.png diff --git a/public/images/pokemon/icons/873s.png b/public/images/pokemon/icons/8/873s.png similarity index 100% rename from public/images/pokemon/icons/873s.png rename to public/images/pokemon/icons/8/873s.png diff --git a/public/images/pokemon/icons/874.png b/public/images/pokemon/icons/8/874.png similarity index 100% rename from public/images/pokemon/icons/874.png rename to public/images/pokemon/icons/8/874.png diff --git a/public/images/pokemon/icons/874s.png b/public/images/pokemon/icons/8/874s.png similarity index 100% rename from public/images/pokemon/icons/874s.png rename to public/images/pokemon/icons/8/874s.png diff --git a/public/images/pokemon/icons/875-no-ice.png b/public/images/pokemon/icons/8/875-no-ice.png similarity index 100% rename from public/images/pokemon/icons/875-no-ice.png rename to public/images/pokemon/icons/8/875-no-ice.png diff --git a/public/images/pokemon/icons/875.png b/public/images/pokemon/icons/8/875.png similarity index 100% rename from public/images/pokemon/icons/875.png rename to public/images/pokemon/icons/8/875.png diff --git a/public/images/pokemon/icons/875s-no-ice.png b/public/images/pokemon/icons/8/875s-no-ice.png similarity index 100% rename from public/images/pokemon/icons/875s-no-ice.png rename to public/images/pokemon/icons/8/875s-no-ice.png diff --git a/public/images/pokemon/icons/875s.png b/public/images/pokemon/icons/8/875s.png similarity index 100% rename from public/images/pokemon/icons/875s.png rename to public/images/pokemon/icons/8/875s.png diff --git a/public/images/pokemon/icons/876-female.png b/public/images/pokemon/icons/8/876-female.png similarity index 100% rename from public/images/pokemon/icons/876-female.png rename to public/images/pokemon/icons/8/876-female.png diff --git a/public/images/pokemon/icons/876.png b/public/images/pokemon/icons/8/876.png similarity index 100% rename from public/images/pokemon/icons/876.png rename to public/images/pokemon/icons/8/876.png diff --git a/public/images/pokemon/icons/876s-female.png b/public/images/pokemon/icons/8/876s-female.png similarity index 100% rename from public/images/pokemon/icons/876s-female.png rename to public/images/pokemon/icons/8/876s-female.png diff --git a/public/images/pokemon/icons/876s.png b/public/images/pokemon/icons/8/876s.png similarity index 100% rename from public/images/pokemon/icons/876s.png rename to public/images/pokemon/icons/8/876s.png diff --git a/public/images/pokemon/icons/877-hangry.png b/public/images/pokemon/icons/8/877-hangry.png similarity index 100% rename from public/images/pokemon/icons/877-hangry.png rename to public/images/pokemon/icons/8/877-hangry.png diff --git a/public/images/pokemon/icons/877.png b/public/images/pokemon/icons/8/877.png similarity index 100% rename from public/images/pokemon/icons/877.png rename to public/images/pokemon/icons/8/877.png diff --git a/public/images/pokemon/icons/877s-hangry.png b/public/images/pokemon/icons/8/877s-hangry.png similarity index 100% rename from public/images/pokemon/icons/877s-hangry.png rename to public/images/pokemon/icons/8/877s-hangry.png diff --git a/public/images/pokemon/icons/877s.png b/public/images/pokemon/icons/8/877s.png similarity index 100% rename from public/images/pokemon/icons/877s.png rename to public/images/pokemon/icons/8/877s.png diff --git a/public/images/pokemon/icons/878.png b/public/images/pokemon/icons/8/878.png similarity index 100% rename from public/images/pokemon/icons/878.png rename to public/images/pokemon/icons/8/878.png diff --git a/public/images/pokemon/icons/878s.png b/public/images/pokemon/icons/8/878s.png similarity index 100% rename from public/images/pokemon/icons/878s.png rename to public/images/pokemon/icons/8/878s.png diff --git a/public/images/pokemon/icons/879-gigantamax.png b/public/images/pokemon/icons/8/879-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/879-gigantamax.png rename to public/images/pokemon/icons/8/879-gigantamax.png diff --git a/public/images/pokemon/icons/879.png b/public/images/pokemon/icons/8/879.png similarity index 100% rename from public/images/pokemon/icons/879.png rename to public/images/pokemon/icons/8/879.png diff --git a/public/images/pokemon/icons/879s-gigantamax.png b/public/images/pokemon/icons/8/879s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/879s-gigantamax.png rename to public/images/pokemon/icons/8/879s-gigantamax.png diff --git a/public/images/pokemon/icons/879s.png b/public/images/pokemon/icons/8/879s.png similarity index 100% rename from public/images/pokemon/icons/879s.png rename to public/images/pokemon/icons/8/879s.png diff --git a/public/images/pokemon/icons/880.png b/public/images/pokemon/icons/8/880.png similarity index 100% rename from public/images/pokemon/icons/880.png rename to public/images/pokemon/icons/8/880.png diff --git a/public/images/pokemon/icons/880s.png b/public/images/pokemon/icons/8/880s.png similarity index 100% rename from public/images/pokemon/icons/880s.png rename to public/images/pokemon/icons/8/880s.png diff --git a/public/images/pokemon/icons/881.png b/public/images/pokemon/icons/8/881.png similarity index 100% rename from public/images/pokemon/icons/881.png rename to public/images/pokemon/icons/8/881.png diff --git a/public/images/pokemon/icons/881s.png b/public/images/pokemon/icons/8/881s.png similarity index 100% rename from public/images/pokemon/icons/881s.png rename to public/images/pokemon/icons/8/881s.png diff --git a/public/images/pokemon/icons/882.png b/public/images/pokemon/icons/8/882.png similarity index 100% rename from public/images/pokemon/icons/882.png rename to public/images/pokemon/icons/8/882.png diff --git a/public/images/pokemon/icons/882s.png b/public/images/pokemon/icons/8/882s.png similarity index 100% rename from public/images/pokemon/icons/882s.png rename to public/images/pokemon/icons/8/882s.png diff --git a/public/images/pokemon/icons/883.png b/public/images/pokemon/icons/8/883.png similarity index 100% rename from public/images/pokemon/icons/883.png rename to public/images/pokemon/icons/8/883.png diff --git a/public/images/pokemon/icons/883s.png b/public/images/pokemon/icons/8/883s.png similarity index 100% rename from public/images/pokemon/icons/883s.png rename to public/images/pokemon/icons/8/883s.png diff --git a/public/images/pokemon/icons/884-gigantamax.png b/public/images/pokemon/icons/8/884-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/884-gigantamax.png rename to public/images/pokemon/icons/8/884-gigantamax.png diff --git a/public/images/pokemon/icons/884.png b/public/images/pokemon/icons/8/884.png similarity index 100% rename from public/images/pokemon/icons/884.png rename to public/images/pokemon/icons/8/884.png diff --git a/public/images/pokemon/icons/884s-gigantamax.png b/public/images/pokemon/icons/8/884s-gigantamax.png similarity index 100% rename from public/images/pokemon/icons/884s-gigantamax.png rename to public/images/pokemon/icons/8/884s-gigantamax.png diff --git a/public/images/pokemon/icons/884s.png b/public/images/pokemon/icons/8/884s.png similarity index 100% rename from public/images/pokemon/icons/884s.png rename to public/images/pokemon/icons/8/884s.png diff --git a/public/images/pokemon/icons/885.png b/public/images/pokemon/icons/8/885.png similarity index 100% rename from public/images/pokemon/icons/885.png rename to public/images/pokemon/icons/8/885.png diff --git a/public/images/pokemon/icons/885s.png b/public/images/pokemon/icons/8/885s.png similarity index 100% rename from public/images/pokemon/icons/885s.png rename to public/images/pokemon/icons/8/885s.png diff --git a/public/images/pokemon/icons/886.png b/public/images/pokemon/icons/8/886.png similarity index 100% rename from public/images/pokemon/icons/886.png rename to public/images/pokemon/icons/8/886.png diff --git a/public/images/pokemon/icons/886s.png b/public/images/pokemon/icons/8/886s.png similarity index 100% rename from public/images/pokemon/icons/886s.png rename to public/images/pokemon/icons/8/886s.png diff --git a/public/images/pokemon/icons/887.png b/public/images/pokemon/icons/8/887.png similarity index 100% rename from public/images/pokemon/icons/887.png rename to public/images/pokemon/icons/8/887.png diff --git a/public/images/pokemon/icons/887s.png b/public/images/pokemon/icons/8/887s.png similarity index 100% rename from public/images/pokemon/icons/887s.png rename to public/images/pokemon/icons/8/887s.png diff --git a/public/images/pokemon/icons/888-crowned.png b/public/images/pokemon/icons/8/888-crowned.png similarity index 100% rename from public/images/pokemon/icons/888-crowned.png rename to public/images/pokemon/icons/8/888-crowned.png diff --git a/public/images/pokemon/icons/888.png b/public/images/pokemon/icons/8/888.png similarity index 100% rename from public/images/pokemon/icons/888.png rename to public/images/pokemon/icons/8/888.png diff --git a/public/images/pokemon/icons/888s-crowned.png b/public/images/pokemon/icons/8/888s-crowned.png similarity index 100% rename from public/images/pokemon/icons/888s-crowned.png rename to public/images/pokemon/icons/8/888s-crowned.png diff --git a/public/images/pokemon/icons/888s.png b/public/images/pokemon/icons/8/888s.png similarity index 100% rename from public/images/pokemon/icons/888s.png rename to public/images/pokemon/icons/8/888s.png diff --git a/public/images/pokemon/icons/889-crowned.png b/public/images/pokemon/icons/8/889-crowned.png similarity index 100% rename from public/images/pokemon/icons/889-crowned.png rename to public/images/pokemon/icons/8/889-crowned.png diff --git a/public/images/pokemon/icons/889.png b/public/images/pokemon/icons/8/889.png similarity index 100% rename from public/images/pokemon/icons/889.png rename to public/images/pokemon/icons/8/889.png diff --git a/public/images/pokemon/icons/889s-crowned.png b/public/images/pokemon/icons/8/889s-crowned.png similarity index 100% rename from public/images/pokemon/icons/889s-crowned.png rename to public/images/pokemon/icons/8/889s-crowned.png diff --git a/public/images/pokemon/icons/889s.png b/public/images/pokemon/icons/8/889s.png similarity index 100% rename from public/images/pokemon/icons/889s.png rename to public/images/pokemon/icons/8/889s.png diff --git a/public/images/pokemon/icons/890-eternamax.png b/public/images/pokemon/icons/8/890-eternamax.png similarity index 100% rename from public/images/pokemon/icons/890-eternamax.png rename to public/images/pokemon/icons/8/890-eternamax.png diff --git a/public/images/pokemon/icons/890.png b/public/images/pokemon/icons/8/890.png similarity index 100% rename from public/images/pokemon/icons/890.png rename to public/images/pokemon/icons/8/890.png diff --git a/public/images/pokemon/icons/890s-eternamax.png b/public/images/pokemon/icons/8/890s-eternamax.png similarity index 100% rename from public/images/pokemon/icons/890s-eternamax.png rename to public/images/pokemon/icons/8/890s-eternamax.png diff --git a/public/images/pokemon/icons/890s.png b/public/images/pokemon/icons/8/890s.png similarity index 100% rename from public/images/pokemon/icons/890s.png rename to public/images/pokemon/icons/8/890s.png diff --git a/public/images/pokemon/icons/891.png b/public/images/pokemon/icons/8/891.png similarity index 100% rename from public/images/pokemon/icons/891.png rename to public/images/pokemon/icons/8/891.png diff --git a/public/images/pokemon/icons/891s.png b/public/images/pokemon/icons/8/891s.png similarity index 100% rename from public/images/pokemon/icons/891s.png rename to public/images/pokemon/icons/8/891s.png diff --git a/public/images/pokemon/icons/892-gigantamax-rapid.png b/public/images/pokemon/icons/8/892-gigantamax-rapid.png similarity index 100% rename from public/images/pokemon/icons/892-gigantamax-rapid.png rename to public/images/pokemon/icons/8/892-gigantamax-rapid.png diff --git a/public/images/pokemon/icons/892-gigantamax-single.png b/public/images/pokemon/icons/8/892-gigantamax-single.png similarity index 100% rename from public/images/pokemon/icons/892-gigantamax-single.png rename to public/images/pokemon/icons/8/892-gigantamax-single.png diff --git a/public/images/pokemon/icons/892-rapid-strike.png b/public/images/pokemon/icons/8/892-rapid-strike.png similarity index 100% rename from public/images/pokemon/icons/892-rapid-strike.png rename to public/images/pokemon/icons/8/892-rapid-strike.png diff --git a/public/images/pokemon/icons/892.png b/public/images/pokemon/icons/8/892.png similarity index 100% rename from public/images/pokemon/icons/892.png rename to public/images/pokemon/icons/8/892.png diff --git a/public/images/pokemon/icons/892s-gigantamax-rapid.png b/public/images/pokemon/icons/8/892s-gigantamax-rapid.png similarity index 100% rename from public/images/pokemon/icons/892s-gigantamax-rapid.png rename to public/images/pokemon/icons/8/892s-gigantamax-rapid.png diff --git a/public/images/pokemon/icons/892s-gigantamax-single.png b/public/images/pokemon/icons/8/892s-gigantamax-single.png similarity index 100% rename from public/images/pokemon/icons/892s-gigantamax-single.png rename to public/images/pokemon/icons/8/892s-gigantamax-single.png diff --git a/public/images/pokemon/icons/892s-rapid-strike.png b/public/images/pokemon/icons/8/892s-rapid-strike.png similarity index 100% rename from public/images/pokemon/icons/892s-rapid-strike.png rename to public/images/pokemon/icons/8/892s-rapid-strike.png diff --git a/public/images/pokemon/icons/892s.png b/public/images/pokemon/icons/8/892s.png similarity index 100% rename from public/images/pokemon/icons/892s.png rename to public/images/pokemon/icons/8/892s.png diff --git a/public/images/pokemon/icons/893-dada.png b/public/images/pokemon/icons/8/893-dada.png similarity index 100% rename from public/images/pokemon/icons/893-dada.png rename to public/images/pokemon/icons/8/893-dada.png diff --git a/public/images/pokemon/icons/893.png b/public/images/pokemon/icons/8/893.png similarity index 100% rename from public/images/pokemon/icons/893.png rename to public/images/pokemon/icons/8/893.png diff --git a/public/images/pokemon/icons/893s-dada.png b/public/images/pokemon/icons/8/893s-dada.png similarity index 100% rename from public/images/pokemon/icons/893s-dada.png rename to public/images/pokemon/icons/8/893s-dada.png diff --git a/public/images/pokemon/icons/893s.png b/public/images/pokemon/icons/8/893s.png similarity index 100% rename from public/images/pokemon/icons/893s.png rename to public/images/pokemon/icons/8/893s.png diff --git a/public/images/pokemon/icons/894.png b/public/images/pokemon/icons/8/894.png similarity index 100% rename from public/images/pokemon/icons/894.png rename to public/images/pokemon/icons/8/894.png diff --git a/public/images/pokemon/icons/894s.png b/public/images/pokemon/icons/8/894s.png similarity index 100% rename from public/images/pokemon/icons/894s.png rename to public/images/pokemon/icons/8/894s.png diff --git a/public/images/pokemon/icons/895.png b/public/images/pokemon/icons/8/895.png similarity index 100% rename from public/images/pokemon/icons/895.png rename to public/images/pokemon/icons/8/895.png diff --git a/public/images/pokemon/icons/895s.png b/public/images/pokemon/icons/8/895s.png similarity index 100% rename from public/images/pokemon/icons/895s.png rename to public/images/pokemon/icons/8/895s.png diff --git a/public/images/pokemon/icons/896.png b/public/images/pokemon/icons/8/896.png similarity index 100% rename from public/images/pokemon/icons/896.png rename to public/images/pokemon/icons/8/896.png diff --git a/public/images/pokemon/icons/896s.png b/public/images/pokemon/icons/8/896s.png similarity index 100% rename from public/images/pokemon/icons/896s.png rename to public/images/pokemon/icons/8/896s.png diff --git a/public/images/pokemon/icons/897.png b/public/images/pokemon/icons/8/897.png similarity index 100% rename from public/images/pokemon/icons/897.png rename to public/images/pokemon/icons/8/897.png diff --git a/public/images/pokemon/icons/897s.png b/public/images/pokemon/icons/8/897s.png similarity index 100% rename from public/images/pokemon/icons/897s.png rename to public/images/pokemon/icons/8/897s.png diff --git a/public/images/pokemon/icons/898-ice.png b/public/images/pokemon/icons/8/898-ice.png similarity index 100% rename from public/images/pokemon/icons/898-ice.png rename to public/images/pokemon/icons/8/898-ice.png diff --git a/public/images/pokemon/icons/898-shadow.png b/public/images/pokemon/icons/8/898-shadow.png similarity index 100% rename from public/images/pokemon/icons/898-shadow.png rename to public/images/pokemon/icons/8/898-shadow.png diff --git a/public/images/pokemon/icons/898.png b/public/images/pokemon/icons/8/898.png similarity index 100% rename from public/images/pokemon/icons/898.png rename to public/images/pokemon/icons/8/898.png diff --git a/public/images/pokemon/icons/898s-ice.png b/public/images/pokemon/icons/8/898s-ice.png similarity index 100% rename from public/images/pokemon/icons/898s-ice.png rename to public/images/pokemon/icons/8/898s-ice.png diff --git a/public/images/pokemon/icons/898s-shadow.png b/public/images/pokemon/icons/8/898s-shadow.png similarity index 100% rename from public/images/pokemon/icons/898s-shadow.png rename to public/images/pokemon/icons/8/898s-shadow.png diff --git a/public/images/pokemon/icons/898s.png b/public/images/pokemon/icons/8/898s.png similarity index 100% rename from public/images/pokemon/icons/898s.png rename to public/images/pokemon/icons/8/898s.png diff --git a/public/images/pokemon/icons/899.png b/public/images/pokemon/icons/8/899.png similarity index 100% rename from public/images/pokemon/icons/899.png rename to public/images/pokemon/icons/8/899.png diff --git a/public/images/pokemon/icons/899s.png b/public/images/pokemon/icons/8/899s.png similarity index 100% rename from public/images/pokemon/icons/899s.png rename to public/images/pokemon/icons/8/899s.png diff --git a/public/images/pokemon/icons/900.png b/public/images/pokemon/icons/8/900.png similarity index 100% rename from public/images/pokemon/icons/900.png rename to public/images/pokemon/icons/8/900.png diff --git a/public/images/pokemon/icons/900s.png b/public/images/pokemon/icons/8/900s.png similarity index 100% rename from public/images/pokemon/icons/900s.png rename to public/images/pokemon/icons/8/900s.png diff --git a/public/images/pokemon/icons/901.png b/public/images/pokemon/icons/8/901.png similarity index 100% rename from public/images/pokemon/icons/901.png rename to public/images/pokemon/icons/8/901.png diff --git a/public/images/pokemon/icons/901s.png b/public/images/pokemon/icons/8/901s.png similarity index 100% rename from public/images/pokemon/icons/901s.png rename to public/images/pokemon/icons/8/901s.png diff --git a/public/images/pokemon/icons/902-female.png b/public/images/pokemon/icons/8/902-female.png similarity index 100% rename from public/images/pokemon/icons/902-female.png rename to public/images/pokemon/icons/8/902-female.png diff --git a/public/images/pokemon/icons/902.png b/public/images/pokemon/icons/8/902.png similarity index 100% rename from public/images/pokemon/icons/902.png rename to public/images/pokemon/icons/8/902.png diff --git a/public/images/pokemon/icons/902s-female.png b/public/images/pokemon/icons/8/902s-female.png similarity index 100% rename from public/images/pokemon/icons/902s-female.png rename to public/images/pokemon/icons/8/902s-female.png diff --git a/public/images/pokemon/icons/902s.png b/public/images/pokemon/icons/8/902s.png similarity index 100% rename from public/images/pokemon/icons/902s.png rename to public/images/pokemon/icons/8/902s.png diff --git a/public/images/pokemon/icons/903.png b/public/images/pokemon/icons/8/903.png similarity index 100% rename from public/images/pokemon/icons/903.png rename to public/images/pokemon/icons/8/903.png diff --git a/public/images/pokemon/icons/903s.png b/public/images/pokemon/icons/8/903s.png similarity index 100% rename from public/images/pokemon/icons/903s.png rename to public/images/pokemon/icons/8/903s.png diff --git a/public/images/pokemon/icons/904.png b/public/images/pokemon/icons/8/904.png similarity index 100% rename from public/images/pokemon/icons/904.png rename to public/images/pokemon/icons/8/904.png diff --git a/public/images/pokemon/icons/904s.png b/public/images/pokemon/icons/8/904s.png similarity index 100% rename from public/images/pokemon/icons/904s.png rename to public/images/pokemon/icons/8/904s.png diff --git a/public/images/pokemon/icons/905-incarnate.png b/public/images/pokemon/icons/8/905-incarnate.png similarity index 100% rename from public/images/pokemon/icons/905-incarnate.png rename to public/images/pokemon/icons/8/905-incarnate.png diff --git a/public/images/pokemon/icons/905-therian.png b/public/images/pokemon/icons/8/905-therian.png similarity index 100% rename from public/images/pokemon/icons/905-therian.png rename to public/images/pokemon/icons/8/905-therian.png diff --git a/public/images/pokemon/icons/905s-incarnate.png b/public/images/pokemon/icons/8/905s-incarnate.png similarity index 100% rename from public/images/pokemon/icons/905s-incarnate.png rename to public/images/pokemon/icons/8/905s-incarnate.png diff --git a/public/images/pokemon/icons/905s-therian.png b/public/images/pokemon/icons/8/905s-therian.png similarity index 100% rename from public/images/pokemon/icons/905s-therian.png rename to public/images/pokemon/icons/8/905s-therian.png diff --git a/public/images/pokemon/icons/8/icons.bat b/public/images/pokemon/icons/8/icons.bat new file mode 100644 index 000000000..3cd1c8b30 --- /dev/null +++ b/public/images/pokemon/icons/8/icons.bat @@ -0,0 +1 @@ +cmd /c TexturePacker ./ ../configuration.tps --sheet ../../../pokemon_icons_8.png --data ../../../pokemon_icons_8.json --replace .png= \ No newline at end of file diff --git a/public/images/pokemon/icons/1000.png b/public/images/pokemon/icons/9/1000.png similarity index 100% rename from public/images/pokemon/icons/1000.png rename to public/images/pokemon/icons/9/1000.png diff --git a/public/images/pokemon/icons/1000s.png b/public/images/pokemon/icons/9/1000s.png similarity index 100% rename from public/images/pokemon/icons/1000s.png rename to public/images/pokemon/icons/9/1000s.png diff --git a/public/images/pokemon/icons/1001.png b/public/images/pokemon/icons/9/1001.png similarity index 100% rename from public/images/pokemon/icons/1001.png rename to public/images/pokemon/icons/9/1001.png diff --git a/public/images/pokemon/icons/1001s.png b/public/images/pokemon/icons/9/1001s.png similarity index 100% rename from public/images/pokemon/icons/1001s.png rename to public/images/pokemon/icons/9/1001s.png diff --git a/public/images/pokemon/icons/1002.png b/public/images/pokemon/icons/9/1002.png similarity index 100% rename from public/images/pokemon/icons/1002.png rename to public/images/pokemon/icons/9/1002.png diff --git a/public/images/pokemon/icons/1002s.png b/public/images/pokemon/icons/9/1002s.png similarity index 100% rename from public/images/pokemon/icons/1002s.png rename to public/images/pokemon/icons/9/1002s.png diff --git a/public/images/pokemon/icons/1003.png b/public/images/pokemon/icons/9/1003.png similarity index 100% rename from public/images/pokemon/icons/1003.png rename to public/images/pokemon/icons/9/1003.png diff --git a/public/images/pokemon/icons/1003s.png b/public/images/pokemon/icons/9/1003s.png similarity index 100% rename from public/images/pokemon/icons/1003s.png rename to public/images/pokemon/icons/9/1003s.png diff --git a/public/images/pokemon/icons/1004.png b/public/images/pokemon/icons/9/1004.png similarity index 100% rename from public/images/pokemon/icons/1004.png rename to public/images/pokemon/icons/9/1004.png diff --git a/public/images/pokemon/icons/1004s.png b/public/images/pokemon/icons/9/1004s.png similarity index 100% rename from public/images/pokemon/icons/1004s.png rename to public/images/pokemon/icons/9/1004s.png diff --git a/public/images/pokemon/icons/1005.png b/public/images/pokemon/icons/9/1005.png similarity index 100% rename from public/images/pokemon/icons/1005.png rename to public/images/pokemon/icons/9/1005.png diff --git a/public/images/pokemon/icons/1005s.png b/public/images/pokemon/icons/9/1005s.png similarity index 100% rename from public/images/pokemon/icons/1005s.png rename to public/images/pokemon/icons/9/1005s.png diff --git a/public/images/pokemon/icons/1006.png b/public/images/pokemon/icons/9/1006.png similarity index 100% rename from public/images/pokemon/icons/1006.png rename to public/images/pokemon/icons/9/1006.png diff --git a/public/images/pokemon/icons/1006s.png b/public/images/pokemon/icons/9/1006s.png similarity index 100% rename from public/images/pokemon/icons/1006s.png rename to public/images/pokemon/icons/9/1006s.png diff --git a/public/images/pokemon/icons/1007-apex-build.png b/public/images/pokemon/icons/9/1007-apex-build.png similarity index 100% rename from public/images/pokemon/icons/1007-apex-build.png rename to public/images/pokemon/icons/9/1007-apex-build.png diff --git a/public/images/pokemon/icons/1007s-apex-build.png b/public/images/pokemon/icons/9/1007s-apex-build.png similarity index 100% rename from public/images/pokemon/icons/1007s-apex-build.png rename to public/images/pokemon/icons/9/1007s-apex-build.png diff --git a/public/images/pokemon/icons/1008-ultimate-mode.png b/public/images/pokemon/icons/9/1008-ultimate-mode.png similarity index 100% rename from public/images/pokemon/icons/1008-ultimate-mode.png rename to public/images/pokemon/icons/9/1008-ultimate-mode.png diff --git a/public/images/pokemon/icons/1008s-ultimate-mode.png b/public/images/pokemon/icons/9/1008s-ultimate-mode.png similarity index 100% rename from public/images/pokemon/icons/1008s-ultimate-mode.png rename to public/images/pokemon/icons/9/1008s-ultimate-mode.png diff --git a/public/images/pokemon/icons/1009.png b/public/images/pokemon/icons/9/1009.png similarity index 100% rename from public/images/pokemon/icons/1009.png rename to public/images/pokemon/icons/9/1009.png diff --git a/public/images/pokemon/icons/1009s.png b/public/images/pokemon/icons/9/1009s.png similarity index 100% rename from public/images/pokemon/icons/1009s.png rename to public/images/pokemon/icons/9/1009s.png diff --git a/public/images/pokemon/icons/1010.png b/public/images/pokemon/icons/9/1010.png similarity index 100% rename from public/images/pokemon/icons/1010.png rename to public/images/pokemon/icons/9/1010.png diff --git a/public/images/pokemon/icons/1010s.png b/public/images/pokemon/icons/9/1010s.png similarity index 100% rename from public/images/pokemon/icons/1010s.png rename to public/images/pokemon/icons/9/1010s.png diff --git a/public/images/pokemon/icons/1011.png b/public/images/pokemon/icons/9/1011.png similarity index 100% rename from public/images/pokemon/icons/1011.png rename to public/images/pokemon/icons/9/1011.png diff --git a/public/images/pokemon/icons/1011s.png b/public/images/pokemon/icons/9/1011s.png similarity index 100% rename from public/images/pokemon/icons/1011s.png rename to public/images/pokemon/icons/9/1011s.png diff --git a/public/images/pokemon/icons/1012-counterfeit.png b/public/images/pokemon/icons/9/1012-counterfeit.png similarity index 100% rename from public/images/pokemon/icons/1012-counterfeit.png rename to public/images/pokemon/icons/9/1012-counterfeit.png diff --git a/public/images/pokemon/icons/1012s-counterfeit.png b/public/images/pokemon/icons/9/1012s-counterfeit.png similarity index 100% rename from public/images/pokemon/icons/1012s-counterfeit.png rename to public/images/pokemon/icons/9/1012s-counterfeit.png diff --git a/public/images/pokemon/icons/1013-unremarkable.png b/public/images/pokemon/icons/9/1013-unremarkable.png similarity index 100% rename from public/images/pokemon/icons/1013-unremarkable.png rename to public/images/pokemon/icons/9/1013-unremarkable.png diff --git a/public/images/pokemon/icons/1013s-unremarkable.png b/public/images/pokemon/icons/9/1013s-unremarkable.png similarity index 100% rename from public/images/pokemon/icons/1013s-unremarkable.png rename to public/images/pokemon/icons/9/1013s-unremarkable.png diff --git a/public/images/pokemon/icons/1014.png b/public/images/pokemon/icons/9/1014.png similarity index 100% rename from public/images/pokemon/icons/1014.png rename to public/images/pokemon/icons/9/1014.png diff --git a/public/images/pokemon/icons/1014s.png b/public/images/pokemon/icons/9/1014s.png similarity index 100% rename from public/images/pokemon/icons/1014s.png rename to public/images/pokemon/icons/9/1014s.png diff --git a/public/images/pokemon/icons/1015.png b/public/images/pokemon/icons/9/1015.png similarity index 100% rename from public/images/pokemon/icons/1015.png rename to public/images/pokemon/icons/9/1015.png diff --git a/public/images/pokemon/icons/1015s.png b/public/images/pokemon/icons/9/1015s.png similarity index 100% rename from public/images/pokemon/icons/1015s.png rename to public/images/pokemon/icons/9/1015s.png diff --git a/public/images/pokemon/icons/1016.png b/public/images/pokemon/icons/9/1016.png similarity index 100% rename from public/images/pokemon/icons/1016.png rename to public/images/pokemon/icons/9/1016.png diff --git a/public/images/pokemon/icons/1016s.png b/public/images/pokemon/icons/9/1016s.png similarity index 100% rename from public/images/pokemon/icons/1016s.png rename to public/images/pokemon/icons/9/1016s.png diff --git a/public/images/pokemon/icons/1017-cornerstone-mask-tera.png b/public/images/pokemon/icons/9/1017-cornerstone-mask-tera.png similarity index 100% rename from public/images/pokemon/icons/1017-cornerstone-mask-tera.png rename to public/images/pokemon/icons/9/1017-cornerstone-mask-tera.png diff --git a/public/images/pokemon/icons/1017-cornerstone-mask.png b/public/images/pokemon/icons/9/1017-cornerstone-mask.png similarity index 100% rename from public/images/pokemon/icons/1017-cornerstone-mask.png rename to public/images/pokemon/icons/9/1017-cornerstone-mask.png diff --git a/public/images/pokemon/icons/1017-hearthflame-mask-tera.png b/public/images/pokemon/icons/9/1017-hearthflame-mask-tera.png similarity index 100% rename from public/images/pokemon/icons/1017-hearthflame-mask-tera.png rename to public/images/pokemon/icons/9/1017-hearthflame-mask-tera.png diff --git a/public/images/pokemon/icons/1017-hearthflame-mask.png b/public/images/pokemon/icons/9/1017-hearthflame-mask.png similarity index 100% rename from public/images/pokemon/icons/1017-hearthflame-mask.png rename to public/images/pokemon/icons/9/1017-hearthflame-mask.png diff --git a/public/images/pokemon/icons/1017-teal-mask-tera.png b/public/images/pokemon/icons/9/1017-teal-mask-tera.png similarity index 100% rename from public/images/pokemon/icons/1017-teal-mask-tera.png rename to public/images/pokemon/icons/9/1017-teal-mask-tera.png diff --git a/public/images/pokemon/icons/1017-teal-mask.png b/public/images/pokemon/icons/9/1017-teal-mask.png similarity index 100% rename from public/images/pokemon/icons/1017-teal-mask.png rename to public/images/pokemon/icons/9/1017-teal-mask.png diff --git a/public/images/pokemon/icons/1017-wellspring-mask-tera.png b/public/images/pokemon/icons/9/1017-wellspring-mask-tera.png similarity index 100% rename from public/images/pokemon/icons/1017-wellspring-mask-tera.png rename to public/images/pokemon/icons/9/1017-wellspring-mask-tera.png diff --git a/public/images/pokemon/icons/1017-wellspring-mask.png b/public/images/pokemon/icons/9/1017-wellspring-mask.png similarity index 100% rename from public/images/pokemon/icons/1017-wellspring-mask.png rename to public/images/pokemon/icons/9/1017-wellspring-mask.png diff --git a/public/images/pokemon/icons/1017s-cornerstone-mask-tera.png b/public/images/pokemon/icons/9/1017s-cornerstone-mask-tera.png similarity index 100% rename from public/images/pokemon/icons/1017s-cornerstone-mask-tera.png rename to public/images/pokemon/icons/9/1017s-cornerstone-mask-tera.png diff --git a/public/images/pokemon/icons/1017s-cornerstone-mask.png b/public/images/pokemon/icons/9/1017s-cornerstone-mask.png similarity index 100% rename from public/images/pokemon/icons/1017s-cornerstone-mask.png rename to public/images/pokemon/icons/9/1017s-cornerstone-mask.png diff --git a/public/images/pokemon/icons/1017s-hearthflame-mask-tera.png b/public/images/pokemon/icons/9/1017s-hearthflame-mask-tera.png similarity index 100% rename from public/images/pokemon/icons/1017s-hearthflame-mask-tera.png rename to public/images/pokemon/icons/9/1017s-hearthflame-mask-tera.png diff --git a/public/images/pokemon/icons/1017s-hearthflame-mask.png b/public/images/pokemon/icons/9/1017s-hearthflame-mask.png similarity index 100% rename from public/images/pokemon/icons/1017s-hearthflame-mask.png rename to public/images/pokemon/icons/9/1017s-hearthflame-mask.png diff --git a/public/images/pokemon/icons/1017s-teal-mask-tera.png b/public/images/pokemon/icons/9/1017s-teal-mask-tera.png similarity index 100% rename from public/images/pokemon/icons/1017s-teal-mask-tera.png rename to public/images/pokemon/icons/9/1017s-teal-mask-tera.png diff --git a/public/images/pokemon/icons/1017s-teal-mask.png b/public/images/pokemon/icons/9/1017s-teal-mask.png similarity index 100% rename from public/images/pokemon/icons/1017s-teal-mask.png rename to public/images/pokemon/icons/9/1017s-teal-mask.png diff --git a/public/images/pokemon/icons/1017s-wellspring-mask-tera.png b/public/images/pokemon/icons/9/1017s-wellspring-mask-tera.png similarity index 100% rename from public/images/pokemon/icons/1017s-wellspring-mask-tera.png rename to public/images/pokemon/icons/9/1017s-wellspring-mask-tera.png diff --git a/public/images/pokemon/icons/1017s-wellspring-mask.png b/public/images/pokemon/icons/9/1017s-wellspring-mask.png similarity index 100% rename from public/images/pokemon/icons/1017s-wellspring-mask.png rename to public/images/pokemon/icons/9/1017s-wellspring-mask.png diff --git a/public/images/pokemon/icons/1018.png b/public/images/pokemon/icons/9/1018.png similarity index 100% rename from public/images/pokemon/icons/1018.png rename to public/images/pokemon/icons/9/1018.png diff --git a/public/images/pokemon/icons/1018s.png b/public/images/pokemon/icons/9/1018s.png similarity index 100% rename from public/images/pokemon/icons/1018s.png rename to public/images/pokemon/icons/9/1018s.png diff --git a/public/images/pokemon/icons/1019.png b/public/images/pokemon/icons/9/1019.png similarity index 100% rename from public/images/pokemon/icons/1019.png rename to public/images/pokemon/icons/9/1019.png diff --git a/public/images/pokemon/icons/1019s.png b/public/images/pokemon/icons/9/1019s.png similarity index 100% rename from public/images/pokemon/icons/1019s.png rename to public/images/pokemon/icons/9/1019s.png diff --git a/public/images/pokemon/icons/1020.png b/public/images/pokemon/icons/9/1020.png similarity index 100% rename from public/images/pokemon/icons/1020.png rename to public/images/pokemon/icons/9/1020.png diff --git a/public/images/pokemon/icons/1020s.png b/public/images/pokemon/icons/9/1020s.png similarity index 100% rename from public/images/pokemon/icons/1020s.png rename to public/images/pokemon/icons/9/1020s.png diff --git a/public/images/pokemon/icons/1021.png b/public/images/pokemon/icons/9/1021.png similarity index 100% rename from public/images/pokemon/icons/1021.png rename to public/images/pokemon/icons/9/1021.png diff --git a/public/images/pokemon/icons/1021s.png b/public/images/pokemon/icons/9/1021s.png similarity index 100% rename from public/images/pokemon/icons/1021s.png rename to public/images/pokemon/icons/9/1021s.png diff --git a/public/images/pokemon/icons/1022.png b/public/images/pokemon/icons/9/1022.png similarity index 100% rename from public/images/pokemon/icons/1022.png rename to public/images/pokemon/icons/9/1022.png diff --git a/public/images/pokemon/icons/1022s.png b/public/images/pokemon/icons/9/1022s.png similarity index 100% rename from public/images/pokemon/icons/1022s.png rename to public/images/pokemon/icons/9/1022s.png diff --git a/public/images/pokemon/icons/1023.png b/public/images/pokemon/icons/9/1023.png similarity index 100% rename from public/images/pokemon/icons/1023.png rename to public/images/pokemon/icons/9/1023.png diff --git a/public/images/pokemon/icons/1023s.png b/public/images/pokemon/icons/9/1023s.png similarity index 100% rename from public/images/pokemon/icons/1023s.png rename to public/images/pokemon/icons/9/1023s.png diff --git a/public/images/pokemon/icons/1024-stellar.png b/public/images/pokemon/icons/9/1024-stellar.png similarity index 100% rename from public/images/pokemon/icons/1024-stellar.png rename to public/images/pokemon/icons/9/1024-stellar.png diff --git a/public/images/pokemon/icons/1024-terastal.png b/public/images/pokemon/icons/9/1024-terastal.png similarity index 100% rename from public/images/pokemon/icons/1024-terastal.png rename to public/images/pokemon/icons/9/1024-terastal.png diff --git a/public/images/pokemon/icons/1024.png b/public/images/pokemon/icons/9/1024.png similarity index 100% rename from public/images/pokemon/icons/1024.png rename to public/images/pokemon/icons/9/1024.png diff --git a/public/images/pokemon/icons/1024s-stellar.png b/public/images/pokemon/icons/9/1024s-stellar.png similarity index 100% rename from public/images/pokemon/icons/1024s-stellar.png rename to public/images/pokemon/icons/9/1024s-stellar.png diff --git a/public/images/pokemon/icons/1024s-terastal.png b/public/images/pokemon/icons/9/1024s-terastal.png similarity index 100% rename from public/images/pokemon/icons/1024s-terastal.png rename to public/images/pokemon/icons/9/1024s-terastal.png diff --git a/public/images/pokemon/icons/1024s.png b/public/images/pokemon/icons/9/1024s.png similarity index 100% rename from public/images/pokemon/icons/1024s.png rename to public/images/pokemon/icons/9/1024s.png diff --git a/public/images/pokemon/icons/1025.png b/public/images/pokemon/icons/9/1025.png similarity index 100% rename from public/images/pokemon/icons/1025.png rename to public/images/pokemon/icons/9/1025.png diff --git a/public/images/pokemon/icons/1025s.png b/public/images/pokemon/icons/9/1025s.png similarity index 100% rename from public/images/pokemon/icons/1025s.png rename to public/images/pokemon/icons/9/1025s.png diff --git a/public/images/pokemon/icons/8128-aqua.png b/public/images/pokemon/icons/9/8128-aqua.png similarity index 100% rename from public/images/pokemon/icons/8128-aqua.png rename to public/images/pokemon/icons/9/8128-aqua.png diff --git a/public/images/pokemon/icons/8128-blaze.png b/public/images/pokemon/icons/9/8128-blaze.png similarity index 100% rename from public/images/pokemon/icons/8128-blaze.png rename to public/images/pokemon/icons/9/8128-blaze.png diff --git a/public/images/pokemon/icons/8128.png b/public/images/pokemon/icons/9/8128.png similarity index 100% rename from public/images/pokemon/icons/8128.png rename to public/images/pokemon/icons/9/8128.png diff --git a/public/images/pokemon/icons/8128s-aqua.png b/public/images/pokemon/icons/9/8128s-aqua.png similarity index 100% rename from public/images/pokemon/icons/8128s-aqua.png rename to public/images/pokemon/icons/9/8128s-aqua.png diff --git a/public/images/pokemon/icons/8128s-blaze.png b/public/images/pokemon/icons/9/8128s-blaze.png similarity index 100% rename from public/images/pokemon/icons/8128s-blaze.png rename to public/images/pokemon/icons/9/8128s-blaze.png diff --git a/public/images/pokemon/icons/8128s.png b/public/images/pokemon/icons/9/8128s.png similarity index 100% rename from public/images/pokemon/icons/8128s.png rename to public/images/pokemon/icons/9/8128s.png diff --git a/public/images/pokemon/icons/8194.png b/public/images/pokemon/icons/9/8194.png similarity index 100% rename from public/images/pokemon/icons/8194.png rename to public/images/pokemon/icons/9/8194.png diff --git a/public/images/pokemon/icons/8194s.png b/public/images/pokemon/icons/9/8194s.png similarity index 100% rename from public/images/pokemon/icons/8194s.png rename to public/images/pokemon/icons/9/8194s.png diff --git a/public/images/pokemon/icons/8901.png b/public/images/pokemon/icons/9/8901.png similarity index 100% rename from public/images/pokemon/icons/8901.png rename to public/images/pokemon/icons/9/8901.png diff --git a/public/images/pokemon/icons/8901s.png b/public/images/pokemon/icons/9/8901s.png similarity index 100% rename from public/images/pokemon/icons/8901s.png rename to public/images/pokemon/icons/9/8901s.png diff --git a/public/images/pokemon/icons/906.png b/public/images/pokemon/icons/9/906.png similarity index 100% rename from public/images/pokemon/icons/906.png rename to public/images/pokemon/icons/9/906.png diff --git a/public/images/pokemon/icons/906s.png b/public/images/pokemon/icons/9/906s.png similarity index 100% rename from public/images/pokemon/icons/906s.png rename to public/images/pokemon/icons/9/906s.png diff --git a/public/images/pokemon/icons/907.png b/public/images/pokemon/icons/9/907.png similarity index 100% rename from public/images/pokemon/icons/907.png rename to public/images/pokemon/icons/9/907.png diff --git a/public/images/pokemon/icons/907s.png b/public/images/pokemon/icons/9/907s.png similarity index 100% rename from public/images/pokemon/icons/907s.png rename to public/images/pokemon/icons/9/907s.png diff --git a/public/images/pokemon/icons/908.png b/public/images/pokemon/icons/9/908.png similarity index 100% rename from public/images/pokemon/icons/908.png rename to public/images/pokemon/icons/9/908.png diff --git a/public/images/pokemon/icons/908s.png b/public/images/pokemon/icons/9/908s.png similarity index 100% rename from public/images/pokemon/icons/908s.png rename to public/images/pokemon/icons/9/908s.png diff --git a/public/images/pokemon/icons/909.png b/public/images/pokemon/icons/9/909.png similarity index 100% rename from public/images/pokemon/icons/909.png rename to public/images/pokemon/icons/9/909.png diff --git a/public/images/pokemon/icons/909s.png b/public/images/pokemon/icons/9/909s.png similarity index 100% rename from public/images/pokemon/icons/909s.png rename to public/images/pokemon/icons/9/909s.png diff --git a/public/images/pokemon/icons/910.png b/public/images/pokemon/icons/9/910.png similarity index 100% rename from public/images/pokemon/icons/910.png rename to public/images/pokemon/icons/9/910.png diff --git a/public/images/pokemon/icons/910s.png b/public/images/pokemon/icons/9/910s.png similarity index 100% rename from public/images/pokemon/icons/910s.png rename to public/images/pokemon/icons/9/910s.png diff --git a/public/images/pokemon/icons/911.png b/public/images/pokemon/icons/9/911.png similarity index 100% rename from public/images/pokemon/icons/911.png rename to public/images/pokemon/icons/9/911.png diff --git a/public/images/pokemon/icons/911s.png b/public/images/pokemon/icons/9/911s.png similarity index 100% rename from public/images/pokemon/icons/911s.png rename to public/images/pokemon/icons/9/911s.png diff --git a/public/images/pokemon/icons/912.png b/public/images/pokemon/icons/9/912.png similarity index 100% rename from public/images/pokemon/icons/912.png rename to public/images/pokemon/icons/9/912.png diff --git a/public/images/pokemon/icons/912s.png b/public/images/pokemon/icons/9/912s.png similarity index 100% rename from public/images/pokemon/icons/912s.png rename to public/images/pokemon/icons/9/912s.png diff --git a/public/images/pokemon/icons/913.png b/public/images/pokemon/icons/9/913.png similarity index 100% rename from public/images/pokemon/icons/913.png rename to public/images/pokemon/icons/9/913.png diff --git a/public/images/pokemon/icons/913s.png b/public/images/pokemon/icons/9/913s.png similarity index 100% rename from public/images/pokemon/icons/913s.png rename to public/images/pokemon/icons/9/913s.png diff --git a/public/images/pokemon/icons/914.png b/public/images/pokemon/icons/9/914.png similarity index 100% rename from public/images/pokemon/icons/914.png rename to public/images/pokemon/icons/9/914.png diff --git a/public/images/pokemon/icons/914s.png b/public/images/pokemon/icons/9/914s.png similarity index 100% rename from public/images/pokemon/icons/914s.png rename to public/images/pokemon/icons/9/914s.png diff --git a/public/images/pokemon/icons/915.png b/public/images/pokemon/icons/9/915.png similarity index 100% rename from public/images/pokemon/icons/915.png rename to public/images/pokemon/icons/9/915.png diff --git a/public/images/pokemon/icons/915s.png b/public/images/pokemon/icons/9/915s.png similarity index 100% rename from public/images/pokemon/icons/915s.png rename to public/images/pokemon/icons/9/915s.png diff --git a/public/images/pokemon/icons/916-female.png b/public/images/pokemon/icons/9/916-female.png similarity index 100% rename from public/images/pokemon/icons/916-female.png rename to public/images/pokemon/icons/9/916-female.png diff --git a/public/images/pokemon/icons/916.png b/public/images/pokemon/icons/9/916.png similarity index 100% rename from public/images/pokemon/icons/916.png rename to public/images/pokemon/icons/9/916.png diff --git a/public/images/pokemon/icons/916s-female.png b/public/images/pokemon/icons/9/916s-female.png similarity index 100% rename from public/images/pokemon/icons/916s-female.png rename to public/images/pokemon/icons/9/916s-female.png diff --git a/public/images/pokemon/icons/916s.png b/public/images/pokemon/icons/9/916s.png similarity index 100% rename from public/images/pokemon/icons/916s.png rename to public/images/pokemon/icons/9/916s.png diff --git a/public/images/pokemon/icons/917.png b/public/images/pokemon/icons/9/917.png similarity index 100% rename from public/images/pokemon/icons/917.png rename to public/images/pokemon/icons/9/917.png diff --git a/public/images/pokemon/icons/917s.png b/public/images/pokemon/icons/9/917s.png similarity index 100% rename from public/images/pokemon/icons/917s.png rename to public/images/pokemon/icons/9/917s.png diff --git a/public/images/pokemon/icons/918.png b/public/images/pokemon/icons/9/918.png similarity index 100% rename from public/images/pokemon/icons/918.png rename to public/images/pokemon/icons/9/918.png diff --git a/public/images/pokemon/icons/918s.png b/public/images/pokemon/icons/9/918s.png similarity index 100% rename from public/images/pokemon/icons/918s.png rename to public/images/pokemon/icons/9/918s.png diff --git a/public/images/pokemon/icons/919.png b/public/images/pokemon/icons/9/919.png similarity index 100% rename from public/images/pokemon/icons/919.png rename to public/images/pokemon/icons/9/919.png diff --git a/public/images/pokemon/icons/919s.png b/public/images/pokemon/icons/9/919s.png similarity index 100% rename from public/images/pokemon/icons/919s.png rename to public/images/pokemon/icons/9/919s.png diff --git a/public/images/pokemon/icons/920.png b/public/images/pokemon/icons/9/920.png similarity index 100% rename from public/images/pokemon/icons/920.png rename to public/images/pokemon/icons/9/920.png diff --git a/public/images/pokemon/icons/920s.png b/public/images/pokemon/icons/9/920s.png similarity index 100% rename from public/images/pokemon/icons/920s.png rename to public/images/pokemon/icons/9/920s.png diff --git a/public/images/pokemon/icons/921.png b/public/images/pokemon/icons/9/921.png similarity index 100% rename from public/images/pokemon/icons/921.png rename to public/images/pokemon/icons/9/921.png diff --git a/public/images/pokemon/icons/921s.png b/public/images/pokemon/icons/9/921s.png similarity index 100% rename from public/images/pokemon/icons/921s.png rename to public/images/pokemon/icons/9/921s.png diff --git a/public/images/pokemon/icons/922.png b/public/images/pokemon/icons/9/922.png similarity index 100% rename from public/images/pokemon/icons/922.png rename to public/images/pokemon/icons/9/922.png diff --git a/public/images/pokemon/icons/922s.png b/public/images/pokemon/icons/9/922s.png similarity index 100% rename from public/images/pokemon/icons/922s.png rename to public/images/pokemon/icons/9/922s.png diff --git a/public/images/pokemon/icons/923.png b/public/images/pokemon/icons/9/923.png similarity index 100% rename from public/images/pokemon/icons/923.png rename to public/images/pokemon/icons/9/923.png diff --git a/public/images/pokemon/icons/923s.png b/public/images/pokemon/icons/9/923s.png similarity index 100% rename from public/images/pokemon/icons/923s.png rename to public/images/pokemon/icons/9/923s.png diff --git a/public/images/pokemon/icons/924.png b/public/images/pokemon/icons/9/924.png similarity index 100% rename from public/images/pokemon/icons/924.png rename to public/images/pokemon/icons/9/924.png diff --git a/public/images/pokemon/icons/924s.png b/public/images/pokemon/icons/9/924s.png similarity index 100% rename from public/images/pokemon/icons/924s.png rename to public/images/pokemon/icons/9/924s.png diff --git a/public/images/pokemon/icons/925-four.png b/public/images/pokemon/icons/9/925-four.png similarity index 100% rename from public/images/pokemon/icons/925-four.png rename to public/images/pokemon/icons/9/925-four.png diff --git a/public/images/pokemon/icons/925-three.png b/public/images/pokemon/icons/9/925-three.png similarity index 100% rename from public/images/pokemon/icons/925-three.png rename to public/images/pokemon/icons/9/925-three.png diff --git a/public/images/pokemon/icons/925s-four.png b/public/images/pokemon/icons/9/925s-four.png similarity index 100% rename from public/images/pokemon/icons/925s-four.png rename to public/images/pokemon/icons/9/925s-four.png diff --git a/public/images/pokemon/icons/925s-three.png b/public/images/pokemon/icons/9/925s-three.png similarity index 100% rename from public/images/pokemon/icons/925s-three.png rename to public/images/pokemon/icons/9/925s-three.png diff --git a/public/images/pokemon/icons/926.png b/public/images/pokemon/icons/9/926.png similarity index 100% rename from public/images/pokemon/icons/926.png rename to public/images/pokemon/icons/9/926.png diff --git a/public/images/pokemon/icons/926s.png b/public/images/pokemon/icons/9/926s.png similarity index 100% rename from public/images/pokemon/icons/926s.png rename to public/images/pokemon/icons/9/926s.png diff --git a/public/images/pokemon/icons/927.png b/public/images/pokemon/icons/9/927.png similarity index 100% rename from public/images/pokemon/icons/927.png rename to public/images/pokemon/icons/9/927.png diff --git a/public/images/pokemon/icons/927s.png b/public/images/pokemon/icons/9/927s.png similarity index 100% rename from public/images/pokemon/icons/927s.png rename to public/images/pokemon/icons/9/927s.png diff --git a/public/images/pokemon/icons/928.png b/public/images/pokemon/icons/9/928.png similarity index 100% rename from public/images/pokemon/icons/928.png rename to public/images/pokemon/icons/9/928.png diff --git a/public/images/pokemon/icons/928s.png b/public/images/pokemon/icons/9/928s.png similarity index 100% rename from public/images/pokemon/icons/928s.png rename to public/images/pokemon/icons/9/928s.png diff --git a/public/images/pokemon/icons/929.png b/public/images/pokemon/icons/9/929.png similarity index 100% rename from public/images/pokemon/icons/929.png rename to public/images/pokemon/icons/9/929.png diff --git a/public/images/pokemon/icons/929s.png b/public/images/pokemon/icons/9/929s.png similarity index 100% rename from public/images/pokemon/icons/929s.png rename to public/images/pokemon/icons/9/929s.png diff --git a/public/images/pokemon/icons/930.png b/public/images/pokemon/icons/9/930.png similarity index 100% rename from public/images/pokemon/icons/930.png rename to public/images/pokemon/icons/9/930.png diff --git a/public/images/pokemon/icons/930s.png b/public/images/pokemon/icons/9/930s.png similarity index 100% rename from public/images/pokemon/icons/930s.png rename to public/images/pokemon/icons/9/930s.png diff --git a/public/images/pokemon/icons/931-blue-plumage.png b/public/images/pokemon/icons/9/931-blue-plumage.png similarity index 100% rename from public/images/pokemon/icons/931-blue-plumage.png rename to public/images/pokemon/icons/9/931-blue-plumage.png diff --git a/public/images/pokemon/icons/931-green-plumage.png b/public/images/pokemon/icons/9/931-green-plumage.png similarity index 100% rename from public/images/pokemon/icons/931-green-plumage.png rename to public/images/pokemon/icons/9/931-green-plumage.png diff --git a/public/images/pokemon/icons/931-white-plumage.png b/public/images/pokemon/icons/9/931-white-plumage.png similarity index 100% rename from public/images/pokemon/icons/931-white-plumage.png rename to public/images/pokemon/icons/9/931-white-plumage.png diff --git a/public/images/pokemon/icons/931-yellow-plumage.png b/public/images/pokemon/icons/9/931-yellow-plumage.png similarity index 100% rename from public/images/pokemon/icons/931-yellow-plumage.png rename to public/images/pokemon/icons/9/931-yellow-plumage.png diff --git a/public/images/pokemon/icons/931s-blue-plumage.png b/public/images/pokemon/icons/9/931s-blue-plumage.png similarity index 100% rename from public/images/pokemon/icons/931s-blue-plumage.png rename to public/images/pokemon/icons/9/931s-blue-plumage.png diff --git a/public/images/pokemon/icons/931s-green-plumage.png b/public/images/pokemon/icons/9/931s-green-plumage.png similarity index 100% rename from public/images/pokemon/icons/931s-green-plumage.png rename to public/images/pokemon/icons/9/931s-green-plumage.png diff --git a/public/images/pokemon/icons/931s-white-plumage.png b/public/images/pokemon/icons/9/931s-white-plumage.png similarity index 100% rename from public/images/pokemon/icons/931s-white-plumage.png rename to public/images/pokemon/icons/9/931s-white-plumage.png diff --git a/public/images/pokemon/icons/931s-yellow-plumage.png b/public/images/pokemon/icons/9/931s-yellow-plumage.png similarity index 100% rename from public/images/pokemon/icons/931s-yellow-plumage.png rename to public/images/pokemon/icons/9/931s-yellow-plumage.png diff --git a/public/images/pokemon/icons/932.png b/public/images/pokemon/icons/9/932.png similarity index 100% rename from public/images/pokemon/icons/932.png rename to public/images/pokemon/icons/9/932.png diff --git a/public/images/pokemon/icons/932s.png b/public/images/pokemon/icons/9/932s.png similarity index 100% rename from public/images/pokemon/icons/932s.png rename to public/images/pokemon/icons/9/932s.png diff --git a/public/images/pokemon/icons/933.png b/public/images/pokemon/icons/9/933.png similarity index 100% rename from public/images/pokemon/icons/933.png rename to public/images/pokemon/icons/9/933.png diff --git a/public/images/pokemon/icons/933s.png b/public/images/pokemon/icons/9/933s.png similarity index 100% rename from public/images/pokemon/icons/933s.png rename to public/images/pokemon/icons/9/933s.png diff --git a/public/images/pokemon/icons/934.png b/public/images/pokemon/icons/9/934.png similarity index 100% rename from public/images/pokemon/icons/934.png rename to public/images/pokemon/icons/9/934.png diff --git a/public/images/pokemon/icons/934s.png b/public/images/pokemon/icons/9/934s.png similarity index 100% rename from public/images/pokemon/icons/934s.png rename to public/images/pokemon/icons/9/934s.png diff --git a/public/images/pokemon/icons/935.png b/public/images/pokemon/icons/9/935.png similarity index 100% rename from public/images/pokemon/icons/935.png rename to public/images/pokemon/icons/9/935.png diff --git a/public/images/pokemon/icons/935s.png b/public/images/pokemon/icons/9/935s.png similarity index 100% rename from public/images/pokemon/icons/935s.png rename to public/images/pokemon/icons/9/935s.png diff --git a/public/images/pokemon/icons/936.png b/public/images/pokemon/icons/9/936.png similarity index 100% rename from public/images/pokemon/icons/936.png rename to public/images/pokemon/icons/9/936.png diff --git a/public/images/pokemon/icons/936s.png b/public/images/pokemon/icons/9/936s.png similarity index 100% rename from public/images/pokemon/icons/936s.png rename to public/images/pokemon/icons/9/936s.png diff --git a/public/images/pokemon/icons/937.png b/public/images/pokemon/icons/9/937.png similarity index 100% rename from public/images/pokemon/icons/937.png rename to public/images/pokemon/icons/9/937.png diff --git a/public/images/pokemon/icons/937s.png b/public/images/pokemon/icons/9/937s.png similarity index 100% rename from public/images/pokemon/icons/937s.png rename to public/images/pokemon/icons/9/937s.png diff --git a/public/images/pokemon/icons/938.png b/public/images/pokemon/icons/9/938.png similarity index 100% rename from public/images/pokemon/icons/938.png rename to public/images/pokemon/icons/9/938.png diff --git a/public/images/pokemon/icons/938s.png b/public/images/pokemon/icons/9/938s.png similarity index 100% rename from public/images/pokemon/icons/938s.png rename to public/images/pokemon/icons/9/938s.png diff --git a/public/images/pokemon/icons/939.png b/public/images/pokemon/icons/9/939.png similarity index 100% rename from public/images/pokemon/icons/939.png rename to public/images/pokemon/icons/9/939.png diff --git a/public/images/pokemon/icons/939s.png b/public/images/pokemon/icons/9/939s.png similarity index 100% rename from public/images/pokemon/icons/939s.png rename to public/images/pokemon/icons/9/939s.png diff --git a/public/images/pokemon/icons/940.png b/public/images/pokemon/icons/9/940.png similarity index 100% rename from public/images/pokemon/icons/940.png rename to public/images/pokemon/icons/9/940.png diff --git a/public/images/pokemon/icons/940s.png b/public/images/pokemon/icons/9/940s.png similarity index 100% rename from public/images/pokemon/icons/940s.png rename to public/images/pokemon/icons/9/940s.png diff --git a/public/images/pokemon/icons/941.png b/public/images/pokemon/icons/9/941.png similarity index 100% rename from public/images/pokemon/icons/941.png rename to public/images/pokemon/icons/9/941.png diff --git a/public/images/pokemon/icons/941s.png b/public/images/pokemon/icons/9/941s.png similarity index 100% rename from public/images/pokemon/icons/941s.png rename to public/images/pokemon/icons/9/941s.png diff --git a/public/images/pokemon/icons/942.png b/public/images/pokemon/icons/9/942.png similarity index 100% rename from public/images/pokemon/icons/942.png rename to public/images/pokemon/icons/9/942.png diff --git a/public/images/pokemon/icons/942s.png b/public/images/pokemon/icons/9/942s.png similarity index 100% rename from public/images/pokemon/icons/942s.png rename to public/images/pokemon/icons/9/942s.png diff --git a/public/images/pokemon/icons/943.png b/public/images/pokemon/icons/9/943.png similarity index 100% rename from public/images/pokemon/icons/943.png rename to public/images/pokemon/icons/9/943.png diff --git a/public/images/pokemon/icons/943s.png b/public/images/pokemon/icons/9/943s.png similarity index 100% rename from public/images/pokemon/icons/943s.png rename to public/images/pokemon/icons/9/943s.png diff --git a/public/images/pokemon/icons/944.png b/public/images/pokemon/icons/9/944.png similarity index 100% rename from public/images/pokemon/icons/944.png rename to public/images/pokemon/icons/9/944.png diff --git a/public/images/pokemon/icons/944s.png b/public/images/pokemon/icons/9/944s.png similarity index 100% rename from public/images/pokemon/icons/944s.png rename to public/images/pokemon/icons/9/944s.png diff --git a/public/images/pokemon/icons/945.png b/public/images/pokemon/icons/9/945.png similarity index 100% rename from public/images/pokemon/icons/945.png rename to public/images/pokemon/icons/9/945.png diff --git a/public/images/pokemon/icons/945s.png b/public/images/pokemon/icons/9/945s.png similarity index 100% rename from public/images/pokemon/icons/945s.png rename to public/images/pokemon/icons/9/945s.png diff --git a/public/images/pokemon/icons/946.png b/public/images/pokemon/icons/9/946.png similarity index 100% rename from public/images/pokemon/icons/946.png rename to public/images/pokemon/icons/9/946.png diff --git a/public/images/pokemon/icons/946s.png b/public/images/pokemon/icons/9/946s.png similarity index 100% rename from public/images/pokemon/icons/946s.png rename to public/images/pokemon/icons/9/946s.png diff --git a/public/images/pokemon/icons/947.png b/public/images/pokemon/icons/9/947.png similarity index 100% rename from public/images/pokemon/icons/947.png rename to public/images/pokemon/icons/9/947.png diff --git a/public/images/pokemon/icons/947s.png b/public/images/pokemon/icons/9/947s.png similarity index 100% rename from public/images/pokemon/icons/947s.png rename to public/images/pokemon/icons/9/947s.png diff --git a/public/images/pokemon/icons/948.png b/public/images/pokemon/icons/9/948.png similarity index 100% rename from public/images/pokemon/icons/948.png rename to public/images/pokemon/icons/9/948.png diff --git a/public/images/pokemon/icons/948s.png b/public/images/pokemon/icons/9/948s.png similarity index 100% rename from public/images/pokemon/icons/948s.png rename to public/images/pokemon/icons/9/948s.png diff --git a/public/images/pokemon/icons/949.png b/public/images/pokemon/icons/9/949.png similarity index 100% rename from public/images/pokemon/icons/949.png rename to public/images/pokemon/icons/9/949.png diff --git a/public/images/pokemon/icons/949s.png b/public/images/pokemon/icons/9/949s.png similarity index 100% rename from public/images/pokemon/icons/949s.png rename to public/images/pokemon/icons/9/949s.png diff --git a/public/images/pokemon/icons/950.png b/public/images/pokemon/icons/9/950.png similarity index 100% rename from public/images/pokemon/icons/950.png rename to public/images/pokemon/icons/9/950.png diff --git a/public/images/pokemon/icons/950s.png b/public/images/pokemon/icons/9/950s.png similarity index 100% rename from public/images/pokemon/icons/950s.png rename to public/images/pokemon/icons/9/950s.png diff --git a/public/images/pokemon/icons/951.png b/public/images/pokemon/icons/9/951.png similarity index 100% rename from public/images/pokemon/icons/951.png rename to public/images/pokemon/icons/9/951.png diff --git a/public/images/pokemon/icons/951s.png b/public/images/pokemon/icons/9/951s.png similarity index 100% rename from public/images/pokemon/icons/951s.png rename to public/images/pokemon/icons/9/951s.png diff --git a/public/images/pokemon/icons/952.png b/public/images/pokemon/icons/9/952.png similarity index 100% rename from public/images/pokemon/icons/952.png rename to public/images/pokemon/icons/9/952.png diff --git a/public/images/pokemon/icons/952s.png b/public/images/pokemon/icons/9/952s.png similarity index 100% rename from public/images/pokemon/icons/952s.png rename to public/images/pokemon/icons/9/952s.png diff --git a/public/images/pokemon/icons/953.png b/public/images/pokemon/icons/9/953.png similarity index 100% rename from public/images/pokemon/icons/953.png rename to public/images/pokemon/icons/9/953.png diff --git a/public/images/pokemon/icons/953s.png b/public/images/pokemon/icons/9/953s.png similarity index 100% rename from public/images/pokemon/icons/953s.png rename to public/images/pokemon/icons/9/953s.png diff --git a/public/images/pokemon/icons/954.png b/public/images/pokemon/icons/9/954.png similarity index 100% rename from public/images/pokemon/icons/954.png rename to public/images/pokemon/icons/9/954.png diff --git a/public/images/pokemon/icons/954s.png b/public/images/pokemon/icons/9/954s.png similarity index 100% rename from public/images/pokemon/icons/954s.png rename to public/images/pokemon/icons/9/954s.png diff --git a/public/images/pokemon/icons/955.png b/public/images/pokemon/icons/9/955.png similarity index 100% rename from public/images/pokemon/icons/955.png rename to public/images/pokemon/icons/9/955.png diff --git a/public/images/pokemon/icons/955s.png b/public/images/pokemon/icons/9/955s.png similarity index 100% rename from public/images/pokemon/icons/955s.png rename to public/images/pokemon/icons/9/955s.png diff --git a/public/images/pokemon/icons/956.png b/public/images/pokemon/icons/9/956.png similarity index 100% rename from public/images/pokemon/icons/956.png rename to public/images/pokemon/icons/9/956.png diff --git a/public/images/pokemon/icons/956s.png b/public/images/pokemon/icons/9/956s.png similarity index 100% rename from public/images/pokemon/icons/956s.png rename to public/images/pokemon/icons/9/956s.png diff --git a/public/images/pokemon/icons/957.png b/public/images/pokemon/icons/9/957.png similarity index 100% rename from public/images/pokemon/icons/957.png rename to public/images/pokemon/icons/9/957.png diff --git a/public/images/pokemon/icons/957s.png b/public/images/pokemon/icons/9/957s.png similarity index 100% rename from public/images/pokemon/icons/957s.png rename to public/images/pokemon/icons/9/957s.png diff --git a/public/images/pokemon/icons/958.png b/public/images/pokemon/icons/9/958.png similarity index 100% rename from public/images/pokemon/icons/958.png rename to public/images/pokemon/icons/9/958.png diff --git a/public/images/pokemon/icons/958s.png b/public/images/pokemon/icons/9/958s.png similarity index 100% rename from public/images/pokemon/icons/958s.png rename to public/images/pokemon/icons/9/958s.png diff --git a/public/images/pokemon/icons/959.png b/public/images/pokemon/icons/9/959.png similarity index 100% rename from public/images/pokemon/icons/959.png rename to public/images/pokemon/icons/9/959.png diff --git a/public/images/pokemon/icons/959s.png b/public/images/pokemon/icons/9/959s.png similarity index 100% rename from public/images/pokemon/icons/959s.png rename to public/images/pokemon/icons/9/959s.png diff --git a/public/images/pokemon/icons/960.png b/public/images/pokemon/icons/9/960.png similarity index 100% rename from public/images/pokemon/icons/960.png rename to public/images/pokemon/icons/9/960.png diff --git a/public/images/pokemon/icons/960s.png b/public/images/pokemon/icons/9/960s.png similarity index 100% rename from public/images/pokemon/icons/960s.png rename to public/images/pokemon/icons/9/960s.png diff --git a/public/images/pokemon/icons/961.png b/public/images/pokemon/icons/9/961.png similarity index 100% rename from public/images/pokemon/icons/961.png rename to public/images/pokemon/icons/9/961.png diff --git a/public/images/pokemon/icons/961s.png b/public/images/pokemon/icons/9/961s.png similarity index 100% rename from public/images/pokemon/icons/961s.png rename to public/images/pokemon/icons/9/961s.png diff --git a/public/images/pokemon/icons/962.png b/public/images/pokemon/icons/9/962.png similarity index 100% rename from public/images/pokemon/icons/962.png rename to public/images/pokemon/icons/9/962.png diff --git a/public/images/pokemon/icons/962s.png b/public/images/pokemon/icons/9/962s.png similarity index 100% rename from public/images/pokemon/icons/962s.png rename to public/images/pokemon/icons/9/962s.png diff --git a/public/images/pokemon/icons/963.png b/public/images/pokemon/icons/9/963.png similarity index 100% rename from public/images/pokemon/icons/963.png rename to public/images/pokemon/icons/9/963.png diff --git a/public/images/pokemon/icons/963s.png b/public/images/pokemon/icons/9/963s.png similarity index 100% rename from public/images/pokemon/icons/963s.png rename to public/images/pokemon/icons/9/963s.png diff --git a/public/images/pokemon/icons/964-hero.png b/public/images/pokemon/icons/9/964-hero.png similarity index 100% rename from public/images/pokemon/icons/964-hero.png rename to public/images/pokemon/icons/9/964-hero.png diff --git a/public/images/pokemon/icons/964-zero.png b/public/images/pokemon/icons/9/964-zero.png similarity index 100% rename from public/images/pokemon/icons/964-zero.png rename to public/images/pokemon/icons/9/964-zero.png diff --git a/public/images/pokemon/icons/964s-hero.png b/public/images/pokemon/icons/9/964s-hero.png similarity index 100% rename from public/images/pokemon/icons/964s-hero.png rename to public/images/pokemon/icons/9/964s-hero.png diff --git a/public/images/pokemon/icons/964s-zero.png b/public/images/pokemon/icons/9/964s-zero.png similarity index 100% rename from public/images/pokemon/icons/964s-zero.png rename to public/images/pokemon/icons/9/964s-zero.png diff --git a/public/images/pokemon/icons/965.png b/public/images/pokemon/icons/9/965.png similarity index 100% rename from public/images/pokemon/icons/965.png rename to public/images/pokemon/icons/9/965.png diff --git a/public/images/pokemon/icons/965s.png b/public/images/pokemon/icons/9/965s.png similarity index 100% rename from public/images/pokemon/icons/965s.png rename to public/images/pokemon/icons/9/965s.png diff --git a/public/images/pokemon/icons/966.png b/public/images/pokemon/icons/9/966.png similarity index 100% rename from public/images/pokemon/icons/966.png rename to public/images/pokemon/icons/9/966.png diff --git a/public/images/pokemon/icons/966s.png b/public/images/pokemon/icons/9/966s.png similarity index 100% rename from public/images/pokemon/icons/966s.png rename to public/images/pokemon/icons/9/966s.png diff --git a/public/images/pokemon/icons/967.png b/public/images/pokemon/icons/9/967.png similarity index 100% rename from public/images/pokemon/icons/967.png rename to public/images/pokemon/icons/9/967.png diff --git a/public/images/pokemon/icons/967s.png b/public/images/pokemon/icons/9/967s.png similarity index 100% rename from public/images/pokemon/icons/967s.png rename to public/images/pokemon/icons/9/967s.png diff --git a/public/images/pokemon/icons/968.png b/public/images/pokemon/icons/9/968.png similarity index 100% rename from public/images/pokemon/icons/968.png rename to public/images/pokemon/icons/9/968.png diff --git a/public/images/pokemon/icons/968s.png b/public/images/pokemon/icons/9/968s.png similarity index 100% rename from public/images/pokemon/icons/968s.png rename to public/images/pokemon/icons/9/968s.png diff --git a/public/images/pokemon/icons/969.png b/public/images/pokemon/icons/9/969.png similarity index 100% rename from public/images/pokemon/icons/969.png rename to public/images/pokemon/icons/9/969.png diff --git a/public/images/pokemon/icons/969s.png b/public/images/pokemon/icons/9/969s.png similarity index 100% rename from public/images/pokemon/icons/969s.png rename to public/images/pokemon/icons/9/969s.png diff --git a/public/images/pokemon/icons/970.png b/public/images/pokemon/icons/9/970.png similarity index 100% rename from public/images/pokemon/icons/970.png rename to public/images/pokemon/icons/9/970.png diff --git a/public/images/pokemon/icons/970s.png b/public/images/pokemon/icons/9/970s.png similarity index 100% rename from public/images/pokemon/icons/970s.png rename to public/images/pokemon/icons/9/970s.png diff --git a/public/images/pokemon/icons/971.png b/public/images/pokemon/icons/9/971.png similarity index 100% rename from public/images/pokemon/icons/971.png rename to public/images/pokemon/icons/9/971.png diff --git a/public/images/pokemon/icons/971s.png b/public/images/pokemon/icons/9/971s.png similarity index 100% rename from public/images/pokemon/icons/971s.png rename to public/images/pokemon/icons/9/971s.png diff --git a/public/images/pokemon/icons/972.png b/public/images/pokemon/icons/9/972.png similarity index 100% rename from public/images/pokemon/icons/972.png rename to public/images/pokemon/icons/9/972.png diff --git a/public/images/pokemon/icons/972s.png b/public/images/pokemon/icons/9/972s.png similarity index 100% rename from public/images/pokemon/icons/972s.png rename to public/images/pokemon/icons/9/972s.png diff --git a/public/images/pokemon/icons/973.png b/public/images/pokemon/icons/9/973.png similarity index 100% rename from public/images/pokemon/icons/973.png rename to public/images/pokemon/icons/9/973.png diff --git a/public/images/pokemon/icons/973s.png b/public/images/pokemon/icons/9/973s.png similarity index 100% rename from public/images/pokemon/icons/973s.png rename to public/images/pokemon/icons/9/973s.png diff --git a/public/images/pokemon/icons/974.png b/public/images/pokemon/icons/9/974.png similarity index 100% rename from public/images/pokemon/icons/974.png rename to public/images/pokemon/icons/9/974.png diff --git a/public/images/pokemon/icons/974s.png b/public/images/pokemon/icons/9/974s.png similarity index 100% rename from public/images/pokemon/icons/974s.png rename to public/images/pokemon/icons/9/974s.png diff --git a/public/images/pokemon/icons/975.png b/public/images/pokemon/icons/9/975.png similarity index 100% rename from public/images/pokemon/icons/975.png rename to public/images/pokemon/icons/9/975.png diff --git a/public/images/pokemon/icons/975s.png b/public/images/pokemon/icons/9/975s.png similarity index 100% rename from public/images/pokemon/icons/975s.png rename to public/images/pokemon/icons/9/975s.png diff --git a/public/images/pokemon/icons/976.png b/public/images/pokemon/icons/9/976.png similarity index 100% rename from public/images/pokemon/icons/976.png rename to public/images/pokemon/icons/9/976.png diff --git a/public/images/pokemon/icons/976s.png b/public/images/pokemon/icons/9/976s.png similarity index 100% rename from public/images/pokemon/icons/976s.png rename to public/images/pokemon/icons/9/976s.png diff --git a/public/images/pokemon/icons/977.png b/public/images/pokemon/icons/9/977.png similarity index 100% rename from public/images/pokemon/icons/977.png rename to public/images/pokemon/icons/9/977.png diff --git a/public/images/pokemon/icons/977s.png b/public/images/pokemon/icons/9/977s.png similarity index 100% rename from public/images/pokemon/icons/977s.png rename to public/images/pokemon/icons/9/977s.png diff --git a/public/images/pokemon/icons/978-curly.png b/public/images/pokemon/icons/9/978-curly.png similarity index 100% rename from public/images/pokemon/icons/978-curly.png rename to public/images/pokemon/icons/9/978-curly.png diff --git a/public/images/pokemon/icons/978-droopy.png b/public/images/pokemon/icons/9/978-droopy.png similarity index 100% rename from public/images/pokemon/icons/978-droopy.png rename to public/images/pokemon/icons/9/978-droopy.png diff --git a/public/images/pokemon/icons/978-stretchy.png b/public/images/pokemon/icons/9/978-stretchy.png similarity index 100% rename from public/images/pokemon/icons/978-stretchy.png rename to public/images/pokemon/icons/9/978-stretchy.png diff --git a/public/images/pokemon/icons/978s-curly.png b/public/images/pokemon/icons/9/978s-curly.png similarity index 100% rename from public/images/pokemon/icons/978s-curly.png rename to public/images/pokemon/icons/9/978s-curly.png diff --git a/public/images/pokemon/icons/978s-droopy.png b/public/images/pokemon/icons/9/978s-droopy.png similarity index 100% rename from public/images/pokemon/icons/978s-droopy.png rename to public/images/pokemon/icons/9/978s-droopy.png diff --git a/public/images/pokemon/icons/978s-stretchy.png b/public/images/pokemon/icons/9/978s-stretchy.png similarity index 100% rename from public/images/pokemon/icons/978s-stretchy.png rename to public/images/pokemon/icons/9/978s-stretchy.png diff --git a/public/images/pokemon/icons/979.png b/public/images/pokemon/icons/9/979.png similarity index 100% rename from public/images/pokemon/icons/979.png rename to public/images/pokemon/icons/9/979.png diff --git a/public/images/pokemon/icons/979s.png b/public/images/pokemon/icons/9/979s.png similarity index 100% rename from public/images/pokemon/icons/979s.png rename to public/images/pokemon/icons/9/979s.png diff --git a/public/images/pokemon/icons/980.png b/public/images/pokemon/icons/9/980.png similarity index 100% rename from public/images/pokemon/icons/980.png rename to public/images/pokemon/icons/9/980.png diff --git a/public/images/pokemon/icons/980s.png b/public/images/pokemon/icons/9/980s.png similarity index 100% rename from public/images/pokemon/icons/980s.png rename to public/images/pokemon/icons/9/980s.png diff --git a/public/images/pokemon/icons/981.png b/public/images/pokemon/icons/9/981.png similarity index 100% rename from public/images/pokemon/icons/981.png rename to public/images/pokemon/icons/9/981.png diff --git a/public/images/pokemon/icons/981s.png b/public/images/pokemon/icons/9/981s.png similarity index 100% rename from public/images/pokemon/icons/981s.png rename to public/images/pokemon/icons/9/981s.png diff --git a/public/images/pokemon/icons/982-three-segment.png b/public/images/pokemon/icons/9/982-three-segment.png similarity index 100% rename from public/images/pokemon/icons/982-three-segment.png rename to public/images/pokemon/icons/9/982-three-segment.png diff --git a/public/images/pokemon/icons/982.png b/public/images/pokemon/icons/9/982.png similarity index 100% rename from public/images/pokemon/icons/982.png rename to public/images/pokemon/icons/9/982.png diff --git a/public/images/pokemon/icons/982s-three-segment.png b/public/images/pokemon/icons/9/982s-three-segment.png similarity index 100% rename from public/images/pokemon/icons/982s-three-segment.png rename to public/images/pokemon/icons/9/982s-three-segment.png diff --git a/public/images/pokemon/icons/982s.png b/public/images/pokemon/icons/9/982s.png similarity index 100% rename from public/images/pokemon/icons/982s.png rename to public/images/pokemon/icons/9/982s.png diff --git a/public/images/pokemon/icons/983.png b/public/images/pokemon/icons/9/983.png similarity index 100% rename from public/images/pokemon/icons/983.png rename to public/images/pokemon/icons/9/983.png diff --git a/public/images/pokemon/icons/983s.png b/public/images/pokemon/icons/9/983s.png similarity index 100% rename from public/images/pokemon/icons/983s.png rename to public/images/pokemon/icons/9/983s.png diff --git a/public/images/pokemon/icons/984.png b/public/images/pokemon/icons/9/984.png similarity index 100% rename from public/images/pokemon/icons/984.png rename to public/images/pokemon/icons/9/984.png diff --git a/public/images/pokemon/icons/984s.png b/public/images/pokemon/icons/9/984s.png similarity index 100% rename from public/images/pokemon/icons/984s.png rename to public/images/pokemon/icons/9/984s.png diff --git a/public/images/pokemon/icons/985.png b/public/images/pokemon/icons/9/985.png similarity index 100% rename from public/images/pokemon/icons/985.png rename to public/images/pokemon/icons/9/985.png diff --git a/public/images/pokemon/icons/985s.png b/public/images/pokemon/icons/9/985s.png similarity index 100% rename from public/images/pokemon/icons/985s.png rename to public/images/pokemon/icons/9/985s.png diff --git a/public/images/pokemon/icons/986.png b/public/images/pokemon/icons/9/986.png similarity index 100% rename from public/images/pokemon/icons/986.png rename to public/images/pokemon/icons/9/986.png diff --git a/public/images/pokemon/icons/986s.png b/public/images/pokemon/icons/9/986s.png similarity index 100% rename from public/images/pokemon/icons/986s.png rename to public/images/pokemon/icons/9/986s.png diff --git a/public/images/pokemon/icons/987.png b/public/images/pokemon/icons/9/987.png similarity index 100% rename from public/images/pokemon/icons/987.png rename to public/images/pokemon/icons/9/987.png diff --git a/public/images/pokemon/icons/987s.png b/public/images/pokemon/icons/9/987s.png similarity index 100% rename from public/images/pokemon/icons/987s.png rename to public/images/pokemon/icons/9/987s.png diff --git a/public/images/pokemon/icons/988.png b/public/images/pokemon/icons/9/988.png similarity index 100% rename from public/images/pokemon/icons/988.png rename to public/images/pokemon/icons/9/988.png diff --git a/public/images/pokemon/icons/988s.png b/public/images/pokemon/icons/9/988s.png similarity index 100% rename from public/images/pokemon/icons/988s.png rename to public/images/pokemon/icons/9/988s.png diff --git a/public/images/pokemon/icons/989.png b/public/images/pokemon/icons/9/989.png similarity index 100% rename from public/images/pokemon/icons/989.png rename to public/images/pokemon/icons/9/989.png diff --git a/public/images/pokemon/icons/989s.png b/public/images/pokemon/icons/9/989s.png similarity index 100% rename from public/images/pokemon/icons/989s.png rename to public/images/pokemon/icons/9/989s.png diff --git a/public/images/pokemon/icons/990.png b/public/images/pokemon/icons/9/990.png similarity index 100% rename from public/images/pokemon/icons/990.png rename to public/images/pokemon/icons/9/990.png diff --git a/public/images/pokemon/icons/990s.png b/public/images/pokemon/icons/9/990s.png similarity index 100% rename from public/images/pokemon/icons/990s.png rename to public/images/pokemon/icons/9/990s.png diff --git a/public/images/pokemon/icons/991.png b/public/images/pokemon/icons/9/991.png similarity index 100% rename from public/images/pokemon/icons/991.png rename to public/images/pokemon/icons/9/991.png diff --git a/public/images/pokemon/icons/991s.png b/public/images/pokemon/icons/9/991s.png similarity index 100% rename from public/images/pokemon/icons/991s.png rename to public/images/pokemon/icons/9/991s.png diff --git a/public/images/pokemon/icons/992.png b/public/images/pokemon/icons/9/992.png similarity index 100% rename from public/images/pokemon/icons/992.png rename to public/images/pokemon/icons/9/992.png diff --git a/public/images/pokemon/icons/992s.png b/public/images/pokemon/icons/9/992s.png similarity index 100% rename from public/images/pokemon/icons/992s.png rename to public/images/pokemon/icons/9/992s.png diff --git a/public/images/pokemon/icons/993.png b/public/images/pokemon/icons/9/993.png similarity index 100% rename from public/images/pokemon/icons/993.png rename to public/images/pokemon/icons/9/993.png diff --git a/public/images/pokemon/icons/993s.png b/public/images/pokemon/icons/9/993s.png similarity index 100% rename from public/images/pokemon/icons/993s.png rename to public/images/pokemon/icons/9/993s.png diff --git a/public/images/pokemon/icons/994.png b/public/images/pokemon/icons/9/994.png similarity index 100% rename from public/images/pokemon/icons/994.png rename to public/images/pokemon/icons/9/994.png diff --git a/public/images/pokemon/icons/994s.png b/public/images/pokemon/icons/9/994s.png similarity index 100% rename from public/images/pokemon/icons/994s.png rename to public/images/pokemon/icons/9/994s.png diff --git a/public/images/pokemon/icons/995.png b/public/images/pokemon/icons/9/995.png similarity index 100% rename from public/images/pokemon/icons/995.png rename to public/images/pokemon/icons/9/995.png diff --git a/public/images/pokemon/icons/995s.png b/public/images/pokemon/icons/9/995s.png similarity index 100% rename from public/images/pokemon/icons/995s.png rename to public/images/pokemon/icons/9/995s.png diff --git a/public/images/pokemon/icons/996.png b/public/images/pokemon/icons/9/996.png similarity index 100% rename from public/images/pokemon/icons/996.png rename to public/images/pokemon/icons/9/996.png diff --git a/public/images/pokemon/icons/996s.png b/public/images/pokemon/icons/9/996s.png similarity index 100% rename from public/images/pokemon/icons/996s.png rename to public/images/pokemon/icons/9/996s.png diff --git a/public/images/pokemon/icons/997.png b/public/images/pokemon/icons/9/997.png similarity index 100% rename from public/images/pokemon/icons/997.png rename to public/images/pokemon/icons/9/997.png diff --git a/public/images/pokemon/icons/997s.png b/public/images/pokemon/icons/9/997s.png similarity index 100% rename from public/images/pokemon/icons/997s.png rename to public/images/pokemon/icons/9/997s.png diff --git a/public/images/pokemon/icons/998.png b/public/images/pokemon/icons/9/998.png similarity index 100% rename from public/images/pokemon/icons/998.png rename to public/images/pokemon/icons/9/998.png diff --git a/public/images/pokemon/icons/998s.png b/public/images/pokemon/icons/9/998s.png similarity index 100% rename from public/images/pokemon/icons/998s.png rename to public/images/pokemon/icons/9/998s.png diff --git a/public/images/pokemon/icons/999-roaming.png b/public/images/pokemon/icons/9/999-roaming.png similarity index 100% rename from public/images/pokemon/icons/999-roaming.png rename to public/images/pokemon/icons/9/999-roaming.png diff --git a/public/images/pokemon/icons/999.png b/public/images/pokemon/icons/9/999.png similarity index 100% rename from public/images/pokemon/icons/999.png rename to public/images/pokemon/icons/9/999.png diff --git a/public/images/pokemon/icons/999s-roaming.png b/public/images/pokemon/icons/9/999s-roaming.png similarity index 100% rename from public/images/pokemon/icons/999s-roaming.png rename to public/images/pokemon/icons/9/999s-roaming.png diff --git a/public/images/pokemon/icons/999s.png b/public/images/pokemon/icons/9/999s.png similarity index 100% rename from public/images/pokemon/icons/999s.png rename to public/images/pokemon/icons/9/999s.png diff --git a/public/images/pokemon/icons/9/icons.bat b/public/images/pokemon/icons/9/icons.bat new file mode 100644 index 000000000..c887ceebc --- /dev/null +++ b/public/images/pokemon/icons/9/icons.bat @@ -0,0 +1 @@ +cmd /c TexturePacker ./ ../configuration.tps --sheet ../../../pokemon_icons_9.png --data ../../../pokemon_icons_9.json --replace .png= \ No newline at end of file diff --git a/public/images/pokemon/icons/configuration.tps b/public/images/pokemon/icons/configuration.tps new file mode 100644 index 000000000..a0cfa1c75 --- /dev/null +++ b/public/images/pokemon/icons/configuration.tps @@ -0,0 +1,207 @@ + + + + fileFormatVersion + 6 + texturePackerVersion + 7.1.0 + autoSDSettings + + + scale + 1 + extension + + spriteFilter + + acceptFractionalValues + + maxTextureSize + + width + -1 + height + -1 + + + + allowRotation + + shapeDebug + + dpi + 72 + dataFormat + phaser + textureFileName + + flipPVR + + pvrQualityLevel + 3 + astcQualityLevel + 2 + basisUniversalQualityLevel + 2 + etc1QualityLevel + 70 + etc2QualityLevel + 70 + dxtCompressionMode + DXT_PERCEPTUAL + ditherType + PngQuantLow + backgroundColor + 0 + libGdx + + filtering + + x + Linear + y + Linear + + + shapePadding + 0 + jpgQuality + 80 + pngOptimizationLevel + 1 + webpQualityLevel + 101 + textureSubPath + + textureFormat + png8 + borderPadding + 0 + maxTextureSize + + width + 512 + height + 1024 + + fixedTextureSize + + width + -1 + height + -1 + + algorithmSettings + + algorithm + MaxRects + freeSizeMode + Best + sizeConstraints + AnySize + forceSquared + + maxRects + + heuristic + Best + + basic + + sortBy + Best + order + Ascending + + polygon + + alignToGrid + 1 + + + dataFileNames + + json + + name + ../../pokemon_icons_9.json + + + multiPackMode + MultiPackOff + forceIdenticalLayout + + outputFormat + RGBA8888 + alphaHandling + ClearTransparentPixels + contentProtection + + key + + + autoAliasEnabled + + trimSpriteNames + + prependSmartFolderName + + autodetectAnimations + + globalSpriteSettings + + scale + 1 + scaleMode + Smooth + extrude + 0 + trimThreshold + 1 + trimMargin + 0 + trimMode + Trim + tracerTolerance + 200 + heuristicMask + + defaultPivotPoint + 0.5,0.5 + writePivotPoints + + + individualSpriteSettings + + fileLists + + default + + files + + + + ignoreFileList + + replaceList + + ignoredWarnings + + commonDivisorX + 1 + commonDivisorY + 1 + packNormalMaps + + autodetectNormalMaps + + normalMapFilter + + normalMapSuffix + + normalMapSheetFileName + + exporterProperties + + + diff --git a/public/images/pokemon/shiny/226.png b/public/images/pokemon/shiny/226.png index 33739283e..5b24827b5 100644 Binary files a/public/images/pokemon/shiny/226.png and b/public/images/pokemon/shiny/226.png differ diff --git a/public/images/pokemon/shiny/279.png b/public/images/pokemon/shiny/279.png index ab07ff1b3..c43634e86 100644 Binary files a/public/images/pokemon/shiny/279.png and b/public/images/pokemon/shiny/279.png differ diff --git a/public/images/pokemon/shiny/308.png b/public/images/pokemon/shiny/308.png index c47463a42..14e97cf83 100644 Binary files a/public/images/pokemon/shiny/308.png and b/public/images/pokemon/shiny/308.png differ diff --git a/public/images/pokemon/shiny/335.png b/public/images/pokemon/shiny/335.png index 9f7bcbc18..e4f8d10fb 100644 Binary files a/public/images/pokemon/shiny/335.png and b/public/images/pokemon/shiny/335.png differ diff --git a/public/images/pokemon/shiny/373-mega.png b/public/images/pokemon/shiny/373-mega.png index e938e10fb..4e9fe93fa 100644 Binary files a/public/images/pokemon/shiny/373-mega.png and b/public/images/pokemon/shiny/373-mega.png differ diff --git a/public/images/pokemon/shiny/373.png b/public/images/pokemon/shiny/373.png index 4db72ef4c..cae369ce4 100644 Binary files a/public/images/pokemon/shiny/373.png and b/public/images/pokemon/shiny/373.png differ diff --git a/public/images/pokemon/shiny/477.png b/public/images/pokemon/shiny/477.png index 131162b56..0f14172f0 100644 Binary files a/public/images/pokemon/shiny/477.png and b/public/images/pokemon/shiny/477.png differ diff --git a/public/images/pokemon/shiny/716-active.png b/public/images/pokemon/shiny/716-active.png index d076c0652..077c657f8 100644 Binary files a/public/images/pokemon/shiny/716-active.png and b/public/images/pokemon/shiny/716-active.png differ diff --git a/public/images/pokemon/shiny/716-neutral.png b/public/images/pokemon/shiny/716-neutral.png index d076c0652..ffe04571a 100644 Binary files a/public/images/pokemon/shiny/716-neutral.png and b/public/images/pokemon/shiny/716-neutral.png differ diff --git a/public/images/pokemon/shiny/997.png b/public/images/pokemon/shiny/997.png index 8ebe1d219..a9efb86b9 100644 Binary files a/public/images/pokemon/shiny/997.png and b/public/images/pokemon/shiny/997.png differ diff --git a/public/images/pokemon_icons_1.json b/public/images/pokemon_icons_1.json index e07d75883..5d56b4b21 100644 --- a/public/images/pokemon_icons_1.json +++ b/public/images/pokemon_icons_1.json @@ -4,8 +4,8 @@ "image": "pokemon_icons_1.png", "format": "RGBA8888", "size": { - "w": 252, - "h": 772 + "w": 256, + "h": 761 }, "scale": 1, "frames": [ @@ -639,6 +639,27 @@ "h": 27 } }, + { + "filename": "48", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 2, + "w": 17, + "h": 26 + }, + "frame": { + "x": 239, + "y": 0, + "w": 17, + "h": 26 + } + }, { "filename": "131-gigantamax", "rotated": false, @@ -717,8 +738,8 @@ "h": 25 }, "frame": { - "x": 0, - "y": 747, + "x": 75, + "y": 27, "w": 31, "h": 25 } @@ -738,7 +759,7 @@ "h": 25 }, "frame": { - "x": 75, + "x": 106, "y": 27, "w": 31, "h": 25 @@ -759,7 +780,7 @@ "h": 25 }, "frame": { - "x": 106, + "x": 137, "y": 27, "w": 31, "h": 25 @@ -780,7 +801,7 @@ "h": 25 }, "frame": { - "x": 137, + "x": 168, "y": 27, "w": 31, "h": 25 @@ -800,27 +821,6 @@ "w": 31, "h": 25 }, - "frame": { - "x": 168, - "y": 27, - "w": 31, - "h": 25 - } - }, - { - "filename": "127s-mega", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 31, - "h": 25 - }, "frame": { "x": 199, "y": 27, @@ -829,7 +829,7 @@ } }, { - "filename": "129", + "filename": "89", "rotated": false, "trimmed": true, "sourceSize": { @@ -837,16 +837,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 22, - "h": 24 + "x": 8, + "y": 3, + "w": 26, + "h": 25 }, "frame": { "x": 230, "y": 27, - "w": 22, - "h": 24 + "w": 26, + "h": 25 } }, { @@ -892,7 +892,7 @@ } }, { - "filename": "3", + "filename": "127s-mega", "rotated": false, "trimmed": true, "sourceSize": { @@ -900,37 +900,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 5, + "x": 6, "y": 4, - "w": 30, - "h": 24 + "w": 31, + "h": 25 }, "frame": { "x": 102, "y": 52, - "w": 30, - "h": 24 - } - }, - { - "filename": "3s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 30, - "h": 24 - }, - "frame": { - "x": 132, - "y": 52, - "w": 30, - "h": 24 + "w": 31, + "h": 25 } }, { @@ -948,7 +927,7 @@ "h": 26 }, "frame": { - "x": 162, + "x": 133, "y": 52, "w": 30, "h": 26 @@ -969,7 +948,7 @@ "h": 26 }, "frame": { - "x": 192, + "x": 163, "y": 52, "w": 30, "h": 26 @@ -990,7 +969,28 @@ "h": 27 }, "frame": { - "x": 222, + "x": 193, + "y": 52, + "w": 30, + "h": 27 + } + }, + { + "filename": "95s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 1, + "w": 30, + "h": 27 + }, + "frame": { + "x": 223, "y": 52, "w": 30, "h": 27 @@ -1018,7 +1018,7 @@ } }, { - "filename": "95s", + "filename": "130", "rotated": false, "trimmed": true, "sourceSize": { @@ -1027,19 +1027,19 @@ }, "spriteSourceSize": { "x": 6, - "y": 1, - "w": 30, - "h": 27 + "y": 2, + "w": 29, + "h": 28 }, "frame": { "x": 63, "y": 76, - "w": 30, - "h": 27 + "w": 29, + "h": 28 } }, { - "filename": "130", + "filename": "130s", "rotated": false, "trimmed": true, "sourceSize": { @@ -1059,27 +1059,6 @@ "h": 28 } }, - { - "filename": "130s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 29, - "h": 28 - }, - "frame": { - "x": 63, - "y": 103, - "w": 29, - "h": 28 - } - }, { "filename": "59", "rotated": false, @@ -1095,12 +1074,96 @@ "h": 27 }, "frame": { - "x": 93, - "y": 76, + "x": 63, + "y": 104, "w": 29, "h": 27 } }, + { + "filename": "133-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 0, + "w": 27, + "h": 30 + }, + "frame": { + "x": 92, + "y": 77, + "w": 27, + "h": 30 + } + }, + { + "filename": "3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 30, + "h": 24 + }, + "frame": { + "x": 92, + "y": 107, + "w": 30, + "h": 24 + } + }, + { + "filename": "50", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 14, + "w": 15, + "h": 14 + }, + "frame": { + "x": 0, + "y": 747, + "w": 15, + "h": 14 + } + }, + { + "filename": "50s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 14, + "w": 15, + "h": 14 + }, + "frame": { + "x": 15, + "y": 747, + "w": 15, + "h": 14 + } + }, { "filename": "59s", "rotated": false, @@ -1116,8 +1179,8 @@ "h": 27 }, "frame": { - "x": 92, - "y": 103, + "x": 119, + "y": 78, "w": 29, "h": 27 } @@ -1137,75 +1200,12 @@ "h": 26 }, "frame": { - "x": 122, - "y": 76, + "x": 148, + "y": 78, "w": 29, "h": 26 } }, - { - "filename": "14", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 13, - "h": 18 - }, - "frame": { - "x": 239, - "y": 0, - "w": 13, - "h": 18 - } - }, - { - "filename": "99", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 30, - "h": 25 - }, - "frame": { - "x": 151, - "y": 78, - "w": 30, - "h": 25 - } - }, - { - "filename": "99s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 30, - "h": 25 - }, - "frame": { - "x": 181, - "y": 78, - "w": 30, - "h": 25 - } - }, { "filename": "3s-mega", "rotated": false, @@ -1221,14 +1221,98 @@ "h": 26 }, "frame": { - "x": 211, + "x": 122, + "y": 105, + "w": 29, + "h": 26 + } + }, + { + "filename": "133s-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 0, + "w": 27, + "h": 30 + }, + "frame": { + "x": 151, + "y": 104, + "w": 27, + "h": 30 + } + }, + { + "filename": "99", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 30, + "h": 25 + }, + "frame": { + "x": 177, + "y": 79, + "w": 30, + "h": 25 + } + }, + { + "filename": "78", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 2, + "w": 29, + "h": 26 + }, + "frame": { + "x": 178, + "y": 104, + "w": 29, + "h": 26 + } + }, + { + "filename": "78s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 2, + "w": 29, + "h": 26 + }, + "frame": { + "x": 207, "y": 79, "w": 29, "h": 26 } }, { - "filename": "11", + "filename": "150-mega-y", "rotated": false, "trimmed": true, "sourceSize": { @@ -1236,20 +1320,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 14, - "y": 10, - "w": 12, - "h": 18 + "x": 10, + "y": 0, + "w": 20, + "h": 30 }, "frame": { - "x": 240, + "x": 236, "y": 79, - "w": 12, - "h": 18 + "w": 20, + "h": 30 } }, { - "filename": "11s", + "filename": "64", "rotated": false, "trimmed": true, "sourceSize": { @@ -1257,16 +1341,142 @@ "h": 30 }, "spriteSourceSize": { - "x": 14, - "y": 10, - "w": 12, - "h": 18 + "x": 5, + "y": 3, + "w": 29, + "h": 25 }, "frame": { - "x": 240, - "y": 97, - "w": 12, - "h": 18 + "x": 207, + "y": 105, + "w": 29, + "h": 25 + } + }, + { + "filename": "150s-mega-y", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 0, + "w": 20, + "h": 30 + }, + "frame": { + "x": 236, + "y": 109, + "w": 20, + "h": 30 + } + }, + { + "filename": "3s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 30, + "h": 24 + }, + "frame": { + "x": 178, + "y": 130, + "w": 30, + "h": 24 + } + }, + { + "filename": "57", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 28, + "h": 23 + }, + "frame": { + "x": 208, + "y": 130, + "w": 28, + "h": 23 + } + }, + { + "filename": "24", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 20, + "h": 23 + }, + "frame": { + "x": 236, + "y": 139, + "w": 20, + "h": 23 + } + }, + { + "filename": "56", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 8, + "w": 28, + "h": 20 + }, + "frame": { + "x": 208, + "y": 153, + "w": 28, + "h": 20 + } + }, + { + "filename": "24s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 20, + "h": 23 + }, + "frame": { + "x": 236, + "y": 162, + "w": 20, + "h": 23 } }, { @@ -1311,132 +1521,6 @@ "h": 30 } }, - { - "filename": "133-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 27, - "h": 30 - }, - "frame": { - "x": 32, - "y": 193, - "w": 27, - "h": 30 - } - }, - { - "filename": "133s-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 27, - "h": 30 - }, - "frame": { - "x": 32, - "y": 223, - "w": 27, - "h": 30 - } - }, - { - "filename": "15-mega", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 27, - "h": 26 - }, - "frame": { - "x": 32, - "y": 253, - "w": 27, - "h": 26 - } - }, - { - "filename": "15s-mega", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 27, - "h": 26 - }, - "frame": { - "x": 32, - "y": 279, - "w": 27, - "h": 26 - } - }, - { - "filename": "25-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 21, - "h": 30 - }, - "frame": { - "x": 56, - "y": 132, - "w": 21, - "h": 30 - } - }, - { - "filename": "25s-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 21, - "h": 30 - }, - "frame": { - "x": 56, - "y": 162, - "w": 21, - "h": 30 - } - }, { "filename": "52-gigantamax", "rotated": false, @@ -1452,8 +1536,8 @@ "h": 30 }, "frame": { - "x": 59, - "y": 192, + "x": 32, + "y": 193, "w": 23, "h": 30 } @@ -1473,14 +1557,14 @@ "h": 30 }, "frame": { - "x": 59, - "y": 222, + "x": 32, + "y": 223, "w": 23, "h": 30 } }, { - "filename": "150-mega-y", + "filename": "25-gigantamax", "rotated": false, "trimmed": true, "sourceSize": { @@ -1490,18 +1574,18 @@ "spriteSourceSize": { "x": 10, "y": 0, - "w": 20, + "w": 21, "h": 30 }, "frame": { - "x": 59, - "y": 252, - "w": 20, + "x": 32, + "y": 253, + "w": 21, "h": 30 } }, { - "filename": "150s-mega-y", + "filename": "25s-gigantamax", "rotated": false, "trimmed": true, "sourceSize": { @@ -1511,18 +1595,18 @@ "spriteSourceSize": { "x": 10, "y": 0, - "w": 20, + "w": 21, "h": 30 }, "frame": { - "x": 77, - "y": 131, - "w": 20, + "x": 32, + "y": 283, + "w": 21, "h": 30 } }, { - "filename": "78", + "filename": "15-mega", "rotated": false, "trimmed": true, "sourceSize": { @@ -1531,19 +1615,19 @@ }, "spriteSourceSize": { "x": 7, - "y": 2, - "w": 29, + "y": 3, + "w": 27, "h": 26 }, "frame": { - "x": 97, - "y": 130, - "w": 29, + "x": 31, + "y": 313, + "w": 27, "h": 26 } }, { - "filename": "78s", + "filename": "15s-mega", "rotated": false, "trimmed": true, "sourceSize": { @@ -1552,19 +1636,19 @@ }, "spriteSourceSize": { "x": 7, - "y": 2, - "w": 29, + "y": 3, + "w": 27, "h": 26 }, "frame": { - "x": 77, - "y": 161, - "w": 29, + "x": 31, + "y": 339, + "w": 27, "h": 26 } }, { - "filename": "80-mega", + "filename": "22", "rotated": false, "trimmed": true, "sourceSize": { @@ -1572,20 +1656,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 25, - "h": 26 + "x": 5, + "y": 6, + "w": 30, + "h": 22 }, "frame": { - "x": 82, - "y": 187, - "w": 25, - "h": 26 + "x": 31, + "y": 365, + "w": 30, + "h": 22 } }, { - "filename": "80s-mega", + "filename": "99s", "rotated": false, "trimmed": true, "sourceSize": { @@ -1593,37 +1677,79 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 25, - "h": 26 - }, - "frame": { - "x": 82, - "y": 213, - "w": 25, - "h": 26 - } - }, - { - "filename": "5", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, + "x": 6, "y": 5, - "w": 22, - "h": 23 + "w": 30, + "h": 25 }, "frame": { - "x": 59, - "y": 282, - "w": 22, - "h": 23 + "x": 30, + "y": 387, + "w": 30, + "h": 25 + } + }, + { + "filename": "64s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 3, + "w": 29, + "h": 25 + }, + "frame": { + "x": 30, + "y": 412, + "w": 29, + "h": 25 + } + }, + { + "filename": "85", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 3, + "w": 29, + "h": 25 + }, + "frame": { + "x": 30, + "y": 437, + "w": 29, + "h": 25 + } + }, + { + "filename": "85s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 3, + "w": 29, + "h": 25 + }, + "frame": { + "x": 30, + "y": 462, + "w": 29, + "h": 25 } }, { @@ -1641,8 +1767,8 @@ "h": 26 }, "frame": { - "x": 106, - "y": 156, + "x": 30, + "y": 487, "w": 27, "h": 26 } @@ -1662,35 +1788,14 @@ "h": 26 }, "frame": { - "x": 107, - "y": 182, + "x": 30, + "y": 513, "w": 27, "h": 26 } }, { - "filename": "64", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 29, - "h": 25 - }, - "frame": { - "x": 107, - "y": 208, - "w": 29, - "h": 25 - } - }, - { - "filename": "9", + "filename": "80-mega", "rotated": false, "trimmed": true, "sourceSize": { @@ -1699,292 +1804,19 @@ }, "spriteSourceSize": { "x": 7, - "y": 4, + "y": 2, "w": 25, - "h": 24 + "h": 26 }, "frame": { - "x": 82, - "y": 239, + "x": 30, + "y": 539, "w": 25, - "h": 24 + "h": 26 } }, { - "filename": "64s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 29, - "h": 25 - }, - "frame": { - "x": 107, - "y": 233, - "w": 29, - "h": 25 - } - }, - { - "filename": "145", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 29, - "h": 19 - }, - "frame": { - "x": 79, - "y": 263, - "w": 29, - "h": 19 - } - }, - { - "filename": "57", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 28, - "h": 23 - }, - "frame": { - "x": 81, - "y": 282, - "w": 28, - "h": 23 - } - }, - { - "filename": "143", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 27, - "h": 24 - }, - "frame": { - "x": 108, - "y": 258, - "w": 27, - "h": 24 - } - }, - { - "filename": "57s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 28, - "h": 23 - }, - "frame": { - "x": 109, - "y": 282, - "w": 28, - "h": 23 - } - }, - { - "filename": "22", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 30, - "h": 22 - }, - "frame": { - "x": 32, - "y": 305, - "w": 30, - "h": 22 - } - }, - { - "filename": "85", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 29, - "h": 25 - }, - "frame": { - "x": 31, - "y": 327, - "w": 29, - "h": 25 - } - }, - { - "filename": "22s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 30, - "h": 22 - }, - "frame": { - "x": 62, - "y": 305, - "w": 30, - "h": 22 - } - }, - { - "filename": "85s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 29, - "h": 25 - }, - "frame": { - "x": 60, - "y": 327, - "w": 29, - "h": 25 - } - }, - { - "filename": "115-mega", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 30, - "h": 22 - }, - "frame": { - "x": 92, - "y": 305, - "w": 30, - "h": 22 - } - }, - { - "filename": "115s-mega", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 30, - "h": 22 - }, - "frame": { - "x": 89, - "y": 327, - "w": 30, - "h": 22 - } - }, - { - "filename": "62", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 29, - "h": 21 - }, - "frame": { - "x": 31, - "y": 352, - "w": 29, - "h": 21 - } - }, - { - "filename": "62s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 29, - "h": 21 - }, - "frame": { - "x": 60, - "y": 352, - "w": 29, - "h": 21 - } - }, - { - "filename": "71", + "filename": "80s-mega", "rotated": false, "trimmed": true, "sourceSize": { @@ -1993,78 +1825,15 @@ }, "spriteSourceSize": { "x": 7, - "y": 5, - "w": 28, - "h": 23 - }, - "frame": { - "x": 89, - "y": 349, - "w": 28, - "h": 23 - } - }, - { - "filename": "71s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 28, - "h": 23 + "y": 2, + "w": 25, + "h": 26 }, "frame": { "x": 30, - "y": 373, - "w": 28, - "h": 23 - } - }, - { - "filename": "89", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 26, - "h": 25 - }, - "frame": { - "x": 30, - "y": 396, - "w": 26, - "h": 25 - } - }, - { - "filename": "89s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 26, - "h": 25 - }, - "frame": { - "x": 30, - "y": 421, - "w": 26, - "h": 25 + "y": 565, + "w": 25, + "h": 26 } }, { @@ -2083,7 +1852,7 @@ }, "frame": { "x": 30, - "y": 446, + "y": 591, "w": 25, "h": 26 } @@ -2104,11 +1873,158 @@ }, "frame": { "x": 30, - "y": 472, + "y": 617, "w": 25, "h": 26 } }, + { + "filename": "56s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 8, + "w": 28, + "h": 20 + }, + "frame": { + "x": 30, + "y": 643, + "w": 28, + "h": 20 + } + }, + { + "filename": "89s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 26, + "h": 25 + }, + "frame": { + "x": 31, + "y": 663, + "w": 26, + "h": 25 + } + }, + { + "filename": "143", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 27, + "h": 24 + }, + "frame": { + "x": 31, + "y": 688, + "w": 27, + "h": 24 + } + }, + { + "filename": "22s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 30, + "h": 22 + }, + "frame": { + "x": 31, + "y": 712, + "w": 30, + "h": 22 + } + }, + { + "filename": "115-mega", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 6, + "w": 30, + "h": 22 + }, + "frame": { + "x": 30, + "y": 734, + "w": 30, + "h": 22 + } + }, + { + "filename": "48s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 2, + "w": 17, + "h": 26 + }, + "frame": { + "x": 56, + "y": 132, + "w": 17, + "h": 26 + } + }, + { + "filename": "115s-mega", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 6, + "w": 30, + "h": 22 + }, + "frame": { + "x": 73, + "y": 131, + "w": 30, + "h": 22 + } + }, { "filename": "142", "rotated": false, @@ -2124,14 +2040,14 @@ "h": 22 }, "frame": { - "x": 58, - "y": 373, + "x": 103, + "y": 131, "w": 29, "h": 22 } }, { - "filename": "9s", + "filename": "30", "rotated": false, "trimmed": true, "sourceSize": { @@ -2139,226 +2055,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 25, - "h": 24 + "x": 11, + "y": 6, + "w": 19, + "h": 22 }, "frame": { - "x": 30, - "y": 498, - "w": 25, - "h": 24 - } - }, - { - "filename": "26", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 25, - "h": 24 - }, - "frame": { - "x": 30, - "y": 522, - "w": 25, - "h": 24 - } - }, - { - "filename": "26s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 25, - "h": 24 - }, - "frame": { - "x": 30, - "y": 546, - "w": 25, - "h": 24 - } - }, - { - "filename": "91", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 25, - "h": 24 - }, - "frame": { - "x": 30, - "y": 570, - "w": 25, - "h": 24 - } - }, - { - "filename": "91s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 25, - "h": 24 - }, - "frame": { - "x": 30, - "y": 594, - "w": 25, - "h": 24 - } - }, - { - "filename": "143s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 27, - "h": 24 - }, - "frame": { - "x": 30, - "y": 618, - "w": 27, - "h": 24 - } - }, - { - "filename": "98", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 28, - "h": 21 - }, - "frame": { - "x": 30, - "y": 642, - "w": 28, - "h": 21 - } - }, - { - "filename": "80", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 27, - "h": 23 - }, - "frame": { - "x": 31, - "y": 663, - "w": 27, - "h": 23 - } - }, - { - "filename": "80s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 27, - "h": 23 - }, - "frame": { - "x": 31, - "y": 686, - "w": 27, - "h": 23 - } - }, - { - "filename": "5s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 23 - }, - "frame": { - "x": 122, - "y": 305, - "w": 22, - "h": 23 - } - }, - { - "filename": "15", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 25, - "h": 23 - }, - "frame": { - "x": 119, - "y": 328, - "w": 25, - "h": 23 + "x": 132, + "y": 131, + "w": 19, + "h": 22 } }, { @@ -2376,56 +2082,14 @@ "h": 22 }, "frame": { - "x": 117, - "y": 351, + "x": 151, + "y": 134, "w": 27, "h": 22 } }, { - "filename": "56", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 8, - "w": 28, - "h": 20 - }, - "frame": { - "x": 31, - "y": 709, - "w": 28, - "h": 20 - } - }, - { - "filename": "146", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 8, - "w": 28, - "h": 18 - }, - "frame": { - "x": 29, - "y": 729, - "w": 28, - "h": 18 - } - }, - { - "filename": "151", + "filename": "150-mega-x", "rotated": false, "trimmed": true, "sourceSize": { @@ -2435,18 +2099,18 @@ "spriteSourceSize": { "x": 9, "y": 2, - "w": 23, - "h": 25 + "w": 21, + "h": 26 }, "frame": { - "x": 31, - "y": 747, - "w": 23, - "h": 25 + "x": 56, + "y": 158, + "w": 21, + "h": 26 } }, { - "filename": "151s", + "filename": "57s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2454,20 +2118,125 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 23, - "h": 25 + "x": 6, + "y": 5, + "w": 28, + "h": 23 }, "frame": { - "x": 54, - "y": 747, - "w": 23, - "h": 25 + "x": 77, + "y": 153, + "w": 28, + "h": 23 } }, { - "filename": "27", + "filename": "71", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 28, + "h": 23 + }, + "frame": { + "x": 105, + "y": 153, + "w": 28, + "h": 23 + } + }, + { + "filename": "23", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 18, + "h": 21 + }, + "frame": { + "x": 133, + "y": 153, + "w": 18, + "h": 21 + } + }, + { + "filename": "62", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 29, + "h": 21 + }, + "frame": { + "x": 151, + "y": 156, + "w": 29, + "h": 21 + } + }, + { + "filename": "71s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 28, + "h": 23 + }, + "frame": { + "x": 180, + "y": 154, + "w": 28, + "h": 23 + } + }, + { + "filename": "98", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 28, + "h": 21 + }, + "frame": { + "x": 208, + "y": 173, + "w": 28, + "h": 21 + } + }, + { + "filename": "36", "rotated": false, "trimmed": true, "sourceSize": { @@ -2476,15 +2245,183 @@ }, "spriteSourceSize": { "x": 10, - "y": 10, + "y": 5, "w": 20, - "h": 18 + "h": 23 }, "frame": { - "x": 57, - "y": 729, + "x": 236, + "y": 185, "w": 20, - "h": 18 + "h": 23 + } + }, + { + "filename": "62s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 29, + "h": 21 + }, + "frame": { + "x": 77, + "y": 176, + "w": 29, + "h": 21 + } + }, + { + "filename": "68s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 27, + "h": 22 + }, + "frame": { + "x": 106, + "y": 176, + "w": 27, + "h": 22 + } + }, + { + "filename": "2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 56, + "y": 184, + "w": 21, + "h": 20 + } + }, + { + "filename": "150s-mega-x", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 21, + "h": 26 + }, + "frame": { + "x": 55, + "y": 204, + "w": 21, + "h": 26 + } + }, + { + "filename": "5", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 23 + }, + "frame": { + "x": 55, + "y": 230, + "w": 22, + "h": 23 + } + }, + { + "filename": "9", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 25, + "h": 24 + }, + "frame": { + "x": 53, + "y": 253, + "w": 25, + "h": 24 + } + }, + { + "filename": "9s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 25, + "h": 24 + }, + "frame": { + "x": 53, + "y": 277, + "w": 25, + "h": 24 + } + }, + { + "filename": "23s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 18, + "h": 21 + }, + "frame": { + "x": 133, + "y": 174, + "w": 18, + "h": 21 } }, { @@ -2502,8 +2439,8 @@ "h": 22 }, "frame": { - "x": 122, - "y": 102, + "x": 151, + "y": 177, "w": 29, "h": 22 } @@ -2523,14 +2460,14 @@ "h": 21 }, "frame": { - "x": 151, - "y": 103, + "x": 180, + "y": 177, "w": 28, "h": 21 } }, { - "filename": "56s", + "filename": "146", "rotated": false, "trimmed": true, "sourceSize": { @@ -2541,38 +2478,17 @@ "x": 7, "y": 8, "w": 28, - "h": 20 + "h": 18 }, "frame": { - "x": 179, - "y": 103, + "x": 208, + "y": 194, "w": 28, - "h": 20 + "h": 18 } }, { - "filename": "68s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 27, - "h": 22 - }, - "frame": { - "x": 126, - "y": 124, - "w": 27, - "h": 22 - } - }, - { - "filename": "42", + "filename": "36s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2582,18 +2498,18 @@ "spriteSourceSize": { "x": 10, "y": 5, - "w": 26, - "h": 22 + "w": 20, + "h": 23 }, "frame": { - "x": 153, - "y": 124, - "w": 26, - "h": 22 + "x": 236, + "y": 208, + "w": 20, + "h": 23 } }, { - "filename": "15s", + "filename": "146s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2601,18 +2517,81 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 25, + "x": 7, + "y": 8, + "w": 28, + "h": 18 + }, + "frame": { + "x": 180, + "y": 198, + "w": 28, + "h": 18 + } + }, + { + "filename": "145", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 29, + "h": 19 + }, + "frame": { + "x": 77, + "y": 197, + "w": 29, + "h": 19 + } + }, + { + "filename": "80", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 27, "h": 23 }, "frame": { - "x": 179, - "y": 123, - "w": 25, + "x": 106, + "y": 198, + "w": 27, "h": 23 } }, + { + "filename": "54", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 18, + "h": 21 + }, + "frame": { + "x": 133, + "y": 195, + "w": 18, + "h": 21 + } + }, { "filename": "145s", "rotated": false, @@ -2628,12 +2607,117 @@ "h": 19 }, "frame": { - "x": 207, - "y": 105, + "x": 151, + "y": 199, "w": 29, "h": 19 } }, + { + "filename": "143s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 27, + "h": 24 + }, + "frame": { + "x": 77, + "y": 216, + "w": 27, + "h": 24 + } + }, + { + "filename": "80s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 27, + "h": 23 + }, + "frame": { + "x": 104, + "y": 221, + "w": 27, + "h": 23 + } + }, + { + "filename": "42", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 26, + "h": 22 + }, + "frame": { + "x": 78, + "y": 240, + "w": 26, + "h": 22 + } + }, + { + "filename": "26", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 25, + "h": 24 + }, + "frame": { + "x": 78, + "y": 262, + "w": 25, + "h": 24 + } + }, + { + "filename": "144", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 27, + "h": 20 + }, + "frame": { + "x": 104, + "y": 244, + "w": 27, + "h": 20 + } + }, { "filename": "42s", "rotated": false, @@ -2649,14 +2733,35 @@ "h": 22 }, "frame": { - "x": 204, - "y": 124, + "x": 103, + "y": 264, "w": 26, "h": 22 } }, { - "filename": "129s", + "filename": "144s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 27, + "h": 20 + }, + "frame": { + "x": 78, + "y": 286, + "w": 27, + "h": 20 + } + }, + { + "filename": "8", "rotated": false, "trimmed": true, "sourceSize": { @@ -2665,15 +2770,141 @@ }, "spriteSourceSize": { "x": 10, - "y": 5, - "w": 22, - "h": 24 + "y": 6, + "w": 24, + "h": 22 }, "frame": { - "x": 230, - "y": 124, + "x": 105, + "y": 286, + "w": 24, + "h": 22 + } + }, + { + "filename": "150", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 5, + "w": 20, + "h": 23 + }, + "frame": { + "x": 58, + "y": 301, + "w": 20, + "h": 23 + } + }, + { + "filename": "151", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 23, + "h": 25 + }, + "frame": { + "x": 58, + "y": 324, + "w": 23, + "h": 25 + } + }, + { + "filename": "102", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 10, + "w": 24, + "h": 18 + }, + "frame": { + "x": 78, + "y": 306, + "w": 24, + "h": 18 + } + }, + { + "filename": "151s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 23, + "h": 25 + }, + "frame": { + "x": 81, + "y": 324, + "w": 23, + "h": 25 + } + }, + { + "filename": "74", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 13, + "w": 24, + "h": 15 + }, + "frame": { + "x": 58, + "y": 349, + "w": 24, + "h": 15 + } + }, + { + "filename": "5s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, "w": 22, - "h": 24 + "h": 23 + }, + "frame": { + "x": 61, + "y": 364, + "w": 22, + "h": 23 } }, { @@ -2691,12 +2922,54 @@ "h": 24 }, "frame": { - "x": 133, - "y": 146, + "x": 60, + "y": 387, "w": 24, "h": 24 } }, + { + "filename": "74s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 13, + "w": 24, + "h": 15 + }, + "frame": { + "x": 82, + "y": 349, + "w": 24, + "h": 15 + } + }, + { + "filename": "15", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 25, + "h": 23 + }, + "frame": { + "x": 83, + "y": 364, + "w": 25, + "h": 23 + } + }, { "filename": "12s", "rotated": false, @@ -2712,56 +2985,14 @@ "h": 24 }, "frame": { - "x": 157, - "y": 146, + "x": 84, + "y": 387, "w": 24, "h": 24 } }, { - "filename": "18", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 25, - "h": 23 - }, - "frame": { - "x": 181, - "y": 146, - "w": 25, - "h": 23 - } - }, - { - "filename": "38", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 23 - }, - "frame": { - "x": 206, - "y": 146, - "w": 24, - "h": 23 - } - }, - { - "filename": "45", + "filename": "81", "rotated": false, "trimmed": true, "sourceSize": { @@ -2770,19 +3001,82 @@ }, "spriteSourceSize": { "x": 9, - "y": 5, - "w": 22, - "h": 23 + "y": 12, + "w": 23, + "h": 15 }, "frame": { - "x": 230, - "y": 148, - "w": 22, - "h": 23 + "x": 102, + "y": 308, + "w": 23, + "h": 15 } }, { - "filename": "18s", + "filename": "26s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 25, + "h": 24 + }, + "frame": { + "x": 104, + "y": 323, + "w": 25, + "h": 24 + } + }, + { + "filename": "7", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 11, + "w": 21, + "h": 17 + }, + "frame": { + "x": 106, + "y": 347, + "w": 21, + "h": 17 + } + }, + { + "filename": "49", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 108, + "y": 364, + "w": 23, + "h": 24 + } + }, + { + "filename": "15s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2791,38 +3085,17 @@ }, "spriteSourceSize": { "x": 8, - "y": 5, + "y": 4, "w": 25, "h": 23 }, "frame": { - "x": 134, - "y": 170, + "x": 108, + "y": 388, "w": 25, "h": 23 } }, - { - "filename": "31", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 23, - "h": 23 - }, - "frame": { - "x": 159, - "y": 170, - "w": 23, - "h": 23 - } - }, { "filename": "67", "rotated": false, @@ -2838,35 +3111,14 @@ "h": 22 }, "frame": { - "x": 182, - "y": 169, + "x": 208, + "y": 212, "w": 26, "h": 22 } }, { - "filename": "45s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 23 - }, - "frame": { - "x": 208, - "y": 169, - "w": 22, - "h": 23 - } - }, - { - "filename": "126", + "filename": "129", "rotated": false, "trimmed": true, "sourceSize": { @@ -2877,181 +3129,13 @@ "x": 10, "y": 5, "w": 22, - "h": 23 + "h": 24 }, "frame": { - "x": 230, - "y": 171, + "x": 234, + "y": 231, "w": 22, - "h": 23 - } - }, - { - "filename": "74", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 24, - "h": 15 - }, - "frame": { - "x": 134, - "y": 193, - "w": 24, - "h": 15 - } - }, - { - "filename": "150-mega-x", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 21, - "h": 26 - }, - "frame": { - "x": 136, - "y": 208, - "w": 21, - "h": 26 - } - }, - { - "filename": "49", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 23, "h": 24 - }, - "frame": { - "x": 136, - "y": 234, - "w": 23, - "h": 24 - } - }, - { - "filename": "94", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 135, - "y": 258, - "w": 24, - "h": 24 - } - }, - { - "filename": "31s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 23, - "h": 23 - }, - "frame": { - "x": 137, - "y": 282, - "w": 23, - "h": 23 - } - }, - { - "filename": "48", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 17, - "h": 26 - }, - "frame": { - "x": 144, - "y": 305, - "w": 17, - "h": 26 - } - }, - { - "filename": "48s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 17, - "h": 26 - }, - "frame": { - "x": 144, - "y": 331, - "w": 17, - "h": 26 - } - }, - { - "filename": "8", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 24, - "h": 22 - }, - "frame": { - "x": 158, - "y": 193, - "w": 24, - "h": 22 } }, { @@ -3069,14 +3153,14 @@ "h": 22 }, "frame": { - "x": 182, - "y": 191, + "x": 180, + "y": 216, "w": 26, "h": 22 } }, { - "filename": "44", + "filename": "75", "rotated": false, "trimmed": true, "sourceSize": { @@ -3084,79 +3168,205 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 22, - "h": 21 + "x": 7, + "y": 6, + "w": 26, + "h": 22 }, "frame": { - "x": 208, - "y": 192, - "w": 22, - "h": 21 - } - }, - { - "filename": "126s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 22, - "h": 23 - }, - "frame": { - "x": 230, - "y": 194, - "w": 22, - "h": 23 - } - }, - { - "filename": "118", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 9, - "w": 24, - "h": 19 - }, - "frame": { - "x": 157, - "y": 215, - "w": 24, - "h": 19 - } - }, - { - "filename": "150s-mega-x", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 21, - "h": 26 - }, - "frame": { - "x": 159, + "x": 206, "y": 234, - "w": 21, - "h": 26 + "w": 26, + "h": 22 + } + }, + { + "filename": "94", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 232, + "y": 255, + "w": 24, + "h": 24 + } + }, + { + "filename": "40", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 3, + "w": 17, + "h": 25 + }, + "frame": { + "x": 57, + "y": 487, + "w": 17, + "h": 25 + } + }, + { + "filename": "40s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 3, + "w": 17, + "h": 25 + }, + "frame": { + "x": 57, + "y": 512, + "w": 17, + "h": 25 + } + }, + { + "filename": "75s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 26, + "h": 22 + }, + "frame": { + "x": 60, + "y": 411, + "w": 26, + "h": 22 + } + }, + { + "filename": "83", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 26, + "h": 22 + }, + "frame": { + "x": 86, + "y": 411, + "w": 26, + "h": 22 + } + }, + { + "filename": "91", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 25, + "h": 24 + }, + "frame": { + "x": 59, + "y": 433, + "w": 25, + "h": 24 + } + }, + { + "filename": "91s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 25, + "h": 24 + }, + "frame": { + "x": 59, + "y": 457, + "w": 25, + "h": 24 + } + }, + { + "filename": "18", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 25, + "h": 23 + }, + "frame": { + "x": 84, + "y": 433, + "w": 25, + "h": 23 + } + }, + { + "filename": "18s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 25, + "h": 23 + }, + "frame": { + "x": 84, + "y": 456, + "w": 25, + "h": 23 } }, { @@ -3174,14 +3384,35 @@ "h": 22 }, "frame": { - "x": 159, - "y": 260, + "x": 112, + "y": 411, "w": 24, "h": 22 } }, { - "filename": "38s", + "filename": "83s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 26, + "h": 22 + }, + "frame": { + "x": 109, + "y": 433, + "w": 26, + "h": 22 + } + }, + { + "filename": "86", "rotated": false, "trimmed": true, "sourceSize": { @@ -3191,13 +3422,13 @@ "spriteSourceSize": { "x": 8, "y": 5, - "w": 24, + "w": 25, "h": 23 }, "frame": { - "x": 160, - "y": 282, - "w": 24, + "x": 109, + "y": 455, + "w": 25, "h": 23 } }, @@ -3216,8 +3447,8 @@ "h": 24 }, "frame": { - "x": 161, - "y": 305, + "x": 74, + "y": 481, "w": 23, "h": 24 } @@ -3237,768 +3468,12 @@ "h": 24 }, "frame": { - "x": 161, - "y": 329, + "x": 74, + "y": 505, "w": 24, "h": 24 } }, - { - "filename": "1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 9, - "w": 20, - "h": 19 - }, - "frame": { - "x": 144, - "y": 357, - "w": 20, - "h": 19 - } - }, - { - "filename": "77", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 23 - }, - "frame": { - "x": 164, - "y": 353, - "w": 24, - "h": 23 - } - }, - { - "filename": "146s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 8, - "w": 28, - "h": 18 - }, - "frame": { - "x": 89, - "y": 372, - "w": 28, - "h": 18 - } - }, - { - "filename": "144", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 27, - "h": 20 - }, - "frame": { - "x": 117, - "y": 373, - "w": 27, - "h": 20 - } - }, - { - "filename": "144s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 27, - "h": 20 - }, - "frame": { - "x": 144, - "y": 376, - "w": 27, - "h": 20 - } - }, - { - "filename": "2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, - "h": 20 - }, - "frame": { - "x": 171, - "y": 376, - "w": 21, - "h": 20 - } - }, - { - "filename": "75", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 26, - "h": 22 - }, - "frame": { - "x": 87, - "y": 390, - "w": 26, - "h": 22 - } - }, - { - "filename": "75s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 26, - "h": 22 - }, - "frame": { - "x": 113, - "y": 393, - "w": 26, - "h": 22 - } - }, - { - "filename": "76", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 26, - "h": 21 - }, - "frame": { - "x": 139, - "y": 396, - "w": 26, - "h": 21 - } - }, - { - "filename": "76s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 26, - "h": 21 - }, - "frame": { - "x": 165, - "y": 396, - "w": 26, - "h": 21 - } - }, - { - "filename": "83", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 26, - "h": 22 - }, - "frame": { - "x": 182, - "y": 213, - "w": 26, - "h": 22 - } - }, - { - "filename": "47", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 22 - }, - "frame": { - "x": 208, - "y": 213, - "w": 22, - "h": 22 - } - }, - { - "filename": "47s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 22 - }, - "frame": { - "x": 230, - "y": 217, - "w": 22, - "h": 22 - } - }, - { - "filename": "83s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 26, - "h": 22 - }, - "frame": { - "x": 180, - "y": 235, - "w": 26, - "h": 22 - } - }, - { - "filename": "72", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 206, - "y": 235, - "w": 24, - "h": 22 - } - }, - { - "filename": "51", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 22 - }, - "frame": { - "x": 230, - "y": 239, - "w": 22, - "h": 22 - } - }, - { - "filename": "86", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 25, - "h": 23 - }, - "frame": { - "x": 183, - "y": 257, - "w": 25, - "h": 23 - } - }, - { - "filename": "51s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 22 - }, - "frame": { - "x": 208, - "y": 257, - "w": 22, - "h": 22 - } - }, - { - "filename": "139", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 22 - }, - "frame": { - "x": 230, - "y": 261, - "w": 22, - "h": 22 - } - }, - { - "filename": "77s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 23 - }, - "frame": { - "x": 184, - "y": 280, - "w": 24, - "h": 23 - } - }, - { - "filename": "139s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 22 - }, - "frame": { - "x": 208, - "y": 279, - "w": 22, - "h": 22 - } - }, - { - "filename": "148", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 22, - "h": 22 - }, - "frame": { - "x": 230, - "y": 283, - "w": 22, - "h": 22 - } - }, - { - "filename": "86s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 25, - "h": 23 - }, - "frame": { - "x": 184, - "y": 303, - "w": 25, - "h": 23 - } - }, - { - "filename": "58", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 21, - "h": 22 - }, - "frame": { - "x": 209, - "y": 301, - "w": 21, - "h": 22 - } - }, - { - "filename": "148s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 22, - "h": 22 - }, - "frame": { - "x": 230, - "y": 305, - "w": 22, - "h": 22 - } - }, - { - "filename": "87", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 25, - "h": 23 - }, - "frame": { - "x": 185, - "y": 326, - "w": 25, - "h": 23 - } - }, - { - "filename": "24", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 20, - "h": 23 - }, - "frame": { - "x": 210, - "y": 323, - "w": 20, - "h": 23 - } - }, - { - "filename": "44s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 22, - "h": 21 - }, - "frame": { - "x": 230, - "y": 327, - "w": 22, - "h": 21 - } - }, - { - "filename": "87s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 25, - "h": 23 - }, - "frame": { - "x": 188, - "y": 349, - "w": 25, - "h": 23 - } - }, - { - "filename": "40", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 17, - "h": 25 - }, - "frame": { - "x": 213, - "y": 346, - "w": 17, - "h": 25 - } - }, - { - "filename": "105", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 22, - "h": 21 - }, - "frame": { - "x": 230, - "y": 348, - "w": 22, - "h": 21 - } - }, - { - "filename": "105s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 22, - "h": 21 - }, - "frame": { - "x": 230, - "y": 369, - "w": 22, - "h": 21 - } - }, - { - "filename": "112", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 25, - "h": 23 - }, - "frame": { - "x": 192, - "y": 372, - "w": 25, - "h": 23 - } - }, - { - "filename": "14s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 13, - "h": 18 - }, - "frame": { - "x": 217, - "y": 371, - "w": 13, - "h": 18 - } - }, - { - "filename": "40s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 17, - "h": 25 - }, - "frame": { - "x": 56, - "y": 396, - "w": 17, - "h": 25 - } - }, - { - "filename": "10", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 12, - "w": 14, - "h": 16 - }, - "frame": { - "x": 73, - "y": 395, - "w": 14, - "h": 16 - } - }, { "filename": "103", "rotated": false, @@ -4014,14 +3489,14 @@ "h": 24 }, "frame": { - "x": 56, - "y": 421, + "x": 97, + "y": 479, "w": 17, "h": 24 } }, { - "filename": "112s", + "filename": "129s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4029,15 +3504,57 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, + "x": 10, "y": 5, - "w": 25, + "w": 22, + "h": 24 + }, + "frame": { + "x": 114, + "y": 478, + "w": 22, + "h": 24 + } + }, + { + "filename": "103s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 4, + "w": 17, + "h": 24 + }, + "frame": { + "x": 98, + "y": 503, + "w": 17, + "h": 24 + } + }, + { + "filename": "31", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 23, "h": 23 }, "frame": { - "x": 73, - "y": 412, - "w": 25, + "x": 115, + "y": 502, + "w": 23, "h": 23 } }, @@ -4056,14 +3573,56 @@ "h": 21 }, "frame": { - "x": 73, - "y": 435, + "x": 74, + "y": 529, "w": 25, "h": 21 } }, { - "filename": "23", + "filename": "31s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 23, + "h": 23 + }, + "frame": { + "x": 99, + "y": 527, + "w": 23, + "h": 23 + } + }, + { + "filename": "38", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 24, + "h": 23 + }, + "frame": { + "x": 122, + "y": 525, + "w": 24, + "h": 23 + } + }, + { + "filename": "30s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4072,19 +3631,19 @@ }, "spriteSourceSize": { "x": 11, - "y": 7, - "w": 18, - "h": 21 + "y": 6, + "w": 19, + "h": 22 }, "frame": { "x": 55, - "y": 446, - "w": 18, - "h": 21 + "y": 539, + "w": 19, + "h": 22 } }, { - "filename": "24s", + "filename": "38s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4092,20 +3651,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, + "x": 8, "y": 5, - "w": 20, + "w": 24, "h": 23 }, "frame": { "x": 55, - "y": 467, - "w": 20, + "y": 561, + "w": 24, "h": 23 } }, { - "filename": "36", + "filename": "77", "rotated": false, "trimmed": true, "sourceSize": { @@ -4113,20 +3672,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, + "x": 8, "y": 5, - "w": 20, + "w": 24, "h": 23 }, "frame": { "x": 55, - "y": 490, - "w": 20, + "y": 584, + "w": 24, "h": 23 } }, { - "filename": "36s", + "filename": "77s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4134,20 +3693,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, + "x": 8, "y": 5, - "w": 20, + "w": 24, "h": 23 }, "frame": { "x": 55, - "y": 513, - "w": 20, + "y": 607, + "w": 24, "h": 23 } }, { - "filename": "150", + "filename": "86s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4155,20 +3714,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, + "x": 8, "y": 5, - "w": 20, + "w": 25, "h": 23 }, "frame": { - "x": 55, - "y": 536, - "w": 20, + "x": 79, + "y": 550, + "w": 25, "h": 23 } }, { - "filename": "150s", + "filename": "87", "rotated": false, "trimmed": true, "sourceSize": { @@ -4176,15 +3735,120 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, + "x": 8, "y": 5, - "w": 20, + "w": 25, "h": 23 }, "frame": { - "x": 55, - "y": 559, - "w": 20, + "x": 79, + "y": 573, + "w": 25, + "h": 23 + } + }, + { + "filename": "87s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 25, + "h": 23 + }, + "frame": { + "x": 79, + "y": 596, + "w": 25, + "h": 23 + } + }, + { + "filename": "45", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 23 + }, + "frame": { + "x": 104, + "y": 550, + "w": 22, + "h": 23 + } + }, + { + "filename": "45s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 23 + }, + "frame": { + "x": 104, + "y": 573, + "w": 22, + "h": 23 + } + }, + { + "filename": "112", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 25, + "h": 23 + }, + "frame": { + "x": 104, + "y": 596, + "w": 25, + "h": 23 + } + }, + { + "filename": "112s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 25, + "h": 23 + }, + "frame": { + "x": 126, + "y": 548, + "w": 25, "h": 23 } }, @@ -4203,12 +3867,138 @@ "h": 22 }, "frame": { - "x": 55, - "y": 582, + "x": 126, + "y": 571, "w": 25, "h": 22 } }, + { + "filename": "126", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 22, + "h": 23 + }, + "frame": { + "x": 129, + "y": 593, + "w": 22, + "h": 23 + } + }, + { + "filename": "76", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 26, + "h": 21 + }, + "frame": { + "x": 79, + "y": 619, + "w": 26, + "h": 21 + } + }, + { + "filename": "20s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 105, + "y": 619, + "w": 25, + "h": 21 + } + }, + { + "filename": "126s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 22, + "h": 23 + }, + "frame": { + "x": 130, + "y": 616, + "w": 22, + "h": 23 + } + }, + { + "filename": "58", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 21, + "h": 22 + }, + "frame": { + "x": 58, + "y": 630, + "w": 21, + "h": 22 + } + }, + { + "filename": "76s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 26, + "h": 21 + }, + "frame": { + "x": 79, + "y": 640, + "w": 26, + "h": 21 + } + }, { "filename": "28s", "rotated": false, @@ -4224,12 +4014,138 @@ "h": 22 }, "frame": { - "x": 75, - "y": 456, + "x": 105, + "y": 640, "w": 25, "h": 22 } }, + { + "filename": "47", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 22, + "h": 22 + }, + "frame": { + "x": 130, + "y": 639, + "w": 22, + "h": 22 + } + }, + { + "filename": "2s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 58, + "y": 652, + "w": 21, + "h": 20 + } + }, + { + "filename": "55", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 79, + "y": 661, + "w": 25, + "h": 21 + } + }, + { + "filename": "55s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 104, + "y": 662, + "w": 25, + "h": 21 + } + }, + { + "filename": "58s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 21, + "h": 22 + }, + "frame": { + "x": 58, + "y": 672, + "w": 21, + "h": 22 + } + }, + { + "filename": "84", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 10, + "w": 21, + "h": 18 + }, + "frame": { + "x": 58, + "y": 694, + "w": 21, + "h": 18 + } + }, { "filename": "73", "rotated": false, @@ -4245,8 +4161,8 @@ "h": 22 }, "frame": { - "x": 75, - "y": 478, + "x": 79, + "y": 682, "w": 25, "h": 22 } @@ -4266,12 +4182,96 @@ "h": 22 }, "frame": { - "x": 75, - "y": 500, + "x": 104, + "y": 683, "w": 25, "h": 22 } }, + { + "filename": "33", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 19, + "h": 22 + }, + "frame": { + "x": 61, + "y": 712, + "w": 19, + "h": 22 + } + }, + { + "filename": "47s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 22, + "h": 22 + }, + "frame": { + "x": 60, + "y": 734, + "w": 22, + "h": 22 + } + }, + { + "filename": "72", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 24, + "h": 22 + }, + "frame": { + "x": 80, + "y": 704, + "w": 24, + "h": 22 + } + }, + { + "filename": "128", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 104, + "y": 705, + "w": 25, + "h": 21 + } + }, { "filename": "149", "rotated": false, @@ -4287,14 +4287,14 @@ "h": 22 }, "frame": { - "x": 75, - "y": 522, + "x": 82, + "y": 726, "w": 25, "h": 22 } }, { - "filename": "149s", + "filename": "51", "rotated": false, "trimmed": true, "sourceSize": { @@ -4302,20 +4302,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, + "x": 9, "y": 6, - "w": 25, + "w": 22, "h": 22 }, "frame": { - "x": 75, - "y": 544, - "w": 25, + "x": 107, + "y": 726, + "w": 22, "h": 22 } }, { - "filename": "21", + "filename": "132", "rotated": false, "trimmed": true, "sourceSize": { @@ -4323,20 +4323,83 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 12, - "w": 19, - "h": 16 + "x": 12, + "y": 15, + "w": 16, + "h": 13 }, "frame": { - "x": 75, - "y": 566, - "w": 19, - "h": 16 + "x": 82, + "y": 748, + "w": 16, + "h": 13 } }, { - "filename": "30", + "filename": "132s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 15, + "w": 16, + "h": 13 + }, + "frame": { + "x": 98, + "y": 748, + "w": 16, + "h": 13 + } + }, + { + "filename": "140", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 15, + "w": 16, + "h": 13 + }, + "frame": { + "x": 114, + "y": 748, + "w": 16, + "h": 13 + } + }, + { + "filename": "150s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 5, + "w": 20, + "h": 23 + }, + "frame": { + "x": 134, + "y": 455, + "w": 20, + "h": 23 + } + }, + { + "filename": "33s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4350,14 +4413,14 @@ "h": 22 }, "frame": { - "x": 80, - "y": 582, + "x": 135, + "y": 433, "w": 19, "h": 22 } }, { - "filename": "20s", + "filename": "51s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4365,20 +4428,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 25, - "h": 21 + "x": 9, + "y": 6, + "w": 22, + "h": 22 }, "frame": { - "x": 57, - "y": 604, - "w": 25, - "h": 21 + "x": 136, + "y": 478, + "w": 22, + "h": 22 } }, { - "filename": "7", + "filename": "44", "rotated": false, "trimmed": true, "sourceSize": { @@ -4387,15 +4450,15 @@ }, "spriteSourceSize": { "x": 10, - "y": 11, - "w": 21, - "h": 17 + "y": 7, + "w": 22, + "h": 21 }, "frame": { - "x": 57, - "y": 625, - "w": 21, - "h": 17 + "x": 158, + "y": 218, + "w": 22, + "h": 21 } }, { @@ -4413,8 +4476,8 @@ "h": 22 }, "frame": { - "x": 58, - "y": 642, + "x": 138, + "y": 500, "w": 23, "h": 22 } @@ -4434,8 +4497,8 @@ "h": 22 }, "frame": { - "x": 58, - "y": 664, + "x": 146, + "y": 522, "w": 23, "h": 22 } @@ -4455,180 +4518,12 @@ "h": 22 }, "frame": { - "x": 58, - "y": 686, + "x": 151, + "y": 544, "w": 24, "h": 22 } }, - { - "filename": "55", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 25, - "h": 21 - }, - "frame": { - "x": 59, - "y": 708, - "w": 25, - "h": 21 - } - }, - { - "filename": "19", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 21 - }, - "frame": { - "x": 82, - "y": 604, - "w": 20, - "h": 21 - } - }, - { - "filename": "7s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 11, - "w": 21, - "h": 17 - }, - "frame": { - "x": 78, - "y": 625, - "w": 21, - "h": 17 - } - }, - { - "filename": "103s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 4, - "w": 17, - "h": 24 - }, - "frame": { - "x": 81, - "y": 642, - "w": 17, - "h": 24 - } - }, - { - "filename": "2s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, - "h": 20 - }, - "frame": { - "x": 81, - "y": 666, - "w": 21, - "h": 20 - } - }, - { - "filename": "58s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 21, - "h": 22 - }, - "frame": { - "x": 82, - "y": 686, - "w": 21, - "h": 22 - } - }, - { - "filename": "19s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 21 - }, - "frame": { - "x": 84, - "y": 708, - "w": 20, - "h": 21 - } - }, - { - "filename": "55s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 25, - "h": 21 - }, - "frame": { - "x": 77, - "y": 729, - "w": 25, - "h": 21 - } - }, { "filename": "82", "rotated": false, @@ -4644,8 +4539,8 @@ "h": 22 }, "frame": { - "x": 77, - "y": 750, + "x": 151, + "y": 566, "w": 24, "h": 22 } @@ -4665,264 +4560,12 @@ "h": 22 }, "frame": { - "x": 101, - "y": 750, + "x": 151, + "y": 588, "w": 24, "h": 22 } }, - { - "filename": "63", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 23, - "h": 21 - }, - "frame": { - "x": 102, - "y": 729, - "w": 23, - "h": 21 - } - }, - { - "filename": "50", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 14, - "w": 15, - "h": 14 - }, - "frame": { - "x": 98, - "y": 412, - "w": 15, - "h": 14 - } - }, - { - "filename": "30s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 19, - "h": 22 - }, - "frame": { - "x": 98, - "y": 426, - "w": 19, - "h": 22 - } - }, - { - "filename": "46", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, - "h": 20 - }, - "frame": { - "x": 117, - "y": 415, - "w": 22, - "h": 20 - } - }, - { - "filename": "119", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 25, - "h": 20 - }, - "frame": { - "x": 139, - "y": 417, - "w": 25, - "h": 20 - } - }, - { - "filename": "119s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 25, - "h": 20 - }, - "frame": { - "x": 164, - "y": 417, - "w": 25, - "h": 20 - } - }, - { - "filename": "46s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, - "h": 20 - }, - "frame": { - "x": 117, - "y": 435, - "w": 22, - "h": 20 - } - }, - { - "filename": "128", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 25, - "h": 21 - }, - "frame": { - "x": 139, - "y": 437, - "w": 25, - "h": 21 - } - }, - { - "filename": "128s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 25, - "h": 21 - }, - "frame": { - "x": 164, - "y": 437, - "w": 25, - "h": 21 - } - }, - { - "filename": "43", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 17, - "h": 19 - }, - "frame": { - "x": 100, - "y": 448, - "w": 17, - "h": 19 - } - }, - { - "filename": "33", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 19, - "h": 22 - }, - "frame": { - "x": 100, - "y": 467, - "w": 19, - "h": 22 - } - }, - { - "filename": "33s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 19, - "h": 22 - }, - "frame": { - "x": 100, - "y": 489, - "w": 19, - "h": 22 - } - }, { "filename": "96", "rotated": false, @@ -4938,8 +4581,8 @@ "h": 22 }, "frame": { - "x": 100, - "y": 511, + "x": 152, + "y": 610, "w": 24, "h": 22 } @@ -4959,264 +4602,12 @@ "h": 22 }, "frame": { - "x": 100, - "y": 533, + "x": 152, + "y": 632, "w": 24, "h": 22 } }, - { - "filename": "74s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 24, - "h": 15 - }, - "frame": { - "x": 100, - "y": 555, - "w": 24, - "h": 15 - } - }, - { - "filename": "131", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 24, - "h": 21 - }, - "frame": { - "x": 99, - "y": 570, - "w": 24, - "h": 21 - } - }, - { - "filename": "132", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 15, - "w": 16, - "h": 13 - }, - "frame": { - "x": 99, - "y": 591, - "w": 16, - "h": 13 - } - }, - { - "filename": "23s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 18, - "h": 21 - }, - "frame": { - "x": 102, - "y": 604, - "w": 18, - "h": 21 - } - }, - { - "filename": "4", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 9, - "w": 21, - "h": 19 - }, - "frame": { - "x": 99, - "y": 625, - "w": 21, - "h": 19 - } - }, - { - "filename": "125", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 21, - "h": 22 - }, - "frame": { - "x": 98, - "y": 644, - "w": 21, - "h": 22 - } - }, - { - "filename": "17", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, - "h": 20 - }, - "frame": { - "x": 102, - "y": 666, - "w": 21, - "h": 20 - } - }, - { - "filename": "125s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 21, - "h": 22 - }, - "frame": { - "x": 103, - "y": 686, - "w": 21, - "h": 22 - } - }, - { - "filename": "52", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 21, - "h": 21 - }, - "frame": { - "x": 104, - "y": 708, - "w": 21, - "h": 21 - } - }, - { - "filename": "135", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 21 - }, - "frame": { - "x": 119, - "y": 455, - "w": 20, - "h": 21 - } - }, - { - "filename": "102", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 10, - "w": 24, - "h": 18 - }, - "frame": { - "x": 139, - "y": 458, - "w": 24, - "h": 18 - } - }, - { - "filename": "131s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 24, - "h": 21 - }, - "frame": { - "x": 119, - "y": 476, - "w": 24, - "h": 21 - } - }, { "filename": "102s", "rotated": false, @@ -5232,14 +4623,56 @@ "h": 18 }, "frame": { - "x": 163, - "y": 458, + "x": 152, + "y": 654, "w": 24, "h": 18 } }, { - "filename": "63s", + "filename": "44s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 22, + "h": 21 + }, + "frame": { + "x": 130, + "y": 661, + "w": 22, + "h": 21 + } + }, + { + "filename": "149s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 25, + "h": 22 + }, + "frame": { + "x": 129, + "y": 682, + "w": 25, + "h": 22 + } + }, + { + "filename": "128s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5248,19 +4681,40 @@ }, "spriteSourceSize": { "x": 9, - "y": 8, - "w": 23, + "y": 7, + "w": 25, "h": 21 }, "frame": { - "x": 143, - "y": 476, - "w": 23, + "x": 129, + "y": 704, + "w": 25, "h": 21 } }, { - "filename": "52s", + "filename": "119", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 25, + "h": 20 + }, + "frame": { + "x": 129, + "y": 725, + "w": 25, + "h": 20 + } + }, + { + "filename": "21", "rotated": false, "trimmed": true, "sourceSize": { @@ -5269,19 +4723,19 @@ }, "spriteSourceSize": { "x": 11, - "y": 7, - "w": 21, - "h": 21 + "y": 12, + "w": 19, + "h": 16 }, "frame": { - "x": 166, - "y": 476, - "w": 21, - "h": 21 + "x": 130, + "y": 745, + "w": 19, + "h": 16 } }, { - "filename": "50s", + "filename": "21s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5289,16 +4743,121 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, - "y": 14, - "w": 15, - "h": 14 + "x": 11, + "y": 12, + "w": 19, + "h": 16 }, "frame": { - "x": 119, - "y": 497, - "w": 15, - "h": 14 + "x": 149, + "y": 745, + "w": 19, + "h": 16 + } + }, + { + "filename": "139", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 22, + "h": 22 + }, + "frame": { + "x": 154, + "y": 672, + "w": 22, + "h": 22 + } + }, + { + "filename": "139s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 22, + "h": 22 + }, + "frame": { + "x": 154, + "y": 694, + "w": 22, + "h": 22 + } + }, + { + "filename": "148", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 22, + "h": 22 + }, + "frame": { + "x": 154, + "y": 716, + "w": 22, + "h": 22 + } + }, + { + "filename": "119s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 25, + "h": 20 + }, + "frame": { + "x": 133, + "y": 218, + "w": 25, + "h": 20 + } + }, + { + "filename": "131", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 24, + "h": 21 + }, + "frame": { + "x": 131, + "y": 238, + "w": 24, + "h": 21 } }, { @@ -5316,8 +4875,8 @@ "h": 20 }, "frame": { - "x": 134, - "y": 497, + "x": 155, + "y": 239, "w": 24, "h": 20 } @@ -5337,12 +4896,117 @@ "h": 20 }, "frame": { - "x": 158, - "y": 497, + "x": 131, + "y": 259, "w": 24, "h": 20 } }, + { + "filename": "117", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 24, + "h": 20 + }, + "frame": { + "x": 155, + "y": 259, + "w": 24, + "h": 20 + } + }, + { + "filename": "131s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 24, + "h": 21 + }, + "frame": { + "x": 129, + "y": 279, + "w": 24, + "h": 21 + } + }, + { + "filename": "63", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 23, + "h": 21 + }, + "frame": { + "x": 153, + "y": 279, + "w": 23, + "h": 21 + } + }, + { + "filename": "117s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 24, + "h": 20 + }, + "frame": { + "x": 129, + "y": 300, + "w": 24, + "h": 20 + } + }, + { + "filename": "63s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 23, + "h": 21 + }, + "frame": { + "x": 153, + "y": 300, + "w": 23, + "h": 21 + } + }, { "filename": "92", "rotated": false, @@ -5358,8 +5022,8 @@ "h": 21 }, "frame": { - "x": 124, - "y": 517, + "x": 129, + "y": 320, "w": 23, "h": 21 } @@ -5379,12 +5043,117 @@ "h": 21 }, "frame": { - "x": 147, - "y": 517, + "x": 152, + "y": 321, "w": 23, "h": 21 } }, + { + "filename": "81s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 12, + "w": 23, + "h": 15 + }, + "frame": { + "x": 129, + "y": 341, + "w": 23, + "h": 15 + } + }, + { + "filename": "106", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 9, + "w": 23, + "h": 19 + }, + "frame": { + "x": 152, + "y": 342, + "w": 23, + "h": 19 + } + }, + { + "filename": "125", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 21, + "h": 22 + }, + "frame": { + "x": 131, + "y": 356, + "w": 21, + "h": 22 + } + }, + { + "filename": "106s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 9, + "w": 23, + "h": 19 + }, + "frame": { + "x": 152, + "y": 361, + "w": 23, + "h": 19 + } + }, + { + "filename": "141", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 19, + "h": 21 + }, + "frame": { + "x": 133, + "y": 378, + "w": 19, + "h": 21 + } + }, { "filename": "115", "rotated": false, @@ -5400,12 +5169,222 @@ "h": 21 }, "frame": { - "x": 124, - "y": 538, + "x": 152, + "y": 380, "w": 23, "h": 21 } }, + { + "filename": "66", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 16, + "h": 20 + }, + "frame": { + "x": 136, + "y": 399, + "w": 16, + "h": 20 + } + }, + { + "filename": "100", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 14, + "w": 14, + "h": 14 + }, + "frame": { + "x": 136, + "y": 419, + "w": 14, + "h": 14 + } + }, + { + "filename": "108", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 11, + "w": 23, + "h": 18 + }, + "frame": { + "x": 152, + "y": 401, + "w": 23, + "h": 18 + } + }, + { + "filename": "100s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 14, + "w": 14, + "h": 14 + }, + "frame": { + "x": 150, + "y": 419, + "w": 14, + "h": 14 + } + }, + { + "filename": "125s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 21, + "h": 22 + }, + "frame": { + "x": 154, + "y": 433, + "w": 21, + "h": 22 + } + }, + { + "filename": "148s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 22, + "h": 22 + }, + "frame": { + "x": 154, + "y": 455, + "w": 22, + "h": 22 + } + }, + { + "filename": "19", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 21 + }, + "frame": { + "x": 158, + "y": 477, + "w": 20, + "h": 21 + } + }, + { + "filename": "19s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 21 + }, + "frame": { + "x": 161, + "y": 498, + "w": 20, + "h": 21 + } + }, + { + "filename": "52", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 21, + "h": 21 + }, + "frame": { + "x": 169, + "y": 519, + "w": 21, + "h": 21 + } + }, + { + "filename": "66s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 16, + "h": 20 + }, + "frame": { + "x": 190, + "y": 238, + "w": 16, + "h": 20 + } + }, { "filename": "115s", "rotated": false, @@ -5421,75 +5400,12 @@ "h": 21 }, "frame": { - "x": 147, - "y": 538, + "x": 179, + "y": 258, "w": 23, "h": 21 } }, - { - "filename": "117", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 24, - "h": 20 - }, - "frame": { - "x": 124, - "y": 559, - "w": 24, - "h": 20 - } - }, - { - "filename": "70", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 22, - "h": 20 - }, - "frame": { - "x": 148, - "y": 559, - "w": 22, - "h": 20 - } - }, - { - "filename": "117s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 24, - "h": 20 - }, - "frame": { - "x": 123, - "y": 579, - "w": 24, - "h": 20 - } - }, { "filename": "127", "rotated": false, @@ -5505,8 +5421,8 @@ "h": 21 }, "frame": { - "x": 147, - "y": 579, + "x": 176, + "y": 279, "w": 23, "h": 21 } @@ -5526,8 +5442,8 @@ "h": 21 }, "frame": { - "x": 120, - "y": 599, + "x": 176, + "y": 300, "w": 23, "h": 21 } @@ -5547,8 +5463,8 @@ "h": 21 }, "frame": { - "x": 120, - "y": 620, + "x": 175, + "y": 321, "w": 23, "h": 21 } @@ -5568,8 +5484,8 @@ "h": 21 }, "frame": { - "x": 143, - "y": 600, + "x": 175, + "y": 342, "w": 23, "h": 21 } @@ -5589,14 +5505,14 @@ "h": 21 }, "frame": { - "x": 143, - "y": 621, + "x": 175, + "y": 363, "w": 23, "h": 21 } }, { - "filename": "54", + "filename": "136s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5604,20 +5520,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, + "x": 9, "y": 7, - "w": 18, + "w": 23, "h": 21 }, "frame": { - "x": 170, - "y": 517, - "w": 18, + "x": 175, + "y": 384, + "w": 23, "h": 21 } }, { - "filename": "54s", + "filename": "108s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5625,15 +5541,57 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, + "x": 9, + "y": 11, + "w": 23, + "h": 18 + }, + "frame": { + "x": 175, + "y": 405, + "w": 23, + "h": 18 + } + }, + { + "filename": "105", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, "y": 7, - "w": 18, + "w": 22, "h": 21 }, "frame": { - "x": 170, - "y": 538, - "w": 18, + "x": 175, + "y": 423, + "w": 22, + "h": 21 + } + }, + { + "filename": "52s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 21, + "h": 21 + }, + "frame": { + "x": 175, + "y": 540, + "w": 21, "h": 21 } }, @@ -5652,96 +5610,12 @@ "h": 21 }, "frame": { - "x": 170, - "y": 559, + "x": 175, + "y": 561, "w": 21, "h": 21 } }, - { - "filename": "17s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, - "h": 20 - }, - "frame": { - "x": 170, - "y": 580, - "w": 21, - "h": 20 - } - }, - { - "filename": "136s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 23, - "h": 21 - }, - "frame": { - "x": 166, - "y": 600, - "w": 23, - "h": 21 - } - }, - { - "filename": "70s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 22, - "h": 20 - }, - "frame": { - "x": 166, - "y": 621, - "w": 22, - "h": 20 - } - }, - { - "filename": "25", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, - "h": 20 - }, - "frame": { - "x": 182, - "y": 497, - "w": 21, - "h": 20 - } - }, { "filename": "79s", "rotated": false, @@ -5757,14 +5631,77 @@ "h": 21 }, "frame": { - "x": 188, - "y": 517, + "x": 175, + "y": 582, "w": 21, "h": 21 } }, { - "filename": "135s", + "filename": "105s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 22, + "h": 21 + }, + "frame": { + "x": 176, + "y": 603, + "w": 22, + "h": 21 + } + }, + { + "filename": "46", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 176, + "y": 624, + "w": 22, + "h": 20 + } + }, + { + "filename": "46s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 176, + "y": 644, + "w": 22, + "h": 20 + } + }, + { + "filename": "70", "rotated": false, "trimmed": true, "sourceSize": { @@ -5773,19 +5710,19 @@ }, "spriteSourceSize": { "x": 10, - "y": 7, - "w": 20, - "h": 21 + "y": 8, + "w": 22, + "h": 20 }, "frame": { - "x": 188, - "y": 538, - "w": 20, - "h": 21 + "x": 176, + "y": 664, + "w": 22, + "h": 20 } }, { - "filename": "141", + "filename": "70s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5794,19 +5731,19 @@ }, "spriteSourceSize": { "x": 10, - "y": 7, - "w": 19, - "h": 21 + "y": 8, + "w": 22, + "h": 20 }, "frame": { - "x": 191, - "y": 559, - "w": 19, - "h": 21 + "x": 176, + "y": 684, + "w": 22, + "h": 20 } }, { - "filename": "25s", + "filename": "17", "rotated": false, "trimmed": true, "sourceSize": { @@ -5820,266 +5757,14 @@ "h": 20 }, "frame": { - "x": 191, - "y": 580, + "x": 176, + "y": 704, "w": 21, "h": 20 } }, { - "filename": "106", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 9, - "w": 23, - "h": 19 - }, - "frame": { - "x": 189, - "y": 600, - "w": 23, - "h": 19 - } - }, - { - "filename": "81", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 12, - "w": 23, - "h": 15 - }, - "frame": { - "x": 120, - "y": 641, - "w": 23, - "h": 15 - } - }, - { - "filename": "81s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 12, - "w": 23, - "h": 15 - }, - "frame": { - "x": 143, - "y": 642, - "w": 23, - "h": 15 - } - }, - { - "filename": "61", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 9, - "w": 22, - "h": 19 - }, - "frame": { - "x": 166, - "y": 641, - "w": 22, - "h": 19 - } - }, - { - "filename": "37", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 20, - "h": 20 - }, - "frame": { - "x": 123, - "y": 656, - "w": 20, - "h": 20 - } - }, - { - "filename": "106s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 9, - "w": 23, - "h": 19 - }, - "frame": { - "x": 143, - "y": 657, - "w": 23, - "h": 19 - } - }, - { - "filename": "61s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 9, - "w": 22, - "h": 19 - }, - "frame": { - "x": 166, - "y": 660, - "w": 22, - "h": 19 - } - }, - { - "filename": "118s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 9, - "w": 24, - "h": 19 - }, - "frame": { - "x": 124, - "y": 676, - "w": 24, - "h": 19 - } - }, - { - "filename": "29", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 18, - "h": 19 - }, - "frame": { - "x": 148, - "y": 676, - "w": 18, - "h": 19 - } - }, - { - "filename": "108", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 11, - "w": 23, - "h": 18 - }, - "frame": { - "x": 166, - "y": 679, - "w": 23, - "h": 18 - } - }, - { - "filename": "132s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 15, - "w": 16, - "h": 13 - }, - "frame": { - "x": 124, - "y": 695, - "w": 16, - "h": 13 - } - }, - { - "filename": "108s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 11, - "w": 23, - "h": 18 - }, - "frame": { - "x": 140, - "y": 695, - "w": 23, - "h": 18 - } - }, - { - "filename": "4s", + "filename": "4", "rotated": false, "trimmed": true, "sourceSize": { @@ -6093,556 +5778,10 @@ "h": 19 }, "frame": { - "x": 163, - "y": 697, - "w": 21, - "h": 19 - } - }, - { - "filename": "10s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 12, - "w": 14, - "h": 16 - }, - "frame": { - "x": 125, - "y": 708, - "w": 14, - "h": 16 - } - }, - { - "filename": "141s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 19, - "h": 21 - }, - "frame": { - "x": 125, + "x": 176, "y": 724, - "w": 19, - "h": 21 - } - }, - { - "filename": "37s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 20, - "h": 20 - }, - "frame": { - "x": 125, - "y": 745, - "w": 20, - "h": 20 - } - }, - { - "filename": "113", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 19, - "h": 20 - }, - "frame": { - "x": 144, - "y": 713, - "w": 19, - "h": 20 - } - }, - { - "filename": "41", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, "w": 21, - "h": 20 - }, - "frame": { - "x": 163, - "y": 716, - "w": 21, - "h": 20 - } - }, - { - "filename": "32", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 20 - }, - "frame": { - "x": 145, - "y": 733, - "w": 18, - "h": 20 - } - }, - { - "filename": "1s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 9, - "w": 20, "h": 19 - }, - "frame": { - "x": 145, - "y": 753, - "w": 20, - "h": 19 - } - }, - { - "filename": "16", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 11, - "w": 18, - "h": 17 - }, - "frame": { - "x": 163, - "y": 736, - "w": 18, - "h": 17 - } - }, - { - "filename": "104", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 9, - "w": 20, - "h": 19 - }, - "frame": { - "x": 165, - "y": 753, - "w": 20, - "h": 19 - } - }, - { - "filename": "32s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 20 - }, - "frame": { - "x": 184, - "y": 697, - "w": 18, - "h": 20 - } - }, - { - "filename": "29s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 18, - "h": 19 - }, - "frame": { - "x": 184, - "y": 717, - "w": 18, - "h": 19 - } - }, - { - "filename": "16s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 11, - "w": 18, - "h": 17 - }, - "frame": { - "x": 181, - "y": 736, - "w": 18, - "h": 17 - } - }, - { - "filename": "104s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 9, - "w": 20, - "h": 19 - }, - "frame": { - "x": 185, - "y": 753, - "w": 20, - "h": 19 - } - }, - { - "filename": "13", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 16, - "h": 17 - }, - "frame": { - "x": 199, - "y": 736, - "w": 16, - "h": 17 - } - }, - { - "filename": "123", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 19, - "h": 19 - }, - "frame": { - "x": 205, - "y": 753, - "w": 19, - "h": 19 - } - }, - { - "filename": "41s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 21, - "h": 20 - }, - "frame": { - "x": 189, - "y": 619, - "w": 21, - "h": 20 - } - }, - { - "filename": "107", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 8, - "w": 21, - "h": 20 - }, - "frame": { - "x": 188, - "y": 639, - "w": 21, - "h": 20 - } - }, - { - "filename": "107s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 8, - "w": 21, - "h": 20 - }, - "frame": { - "x": 188, - "y": 659, - "w": 21, - "h": 20 - } - }, - { - "filename": "27s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 10, - "w": 20, - "h": 18 - }, - "frame": { - "x": 189, - "y": 679, - "w": 20, - "h": 18 - } - }, - { - "filename": "39", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 18, - "h": 20 - }, - "frame": { - "x": 202, - "y": 697, - "w": 18, - "h": 20 - } - }, - { - "filename": "35", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 9, - "w": 18, - "h": 19 - }, - "frame": { - "x": 202, - "y": 717, - "w": 18, - "h": 19 - } - }, - { - "filename": "13s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 16, - "h": 17 - }, - "frame": { - "x": 215, - "y": 736, - "w": 16, - "h": 17 - } - }, - { - "filename": "123s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 19, - "h": 19 - }, - "frame": { - "x": 224, - "y": 753, - "w": 19, - "h": 19 - } - }, - { - "filename": "124", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 21, - "h": 20 - }, - "frame": { - "x": 231, - "y": 390, - "w": 21, - "h": 20 - } - }, - { - "filename": "124s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 21, - "h": 20 - }, - "frame": { - "x": 231, - "y": 410, - "w": 21, - "h": 20 - } - }, - { - "filename": "84", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 21, - "h": 18 - }, - "frame": { - "x": 231, - "y": 430, - "w": 21, - "h": 18 } }, { @@ -6660,8 +5799,8 @@ "h": 18 }, "frame": { - "x": 231, - "y": 448, + "x": 168, + "y": 743, "w": 21, "h": 18 } @@ -6681,12 +5820,495 @@ "h": 18 }, "frame": { - "x": 231, - "y": 466, + "x": 189, + "y": 743, "w": 21, "h": 18 } }, + { + "filename": "61", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 9, + "w": 22, + "h": 19 + }, + "frame": { + "x": 210, + "y": 256, + "w": 22, + "h": 19 + } + }, + { + "filename": "17s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 176, + "y": 444, + "w": 21, + "h": 20 + } + }, + { + "filename": "140s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 15, + "w": 16, + "h": 13 + }, + "frame": { + "x": 176, + "y": 464, + "w": 16, + "h": 13 + } + }, + { + "filename": "54s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 18, + "h": 21 + }, + "frame": { + "x": 178, + "y": 477, + "w": 18, + "h": 21 + } + }, + { + "filename": "135", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 21 + }, + "frame": { + "x": 181, + "y": 498, + "w": 20, + "h": 21 + } + }, + { + "filename": "135s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 21 + }, + "frame": { + "x": 190, + "y": 519, + "w": 20, + "h": 21 + } + }, + { + "filename": "141s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 19, + "h": 21 + }, + "frame": { + "x": 196, + "y": 540, + "w": 19, + "h": 21 + } + }, + { + "filename": "25", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 196, + "y": 561, + "w": 21, + "h": 20 + } + }, + { + "filename": "25s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 196, + "y": 581, + "w": 21, + "h": 20 + } + }, + { + "filename": "37", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 20 + }, + "frame": { + "x": 198, + "y": 601, + "w": 20, + "h": 20 + } + }, + { + "filename": "37s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 20 + }, + "frame": { + "x": 198, + "y": 621, + "w": 20, + "h": 20 + } + }, + { + "filename": "41", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 21, + "h": 20 + }, + "frame": { + "x": 198, + "y": 641, + "w": 21, + "h": 20 + } + }, + { + "filename": "41s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 21, + "h": 20 + }, + "frame": { + "x": 198, + "y": 661, + "w": 21, + "h": 20 + } + }, + { + "filename": "107", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 198, + "y": 681, + "w": 21, + "h": 20 + } + }, + { + "filename": "61s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 9, + "w": 22, + "h": 19 + }, + "frame": { + "x": 210, + "y": 275, + "w": 22, + "h": 19 + } + }, + { + "filename": "118", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 9, + "w": 24, + "h": 19 + }, + "frame": { + "x": 232, + "y": 279, + "w": 24, + "h": 19 + } + }, + { + "filename": "118s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 9, + "w": 24, + "h": 19 + }, + "frame": { + "x": 199, + "y": 294, + "w": 24, + "h": 19 + } + }, + { + "filename": "4s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 9, + "w": 21, + "h": 19 + }, + "frame": { + "x": 199, + "y": 313, + "w": 21, + "h": 19 + } + }, + { + "filename": "107s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 198, + "y": 332, + "w": 21, + "h": 20 + } + }, + { + "filename": "124", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 198, + "y": 352, + "w": 21, + "h": 20 + } + }, + { + "filename": "124s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 198, + "y": 372, + "w": 21, + "h": 20 + } + }, + { + "filename": "1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 9, + "w": 20, + "h": 19 + }, + "frame": { + "x": 198, + "y": 392, + "w": 20, + "h": 19 + } + }, + { + "filename": "1s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 9, + "w": 20, + "h": 19 + }, + "frame": { + "x": 198, + "y": 411, + "w": 20, + "h": 19 + } + }, { "filename": "88s", "rotated": false, @@ -6702,12 +6324,243 @@ "h": 18 }, "frame": { - "x": 231, - "y": 484, + "x": 197, + "y": 430, "w": 21, "h": 18 } }, + { + "filename": "7s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 11, + "w": 21, + "h": 17 + }, + "frame": { + "x": 197, + "y": 448, + "w": 21, + "h": 17 + } + }, + { + "filename": "27", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 20, + "h": 18 + }, + "frame": { + "x": 223, + "y": 298, + "w": 20, + "h": 18 + } + }, + { + "filename": "14", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 13, + "h": 18 + }, + "frame": { + "x": 243, + "y": 298, + "w": 13, + "h": 18 + } + }, + { + "filename": "27s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 20, + "h": 18 + }, + "frame": { + "x": 220, + "y": 316, + "w": 20, + "h": 18 + } + }, + { + "filename": "13", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 16, + "h": 17 + }, + "frame": { + "x": 240, + "y": 316, + "w": 16, + "h": 17 + } + }, + { + "filename": "104", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 9, + "w": 20, + "h": 19 + }, + "frame": { + "x": 219, + "y": 334, + "w": 20, + "h": 19 + } + }, + { + "filename": "43", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 17, + "h": 19 + }, + "frame": { + "x": 239, + "y": 334, + "w": 17, + "h": 19 + } + }, + { + "filename": "104s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 9, + "w": 20, + "h": 19 + }, + "frame": { + "x": 219, + "y": 353, + "w": 20, + "h": 19 + } + }, + { + "filename": "43s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 17, + "h": 19 + }, + "frame": { + "x": 239, + "y": 353, + "w": 17, + "h": 19 + } + }, + { + "filename": "113", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 19, + "h": 20 + }, + "frame": { + "x": 219, + "y": 372, + "w": 19, + "h": 20 + } + }, + { + "filename": "32", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 18, + "h": 20 + }, + "frame": { + "x": 238, + "y": 372, + "w": 18, + "h": 20 + } + }, { "filename": "113s", "rotated": false, @@ -6723,12 +6576,96 @@ "h": 20 }, "frame": { - "x": 212, - "y": 395, + "x": 218, + "y": 392, "w": 19, "h": 20 } }, + { + "filename": "123", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 19, + "h": 19 + }, + "frame": { + "x": 237, + "y": 392, + "w": 19, + "h": 19 + } + }, + { + "filename": "123s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 19, + "h": 19 + }, + "frame": { + "x": 237, + "y": 411, + "w": 19, + "h": 19 + } + }, + { + "filename": "90", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 10, + "w": 19, + "h": 18 + }, + "frame": { + "x": 218, + "y": 412, + "w": 19, + "h": 18 + } + }, + { + "filename": "32s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 18, + "h": 20 + }, + "frame": { + "x": 218, + "y": 430, + "w": 18, + "h": 20 + } + }, { "filename": "147", "rotated": false, @@ -6744,14 +6681,14 @@ "h": 18 }, "frame": { - "x": 192, - "y": 395, + "x": 236, + "y": 430, "w": 20, "h": 18 } }, { - "filename": "90", + "filename": "147s", "rotated": false, "trimmed": true, "sourceSize": { @@ -6761,16 +6698,205 @@ "spriteSourceSize": { "x": 11, "y": 10, - "w": 19, + "w": 20, "h": 18 }, "frame": { - "x": 212, - "y": 415, - "w": 19, + "x": 236, + "y": 448, + "w": 20, "h": 18 } }, + { + "filename": "16", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 11, + "w": 18, + "h": 17 + }, + "frame": { + "x": 218, + "y": 450, + "w": 18, + "h": 17 + } + }, + { + "filename": "60", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 13, + "w": 20, + "h": 15 + }, + "frame": { + "x": 236, + "y": 466, + "w": 20, + "h": 15 + } + }, + { + "filename": "16s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 11, + "w": 18, + "h": 17 + }, + "frame": { + "x": 218, + "y": 467, + "w": 18, + "h": 17 + } + }, + { + "filename": "60s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 13, + "w": 20, + "h": 15 + }, + "frame": { + "x": 236, + "y": 481, + "w": 20, + "h": 15 + } + }, + { + "filename": "122", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 17, + "h": 18 + }, + "frame": { + "x": 201, + "y": 465, + "w": 17, + "h": 18 + } + }, + { + "filename": "69", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 13, + "w": 20, + "h": 15 + }, + "frame": { + "x": 196, + "y": 483, + "w": 20, + "h": 15 + } + }, + { + "filename": "69s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 13, + "w": 20, + "h": 15 + }, + "frame": { + "x": 216, + "y": 484, + "w": 20, + "h": 15 + } + }, + { + "filename": "39", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 18, + "h": 20 + }, + "frame": { + "x": 201, + "y": 499, + "w": 18, + "h": 20 + } + }, + { + "filename": "39s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 18, + "h": 20 + }, + "frame": { + "x": 219, + "y": 499, + "w": 18, + "h": 20 + } + }, { "filename": "90s", "rotated": false, @@ -6786,8 +6912,8 @@ "h": 18 }, "frame": { - "x": 212, - "y": 433, + "x": 237, + "y": 496, "w": 19, "h": 18 } @@ -6807,14 +6933,14 @@ "h": 18 }, "frame": { - "x": 212, - "y": 451, + "x": 237, + "y": 514, "w": 19, "h": 18 } }, { - "filename": "114s", + "filename": "29", "rotated": false, "trimmed": true, "sourceSize": { @@ -6823,19 +6949,19 @@ }, "spriteSourceSize": { "x": 11, - "y": 10, - "w": 19, - "h": 18 + "y": 9, + "w": 18, + "h": 19 }, "frame": { - "x": 212, - "y": 469, - "w": 19, - "h": 18 + "x": 210, + "y": 519, + "w": 18, + "h": 19 } }, { - "filename": "21s", + "filename": "29s", "rotated": false, "trimmed": true, "sourceSize": { @@ -6844,19 +6970,19 @@ }, "spriteSourceSize": { "x": 11, - "y": 12, - "w": 19, - "h": 16 + "y": 9, + "w": 18, + "h": 19 }, "frame": { - "x": 212, - "y": 487, - "w": 19, - "h": 16 + "x": 215, + "y": 538, + "w": 18, + "h": 19 } }, { - "filename": "100", + "filename": "35", "rotated": false, "trimmed": true, "sourceSize": { @@ -6864,16 +6990,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, - "y": 14, - "w": 14, - "h": 14 + "x": 12, + "y": 9, + "w": 18, + "h": 19 }, "frame": { - "x": 203, - "y": 503, - "w": 14, - "h": 14 + "x": 217, + "y": 557, + "w": 18, + "h": 19 } }, { @@ -6892,55 +7018,13 @@ }, "frame": { "x": 217, - "y": 503, + "y": 576, "w": 18, "h": 19 } }, { - "filename": "43s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 17, - "h": 19 - }, - "frame": { - "x": 235, - "y": 502, - "w": 17, - "h": 19 - } - }, - { - "filename": "122", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 17, - "h": 18 - }, - "frame": { - "x": 235, - "y": 521, - "w": 17, - "h": 18 - } - }, - { - "filename": "147s", + "filename": "114s", "rotated": false, "trimmed": true, "sourceSize": { @@ -6950,13 +7034,13 @@ "spriteSourceSize": { "x": 11, "y": 10, - "w": 20, + "w": 19, "h": 18 }, "frame": { - "x": 209, - "y": 522, - "w": 20, + "x": 218, + "y": 595, + "w": 19, "h": 18 } }, @@ -6975,96 +7059,12 @@ "h": 18 }, "frame": { - "x": 208, - "y": 540, + "x": 237, + "y": 532, "w": 19, "h": 18 } }, - { - "filename": "39s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 18, - "h": 20 - }, - "frame": { - "x": 210, - "y": 558, - "w": 18, - "h": 20 - } - }, - { - "filename": "66", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 16, - "h": 20 - }, - "frame": { - "x": 212, - "y": 578, - "w": 16, - "h": 20 - } - }, - { - "filename": "66s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 16, - "h": 20 - }, - "frame": { - "x": 212, - "y": 598, - "w": 16, - "h": 20 - } - }, - { - "filename": "60", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 13, - "w": 20, - "h": 15 - }, - "frame": { - "x": 191, - "y": 413, - "w": 20, - "h": 15 - } - }, { "filename": "121s", "rotated": false, @@ -7080,33 +7080,12 @@ "h": 18 }, "frame": { - "x": 189, - "y": 428, + "x": 218, + "y": 613, "w": 19, "h": 18 } }, - { - "filename": "60s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 13, - "w": 20, - "h": 15 - }, - "frame": { - "x": 189, - "y": 446, - "w": 20, - "h": 15 - } - }, { "filename": "137", "rotated": false, @@ -7122,8 +7101,8 @@ "h": 18 }, "frame": { - "x": 187, - "y": 461, + "x": 237, + "y": 550, "w": 19, "h": 18 } @@ -7143,75 +7122,12 @@ "h": 18 }, "frame": { - "x": 187, - "y": 479, + "x": 237, + "y": 568, "w": 19, "h": 18 } }, - { - "filename": "122s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 17, - "h": 18 - }, - "frame": { - "x": 227, - "y": 540, - "w": 17, - "h": 18 - } - }, - { - "filename": "133", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 17, - "h": 18 - }, - "frame": { - "x": 228, - "y": 558, - "w": 17, - "h": 18 - } - }, - { - "filename": "133s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 17, - "h": 18 - }, - "frame": { - "x": 228, - "y": 576, - "w": 17, - "h": 18 - } - }, { "filename": "138", "rotated": false, @@ -7227,33 +7143,12 @@ "h": 18 }, "frame": { - "x": 228, - "y": 594, + "x": 237, + "y": 586, "w": 18, "h": 18 } }, - { - "filename": "69", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 13, - "w": 20, - "h": 15 - }, - "frame": { - "x": 228, - "y": 612, - "w": 20, - "h": 15 - } - }, { "filename": "138s", "rotated": false, @@ -7269,33 +7164,12 @@ "h": 18 }, "frame": { - "x": 210, - "y": 619, + "x": 237, + "y": 604, "w": 18, "h": 18 } }, - { - "filename": "69s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 13, - "w": 20, - "h": 15 - }, - "frame": { - "x": 228, - "y": 627, - "w": 20, - "h": 15 - } - }, { "filename": "116", "rotated": false, @@ -7311,8 +7185,8 @@ "h": 17 }, "frame": { - "x": 210, - "y": 637, + "x": 237, + "y": 622, "w": 18, "h": 17 } @@ -7332,12 +7206,54 @@ "h": 17 }, "frame": { - "x": 209, - "y": 654, + "x": 219, + "y": 631, "w": 18, "h": 17 } }, + { + "filename": "122s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 17, + "h": 18 + }, + "frame": { + "x": 219, + "y": 648, + "w": 17, + "h": 18 + } + }, + { + "filename": "133", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 17, + "h": 18 + }, + "frame": { + "x": 219, + "y": 666, + "w": 17, + "h": 18 + } + }, { "filename": "120", "rotated": false, @@ -7353,8 +7269,8 @@ "h": 17 }, "frame": { - "x": 209, - "y": 671, + "x": 219, + "y": 684, "w": 17, "h": 17 } @@ -7374,12 +7290,54 @@ "h": 17 }, "frame": { - "x": 228, - "y": 642, + "x": 237, + "y": 639, "w": 17, "h": 17 } }, + { + "filename": "133s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 17, + "h": 18 + }, + "frame": { + "x": 236, + "y": 656, + "w": 17, + "h": 18 + } + }, + { + "filename": "13s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 16, + "h": 17 + }, + "frame": { + "x": 236, + "y": 674, + "w": 16, + "h": 17 + } + }, { "filename": "101", "rotated": false, @@ -7395,12 +7353,54 @@ "h": 16 }, "frame": { - "x": 227, - "y": 659, + "x": 236, + "y": 691, "w": 16, "h": 16 } }, + { + "filename": "11", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 10, + "w": 12, + "h": 18 + }, + "frame": { + "x": 197, + "y": 704, + "w": 12, + "h": 18 + } + }, + { + "filename": "11s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 10, + "w": 12, + "h": 18 + }, + "frame": { + "x": 197, + "y": 722, + "w": 12, + "h": 18 + } + }, { "filename": "101s", "rotated": false, @@ -7416,56 +7416,14 @@ "h": 16 }, "frame": { - "x": 226, - "y": 675, + "x": 209, + "y": 701, "w": 16, "h": 16 } }, { - "filename": "140", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 15, - "w": 16, - "h": 13 - }, - "frame": { - "x": 220, - "y": 691, - "w": 16, - "h": 13 - } - }, - { - "filename": "140s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 15, - "w": 16, - "h": 13 - }, - "frame": { - "x": 236, - "y": 691, - "w": 16, - "h": 13 - } - }, - { - "filename": "100s", + "filename": "14s", "rotated": false, "trimmed": true, "sourceSize": { @@ -7474,15 +7432,57 @@ }, "spriteSourceSize": { "x": 13, - "y": 14, - "w": 14, - "h": 14 + "y": 10, + "w": 13, + "h": 18 }, "frame": { - "x": 220, - "y": 704, + "x": 209, + "y": 717, + "w": 13, + "h": 18 + } + }, + { + "filename": "10", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 12, "w": 14, - "h": 14 + "h": 16 + }, + "frame": { + "x": 210, + "y": 735, + "w": 14, + "h": 16 + } + }, + { + "filename": "10s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 12, + "w": 14, + "h": 16 + }, + "frame": { + "x": 222, + "y": 717, + "w": 14, + "h": 16 } } ] @@ -7491,6 +7491,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:85a482ea583d804e387d72159fb4dc3a:dada7b2afa6cda0b92202c49682cefa0:e0e302e76ca76d7185883646a41dda84$" + "smartupdate": "$TexturePacker:SmartUpdate:aee11af9f29a12670b32e91d8d36169c:0adaf84d65f473c5cebaf3ea5359fc3d:e0e302e76ca76d7185883646a41dda84$" } } diff --git a/public/images/pokemon_icons_1.png b/public/images/pokemon_icons_1.png index 629dee386..50dc52d43 100644 Binary files a/public/images/pokemon_icons_1.png and b/public/images/pokemon_icons_1.png differ diff --git a/public/images/pokemon_icons_1v.json b/public/images/pokemon_icons_1v.json index daa3e070e..77019eb2c 100644 --- a/public/images/pokemon_icons_1v.json +++ b/public/images/pokemon_icons_1v.json @@ -199,7 +199,7 @@ } }, { - "filename": "29_1", + "filename": "29_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -220,7 +220,7 @@ } }, { - "filename": "29_2", + "filename": "29_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -241,7 +241,7 @@ } }, { - "filename": "29_3", + "filename": "35_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -249,7 +249,7 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, + "x": 11, "y": 8, "w": 20, "h": 21 @@ -262,7 +262,7 @@ } }, { - "filename": "35_2", + "filename": "35_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -283,7 +283,7 @@ } }, { - "filename": "35_3", + "filename": "123_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -291,15 +291,15 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, + "x": 10, "y": 8, - "w": 20, + "w": 21, "h": 21 }, "frame": { "x": 20, "y": 17, - "w": 20, + "w": 21, "h": 21 } }, @@ -318,7 +318,7 @@ "h": 21 }, "frame": { - "x": 40, + "x": 41, "y": 20, "w": 26, "h": 21 @@ -339,7 +339,7 @@ "h": 21 }, "frame": { - "x": 66, + "x": 67, "y": 20, "w": 26, "h": 21 @@ -360,33 +360,12 @@ "h": 21 }, "frame": { - "x": 92, + "x": 93, "y": 20, "w": 26, "h": 21 } }, - { - "filename": "123_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, - "h": 21 - }, - "frame": { - "x": 118, - "y": 20, - "w": 21, - "h": 21 - } - }, { "filename": "123_2", "rotated": false, @@ -402,7 +381,7 @@ "h": 21 }, "frame": { - "x": 139, + "x": 119, "y": 20, "w": 21, "h": 21 @@ -423,7 +402,7 @@ "h": 21 }, "frame": { - "x": 160, + "x": 140, "y": 20, "w": 21, "h": 21 @@ -444,12 +423,33 @@ "h": 21 }, "frame": { - "x": 181, + "x": 161, "y": 20, "w": 31, "h": 21 } }, + { + "filename": "41_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 23, + "h": 22 + }, + "frame": { + "x": 192, + "y": 20, + "w": 23, + "h": 22 + } + }, { "filename": "145_2", "rotated": false, @@ -465,7 +465,7 @@ "h": 21 }, "frame": { - "x": 212, + "x": 215, "y": 21, "w": 31, "h": 21 @@ -486,14 +486,14 @@ "h": 21 }, "frame": { - "x": 243, + "x": 246, "y": 21, "w": 31, "h": 21 } }, { - "filename": "41_1", + "filename": "41_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -513,27 +513,6 @@ "h": 22 } }, - { - "filename": "41_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 23, - "h": 22 - }, - "frame": { - "x": 23, - "y": 41, - "w": 23, - "h": 22 - } - }, { "filename": "41_3", "rotated": false, @@ -549,7 +528,7 @@ "h": 22 }, "frame": { - "x": 46, + "x": 23, "y": 41, "w": 23, "h": 22 @@ -570,7 +549,7 @@ "h": 22 }, "frame": { - "x": 69, + "x": 46, "y": 41, "w": 24, "h": 22 @@ -591,7 +570,7 @@ "h": 22 }, "frame": { - "x": 93, + "x": 70, "y": 41, "w": 24, "h": 22 @@ -612,7 +591,7 @@ "h": 22 }, "frame": { - "x": 117, + "x": 94, "y": 41, "w": 24, "h": 22 @@ -633,7 +612,7 @@ "h": 22 }, "frame": { - "x": 141, + "x": 118, "y": 41, "w": 24, "h": 22 @@ -654,7 +633,7 @@ "h": 22 }, "frame": { - "x": 165, + "x": 142, "y": 41, "w": 24, "h": 22 @@ -675,7 +654,7 @@ "h": 22 }, "frame": { - "x": 189, + "x": 166, "y": 41, "w": 21, "h": 22 @@ -696,7 +675,7 @@ "h": 22 }, "frame": { - "x": 210, + "x": 187, "y": 42, "w": 21, "h": 22 @@ -717,14 +696,35 @@ "h": 22 }, "frame": { - "x": 231, + "x": 208, "y": 42, "w": 21, "h": 22 } }, { - "filename": "52_1", + "filename": "119_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 27, + "h": 22 + }, + "frame": { + "x": 229, + "y": 42, + "w": 27, + "h": 22 + } + }, + { + "filename": "30_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -733,19 +733,19 @@ }, "spriteSourceSize": { "x": 10, - "y": 6, - "w": 23, - "h": 23 + "y": 5, + "w": 21, + "h": 24 }, "frame": { - "x": 252, + "x": 256, "y": 42, - "w": 23, - "h": 23 + "w": 21, + "h": 24 } }, { - "filename": "52_2", + "filename": "52_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -766,7 +766,7 @@ } }, { - "filename": "119_1", + "filename": "119_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -787,7 +787,7 @@ } }, { - "filename": "119_2", + "filename": "119_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -807,27 +807,6 @@ "h": 22 } }, - { - "filename": "119_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 27, - "h": 22 - }, - "frame": { - "x": 77, - "y": 63, - "w": 27, - "h": 22 - } - }, { "filename": "144_1", "rotated": false, @@ -843,7 +822,7 @@ "h": 22 }, "frame": { - "x": 104, + "x": 77, "y": 63, "w": 29, "h": 22 @@ -864,7 +843,7 @@ "h": 22 }, "frame": { - "x": 133, + "x": 106, "y": 63, "w": 29, "h": 22 @@ -885,12 +864,33 @@ "h": 22 }, "frame": { - "x": 162, + "x": 135, "y": 63, "w": 29, "h": 22 } }, + { + "filename": "52_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 23, + "h": 23 + }, + "frame": { + "x": 164, + "y": 63, + "w": 23, + "h": 23 + } + }, { "filename": "52_3", "rotated": false, @@ -906,7 +906,7 @@ "h": 23 }, "frame": { - "x": 191, + "x": 187, "y": 64, "w": 23, "h": 23 @@ -927,14 +927,14 @@ "h": 23 }, "frame": { - "x": 214, + "x": 210, "y": 64, "w": 25, "h": 23 } }, { - "filename": "92_2", + "filename": "30_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -942,16 +942,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 25, - "h": 23 + "x": 10, + "y": 5, + "w": 21, + "h": 24 }, "frame": { - "x": 239, - "y": 65, - "w": 25, - "h": 23 + "x": 235, + "y": 64, + "w": 21, + "h": 24 } }, { @@ -976,7 +976,7 @@ } }, { - "filename": "92_3", + "filename": "92_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -996,6 +996,27 @@ "h": 23 } }, + { + "filename": "92_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 25, + "h": 23 + }, + "frame": { + "x": 47, + "y": 85, + "w": 25, + "h": 23 + } + }, { "filename": "131_2", "rotated": false, @@ -1011,7 +1032,7 @@ "h": 23 }, "frame": { - "x": 47, + "x": 72, "y": 85, "w": 26, "h": 23 @@ -1032,7 +1053,7 @@ "h": 23 }, "frame": { - "x": 73, + "x": 98, "y": 85, "w": 26, "h": 23 @@ -1053,7 +1074,7 @@ "h": 23 }, "frame": { - "x": 99, + "x": 124, "y": 85, "w": 25, "h": 23 @@ -1074,8 +1095,8 @@ "h": 23 }, "frame": { - "x": 124, - "y": 85, + "x": 149, + "y": 86, "w": 25, "h": 23 } @@ -1095,8 +1116,8 @@ "h": 23 }, "frame": { - "x": 149, - "y": 85, + "x": 174, + "y": 87, "w": 22, "h": 23 } @@ -1116,7 +1137,7 @@ "h": 23 }, "frame": { - "x": 171, + "x": 196, "y": 87, "w": 22, "h": 23 @@ -1137,33 +1158,12 @@ "h": 23 }, "frame": { - "x": 193, - "y": 87, + "x": 218, + "y": 88, "w": 25, "h": 23 } }, - { - "filename": "30_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 21, - "h": 24 - }, - "frame": { - "x": 218, - "y": 87, - "w": 21, - "h": 24 - } - }, { "filename": "136_2", "rotated": false, @@ -1179,14 +1179,14 @@ "h": 23 }, "frame": { - "x": 239, + "x": 243, "y": 88, "w": 25, "h": 23 } }, { - "filename": "30_3", + "filename": "36_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1194,16 +1194,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 21, - "h": 24 + "x": 9, + "y": 4, + "w": 22, + "h": 25 }, "frame": { "x": 0, "y": 106, - "w": 21, - "h": 24 + "w": 22, + "h": 25 } }, { @@ -1221,7 +1221,7 @@ "h": 23 }, "frame": { - "x": 21, + "x": 22, "y": 108, "w": 25, "h": 23 @@ -1242,7 +1242,7 @@ "h": 24 }, "frame": { - "x": 46, + "x": 47, "y": 108, "w": 28, "h": 24 @@ -1263,7 +1263,7 @@ "h": 24 }, "frame": { - "x": 74, + "x": 75, "y": 108, "w": 28, "h": 24 @@ -1284,7 +1284,7 @@ "h": 24 }, "frame": { - "x": 102, + "x": 103, "y": 108, "w": 28, "h": 24 @@ -1305,8 +1305,8 @@ "h": 24 }, "frame": { - "x": 130, - "y": 108, + "x": 131, + "y": 109, "w": 24, "h": 24 } @@ -1326,7 +1326,7 @@ "h": 24 }, "frame": { - "x": 154, + "x": 155, "y": 110, "w": 24, "h": 24 @@ -1347,7 +1347,7 @@ "h": 24 }, "frame": { - "x": 178, + "x": 179, "y": 110, "w": 24, "h": 24 @@ -1368,7 +1368,7 @@ "h": 24 }, "frame": { - "x": 202, + "x": 203, "y": 111, "w": 25, "h": 24 @@ -1389,12 +1389,33 @@ "h": 24 }, "frame": { - "x": 227, + "x": 228, "y": 111, "w": 25, "h": 24 } }, + { + "filename": "148_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 24, + "h": 24 + }, + "frame": { + "x": 253, + "y": 111, + "w": 24, + "h": 24 + } + }, { "filename": "53_3", "rotated": false, @@ -1410,12 +1431,33 @@ "h": 24 }, "frame": { - "x": 252, - "y": 111, + "x": 0, + "y": 131, "w": 25, "h": 24 } }, + { + "filename": "36_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 22, + "h": 25 + }, + "frame": { + "x": 25, + "y": 131, + "w": 22, + "h": 25 + } + }, { "filename": "83_2", "rotated": false, @@ -1431,8 +1473,8 @@ "h": 24 }, "frame": { - "x": 0, - "y": 131, + "x": 47, + "y": 132, "w": 28, "h": 24 } @@ -1452,33 +1494,12 @@ "h": 24 }, "frame": { - "x": 28, + "x": 75, "y": 132, "w": 28, "h": 24 } }, - { - "filename": "148_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 24, - "h": 24 - }, - "frame": { - "x": 56, - "y": 132, - "w": 24, - "h": 24 - } - }, { "filename": "148_3", "rotated": false, @@ -1494,7 +1515,7 @@ "h": 24 }, "frame": { - "x": 80, + "x": 103, "y": 132, "w": 24, "h": 24 @@ -1515,33 +1536,12 @@ "h": 24 }, "frame": { - "x": 104, - "y": 132, + "x": 127, + "y": 133, "w": 27, "h": 24 } }, - { - "filename": "36_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 22, - "h": 25 - }, - "frame": { - "x": 131, - "y": 132, - "w": 22, - "h": 25 - } - }, { "filename": "149_3", "rotated": false, @@ -1557,14 +1557,14 @@ "h": 24 }, "frame": { - "x": 153, + "x": 154, "y": 134, "w": 27, "h": 24 } }, { - "filename": "36_3", + "filename": "150_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1572,13 +1572,13 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, + "x": 11, "y": 4, "w": 22, "h": 25 }, "frame": { - "x": 180, + "x": 181, "y": 134, "w": 22, "h": 25 @@ -1599,7 +1599,7 @@ "h": 25 }, "frame": { - "x": 202, + "x": 203, "y": 135, "w": 25, "h": 25 @@ -1620,12 +1620,33 @@ "h": 25 }, "frame": { - "x": 227, + "x": 228, "y": 135, "w": 25, "h": 25 } }, + { + "filename": "150_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 22, + "h": 25 + }, + "frame": { + "x": 253, + "y": 135, + "w": 22, + "h": 25 + } + }, { "filename": "31_3", "rotated": false, @@ -1640,31 +1661,10 @@ "w": 25, "h": 25 }, - "frame": { - "x": 252, - "y": 135, - "w": 25, - "h": 25 - } - }, - { - "filename": "77_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 26, - "h": 25 - }, "frame": { "x": 0, "y": 155, - "w": 26, + "w": 25, "h": 25 } }, @@ -1683,7 +1683,7 @@ "h": 25 }, "frame": { - "x": 26, + "x": 25, "y": 156, "w": 30, "h": 25 @@ -1704,12 +1704,33 @@ "h": 25 }, "frame": { - "x": 56, + "x": 55, "y": 156, "w": 30, "h": 25 } }, + { + "filename": "77_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 26, + "h": 25 + }, + "frame": { + "x": 85, + "y": 156, + "w": 26, + "h": 25 + } + }, { "filename": "77_3", "rotated": false, @@ -1725,8 +1746,8 @@ "h": 25 }, "frame": { - "x": 86, - "y": 156, + "x": 111, + "y": 157, "w": 26, "h": 25 } @@ -1746,8 +1767,8 @@ "h": 25 }, "frame": { - "x": 112, - "y": 157, + "x": 137, + "y": 158, "w": 27, "h": 25 } @@ -1767,8 +1788,8 @@ "h": 25 }, "frame": { - "x": 139, - "y": 158, + "x": 164, + "y": 159, "w": 27, "h": 25 } @@ -1788,8 +1809,8 @@ "h": 25 }, "frame": { - "x": 166, - "y": 159, + "x": 191, + "y": 160, "w": 27, "h": 25 } @@ -1809,7 +1830,7 @@ "h": 25 }, "frame": { - "x": 193, + "x": 218, "y": 160, "w": 27, "h": 25 @@ -1830,7 +1851,7 @@ "h": 25 }, "frame": { - "x": 220, + "x": 245, "y": 160, "w": 27, "h": 25 @@ -1850,52 +1871,10 @@ "w": 27, "h": 25 }, - "frame": { - "x": 247, - "y": 160, - "w": 27, - "h": 25 - } - }, - { - "filename": "150_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 22, - "h": 25 - }, "frame": { "x": 0, - "y": 180, - "w": 22, - "h": 25 - } - }, - { - "filename": "150_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 22, - "h": 25 - }, - "frame": { - "x": 22, "y": 181, - "w": 22, + "w": 27, "h": 25 } }, @@ -1914,7 +1893,7 @@ "h": 26 }, "frame": { - "x": 44, + "x": 27, "y": 181, "w": 26, "h": 26 @@ -1935,7 +1914,7 @@ "h": 26 }, "frame": { - "x": 70, + "x": 53, "y": 181, "w": 26, "h": 26 @@ -1956,8 +1935,8 @@ "h": 26 }, "frame": { - "x": 96, - "y": 182, + "x": 79, + "y": 181, "w": 26, "h": 26 } @@ -1977,8 +1956,8 @@ "h": 27 }, "frame": { - "x": 122, - "y": 183, + "x": 105, + "y": 182, "w": 25, "h": 27 } @@ -1998,8 +1977,8 @@ "h": 27 }, "frame": { - "x": 147, - "y": 184, + "x": 130, + "y": 183, "w": 25, "h": 27 } @@ -2019,8 +1998,8 @@ "h": 28 }, "frame": { - "x": 172, - "y": 185, + "x": 155, + "y": 184, "w": 31, "h": 28 } @@ -2040,7 +2019,7 @@ "h": 28 }, "frame": { - "x": 203, + "x": 186, "y": 185, "w": 31, "h": 28 @@ -2061,54 +2040,12 @@ "h": 28 }, "frame": { - "x": 234, + "x": 217, "y": 185, "w": 32, "h": 28 } }, - { - "filename": "93_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 32, - "h": 28 - }, - "frame": { - "x": 0, - "y": 206, - "w": 32, - "h": 28 - } - }, - { - "filename": "93_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 32, - "h": 28 - }, - "frame": { - "x": 32, - "y": 207, - "w": 32, - "h": 28 - } - }, { "filename": "150-mega-x_2", "rotated": false, @@ -2124,8 +2061,8 @@ "h": 28 }, "frame": { - "x": 64, - "y": 207, + "x": 249, + "y": 185, "w": 23, "h": 28 } @@ -2145,12 +2082,54 @@ "h": 28 }, "frame": { - "x": 87, - "y": 208, + "x": 0, + "y": 206, "w": 23, "h": 28 } }, + { + "filename": "93_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 32, + "h": 28 + }, + "frame": { + "x": 23, + "y": 207, + "w": 32, + "h": 28 + } + }, + { + "filename": "93_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 2, + "y": 1, + "w": 32, + "h": 28 + }, + "frame": { + "x": 55, + "y": 207, + "w": 32, + "h": 28 + } + }, { "filename": "131-gigantamax_2", "rotated": false, @@ -2166,7 +2145,28 @@ "h": 29 }, "frame": { - "x": 110, + "x": 87, + "y": 209, + "w": 33, + "h": 29 + } + }, + { + "filename": "131-gigantamax_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 33, + "h": 29 + }, + "frame": { + "x": 120, "y": 210, "w": 33, "h": 29 @@ -2187,33 +2187,12 @@ "h": 30 }, "frame": { - "x": 143, - "y": 211, + "x": 153, + "y": 212, "w": 25, "h": 30 } }, - { - "filename": "131-gigantamax_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 33, - "h": 29 - }, - "frame": { - "x": 168, - "y": 213, - "w": 33, - "h": 29 - } - }, { "filename": "52-gigantamax_2", "rotated": false, @@ -2229,7 +2208,7 @@ "h": 30 }, "frame": { - "x": 201, + "x": 178, "y": 213, "w": 25, "h": 30 @@ -2250,14 +2229,14 @@ "h": 30 }, "frame": { - "x": 226, + "x": 203, "y": 213, "w": 25, "h": 30 } }, { - "filename": "150-mega-y_2", + "filename": "94-gigantamax_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -2265,20 +2244,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, + "x": 3, "y": 0, - "w": 22, + "w": 34, "h": 30 }, "frame": { - "x": 251, + "x": 228, "y": 213, - "w": 22, + "w": 34, "h": 30 } }, { - "filename": "150-mega-y_3", + "filename": "150-mega-y_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -2299,7 +2278,7 @@ } }, { - "filename": "94-gigantamax_1", + "filename": "94-gigantamax_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -2320,7 +2299,7 @@ } }, { - "filename": "94-gigantamax_2", + "filename": "150-mega-y_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -2328,15 +2307,15 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, + "x": 9, "y": 0, - "w": 34, + "w": 22, "h": 30 }, "frame": { "x": 56, - "y": 236, - "w": 34, + "y": 235, + "w": 22, "h": 30 } }, @@ -2355,8 +2334,8 @@ "h": 30 }, "frame": { - "x": 90, - "y": 239, + "x": 78, + "y": 238, "w": 34, "h": 30 } @@ -2376,8 +2355,8 @@ "h": 30 }, "frame": { - "x": 124, - "y": 241, + "x": 112, + "y": 239, "w": 36, "h": 30 } @@ -2397,8 +2376,8 @@ "h": 30 }, "frame": { - "x": 160, - "y": 242, + "x": 148, + "y": 243, "w": 36, "h": 30 } @@ -2418,7 +2397,7 @@ "h": 30 }, "frame": { - "x": 196, + "x": 184, "y": 243, "w": 36, "h": 30 @@ -2430,6 +2409,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:429d90e6d126fba8a16e4abf1b881671:64ab0e3b54dd7c7e4e6017f2657aa1f5:2fc2d7db306a93e9369e20846ccef45c$" + "smartupdate": "$TexturePacker:SmartUpdate:a24b64a86b919c517cbab75f64d0acf0:bf992b480273c9544bc10eecda7671d7:2fc2d7db306a93e9369e20846ccef45c$" } } diff --git a/public/images/pokemon_icons_1v.png b/public/images/pokemon_icons_1v.png index 48eb12fe1..0c4f3d319 100644 Binary files a/public/images/pokemon_icons_1v.png and b/public/images/pokemon_icons_1v.png differ diff --git a/public/images/pokemon_icons_2.json b/public/images/pokemon_icons_2.json index 67d78812e..c99d8030a 100644 --- a/public/images/pokemon_icons_2.json +++ b/public/images/pokemon_icons_2.json @@ -4357,7 +4357,7 @@ } }, { - "filename": "172-spiky", + "filename": "172", "rotated": false, "trimmed": true, "sourceSize": { @@ -4462,7 +4462,7 @@ } }, { - "filename": "172", + "filename": "172-spiky", "rotated": false, "trimmed": true, "sourceSize": { @@ -4714,7 +4714,7 @@ } }, { - "filename": "172s-spiky", + "filename": "172s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4777,7 +4777,7 @@ } }, { - "filename": "172s", + "filename": "172s-spiky", "rotated": false, "trimmed": true, "sourceSize": { @@ -5643,6 +5643,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:24c0e043b77bb41bcd335b45d511469e:5ea4e40521f9e8df97120dca6c6a75d4:c4863c5093a921f7cedf2f07c8e4b312$" + "smartupdate": "$TexturePacker:SmartUpdate:fb65cd7da07b1ca17dcf790954979dcb:904e2f46add51b0142753f21661bb455:c4863c5093a921f7cedf2f07c8e4b312$" } } diff --git a/public/images/pokemon_icons_2.png b/public/images/pokemon_icons_2.png index 1be4d74bb..2596dfa26 100644 Binary files a/public/images/pokemon_icons_2.png and b/public/images/pokemon_icons_2.png differ diff --git a/public/images/pokemon_icons_3.json b/public/images/pokemon_icons_3.json index 124686180..220d91f52 100644 --- a/public/images/pokemon_icons_3.json +++ b/public/images/pokemon_icons_3.json @@ -4,8 +4,8 @@ "image": "pokemon_icons_3.png", "format": "RGBA8888", "size": { - "w": 246, - "h": 682 + "w": 256, + "h": 657 }, "scale": 1, "frames": [ @@ -324,27 +324,6 @@ "h": 24 } }, - { - "filename": "308-mega", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 29, - "h": 27 - }, - "frame": { - "x": 217, - "y": 0, - "w": 29, - "h": 27 - } - }, { "filename": "381s-mega", "rotated": false, @@ -506,6 +485,27 @@ "w": 36, "h": 21 }, + "frame": { + "x": 217, + "y": 0, + "w": 36, + "h": 21 + } + }, + { + "filename": "382s-primal", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 8, + "w": 36, + "h": 21 + }, "frame": { "x": 180, "y": 24, @@ -528,8 +528,8 @@ "h": 26 }, "frame": { - "x": 216, - "y": 27, + "x": 0, + "y": 347, "w": 30, "h": 26 } @@ -550,11 +550,32 @@ }, "frame": { "x": 0, - "y": 347, + "y": 373, "w": 30, "h": 26 } }, + { + "filename": "308-mega", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 2, + "w": 29, + "h": 27 + }, + "frame": { + "x": 0, + "y": 399, + "w": 29, + "h": 27 + } + }, { "filename": "308s-mega", "rotated": false, @@ -571,7 +592,7 @@ }, "frame": { "x": 0, - "y": 373, + "y": 426, "w": 29, "h": 27 } @@ -592,7 +613,7 @@ }, "frame": { "x": 0, - "y": 400, + "y": 453, "w": 26, "h": 30 } @@ -613,7 +634,7 @@ }, "frame": { "x": 0, - "y": 430, + "y": 483, "w": 26, "h": 30 } @@ -634,7 +655,7 @@ }, "frame": { "x": 0, - "y": 460, + "y": 513, "w": 28, "h": 27 } @@ -655,7 +676,7 @@ }, "frame": { "x": 0, - "y": 487, + "y": 540, "w": 28, "h": 27 } @@ -676,7 +697,7 @@ }, "frame": { "x": 0, - "y": 514, + "y": 567, "w": 28, "h": 26 } @@ -697,7 +718,7 @@ }, "frame": { "x": 0, - "y": 540, + "y": 593, "w": 28, "h": 26 } @@ -718,13 +739,13 @@ }, "frame": { "x": 0, - "y": 566, + "y": 619, "w": 29, "h": 26 } }, { - "filename": "386s-attack", + "filename": "304", "rotated": false, "trimmed": true, "sourceSize": { @@ -732,20 +753,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 29, - "h": 26 + "x": 12, + "y": 16, + "w": 16, + "h": 12 }, "frame": { "x": 0, - "y": 592, - "w": 29, - "h": 26 + "y": 645, + "w": 16, + "h": 12 } }, { - "filename": "275", + "filename": "304s", "rotated": false, "trimmed": true, "sourceSize": { @@ -753,121 +774,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 31, - "h": 24 + "x": 12, + "y": 16, + "w": 16, + "h": 12 }, "frame": { - "x": 0, - "y": 618, - "w": 31, - "h": 24 - } - }, - { - "filename": "275s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 31, - "h": 24 - }, - "frame": { - "x": 0, - "y": 642, - "w": 31, - "h": 24 - } - }, - { - "filename": "263", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 22, - "h": 16 - }, - "frame": { - "x": 0, - "y": 666, - "w": 22, - "h": 16 - } - }, - { - "filename": "263s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 22, - "h": 16 - }, - "frame": { - "x": 22, - "y": 666, - "w": 22, - "h": 16 - } - }, - { - "filename": "382s-primal", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 8, - "w": 36, - "h": 21 - }, - "frame": { - "x": 180, - "y": 45, - "w": 36, - "h": 21 - } - }, - { - "filename": "321", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 30, - "h": 23 - }, - "frame": { - "x": 216, - "y": 53, - "w": 30, - "h": 23 + "x": 16, + "y": 645, + "w": 16, + "h": 12 } }, { @@ -1039,7 +955,7 @@ } }, { - "filename": "373", + "filename": "275", "rotated": false, "trimmed": true, "sourceSize": { @@ -1047,41 +963,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 32, - "h": 23 + "x": 5, + "y": 4, + "w": 31, + "h": 24 }, "frame": { "x": 31, "y": 234, - "w": 32, - "h": 23 + "w": 31, + "h": 24 } }, { - "filename": "373s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 32, - "h": 23 - }, - "frame": { - "x": 31, - "y": 257, - "w": 32, - "h": 23 - } - }, - { - "filename": "376", + "filename": "275s", "rotated": false, "trimmed": true, "sourceSize": { @@ -1090,61 +985,19 @@ }, "spriteSourceSize": { "x": 5, - "y": 7, - "w": 32, - "h": 23 + "y": 4, + "w": 31, + "h": 24 }, "frame": { "x": 31, - "y": 280, - "w": 32, - "h": 23 + "y": 258, + "w": 31, + "h": 24 } }, { - "filename": "376s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 32, - "h": 23 - }, - "frame": { - "x": 31, - "y": 303, - "w": 32, - "h": 23 - } - }, - { - "filename": "321s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 30, - "h": 23 - }, - "frame": { - "x": 31, - "y": 326, - "w": 30, - "h": 23 - } - }, - { - "filename": "306", + "filename": "386s-attack", "rotated": false, "trimmed": true, "sourceSize": { @@ -1155,13 +1008,13 @@ "x": 5, "y": 4, "w": 29, - "h": 24 + "h": 26 }, "frame": { - "x": 30, - "y": 349, + "x": 31, + "y": 282, "w": 29, - "h": 24 + "h": 26 } }, { @@ -1179,8 +1032,8 @@ "h": 25 }, "frame": { - "x": 29, - "y": 373, + "x": 31, + "y": 308, "w": 28, "h": 25 } @@ -1200,8 +1053,8 @@ "h": 22 }, "frame": { - "x": 29, - "y": 398, + "x": 31, + "y": 333, "w": 28, "h": 22 } @@ -1221,14 +1074,14 @@ "h": 25 }, "frame": { - "x": 26, - "y": 420, + "x": 30, + "y": 355, "w": 28, "h": 25 } }, { - "filename": "287", + "filename": "253s", "rotated": false, "trimmed": true, "sourceSize": { @@ -1237,99 +1090,15 @@ }, "spriteSourceSize": { "x": 7, - "y": 13, - "w": 25, - "h": 15 + "y": 6, + "w": 28, + "h": 22 }, "frame": { - "x": 26, - "y": 445, - "w": 25, - "h": 15 - } - }, - { - "filename": "319-mega", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 25, - "h": 27 - }, - "frame": { - "x": 28, - "y": 460, - "w": 25, - "h": 27 - } - }, - { - "filename": "319s-mega", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 25, - "h": 27 - }, - "frame": { - "x": 28, - "y": 487, - "w": 25, - "h": 27 - } - }, - { - "filename": "257", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 25, - "h": 26 - }, - "frame": { - "x": 28, - "y": 514, - "w": 25, - "h": 26 - } - }, - { - "filename": "257s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 25, - "h": 26 - }, - "frame": { - "x": 28, - "y": 540, - "w": 25, - "h": 26 + "x": 30, + "y": 380, + "w": 28, + "h": 22 } }, { @@ -1348,7 +1117,7 @@ }, "frame": { "x": 29, - "y": 566, + "y": 402, "w": 27, "h": 26 } @@ -1369,11 +1138,137 @@ }, "frame": { "x": 29, - "y": 592, + "y": 428, "w": 27, "h": 26 } }, + { + "filename": "306", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 29, + "h": 24 + }, + "frame": { + "x": 26, + "y": 454, + "w": 29, + "h": 24 + } + }, + { + "filename": "306s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 29, + "h": 24 + }, + "frame": { + "x": 26, + "y": 478, + "w": 29, + "h": 24 + } + }, + { + "filename": "319-mega", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 25, + "h": 27 + }, + "frame": { + "x": 28, + "y": 502, + "w": 25, + "h": 27 + } + }, + { + "filename": "319s-mega", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 25, + "h": 27 + }, + "frame": { + "x": 28, + "y": 529, + "w": 25, + "h": 27 + } + }, + { + "filename": "257", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 2, + "w": 25, + "h": 26 + }, + "frame": { + "x": 28, + "y": 556, + "w": 25, + "h": 26 + } + }, + { + "filename": "257s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 2, + "w": 25, + "h": 26 + }, + "frame": { + "x": 28, + "y": 582, + "w": 25, + "h": 26 + } + }, { "filename": "359-mega", "rotated": false, @@ -1389,14 +1284,14 @@ "h": 26 }, "frame": { - "x": 31, - "y": 618, + "x": 29, + "y": 608, "w": 26, "h": 26 } }, { - "filename": "253s", + "filename": "373", "rotated": false, "trimmed": true, "sourceSize": { @@ -1404,20 +1299,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 28, - "h": 22 + "x": 4, + "y": 5, + "w": 32, + "h": 23 }, "frame": { - "x": 31, - "y": 644, - "w": 28, - "h": 22 + "x": 32, + "y": 634, + "w": 32, + "h": 23 } }, { - "filename": "333", + "filename": "373s", "rotated": false, "trimmed": true, "sourceSize": { @@ -1425,20 +1320,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 11, - "w": 19, - "h": 16 + "x": 4, + "y": 5, + "w": 32, + "h": 23 }, "frame": { - "x": 44, - "y": 666, - "w": 19, - "h": 16 + "x": 217, + "y": 21, + "w": 32, + "h": 23 } }, { - "filename": "306s", + "filename": "376", "rotated": false, "trimmed": true, "sourceSize": { @@ -1447,15 +1342,78 @@ }, "spriteSourceSize": { "x": 5, - "y": 4, - "w": 29, - "h": 24 + "y": 7, + "w": 32, + "h": 23 + }, + "frame": { + "x": 180, + "y": 45, + "w": 32, + "h": 23 + } + }, + { + "filename": "376s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 32, + "h": 23 }, "frame": { "x": 75, "y": 49, - "w": 29, - "h": 24 + "w": 32, + "h": 23 + } + }, + { + "filename": "321", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 30, + "h": 23 + }, + "frame": { + "x": 68, + "y": 72, + "w": 30, + "h": 23 + } + }, + { + "filename": "321s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 30, + "h": 23 + }, + "frame": { + "x": 65, + "y": 95, + "w": 30, + "h": 23 } }, { @@ -1473,8 +1431,8 @@ "h": 22 }, "frame": { - "x": 68, - "y": 73, + "x": 65, + "y": 118, "w": 28, "h": 22 } @@ -1494,8 +1452,8 @@ "h": 26 }, "frame": { - "x": 65, - "y": 95, + "x": 63, + "y": 140, "w": 26, "h": 26 } @@ -1515,8 +1473,8 @@ "h": 25 }, "frame": { - "x": 65, - "y": 121, + "x": 63, + "y": 166, "w": 26, "h": 25 } @@ -1537,13 +1495,13 @@ }, "frame": { "x": 63, - "y": 146, + "y": 191, "w": 26, "h": 25 } }, { - "filename": "282-mega", + "filename": "269", "rotated": false, "trimmed": true, "sourceSize": { @@ -1551,16 +1509,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 4, + "x": 7, + "y": 9, "w": 26, - "h": 24 + "h": 19 }, "frame": { "x": 63, - "y": 171, + "y": 216, "w": 26, - "h": 24 + "h": 19 } }, { @@ -1578,14 +1536,14 @@ "h": 24 }, "frame": { - "x": 63, - "y": 195, + "x": 62, + "y": 235, "w": 26, "h": 24 } }, { - "filename": "282s-mega", + "filename": "282-mega", "rotated": false, "trimmed": true, "sourceSize": { @@ -1599,8 +1557,8 @@ "h": 24 }, "frame": { - "x": 63, - "y": 219, + "x": 62, + "y": 259, "w": 26, "h": 24 } @@ -1620,12 +1578,75 @@ "h": 24 }, "frame": { - "x": 63, - "y": 243, + "x": 60, + "y": 283, "w": 26, "h": 24 } }, + { + "filename": "256", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 23, + "h": 25 + }, + "frame": { + "x": 98, + "y": 72, + "w": 23, + "h": 25 + } + }, + { + "filename": "282s-mega", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 26, + "h": 24 + }, + "frame": { + "x": 95, + "y": 97, + "w": 26, + "h": 24 + } + }, + { + "filename": "365s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 28, + "h": 22 + }, + "frame": { + "x": 93, + "y": 121, + "w": 28, + "h": 22 + } + }, { "filename": "310-mega", "rotated": false, @@ -1641,8 +1662,8 @@ "h": 24 }, "frame": { - "x": 63, - "y": 267, + "x": 89, + "y": 143, "w": 26, "h": 24 } @@ -1662,35 +1683,14 @@ "h": 24 }, "frame": { - "x": 63, - "y": 291, + "x": 89, + "y": 167, "w": 26, "h": 24 } }, { - "filename": "269", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 9, - "w": 26, - "h": 19 - }, - "frame": { - "x": 63, - "y": 315, - "w": 26, - "h": 19 - } - }, - { - "filename": "365s", + "filename": "356", "rotated": false, "trimmed": true, "sourceSize": { @@ -1699,19 +1699,19 @@ }, "spriteSourceSize": { "x": 8, - "y": 6, - "w": 28, - "h": 22 + "y": 4, + "w": 26, + "h": 24 }, "frame": { - "x": 61, - "y": 334, - "w": 28, - "h": 22 + "x": 89, + "y": 191, + "w": 26, + "h": 24 } }, { - "filename": "381", + "filename": "284", "rotated": false, "trimmed": true, "sourceSize": { @@ -1719,16 +1719,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, + "x": 7, "y": 5, - "w": 28, - "h": 22 + "w": 26, + "h": 23 }, "frame": { - "x": 59, - "y": 356, - "w": 28, - "h": 22 + "x": 89, + "y": 215, + "w": 26, + "h": 23 } }, { @@ -1746,8 +1746,8 @@ "h": 23 }, "frame": { - "x": 57, - "y": 378, + "x": 88, + "y": 238, "w": 27, "h": 23 } @@ -1767,365 +1767,8 @@ "h": 22 }, "frame": { - "x": 57, - "y": 401, - "w": 27, - "h": 22 - } - }, - { - "filename": "381s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 28, - "h": 22 - }, - "frame": { - "x": 54, - "y": 423, - "w": 28, - "h": 22 - } - }, - { - "filename": "287s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 13, - "w": 25, - "h": 15 - }, - "frame": { - "x": 51, - "y": 445, - "w": 25, - "h": 15 - } - }, - { - "filename": "256", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 23, - "h": 25 - }, - "frame": { - "x": 53, - "y": 460, - "w": 23, - "h": 25 - } - }, - { - "filename": "256s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 23, - "h": 25 - }, - "frame": { - "x": 53, - "y": 485, - "w": 23, - "h": 25 - } - }, - { - "filename": "272", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 22, - "h": 26 - }, - "frame": { - "x": 53, - "y": 510, - "w": 22, - "h": 26 - } - }, - { - "filename": "272s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 22, - "h": 26 - }, - "frame": { - "x": 53, - "y": 536, - "w": 22, - "h": 26 - } - }, - { - "filename": "332", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 1, - "w": 19, - "h": 27 - }, - "frame": { - "x": 56, - "y": 562, - "w": 19, - "h": 27 - } - }, - { - "filename": "332s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 1, - "w": 19, - "h": 27 - }, - "frame": { - "x": 56, - "y": 589, - "w": 19, - "h": 27 - } - }, - { - "filename": "286", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 23, - "h": 25 - }, - "frame": { - "x": 57, - "y": 616, - "w": 23, - "h": 25 - } - }, - { - "filename": "286s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 23, - "h": 25 - }, - "frame": { - "x": 59, - "y": 641, - "w": 23, - "h": 25 - } - }, - { - "filename": "333s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 11, - "w": 19, - "h": 16 - }, - "frame": { - "x": 63, - "y": 666, - "w": 19, - "h": 16 - } - }, - { - "filename": "308", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 17, - "h": 25 - }, - "frame": { - "x": 76, - "y": 445, - "w": 17, - "h": 25 - } - }, - { - "filename": "308s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 17, - "h": 25 - }, - "frame": { - "x": 76, - "y": 470, - "w": 17, - "h": 25 - } - }, - { - "filename": "271", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 22 - }, - "frame": { - "x": 82, - "y": 423, - "w": 19, - "h": 22 - } - }, - { - "filename": "359", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 25 - }, - "frame": { - "x": 93, - "y": 445, - "w": 23, - "h": 25 - } - }, - { - "filename": "359s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 25 - }, - "frame": { - "x": 93, - "y": 470, - "w": 23, - "h": 25 - } - }, - { - "filename": "288s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 27, - "h": 22 - }, - "frame": { - "x": 76, - "y": 495, + "x": 88, + "y": 261, "w": 27, "h": 22 } @@ -2145,12 +1788,33 @@ "h": 23 }, "frame": { - "x": 75, - "y": 517, + "x": 86, + "y": 283, "w": 27, "h": 23 } }, + { + "filename": "274", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 5, + "w": 16, + "h": 23 + }, + "frame": { + "x": 107, + "y": 49, + "w": 16, + "h": 23 + } + }, { "filename": "334-mega", "rotated": false, @@ -2166,8 +1830,8 @@ "h": 23 }, "frame": { - "x": 75, - "y": 540, + "x": 123, + "y": 48, "w": 27, "h": 23 } @@ -2187,14 +1851,14 @@ "h": 23 }, "frame": { - "x": 75, - "y": 563, + "x": 150, + "y": 48, "w": 27, "h": 23 } }, { - "filename": "356", + "filename": "332", "rotated": false, "trimmed": true, "sourceSize": { @@ -2202,20 +1866,83 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 26, - "h": 24 + "x": 11, + "y": 1, + "w": 19, + "h": 27 }, "frame": { - "x": 75, - "y": 586, - "w": 26, - "h": 24 + "x": 115, + "y": 143, + "w": 19, + "h": 27 } }, { - "filename": "386-speed", + "filename": "332s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 1, + "w": 19, + "h": 27 + }, + "frame": { + "x": 115, + "y": 170, + "w": 19, + "h": 27 + } + }, + { + "filename": "272", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 22, + "h": 26 + }, + "frame": { + "x": 115, + "y": 197, + "w": 22, + "h": 26 + } + }, + { + "filename": "272s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 22, + "h": 26 + }, + "frame": { + "x": 115, + "y": 223, + "w": 22, + "h": 26 + } + }, + { + "filename": "256s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2224,122 +1951,17 @@ }, "spriteSourceSize": { "x": 8, - "y": 4, - "w": 25, + "y": 3, + "w": 23, "h": 25 }, "frame": { - "x": 80, - "y": 610, - "w": 25, + "x": 115, + "y": 249, + "w": 23, "h": 25 } }, - { - "filename": "386s-speed", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 25, - "h": 25 - }, - "frame": { - "x": 82, - "y": 635, - "w": 25, - "h": 25 - } - }, - { - "filename": "323", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 27, - "h": 22 - }, - "frame": { - "x": 82, - "y": 660, - "w": 27, - "h": 22 - } - }, - { - "filename": "267", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 25, - "h": 24 - }, - "frame": { - "x": 103, - "y": 495, - "w": 25, - "h": 24 - } - }, - { - "filename": "356s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 26, - "h": 24 - }, - "frame": { - "x": 102, - "y": 519, - "w": 26, - "h": 24 - } - }, - { - "filename": "267s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 25, - "h": 24 - }, - "frame": { - "x": 102, - "y": 543, - "w": 25, - "h": 24 - } - }, { "filename": "262", "rotated": false, @@ -2355,12 +1977,96 @@ "h": 21 }, "frame": { - "x": 102, - "y": 567, + "x": 115, + "y": 274, "w": 25, "h": 21 } }, + { + "filename": "288s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 27, + "h": 22 + }, + "frame": { + "x": 113, + "y": 295, + "w": 27, + "h": 22 + } + }, + { + "filename": "323", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 27, + "h": 22 + }, + "frame": { + "x": 86, + "y": 306, + "w": 27, + "h": 22 + } + }, + { + "filename": "284s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 26, + "h": 23 + }, + "frame": { + "x": 60, + "y": 307, + "w": 26, + "h": 23 + } + }, + { + "filename": "356s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 26, + "h": 24 + }, + "frame": { + "x": 59, + "y": 330, + "w": 26, + "h": 24 + } + }, { "filename": "323s", "rotated": false, @@ -2376,56 +2082,14 @@ "h": 22 }, "frame": { - "x": 101, - "y": 588, + "x": 113, + "y": 317, "w": 27, "h": 22 } }, { - "filename": "346", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 25, - "h": 24 - }, - "frame": { - "x": 105, - "y": 610, - "w": 25, - "h": 24 - } - }, - { - "filename": "346s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 25, - "h": 24 - }, - "frame": { - "x": 107, - "y": 634, - "w": 25, - "h": 24 - } - }, - { - "filename": "367", + "filename": "350", "rotated": false, "trimmed": true, "sourceSize": { @@ -2434,40 +2098,19 @@ }, "spriteSourceSize": { "x": 9, - "y": 5, - "w": 25, - "h": 24 - }, - "frame": { - "x": 109, - "y": 658, - "w": 25, - "h": 24 - } - }, - { - "filename": "271s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, "y": 6, - "w": 19, + "w": 27, "h": 22 }, "frame": { - "x": 96, - "y": 73, - "w": 19, + "x": 86, + "y": 328, + "w": 27, "h": 22 } }, { - "filename": "367s", + "filename": "350s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2476,19 +2119,40 @@ }, "spriteSourceSize": { "x": 9, - "y": 5, - "w": 25, - "h": 24 + "y": 6, + "w": 27, + "h": 22 }, "frame": { - "x": 91, - "y": 95, - "w": 25, - "h": 24 + "x": 113, + "y": 339, + "w": 27, + "h": 22 } }, { - "filename": "284", + "filename": "381", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 28, + "h": 22 + }, + "frame": { + "x": 85, + "y": 350, + "w": 28, + "h": 22 + } + }, + { + "filename": "269s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2497,36 +2161,15 @@ }, "spriteSourceSize": { "x": 7, - "y": 5, + "y": 9, "w": 26, - "h": 23 + "h": 19 }, "frame": { - "x": 91, - "y": 119, + "x": 59, + "y": 354, "w": 26, - "h": 23 - } - }, - { - "filename": "319", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 21, - "h": 24 - }, - "frame": { - "x": 104, - "y": 49, - "w": 21, - "h": 24 + "h": 19 } }, { @@ -2544,8 +2187,8 @@ "h": 23 }, "frame": { - "x": 125, - "y": 48, + "x": 58, + "y": 373, "w": 27, "h": 23 } @@ -2565,201 +2208,12 @@ "h": 23 }, "frame": { - "x": 152, - "y": 48, + "x": 85, + "y": 372, "w": 27, "h": 23 } }, - { - "filename": "315", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 25, - "h": 22 - }, - "frame": { - "x": 115, - "y": 73, - "w": 25, - "h": 22 - } - }, - { - "filename": "362-mega", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 116, - "y": 95, - "w": 23, - "h": 24 - } - }, - { - "filename": "284s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 26, - "h": 23 - }, - "frame": { - "x": 140, - "y": 71, - "w": 26, - "h": 23 - } - }, - { - "filename": "297", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 23 - }, - "frame": { - "x": 117, - "y": 119, - "w": 24, - "h": 23 - } - }, - { - "filename": "274", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 5, - "w": 16, - "h": 23 - }, - "frame": { - "x": 166, - "y": 71, - "w": 16, - "h": 23 - } - }, - { - "filename": "348", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 26, - "h": 23 - }, - "frame": { - "x": 182, - "y": 66, - "w": 26, - "h": 23 - } - }, - { - "filename": "350", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 27, - "h": 22 - }, - "frame": { - "x": 208, - "y": 76, - "w": 27, - "h": 22 - } - }, - { - "filename": "269s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 9, - "w": 26, - "h": 19 - }, - "frame": { - "x": 182, - "y": 89, - "w": 26, - "h": 19 - } - }, - { - "filename": "350s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 27, - "h": 22 - }, - "frame": { - "x": 208, - "y": 98, - "w": 27, - "h": 22 - } - }, { "filename": "375", "rotated": false, @@ -2775,12 +2229,369 @@ "h": 22 }, "frame": { - "x": 91, - "y": 142, + "x": 113, + "y": 361, "w": 27, "h": 22 } }, + { + "filename": "381s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 28, + "h": 22 + }, + "frame": { + "x": 112, + "y": 383, + "w": 28, + "h": 22 + } + }, + { + "filename": "375s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 8, + "w": 27, + "h": 22 + }, + "frame": { + "x": 85, + "y": 395, + "w": 27, + "h": 22 + } + }, + { + "filename": "380", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 27, + "h": 21 + }, + "frame": { + "x": 58, + "y": 396, + "w": 27, + "h": 21 + } + }, + { + "filename": "386-speed", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 25, + "h": 25 + }, + "frame": { + "x": 56, + "y": 417, + "w": 25, + "h": 25 + } + }, + { + "filename": "386s-speed", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 25, + "h": 25 + }, + "frame": { + "x": 81, + "y": 417, + "w": 25, + "h": 25 + } + }, + { + "filename": "380s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 27, + "h": 21 + }, + "frame": { + "x": 112, + "y": 405, + "w": 27, + "h": 21 + } + }, + { + "filename": "278", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 14, + "w": 26, + "h": 14 + }, + "frame": { + "x": 56, + "y": 442, + "w": 26, + "h": 14 + } + }, + { + "filename": "267", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 25, + "h": 24 + }, + "frame": { + "x": 55, + "y": 456, + "w": 25, + "h": 24 + } + }, + { + "filename": "267s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 25, + "h": 24 + }, + "frame": { + "x": 55, + "y": 480, + "w": 25, + "h": 24 + } + }, + { + "filename": "346", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 25, + "h": 24 + }, + "frame": { + "x": 53, + "y": 504, + "w": 25, + "h": 24 + } + }, + { + "filename": "346s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 25, + "h": 24 + }, + "frame": { + "x": 53, + "y": 528, + "w": 25, + "h": 24 + } + }, + { + "filename": "367", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 25, + "h": 24 + }, + "frame": { + "x": 53, + "y": 552, + "w": 25, + "h": 24 + } + }, + { + "filename": "367s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 25, + "h": 24 + }, + "frame": { + "x": 53, + "y": 576, + "w": 25, + "h": 24 + } + }, + { + "filename": "286", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 23, + "h": 25 + }, + "frame": { + "x": 55, + "y": 600, + "w": 23, + "h": 25 + } + }, + { + "filename": "262s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 82, + "y": 442, + "w": 25, + "h": 21 + } + }, + { + "filename": "348", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 26, + "h": 23 + }, + "frame": { + "x": 80, + "y": 463, + "w": 26, + "h": 23 + } + }, + { + "filename": "303", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 26, + "h": 21 + }, + "frame": { + "x": 80, + "y": 486, + "w": 26, + "h": 21 + } + }, { "filename": "348s", "rotated": false, @@ -2796,8 +2607,8 @@ "h": 23 }, "frame": { - "x": 89, - "y": 164, + "x": 78, + "y": 507, "w": 26, "h": 23 } @@ -2817,8 +2628,8 @@ "h": 23 }, "frame": { - "x": 89, - "y": 187, + "x": 78, + "y": 530, "w": 26, "h": 23 } @@ -2838,14 +2649,56 @@ "h": 23 }, "frame": { - "x": 89, - "y": 210, + "x": 78, + "y": 553, "w": 26, "h": 23 } }, { - "filename": "375s", + "filename": "286s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 23, + "h": 25 + }, + "frame": { + "x": 78, + "y": 576, + "w": 23, + "h": 25 + } + }, + { + "filename": "359", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 23, + "h": 25 + }, + "frame": { + "x": 78, + "y": 601, + "w": 23, + "h": 25 + } + }, + { + "filename": "278s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2854,15 +2707,15 @@ }, "spriteSourceSize": { "x": 7, - "y": 8, - "w": 27, - "h": 22 + "y": 14, + "w": 26, + "h": 14 }, "frame": { - "x": 89, - "y": 233, - "w": 27, - "h": 22 + "x": 106, + "y": 426, + "w": 26, + "h": 14 } }, { @@ -2880,12 +2733,54 @@ "h": 23 }, "frame": { - "x": 89, - "y": 255, + "x": 107, + "y": 440, "w": 25, "h": 23 } }, + { + "filename": "359s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 23, + "h": 25 + }, + "frame": { + "x": 106, + "y": 463, + "w": 23, + "h": 25 + } + }, + { + "filename": "277", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 9, + "w": 23, + "h": 19 + }, + "frame": { + "x": 106, + "y": 488, + "w": 23, + "h": 19 + } + }, { "filename": "378s", "rotated": false, @@ -2901,12 +2796,33 @@ "h": 23 }, "frame": { - "x": 89, - "y": 278, + "x": 104, + "y": 507, "w": 25, "h": 23 } }, + { + "filename": "297", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 24, + "h": 23 + }, + "frame": { + "x": 104, + "y": 530, + "w": 24, + "h": 23 + } + }, { "filename": "297s", "rotated": false, @@ -2922,96 +2838,12 @@ "h": 23 }, "frame": { - "x": 89, - "y": 301, + "x": 104, + "y": 553, "w": 24, "h": 23 } }, - { - "filename": "342", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 23 - }, - "frame": { - "x": 89, - "y": 324, - "w": 24, - "h": 23 - } - }, - { - "filename": "315s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 25, - "h": 22 - }, - "frame": { - "x": 118, - "y": 142, - "w": 25, - "h": 22 - } - }, - { - "filename": "380", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 27, - "h": 21 - }, - "frame": { - "x": 115, - "y": 164, - "w": 27, - "h": 21 - } - }, - { - "filename": "380s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 27, - "h": 21 - }, - "frame": { - "x": 115, - "y": 185, - "w": 27, - "h": 21 - } - }, { "filename": "386", "rotated": false, @@ -3027,75 +2859,12 @@ "h": 22 }, "frame": { - "x": 115, - "y": 206, + "x": 101, + "y": 576, "w": 26, "h": 22 } }, - { - "filename": "342s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 23 - }, - "frame": { - "x": 116, - "y": 228, - "w": 24, - "h": 23 - } - }, - { - "filename": "262s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 25, - "h": 21 - }, - "frame": { - "x": 89, - "y": 347, - "w": 25, - "h": 21 - } - }, - { - "filename": "278", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 14, - "w": 26, - "h": 14 - }, - "frame": { - "x": 87, - "y": 368, - "w": 26, - "h": 14 - } - }, { "filename": "386s", "rotated": false, @@ -3111,98 +2880,14 @@ "h": 22 }, "frame": { - "x": 84, - "y": 382, + "x": 101, + "y": 598, "w": 26, "h": 22 } }, { - "filename": "340", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 24, - "h": 19 - }, - "frame": { - "x": 84, - "y": 404, - "w": 24, - "h": 19 - } - }, - { - "filename": "335", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 23, - "h": 22 - }, - "frame": { - "x": 101, - "y": 423, - "w": 23, - "h": 22 - } - }, - { - "filename": "277", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 9, - "w": 23, - "h": 19 - }, - "frame": { - "x": 108, - "y": 404, - "w": 23, - "h": 19 - } - }, - { - "filename": "335s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 23, - "h": 22 - }, - "frame": { - "x": 110, - "y": 382, - "w": 23, - "h": 22 - } - }, - { - "filename": "278s", + "filename": "303s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3211,19 +2896,19 @@ }, "spriteSourceSize": { "x": 7, - "y": 14, + "y": 7, "w": 26, - "h": 14 + "h": 21 }, "frame": { - "x": 113, - "y": 368, + "x": 101, + "y": 620, "w": 26, - "h": 14 + "h": 21 } }, { - "filename": "319s", + "filename": "263", "rotated": false, "trimmed": true, "sourceSize": { @@ -3232,14 +2917,308 @@ }, "spriteSourceSize": { "x": 10, - "y": 4, + "y": 12, + "w": 22, + "h": 16 + }, + "frame": { + "x": 64, + "y": 641, + "w": 22, + "h": 16 + } + }, + { + "filename": "263s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 22, + "h": 16 + }, + "frame": { + "x": 86, + "y": 641, + "w": 22, + "h": 16 + } + }, + { + "filename": "333", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 11, + "w": 19, + "h": 16 + }, + "frame": { + "x": 108, + "y": 641, + "w": 19, + "h": 16 + } + }, + { + "filename": "287", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 13, + "w": 25, + "h": 15 + }, + "frame": { + "x": 64, + "y": 626, + "w": 25, + "h": 15 + } + }, + { + "filename": "308", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 3, + "w": 17, + "h": 25 + }, + "frame": { + "x": 132, + "y": 426, + "w": 17, + "h": 25 + } + }, + { + "filename": "252", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, "w": 21, + "h": 21 + }, + "frame": { + "x": 139, + "y": 405, + "w": 21, + "h": 21 + } + }, + { + "filename": "308s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 3, + "w": 17, + "h": 25 + }, + "frame": { + "x": 149, + "y": 426, + "w": 17, + "h": 25 + } + }, + { + "filename": "364", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 10, + "w": 26, + "h": 18 + }, + "frame": { + "x": 132, + "y": 451, + "w": 26, + "h": 18 + } + }, + { + "filename": "315", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 25, + "h": 22 + }, + "frame": { + "x": 129, + "y": 469, + "w": 25, + "h": 22 + } + }, + { + "filename": "315s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 25, + "h": 22 + }, + "frame": { + "x": 129, + "y": 491, + "w": 25, + "h": 22 + } + }, + { + "filename": "329", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 25, + "h": 20 + }, + "frame": { + "x": 129, + "y": 513, + "w": 25, + "h": 20 + } + }, + { + "filename": "342", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 24, + "h": 23 + }, + "frame": { + "x": 128, + "y": 533, + "w": 24, + "h": 23 + } + }, + { + "filename": "329s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 25, + "h": 20 + }, + "frame": { + "x": 128, + "y": 556, + "w": 25, + "h": 20 + } + }, + { + "filename": "342s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 24, + "h": 23 + }, + "frame": { + "x": 127, + "y": 576, + "w": 24, + "h": 23 + } + }, + { + "filename": "362-mega", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 23, "h": 24 }, "frame": { - "x": 116, - "y": 445, - "w": 21, + "x": 127, + "y": 599, + "w": 23, "h": 24 } }, @@ -3258,14 +3237,14 @@ "h": 24 }, "frame": { - "x": 116, - "y": 469, + "x": 127, + "y": 623, "w": 23, "h": 24 } }, { - "filename": "338", + "filename": "319", "rotated": false, "trimmed": true, "sourceSize": { @@ -3274,19 +3253,61 @@ }, "spriteSourceSize": { "x": 10, - "y": 6, + "y": 4, "w": 21, - "h": 22 + "h": 24 }, "frame": { - "x": 124, - "y": 423, + "x": 154, + "y": 469, "w": 21, - "h": 22 + "h": 24 } }, { - "filename": "277s", + "filename": "319s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 21, + "h": 24 + }, + "frame": { + "x": 154, + "y": 493, + "w": 21, + "h": 24 + } + }, + { + "filename": "258", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 19, + "h": 18 + }, + "frame": { + "x": 158, + "y": 451, + "w": 19, + "h": 18 + } + }, + { + "filename": "252s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3295,187 +3316,19 @@ }, "spriteSourceSize": { "x": 9, - "y": 9, - "w": 23, - "h": 19 - }, - "frame": { - "x": 131, - "y": 404, - "w": 23, - "h": 19 - } - }, - { - "filename": "338s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 21, - "h": 22 - }, - "frame": { - "x": 133, - "y": 382, - "w": 21, - "h": 22 - } - }, - { - "filename": "334", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 20, - "h": 24 - }, - "frame": { - "x": 137, - "y": 445, - "w": 20, - "h": 24 - } - }, - { - "filename": "360", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 25, - "h": 22 - }, - "frame": { - "x": 145, - "y": 423, - "w": 25, - "h": 22 - } - }, - { - "filename": "334s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 20, - "h": 24 - }, - "frame": { - "x": 139, - "y": 469, - "w": 20, - "h": 24 - } - }, - { - "filename": "303", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, "y": 7, - "w": 26, + "w": 21, "h": 21 }, "frame": { - "x": 128, - "y": 493, - "w": 26, + "x": 154, + "y": 517, + "w": 21, "h": 21 } }, { - "filename": "303s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 26, - "h": 21 - }, - "frame": { - "x": 128, - "y": 514, - "w": 26, - "h": 21 - } - }, - { - "filename": "274s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 5, - "w": 16, - "h": 23 - }, - "frame": { - "x": 157, - "y": 445, - "w": 16, - "h": 23 - } - }, - { - "filename": "281", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 18, - "h": 23 - }, - "frame": { - "x": 159, - "y": 468, - "w": 18, - "h": 23 - } - }, - { - "filename": "364", + "filename": "320", "rotated": false, "trimmed": true, "sourceSize": { @@ -3485,205 +3338,16 @@ "spriteSourceSize": { "x": 8, "y": 10, - "w": 26, + "w": 24, "h": 18 }, "frame": { - "x": 128, - "y": 535, - "w": 26, + "x": 152, + "y": 538, + "w": 24, "h": 18 } }, - { - "filename": "360s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 25, - "h": 22 - }, - "frame": { - "x": 127, - "y": 553, - "w": 25, - "h": 22 - } - }, - { - "filename": "339", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 14, - "w": 21, - "h": 13 - }, - "frame": { - "x": 127, - "y": 575, - "w": 21, - "h": 13 - } - }, - { - "filename": "379", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 23, - "h": 22 - }, - "frame": { - "x": 128, - "y": 588, - "w": 23, - "h": 22 - } - }, - { - "filename": "294", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 21, - "h": 23 - }, - "frame": { - "x": 130, - "y": 610, - "w": 21, - "h": 23 - } - }, - { - "filename": "294s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 21, - "h": 23 - }, - "frame": { - "x": 132, - "y": 633, - "w": 21, - "h": 23 - } - }, - { - "filename": "310", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 20, - "h": 23 - }, - "frame": { - "x": 134, - "y": 656, - "w": 20, - "h": 23 - } - }, - { - "filename": "281s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 18, - "h": 23 - }, - "frame": { - "x": 154, - "y": 493, - "w": 18, - "h": 23 - } - }, - { - "filename": "310s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 20, - "h": 23 - }, - "frame": { - "x": 154, - "y": 516, - "w": 20, - "h": 23 - } - }, - { - "filename": "252", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 21, - "h": 21 - }, - "frame": { - "x": 154, - "y": 539, - "w": 21, - "h": 21 - } - }, { "filename": "279", "rotated": false, @@ -3699,12 +3363,54 @@ "h": 21 }, "frame": { - "x": 152, - "y": 560, + "x": 153, + "y": 556, "w": 23, "h": 21 } }, + { + "filename": "360", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 25, + "h": 22 + }, + "frame": { + "x": 151, + "y": 577, + "w": 25, + "h": 22 + } + }, + { + "filename": "360s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 25, + "h": 22 + }, + "frame": { + "x": 150, + "y": 599, + "w": 25, + "h": 22 + } + }, { "filename": "368", "rotated": false, @@ -3720,12 +3426,117 @@ "h": 21 }, "frame": { - "x": 151, - "y": 581, + "x": 150, + "y": 621, "w": 26, "h": 21 } }, + { + "filename": "287s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 13, + "w": 25, + "h": 15 + }, + "frame": { + "x": 150, + "y": 642, + "w": 25, + "h": 15 + } + }, + { + "filename": "309", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 13, + "w": 19, + "h": 15 + }, + "frame": { + "x": 175, + "y": 642, + "w": 19, + "h": 15 + } + }, + { + "filename": "274s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 5, + "w": 16, + "h": 23 + }, + "frame": { + "x": 212, + "y": 45, + "w": 16, + "h": 23 + } + }, + { + "filename": "294", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 228, + "y": 44, + "w": 21, + "h": 23 + } + }, + { + "filename": "364s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 10, + "w": 26, + "h": 18 + }, + "frame": { + "x": 123, + "y": 71, + "w": 26, + "h": 18 + } + }, { "filename": "368s", "rotated": false, @@ -3741,8 +3552,8 @@ "h": 21 }, "frame": { - "x": 151, - "y": 602, + "x": 121, + "y": 89, "w": 26, "h": 21 } @@ -3762,8 +3573,8 @@ "h": 21 }, "frame": { - "x": 153, - "y": 623, + "x": 121, + "y": 110, "w": 25, "h": 21 } @@ -3783,56 +3594,14 @@ "h": 21 }, "frame": { - "x": 154, - "y": 644, + "x": 149, + "y": 71, "w": 25, "h": 21 } }, { - "filename": "305", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 11, - "w": 23, - "h": 17 - }, - "frame": { - "x": 154, - "y": 665, - "w": 23, - "h": 17 - } - }, - { - "filename": "305s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 11, - "w": 23, - "h": 17 - }, - "frame": { - "x": 177, - "y": 665, - "w": 23, - "h": 17 - } - }, - { - "filename": "320", + "filename": "320s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3846,14 +3615,14 @@ "h": 18 }, "frame": { - "x": 116, - "y": 251, + "x": 147, + "y": 92, "w": 24, "h": 18 } }, { - "filename": "329", + "filename": "279s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3861,20 +3630,62 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 25, - "h": 20 + "x": 8, + "y": 7, + "w": 23, + "h": 21 }, "frame": { - "x": 114, - "y": 269, - "w": 25, - "h": 20 + "x": 146, + "y": 110, + "w": 23, + "h": 21 } }, { - "filename": "329s", + "filename": "335", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 23, + "h": 22 + }, + "frame": { + "x": 134, + "y": 131, + "w": 23, + "h": 22 + } + }, + { + "filename": "335s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 23, + "h": 22 + }, + "frame": { + "x": 134, + "y": 153, + "w": 23, + "h": 22 + } + }, + { + "filename": "379", "rotated": false, "trimmed": true, "sourceSize": { @@ -3883,15 +3694,162 @@ }, "spriteSourceSize": { "x": 9, - "y": 8, - "w": 25, - "h": 20 + "y": 6, + "w": 23, + "h": 22 }, "frame": { - "x": 114, - "y": 289, - "w": 25, - "h": 20 + "x": 134, + "y": 175, + "w": 23, + "h": 22 + } + }, + { + "filename": "334", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 20, + "h": 24 + }, + "frame": { + "x": 137, + "y": 197, + "w": 20, + "h": 24 + } + }, + { + "filename": "334s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 20, + "h": 24 + }, + "frame": { + "x": 137, + "y": 221, + "w": 20, + "h": 24 + } + }, + { + "filename": "294s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 138, + "y": 245, + "w": 21, + "h": 23 + } + }, + { + "filename": "310", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 20, + "h": 23 + }, + "frame": { + "x": 140, + "y": 268, + "w": 20, + "h": 23 + } + }, + { + "filename": "310s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 20, + "h": 23 + }, + "frame": { + "x": 140, + "y": 291, + "w": 20, + "h": 23 + } + }, + { + "filename": "338", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 21, + "h": 22 + }, + "frame": { + "x": 140, + "y": 314, + "w": 21, + "h": 22 + } + }, + { + "filename": "338s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 21, + "h": 22 + }, + "frame": { + "x": 140, + "y": 336, + "w": 21, + "h": 22 } }, { @@ -3909,14 +3867,14 @@ "h": 22 }, "frame": { - "x": 113, - "y": 309, + "x": 140, + "y": 358, "w": 23, "h": 22 } }, { - "filename": "290", + "filename": "302", "rotated": false, "trimmed": true, "sourceSize": { @@ -3924,16 +3882,121 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 14, + "x": 7, + "y": 7, "w": 23, - "h": 14 + "h": 21 }, "frame": { - "x": 113, - "y": 331, + "x": 140, + "y": 380, "w": 23, - "h": 14 + "h": 21 + } + }, + { + "filename": "281", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 18, + "h": 23 + }, + "frame": { + "x": 157, + "y": 131, + "w": 18, + "h": 23 + } + }, + { + "filename": "281s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 18, + "h": 23 + }, + "frame": { + "x": 157, + "y": 154, + "w": 18, + "h": 23 + } + }, + { + "filename": "271", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 22 + }, + "frame": { + "x": 157, + "y": 177, + "w": 19, + "h": 22 + } + }, + { + "filename": "271s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 22 + }, + "frame": { + "x": 157, + "y": 199, + "w": 19, + "h": 22 + } + }, + { + "filename": "259", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 21 + }, + "frame": { + "x": 157, + "y": 221, + "w": 20, + "h": 21 } }, { @@ -3951,8 +4014,8 @@ "h": 23 }, "frame": { - "x": 114, - "y": 345, + "x": 159, + "y": 242, "w": 17, "h": 23 } @@ -3972,35 +4035,14 @@ "h": 23 }, "frame": { - "x": 131, - "y": 345, + "x": 160, + "y": 265, "w": 17, "h": 23 } }, { - "filename": "290s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 14, - "w": 23, - "h": 14 - }, - "frame": { - "x": 139, - "y": 368, - "w": 23, - "h": 14 - } - }, - { - "filename": "259", + "filename": "259s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4014,33 +4056,12 @@ "h": 21 }, "frame": { - "x": 162, - "y": 94, + "x": 160, + "y": 288, "w": 20, "h": 21 } }, - { - "filename": "364s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 10, - "w": 26, - "h": 18 - }, - "frame": { - "x": 182, - "y": 108, - "w": 26, - "h": 18 - } - }, { "filename": "301", "rotated": false, @@ -4056,96 +4077,12 @@ "h": 21 }, "frame": { - "x": 140, - "y": 94, + "x": 161, + "y": 309, "w": 22, "h": 21 } }, - { - "filename": "279s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 23, - "h": 21 - }, - "frame": { - "x": 141, - "y": 115, - "w": 23, - "h": 21 - } - }, - { - "filename": "355", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 18, - "h": 21 - }, - "frame": { - "x": 164, - "y": 115, - "w": 18, - "h": 21 - } - }, - { - "filename": "302", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 23, - "h": 21 - }, - "frame": { - "x": 143, - "y": 136, - "w": 23, - "h": 21 - } - }, - { - "filename": "252s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 21, - "h": 21 - }, - "frame": { - "x": 166, - "y": 136, - "w": 21, - "h": 21 - } - }, { "filename": "301s", "rotated": false, @@ -4161,8 +4098,8 @@ "h": 21 }, "frame": { - "x": 187, - "y": 126, + "x": 161, + "y": 330, "w": 22, "h": 21 } @@ -4182,54 +4119,12 @@ "h": 21 }, "frame": { - "x": 209, - "y": 120, + "x": 163, + "y": 351, "w": 23, "h": 21 } }, - { - "filename": "351-rainy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 7, - "w": 14, - "h": 21 - }, - "frame": { - "x": 232, - "y": 120, - "w": 14, - "h": 21 - } - }, - { - "filename": "264", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, - "h": 20 - }, - "frame": { - "x": 187, - "y": 147, - "w": 22, - "h": 20 - } - }, { "filename": "291", "rotated": false, @@ -4245,140 +4140,14 @@ "h": 20 }, "frame": { - "x": 209, - "y": 141, + "x": 163, + "y": 372, "w": 23, "h": 20 } }, { - "filename": "351s-rainy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 7, - "w": 14, - "h": 21 - }, - "frame": { - "x": 232, - "y": 141, - "w": 14, - "h": 21 - } - }, - { - "filename": "320s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 10, - "w": 24, - "h": 18 - }, - "frame": { - "x": 143, - "y": 157, - "w": 24, - "h": 18 - } - }, - { - "filename": "259s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 21 - }, - "frame": { - "x": 167, - "y": 157, - "w": 20, - "h": 21 - } - }, - { - "filename": "291s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 23, - "h": 20 - }, - "frame": { - "x": 142, - "y": 175, - "w": 23, - "h": 20 - } - }, - { - "filename": "264s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, - "h": 20 - }, - "frame": { - "x": 165, - "y": 178, - "w": 22, - "h": 20 - } - }, - { - "filename": "336", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 23, - "h": 20 - }, - "frame": { - "x": 187, - "y": 167, - "w": 23, - "h": 20 - } - }, - { - "filename": "283", + "filename": "277s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4391,309 +4160,15 @@ "w": 23, "h": 19 }, - "frame": { - "x": 142, - "y": 195, - "w": 23, - "h": 19 - } - }, - { - "filename": "283s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 9, - "w": 23, - "h": 19 - }, - "frame": { - "x": 165, - "y": 198, - "w": 23, - "h": 19 - } - }, - { - "filename": "340s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 24, - "h": 19 - }, - "frame": { - "x": 141, - "y": 214, - "w": 24, - "h": 19 - } - }, - { - "filename": "336s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 23, - "h": 20 - }, - "frame": { - "x": 140, - "y": 233, - "w": 23, - "h": 20 - } - }, - { - "filename": "324", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 23, - "h": 18 - }, - "frame": { - "x": 165, - "y": 217, - "w": 23, - "h": 18 - } - }, - { - "filename": "324s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 23, - "h": 18 - }, - "frame": { - "x": 140, - "y": 253, - "w": 23, - "h": 18 - } - }, - { - "filename": "326", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 9, - "w": 23, - "h": 19 - }, - "frame": { - "x": 139, - "y": 271, - "w": 23, - "h": 19 - } - }, - { - "filename": "326s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 9, - "w": 23, - "h": 19 - }, - "frame": { - "x": 139, - "y": 290, - "w": 23, - "h": 19 - } - }, - { - "filename": "347", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 22, - "h": 20 - }, - "frame": { - "x": 136, - "y": 309, - "w": 22, - "h": 20 - } - }, - { - "filename": "363", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 12, - "w": 19, - "h": 16 - }, - "frame": { - "x": 136, - "y": 329, - "w": 19, - "h": 16 - } - }, - { - "filename": "347s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 22, - "h": 20 - }, "frame": { "x": 163, - "y": 235, - "w": 22, - "h": 20 + "y": 392, + "w": 23, + "h": 19 } }, { - "filename": "331", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 11, - "w": 22, - "h": 17 - }, - "frame": { - "x": 163, - "y": 255, - "w": 22, - "h": 17 - } - }, - { - "filename": "385", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 22, - "h": 20 - }, - "frame": { - "x": 162, - "y": 272, - "w": 22, - "h": 20 - } - }, - { - "filename": "331s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 11, - "w": 22, - "h": 17 - }, - "frame": { - "x": 162, - "y": 292, - "w": 22, - "h": 17 - } - }, - { - "filename": "385s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 22, - "h": 20 - }, - "frame": { - "x": 158, - "y": 309, - "w": 22, - "h": 20 - } - }, - { - "filename": "354", + "filename": "309s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4702,246 +4177,15 @@ }, "spriteSourceSize": { "x": 11, - "y": 9, - "w": 22, - "h": 19 - }, - "frame": { - "x": 155, - "y": 329, - "w": 22, - "h": 19 - } - }, - { - "filename": "300", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 20, - "h": 20 - }, - "frame": { - "x": 148, - "y": 348, - "w": 20, - "h": 20 - } - }, - { - "filename": "354s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 22, - "h": 19 - }, - "frame": { - "x": 210, - "y": 161, - "w": 22, - "h": 19 - } - }, - { - "filename": "325", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 14, - "h": 20 - }, - "frame": { - "x": 232, - "y": 162, - "w": 14, - "h": 20 - } - }, - { - "filename": "344", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 20, - "h": 21 - }, - "frame": { - "x": 188, - "y": 187, - "w": 20, - "h": 21 - } - }, - { - "filename": "344s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 20, - "h": 21 - }, - "frame": { - "x": 188, - "y": 208, - "w": 20, - "h": 21 - } - }, - { - "filename": "300s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 20, - "h": 20 - }, - "frame": { - "x": 168, - "y": 348, - "w": 20, - "h": 20 - } - }, - { - "filename": "261", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 10, - "w": 21, - "h": 18 - }, - "frame": { - "x": 162, - "y": 368, - "w": 21, - "h": 18 - } - }, - { - "filename": "255", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 13, - "h": 19 - }, - "frame": { - "x": 177, - "y": 329, - "w": 13, - "h": 19 - } - }, - { - "filename": "307", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 20 - }, - "frame": { - "x": 180, - "y": 309, - "w": 17, - "h": 20 - } - }, - { - "filename": "372", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 20, - "h": 21 - }, - "frame": { - "x": 154, - "y": 386, - "w": 20, - "h": 21 - } - }, - { - "filename": "363s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 12, + "y": 13, "w": 19, - "h": 16 + "h": 15 }, "frame": { - "x": 154, - "y": 407, + "x": 160, + "y": 411, "w": 19, - "h": 16 + "h": 15 } }, { @@ -4959,75 +4203,12 @@ "h": 21 }, "frame": { - "x": 174, - "y": 386, + "x": 166, + "y": 426, "w": 15, "h": 21 } }, - { - "filename": "258", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 10, - "w": 19, - "h": 18 - }, - "frame": { - "x": 173, - "y": 407, - "w": 19, - "h": 18 - } - }, - { - "filename": "313", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 20, - "h": 20 - }, - "frame": { - "x": 170, - "y": 425, - "w": 20, - "h": 20 - } - }, - { - "filename": "349", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 7, - "w": 17, - "h": 21 - }, - "frame": { - "x": 173, - "y": 445, - "w": 17, - "h": 21 - } - }, { "filename": "327s", "rotated": false, @@ -5043,8 +4224,8 @@ "h": 21 }, "frame": { - "x": 177, - "y": 466, + "x": 169, + "y": 110, "w": 15, "h": 21 } @@ -5064,8 +4245,8 @@ "h": 18 }, "frame": { - "x": 183, - "y": 368, + "x": 171, + "y": 92, "w": 19, "h": 18 } @@ -5085,14 +4266,14 @@ "h": 21 }, "frame": { - "x": 189, - "y": 386, + "x": 174, + "y": 71, "w": 16, "h": 21 } }, { - "filename": "307s", + "filename": "291s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5100,41 +4281,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, + "x": 8, "y": 8, - "w": 17, + "w": 23, "h": 20 }, - "frame": { - "x": 188, - "y": 348, - "w": 17, - "h": 20 - } - }, - { - "filename": "292", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 9, - "w": 20, - "h": 19 - }, "frame": { "x": 190, - "y": 329, - "w": 20, - "h": 19 + "y": 68, + "w": 23, + "h": 20 } }, { - "filename": "255s", + "filename": "336", "rotated": false, "trimmed": true, "sourceSize": { @@ -5142,16 +4302,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 13, - "h": 19 + "x": 8, + "y": 8, + "w": 23, + "h": 20 }, "frame": { - "x": 192, - "y": 407, - "w": 13, - "h": 19 + "x": 190, + "y": 88, + "w": 23, + "h": 20 } }, { @@ -5169,14 +4329,56 @@ "h": 21 }, "frame": { - "x": 190, - "y": 426, + "x": 213, + "y": 68, "w": 16, "h": 21 } }, { - "filename": "292s", + "filename": "344", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 20, + "h": 21 + }, + "frame": { + "x": 229, + "y": 67, + "w": 20, + "h": 21 + } + }, + { + "filename": "264", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 213, + "y": 89, + "w": 22, + "h": 20 + } + }, + { + "filename": "341", "rotated": false, "trimmed": true, "sourceSize": { @@ -5186,39 +4388,18 @@ "spriteSourceSize": { "x": 10, "y": 9, - "w": 20, + "w": 21, "h": 19 }, "frame": { - "x": 190, - "y": 447, - "w": 20, + "x": 235, + "y": 88, + "w": 21, "h": 19 } }, { - "filename": "355s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 18, - "h": 21 - }, - "frame": { - "x": 192, - "y": 466, - "w": 18, - "h": 21 - } - }, - { - "filename": "261s", + "filename": "341s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5227,19 +4408,61 @@ }, "spriteSourceSize": { "x": 10, - "y": 10, + "y": 9, "w": 21, - "h": 18 + "h": 19 }, "frame": { - "x": 210, - "y": 180, + "x": 235, + "y": 107, "w": 21, - "h": 18 + "h": 19 } }, { - "filename": "358", + "filename": "344s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 20, + "h": 21 + }, + "frame": { + "x": 175, + "y": 131, + "w": 20, + "h": 21 + } + }, + { + "filename": "372", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 20, + "h": 21 + }, + "frame": { + "x": 175, + "y": 152, + "w": 20, + "h": 21 + } + }, + { + "filename": "349", "rotated": false, "trimmed": true, "sourceSize": { @@ -5248,14 +4471,14 @@ }, "spriteSourceSize": { "x": 13, - "y": 8, - "w": 15, + "y": 7, + "w": 17, "h": 21 }, "frame": { - "x": 231, - "y": 182, - "w": 15, + "x": 184, + "y": 110, + "w": 17, "h": 21 } }, @@ -5274,14 +4497,434 @@ "h": 21 }, "frame": { - "x": 208, - "y": 198, + "x": 176, + "y": 173, "w": 20, "h": 21 } }, { - "filename": "345", + "filename": "264s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 176, + "y": 194, + "w": 22, + "h": 20 + } + }, + { + "filename": "336s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 23, + "h": 20 + }, + "frame": { + "x": 177, + "y": 214, + "w": 23, + "h": 20 + } + }, + { + "filename": "283", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 9, + "w": 23, + "h": 19 + }, + "frame": { + "x": 177, + "y": 234, + "w": 23, + "h": 19 + } + }, + { + "filename": "283s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 9, + "w": 23, + "h": 19 + }, + "frame": { + "x": 177, + "y": 253, + "w": 23, + "h": 19 + } + }, + { + "filename": "333s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 11, + "w": 19, + "h": 16 + }, + "frame": { + "x": 177, + "y": 272, + "w": 19, + "h": 16 + } + }, + { + "filename": "349s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 7, + "w": 17, + "h": 21 + }, + "frame": { + "x": 180, + "y": 288, + "w": 17, + "h": 21 + } + }, + { + "filename": "351-rainy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 7, + "w": 14, + "h": 21 + }, + "frame": { + "x": 183, + "y": 309, + "w": 14, + "h": 21 + } + }, + { + "filename": "351s-rainy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 7, + "w": 14, + "h": 21 + }, + "frame": { + "x": 183, + "y": 330, + "w": 14, + "h": 21 + } + }, + { + "filename": "355", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 18, + "h": 21 + }, + "frame": { + "x": 186, + "y": 351, + "w": 18, + "h": 21 + } + }, + { + "filename": "355s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 18, + "h": 21 + }, + "frame": { + "x": 186, + "y": 372, + "w": 18, + "h": 21 + } + }, + { + "filename": "261", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 21, + "h": 18 + }, + "frame": { + "x": 186, + "y": 393, + "w": 21, + "h": 18 + } + }, + { + "filename": "290", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 14, + "w": 23, + "h": 14 + }, + "frame": { + "x": 179, + "y": 411, + "w": 23, + "h": 14 + } + }, + { + "filename": "347", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 181, + "y": 425, + "w": 22, + "h": 20 + } + }, + { + "filename": "340", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 10, + "w": 24, + "h": 19 + }, + "frame": { + "x": 201, + "y": 109, + "w": 24, + "h": 19 + } + }, + { + "filename": "340s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 10, + "w": 24, + "h": 19 + }, + "frame": { + "x": 201, + "y": 128, + "w": 24, + "h": 19 + } + }, + { + "filename": "326", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 9, + "w": 23, + "h": 19 + }, + "frame": { + "x": 195, + "y": 147, + "w": 23, + "h": 19 + } + }, + { + "filename": "347s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 196, + "y": 166, + "w": 22, + "h": 20 + } + }, + { + "filename": "300", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 20 + }, + "frame": { + "x": 198, + "y": 186, + "w": 20, + "h": 20 + } + }, + { + "filename": "326s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 9, + "w": 23, + "h": 19 + }, + "frame": { + "x": 225, + "y": 126, + "w": 23, + "h": 19 + } + }, + { + "filename": "300s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 20 + }, + "frame": { + "x": 200, + "y": 206, + "w": 20, + "h": 20 + } + }, + { + "filename": "313", "rotated": false, "trimmed": true, "sourceSize": { @@ -5290,14 +4933,14 @@ }, "spriteSourceSize": { "x": 11, - "y": 8, - "w": 18, + "y": 7, + "w": 20, "h": 20 }, "frame": { - "x": 228, - "y": 203, - "w": 18, + "x": 200, + "y": 226, + "w": 20, "h": 20 } }, @@ -5316,14 +4959,14 @@ "h": 20 }, "frame": { - "x": 208, - "y": 219, + "x": 200, + "y": 246, "w": 20, "h": 20 } }, { - "filename": "345s", + "filename": "358", "rotated": false, "trimmed": true, "sourceSize": { @@ -5331,20 +4974,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, + "x": 13, "y": 8, - "w": 18, - "h": 20 + "w": 15, + "h": 21 }, "frame": { - "x": 228, - "y": 223, - "w": 18, - "h": 20 + "x": 218, + "y": 147, + "w": 15, + "h": 21 } }, { - "filename": "317", + "filename": "324", "rotated": false, "trimmed": true, "sourceSize": { @@ -5352,20 +4995,209 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, + "x": 9, "y": 10, - "w": 20, + "w": 23, "h": 18 }, "frame": { - "x": 188, + "x": 233, + "y": 145, + "w": 23, + "h": 18 + } + }, + { + "filename": "324s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 10, + "w": 23, + "h": 18 + }, + "frame": { + "x": 233, + "y": 163, + "w": 23, + "h": 18 + } + }, + { + "filename": "358s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 15, + "h": 21 + }, + "frame": { + "x": 218, + "y": 168, + "w": 15, + "h": 21 + } + }, + { + "filename": "305", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 11, + "w": 23, + "h": 17 + }, + "frame": { + "x": 233, + "y": 181, + "w": 23, + "h": 17 + } + }, + { + "filename": "273", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 15, + "h": 17 + }, + "frame": { + "x": 218, + "y": 189, + "w": 15, + "h": 17 + } + }, + { + "filename": "305s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 11, + "w": 23, + "h": 17 + }, + "frame": { + "x": 233, + "y": 198, + "w": 23, + "h": 17 + } + }, + { + "filename": "351", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 13, + "h": 20 + }, + "frame": { + "x": 220, + "y": 206, + "w": 13, + "h": 20 + } + }, + { + "filename": "290s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 14, + "w": 23, + "h": 14 + }, + "frame": { + "x": 233, + "y": 215, + "w": 23, + "h": 14 + } + }, + { + "filename": "351s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 13, + "h": 20 + }, + "frame": { + "x": 220, + "y": 226, + "w": 13, + "h": 20 + } + }, + { + "filename": "331", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 11, + "w": 22, + "h": 17 + }, + "frame": { + "x": 233, "y": 229, - "w": 20, - "h": 18 + "w": 22, + "h": 17 } }, { - "filename": "341", + "filename": "385", "rotated": false, "trimmed": true, "sourceSize": { @@ -5374,19 +5206,103 @@ }, "spriteSourceSize": { "x": 10, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 220, + "y": 246, + "w": 22, + "h": 20 + } + }, + { + "filename": "325", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 14, + "h": 20 + }, + "frame": { + "x": 242, + "y": 246, + "w": 14, + "h": 20 + } + }, + { + "filename": "331s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 11, + "w": 22, + "h": 17 + }, + "frame": { + "x": 200, + "y": 266, + "w": 22, + "h": 17 + } + }, + { + "filename": "354", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, "y": 9, - "w": 21, + "w": 22, "h": 19 }, "frame": { - "x": 185, - "y": 247, - "w": 21, + "x": 222, + "y": 266, + "w": 22, "h": 19 } }, { - "filename": "317s", + "filename": "370", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 11, + "w": 12, + "h": 17 + }, + "frame": { + "x": 244, + "y": 266, + "w": 12, + "h": 17 + } + }, + { + "filename": "385s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5395,19 +5311,82 @@ }, "spriteSourceSize": { "x": 10, - "y": 10, - "w": 20, - "h": 18 + "y": 8, + "w": 22, + "h": 20 }, "frame": { - "x": 208, - "y": 239, - "w": 20, - "h": 18 + "x": 197, + "y": 283, + "w": 22, + "h": 20 } }, { - "filename": "351-sunny", + "filename": "354s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 22, + "h": 19 + }, + "frame": { + "x": 197, + "y": 303, + "w": 22, + "h": 19 + } + }, + { + "filename": "352", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 20 + }, + "frame": { + "x": 197, + "y": 322, + "w": 20, + "h": 20 + } + }, + { + "filename": "352s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 20 + }, + "frame": { + "x": 219, + "y": 285, + "w": 20, + "h": 20 + } + }, + { + "filename": "307", "rotated": false, "trimmed": true, "sourceSize": { @@ -5417,16 +5396,58 @@ "spriteSourceSize": { "x": 11, "y": 8, - "w": 18, + "w": 17, "h": 20 }, "frame": { - "x": 228, - "y": 243, - "w": 18, + "x": 239, + "y": 285, + "w": 17, "h": 20 } }, + { + "filename": "261s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 21, + "h": 18 + }, + "frame": { + "x": 219, + "y": 305, + "w": 21, + "h": 18 + } + }, + { + "filename": "311", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 16, + "h": 19 + }, + "frame": { + "x": 240, + "y": 305, + "w": 16, + "h": 19 + } + }, { "filename": "266", "rotated": false, @@ -5442,14 +5463,14 @@ "h": 18 }, "frame": { - "x": 206, - "y": 257, + "x": 217, + "y": 323, "w": 21, "h": 18 } }, { - "filename": "314", + "filename": "345", "rotated": false, "trimmed": true, "sourceSize": { @@ -5458,14 +5479,14 @@ }, "spriteSourceSize": { "x": 11, - "y": 7, - "w": 19, + "y": 8, + "w": 18, "h": 20 }, "frame": { - "x": 227, - "y": 263, - "w": 19, + "x": 238, + "y": 324, + "w": 18, "h": 20 } }, @@ -5484,161 +5505,14 @@ "h": 18 }, "frame": { - "x": 185, - "y": 266, + "x": 217, + "y": 341, "w": 21, "h": 18 } }, { - "filename": "341s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 9, - "w": 21, - "h": 19 - }, - "frame": { - "x": 184, - "y": 284, - "w": 21, - "h": 19 - } - }, - { - "filename": "268", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 21, - "h": 18 - }, - "frame": { - "x": 206, - "y": 275, - "w": 21, - "h": 18 - } - }, - { - "filename": "314s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 19, - "h": 20 - }, - "frame": { - "x": 227, - "y": 283, - "w": 19, - "h": 20 - } - }, - { - "filename": "268s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 21, - "h": 18 - }, - "frame": { - "x": 205, - "y": 293, - "w": 21, - "h": 18 - } - }, - { - "filename": "352", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 20, - "h": 20 - }, - "frame": { - "x": 226, - "y": 303, - "w": 20, - "h": 20 - } - }, - { - "filename": "322", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 10, - "w": 19, - "h": 18 - }, - "frame": { - "x": 197, - "y": 311, - "w": 19, - "h": 18 - } - }, - { - "filename": "296", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 18, - "h": 19 - }, - "frame": { - "x": 210, - "y": 329, - "w": 18, - "h": 19 - } - }, - { - "filename": "351s-sunny", + "filename": "345s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5652,98 +5526,14 @@ "h": 20 }, "frame": { - "x": 228, - "y": 323, + "x": 238, + "y": 344, "w": 18, "h": 20 } }, { - "filename": "296s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 18, - "h": 19 - }, - "frame": { - "x": 228, - "y": 343, - "w": 18, - "h": 19 - } - }, - { - "filename": "352s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 20, - "h": 20 - }, - "frame": { - "x": 205, - "y": 348, - "w": 20, - "h": 20 - } - }, - { - "filename": "322s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 10, - "w": 19, - "h": 18 - }, - "frame": { - "x": 202, - "y": 368, - "w": 19, - "h": 18 - } - }, - { - "filename": "339s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 14, - "w": 21, - "h": 13 - }, - "frame": { - "x": 225, - "y": 362, - "w": 21, - "h": 13 - } - }, - { - "filename": "349s", + "filename": "255", "rotated": false, "trimmed": true, "sourceSize": { @@ -5752,98 +5542,35 @@ }, "spriteSourceSize": { "x": 13, - "y": 7, + "y": 9, + "w": 13, + "h": 19 + }, + "frame": { + "x": 204, + "y": 342, + "w": 13, + "h": 19 + } + }, + { + "filename": "307s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, "w": 17, - "h": 21 + "h": 20 }, "frame": { - "x": 205, - "y": 386, + "x": 204, + "y": 361, "w": 17, - "h": 21 - } - }, - { - "filename": "318", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 19, - "h": 19 - }, - "frame": { - "x": 205, - "y": 407, - "w": 19, - "h": 19 - } - }, - { - "filename": "358s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 15, - "h": 21 - }, - "frame": { - "x": 206, - "y": 426, - "w": 15, - "h": 21 - } - }, - { - "filename": "325s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 14, - "h": 20 - }, - "frame": { - "x": 210, - "y": 447, - "w": 14, - "h": 20 - } - }, - { - "filename": "362", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 19, - "h": 20 - }, - "frame": { - "x": 210, - "y": 467, - "w": 19, "h": 20 } }, @@ -5862,14 +5589,14 @@ "h": 18 }, "frame": { - "x": 229, - "y": 375, + "x": 221, + "y": 359, "w": 17, "h": 18 } }, { - "filename": "299s", + "filename": "351-sunny", "rotated": false, "trimmed": true, "sourceSize": { @@ -5878,99 +5605,15 @@ }, "spriteSourceSize": { "x": 11, - "y": 10, - "w": 17, - "h": 18 + "y": 8, + "w": 18, + "h": 20 }, "frame": { - "x": 229, - "y": 393, - "w": 17, - "h": 18 - } - }, - { - "filename": "316", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 17, - "h": 17 - }, - "frame": { - "x": 229, - "y": 411, - "w": 17, - "h": 17 - } - }, - { - "filename": "316s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 17, - "h": 17 - }, - "frame": { - "x": 229, - "y": 428, - "w": 17, - "h": 17 - } - }, - { - "filename": "293", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 12, - "w": 17, - "h": 16 - }, - "frame": { - "x": 229, - "y": 445, - "w": 17, - "h": 16 - } - }, - { - "filename": "293s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 12, - "w": 17, - "h": 16 - }, - "frame": { - "x": 229, - "y": 461, - "w": 17, - "h": 16 + "x": 238, + "y": 364, + "w": 18, + "h": 20 } }, { @@ -5988,14 +5631,14 @@ "h": 15 }, "frame": { - "x": 229, - "y": 477, + "x": 221, + "y": 377, "w": 17, "h": 15 } }, { - "filename": "309", + "filename": "351s-sunny", "rotated": false, "trimmed": true, "sourceSize": { @@ -6004,40 +5647,19 @@ }, "spriteSourceSize": { "x": 11, - "y": 13, - "w": 19, - "h": 15 + "y": 8, + "w": 18, + "h": 20 }, "frame": { - "x": 177, - "y": 487, - "w": 19, - "h": 15 + "x": 238, + "y": 384, + "w": 18, + "h": 20 } }, { - "filename": "309s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 13, - "w": 19, - "h": 15 - }, - "frame": { - "x": 196, - "y": 487, - "w": 19, - "h": 15 - } - }, - { - "filename": "280", + "filename": "325s", "rotated": false, "trimmed": true, "sourceSize": { @@ -6046,15 +5668,15 @@ }, "spriteSourceSize": { "x": 13, - "y": 10, + "y": 8, "w": 14, - "h": 18 + "h": 20 }, "frame": { - "x": 215, - "y": 487, + "x": 207, + "y": 381, "w": 14, - "h": 18 + "h": 20 } }, { @@ -6072,77 +5694,14 @@ "h": 15 }, "frame": { - "x": 229, - "y": 492, + "x": 221, + "y": 392, "w": 17, "h": 15 } }, { - "filename": "304", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 16, - "w": 16, - "h": 12 - }, - "frame": { - "x": 172, - "y": 502, - "w": 16, - "h": 12 - } - }, - { - "filename": "362s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 19, - "h": 20 - }, - "frame": { - "x": 174, - "y": 514, - "w": 19, - "h": 20 - } - }, - { - "filename": "304s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 16, - "w": 16, - "h": 12 - }, - "frame": { - "x": 188, - "y": 502, - "w": 16, - "h": 12 - } - }, - { - "filename": "318s", + "filename": "296", "rotated": false, "trimmed": true, "sourceSize": { @@ -6152,18 +5711,60 @@ "spriteSourceSize": { "x": 11, "y": 9, - "w": 19, + "w": 18, "h": 19 }, "frame": { - "x": 175, - "y": 534, - "w": 19, + "x": 238, + "y": 404, + "w": 18, "h": 19 } }, { - "filename": "328", + "filename": "280", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 14, + "h": 18 + }, + "frame": { + "x": 207, + "y": 401, + "w": 14, + "h": 18 + } + }, + { + "filename": "293", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 12, + "w": 17, + "h": 16 + }, + "frame": { + "x": 221, + "y": 407, + "w": 17, + "h": 16 + } + }, + { + "filename": "296s", "rotated": false, "trimmed": true, "sourceSize": { @@ -6173,18 +5774,18 @@ "spriteSourceSize": { "x": 11, "y": 9, - "w": 19, + "w": 18, "h": 19 }, "frame": { - "x": 175, - "y": 553, - "w": 19, + "x": 203, + "y": 419, + "w": 18, "h": 19 } }, { - "filename": "351", + "filename": "268", "rotated": false, "trimmed": true, "sourceSize": { @@ -6192,37 +5793,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 13, - "h": 20 + "x": 9, + "y": 10, + "w": 21, + "h": 18 }, "frame": { - "x": 193, - "y": 514, - "w": 13, - "h": 20 - } - }, - { - "filename": "351s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 13, - "h": 20 - }, - "frame": { - "x": 194, - "y": 534, - "w": 13, - "h": 20 + "x": 221, + "y": 423, + "w": 21, + "h": 18 } }, { @@ -6240,12 +5820,411 @@ "h": 18 }, "frame": { - "x": 194, - "y": 554, + "x": 242, + "y": 423, "w": 14, "h": 18 } }, + { + "filename": "265", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 11, + "w": 18, + "h": 17 + }, + "frame": { + "x": 203, + "y": 438, + "w": 18, + "h": 17 + } + }, + { + "filename": "268s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 10, + "w": 21, + "h": 18 + }, + "frame": { + "x": 221, + "y": 441, + "w": 21, + "h": 18 + } + }, + { + "filename": "255s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 13, + "h": 19 + }, + "frame": { + "x": 242, + "y": 441, + "w": 13, + "h": 19 + } + }, + { + "filename": "339", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 14, + "w": 21, + "h": 13 + }, + "frame": { + "x": 181, + "y": 445, + "w": 21, + "h": 13 + } + }, + { + "filename": "339s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 14, + "w": 21, + "h": 13 + }, + "frame": { + "x": 177, + "y": 458, + "w": 21, + "h": 13 + } + }, + { + "filename": "292", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 9, + "w": 20, + "h": 19 + }, + "frame": { + "x": 175, + "y": 471, + "w": 20, + "h": 19 + } + }, + { + "filename": "292s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 9, + "w": 20, + "h": 19 + }, + "frame": { + "x": 175, + "y": 490, + "w": 20, + "h": 19 + } + }, + { + "filename": "314", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 19, + "h": 20 + }, + "frame": { + "x": 175, + "y": 509, + "w": 19, + "h": 20 + } + }, + { + "filename": "314s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 19, + "h": 20 + }, + "frame": { + "x": 176, + "y": 529, + "w": 19, + "h": 20 + } + }, + { + "filename": "362", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 19, + "h": 20 + }, + "frame": { + "x": 176, + "y": 549, + "w": 19, + "h": 20 + } + }, + { + "filename": "362s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 19, + "h": 20 + }, + "frame": { + "x": 176, + "y": 569, + "w": 19, + "h": 20 + } + }, + { + "filename": "317", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 20, + "h": 18 + }, + "frame": { + "x": 176, + "y": 589, + "w": 20, + "h": 18 + } + }, + { + "filename": "318", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 19, + "h": 19 + }, + "frame": { + "x": 202, + "y": 455, + "w": 19, + "h": 19 + } + }, + { + "filename": "317s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 20, + "h": 18 + }, + "frame": { + "x": 221, + "y": 459, + "w": 20, + "h": 18 + } + }, + { + "filename": "371", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 15, + "h": 20 + }, + "frame": { + "x": 241, + "y": 460, + "w": 15, + "h": 20 + } + }, + { + "filename": "318s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 19, + "h": 19 + }, + "frame": { + "x": 195, + "y": 474, + "w": 19, + "h": 19 + } + }, + { + "filename": "322", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 19, + "h": 18 + }, + "frame": { + "x": 195, + "y": 493, + "w": 19, + "h": 18 + } + }, + { + "filename": "322s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 19, + "h": 18 + }, + "frame": { + "x": 194, + "y": 511, + "w": 19, + "h": 18 + } + }, + { + "filename": "328", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 19, + "h": 19 + }, + "frame": { + "x": 195, + "y": 529, + "w": 19, + "h": 19 + } + }, { "filename": "328s", "rotated": false, @@ -6261,8 +6240,8 @@ "h": 19 }, "frame": { - "x": 177, - "y": 572, + "x": 195, + "y": 548, "w": 19, "h": 19 } @@ -6282,96 +6261,12 @@ "h": 19 }, "frame": { - "x": 177, - "y": 591, + "x": 195, + "y": 567, "w": 19, "h": 19 } }, - { - "filename": "371", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 15, - "h": 20 - }, - "frame": { - "x": 196, - "y": 572, - "w": 15, - "h": 20 - } - }, - { - "filename": "298", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 15, - "h": 19 - }, - "frame": { - "x": 196, - "y": 592, - "w": 15, - "h": 19 - } - }, - { - "filename": "265", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 11, - "w": 18, - "h": 17 - }, - "frame": { - "x": 178, - "y": 610, - "w": 18, - "h": 17 - } - }, - { - "filename": "265s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 11, - "w": 18, - "h": 17 - }, - "frame": { - "x": 178, - "y": 627, - "w": 18, - "h": 17 - } - }, { "filename": "366s", "rotated": false, @@ -6387,75 +6282,12 @@ "h": 19 }, "frame": { - "x": 179, - "y": 644, + "x": 196, + "y": 586, "w": 19, "h": 19 } }, - { - "filename": "371s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 15, - "h": 20 - }, - "frame": { - "x": 196, - "y": 611, - "w": 15, - "h": 20 - } - }, - { - "filename": "298s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 15, - "h": 19 - }, - "frame": { - "x": 198, - "y": 631, - "w": 15, - "h": 19 - } - }, - { - "filename": "276", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 13, - "w": 18, - "h": 15 - }, - "frame": { - "x": 198, - "y": 650, - "w": 18, - "h": 15 - } - }, { "filename": "374", "rotated": false, @@ -6471,8 +6303,8 @@ "h": 17 }, "frame": { - "x": 200, - "y": 665, + "x": 214, + "y": 477, "w": 19, "h": 17 } @@ -6492,14 +6324,14 @@ "h": 17 }, "frame": { - "x": 206, - "y": 505, + "x": 214, + "y": 494, "w": 19, "h": 17 } }, { - "filename": "276s", + "filename": "299s", "rotated": false, "trimmed": true, "sourceSize": { @@ -6508,36 +6340,15 @@ }, "spriteSourceSize": { "x": 11, - "y": 13, - "w": 18, - "h": 15 + "y": 10, + "w": 17, + "h": 18 }, "frame": { - "x": 225, - "y": 507, - "w": 18, - "h": 15 - } - }, - { - "filename": "311", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 9, - "w": 16, - "h": 19 - }, - "frame": { - "x": 207, - "y": 522, - "w": 16, - "h": 19 + "x": 213, + "y": 511, + "w": 17, + "h": 18 } }, { @@ -6555,8 +6366,8 @@ "h": 19 }, "frame": { - "x": 223, - "y": 522, + "x": 214, + "y": 529, "w": 16, "h": 19 } @@ -6576,8 +6387,8 @@ "h": 19 }, "frame": { - "x": 208, - "y": 541, + "x": 214, + "y": 548, "w": 16, "h": 19 } @@ -6597,12 +6408,159 @@ "h": 19 }, "frame": { - "x": 224, - "y": 541, + "x": 214, + "y": 567, "w": 16, "h": 19 } }, + { + "filename": "298", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 15, + "h": 19 + }, + "frame": { + "x": 215, + "y": 586, + "w": 15, + "h": 19 + } + }, + { + "filename": "265s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 11, + "w": 18, + "h": 17 + }, + "frame": { + "x": 233, + "y": 480, + "w": 18, + "h": 17 + } + }, + { + "filename": "276", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 13, + "w": 18, + "h": 15 + }, + "frame": { + "x": 233, + "y": 497, + "w": 18, + "h": 15 + } + }, + { + "filename": "363", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 12, + "w": 19, + "h": 16 + }, + "frame": { + "x": 230, + "y": 512, + "w": 19, + "h": 16 + } + }, + { + "filename": "363s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 12, + "w": 19, + "h": 16 + }, + "frame": { + "x": 230, + "y": 528, + "w": 19, + "h": 16 + } + }, + { + "filename": "371s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 15, + "h": 20 + }, + "frame": { + "x": 230, + "y": 544, + "w": 15, + "h": 20 + } + }, + { + "filename": "298s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 15, + "h": 19 + }, + "frame": { + "x": 230, + "y": 564, + "w": 15, + "h": 19 + } + }, { "filename": "353", "rotated": false, @@ -6618,14 +6576,14 @@ "h": 19 }, "frame": { - "x": 211, - "y": 560, + "x": 230, + "y": 583, "w": 15, "h": 19 } }, { - "filename": "353s", + "filename": "276s", "rotated": false, "trimmed": true, "sourceSize": { @@ -6633,100 +6591,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 15, - "h": 19 + "x": 11, + "y": 13, + "w": 18, + "h": 15 }, "frame": { - "x": 211, - "y": 579, - "w": 15, - "h": 19 - } - }, - { - "filename": "361", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 15, - "h": 19 - }, - "frame": { - "x": 211, - "y": 598, - "w": 15, - "h": 19 - } - }, - { - "filename": "361s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 15, - "h": 19 - }, - "frame": { - "x": 226, - "y": 560, - "w": 15, - "h": 19 - } - }, - { - "filename": "273", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 15, - "h": 17 - }, - "frame": { - "x": 226, - "y": 579, - "w": 15, - "h": 17 - } - }, - { - "filename": "273s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 15, - "h": 17 - }, - "frame": { - "x": 226, - "y": 596, - "w": 15, - "h": 17 + "x": 196, + "y": 605, + "w": 18, + "h": 15 } }, { @@ -6744,8 +6618,8 @@ "h": 15 }, "frame": { - "x": 226, - "y": 613, + "x": 214, + "y": 605, "w": 18, "h": 15 } @@ -6765,12 +6639,96 @@ "h": 19 }, "frame": { - "x": 213, - "y": 617, + "x": 232, + "y": 602, "w": 13, "h": 19 } }, + { + "filename": "316", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 17, + "h": 17 + }, + "frame": { + "x": 176, + "y": 607, + "w": 17, + "h": 17 + } + }, + { + "filename": "316s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 17, + "h": 17 + }, + "frame": { + "x": 176, + "y": 624, + "w": 17, + "h": 17 + } + }, + { + "filename": "353s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 15, + "h": 19 + }, + "frame": { + "x": 193, + "y": 620, + "w": 15, + "h": 19 + } + }, + { + "filename": "361", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 15, + "h": 19 + }, + "frame": { + "x": 208, + "y": 620, + "w": 15, + "h": 19 + } + }, { "filename": "285s", "rotated": false, @@ -6786,12 +6744,54 @@ "h": 15 }, "frame": { - "x": 226, - "y": 628, + "x": 194, + "y": 639, "w": 18, "h": 15 } }, + { + "filename": "273s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 15, + "h": 17 + }, + "frame": { + "x": 212, + "y": 639, + "w": 15, + "h": 17 + } + }, + { + "filename": "293s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 12, + "w": 17, + "h": 16 + }, + "frame": { + "x": 223, + "y": 621, + "w": 17, + "h": 16 + } + }, { "filename": "337s", "rotated": false, @@ -6807,14 +6807,14 @@ "h": 19 }, "frame": { - "x": 216, - "y": 643, + "x": 227, + "y": 637, "w": 13, "h": 19 } }, { - "filename": "370", + "filename": "361s", "rotated": false, "trimmed": true, "sourceSize": { @@ -6822,16 +6822,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 14, - "y": 11, - "w": 12, - "h": 17 + "x": 13, + "y": 9, + "w": 15, + "h": 19 }, "frame": { - "x": 229, - "y": 643, - "w": 12, - "h": 17 + "x": 240, + "y": 621, + "w": 15, + "h": 19 } }, { @@ -6849,8 +6849,8 @@ "h": 17 }, "frame": { - "x": 219, - "y": 662, + "x": 240, + "y": 640, "w": 12, "h": 17 } @@ -6861,6 +6861,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:b4ae61d1b5455c0b3b9faf51b14f4139:5632c8d6ed696f41abde010ac8199aa8:c482ca0f7f1083c80226b55174bb3cc9$" + "smartupdate": "$TexturePacker:SmartUpdate:6d4aad78269dda935ec7245e2c18cb45:d9973a866ccb76b1e9c7fe5818fcdbf1:c482ca0f7f1083c80226b55174bb3cc9$" } } diff --git a/public/images/pokemon_icons_3.png b/public/images/pokemon_icons_3.png index 175f36c5e..a0eec0a52 100644 Binary files a/public/images/pokemon_icons_3.png and b/public/images/pokemon_icons_3.png differ diff --git a/public/images/pokemon_icons_4.json b/public/images/pokemon_icons_4.json index 5e7001803..3a93cb4a2 100644 --- a/public/images/pokemon_icons_4.json +++ b/public/images/pokemon_icons_4.json @@ -1543,7 +1543,7 @@ } }, { - "filename": "450-f", + "filename": "450", "rotated": false, "trimmed": true, "sourceSize": { @@ -2740,7 +2740,7 @@ } }, { - "filename": "450", + "filename": "450-f", "rotated": false, "trimmed": true, "sourceSize": { @@ -2929,7 +2929,7 @@ } }, { - "filename": "450s-f", + "filename": "450s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3223,7 +3223,7 @@ } }, { - "filename": "450s", + "filename": "450s-f", "rotated": false, "trimmed": true, "sourceSize": { @@ -4126,7 +4126,7 @@ } }, { - "filename": "449-f", + "filename": "449", "rotated": false, "trimmed": true, "sourceSize": { @@ -4147,7 +4147,7 @@ } }, { - "filename": "449", + "filename": "449-f", "rotated": false, "trimmed": true, "sourceSize": { @@ -4168,7 +4168,7 @@ } }, { - "filename": "449s-f", + "filename": "449s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4189,7 +4189,7 @@ } }, { - "filename": "449s", + "filename": "449s-f", "rotated": false, "trimmed": true, "sourceSize": { @@ -6273,6 +6273,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:c8b7fe5b84bc591ac349dae2767d66e9:6ab53090843a95b6c6920a4ca340d9e7:3f74c54ad2b3085ce7282c3466535f4a$" + "smartupdate": "$TexturePacker:SmartUpdate:9e39a5435d1f76d9631d9b71ab5b9c94:568b2cb64a14edb2784dab148de2e1d5:3f74c54ad2b3085ce7282c3466535f4a$" } } diff --git a/public/images/pokemon_icons_4.png b/public/images/pokemon_icons_4.png index 4ef7b5976..69f078d1f 100644 Binary files a/public/images/pokemon_icons_4.png and b/public/images/pokemon_icons_4.png differ diff --git a/public/images/pokemon_icons_5.json b/public/images/pokemon_icons_5.json index fcfdeb620..fdbba6575 100644 --- a/public/images/pokemon_icons_5.json +++ b/public/images/pokemon_icons_5.json @@ -3685,7 +3685,7 @@ } }, { - "filename": "649-burn", + "filename": "649", "rotated": false, "trimmed": true, "sourceSize": { @@ -3727,7 +3727,7 @@ } }, { - "filename": "649-chill", + "filename": "649-burn", "rotated": false, "trimmed": true, "sourceSize": { @@ -3811,7 +3811,7 @@ } }, { - "filename": "649-douse", + "filename": "649-chill", "rotated": false, "trimmed": true, "sourceSize": { @@ -3853,7 +3853,7 @@ } }, { - "filename": "649-shock", + "filename": "649-douse", "rotated": false, "trimmed": true, "sourceSize": { @@ -3895,7 +3895,7 @@ } }, { - "filename": "649", + "filename": "649-shock", "rotated": false, "trimmed": true, "sourceSize": { @@ -4000,7 +4000,7 @@ } }, { - "filename": "649s-burn", + "filename": "649s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4126,7 +4126,7 @@ } }, { - "filename": "649s-chill", + "filename": "649s-burn", "rotated": false, "trimmed": true, "sourceSize": { @@ -4147,7 +4147,7 @@ } }, { - "filename": "649s-douse", + "filename": "649s-chill", "rotated": false, "trimmed": true, "sourceSize": { @@ -4168,7 +4168,7 @@ } }, { - "filename": "649s-shock", + "filename": "649s-douse", "rotated": false, "trimmed": true, "sourceSize": { @@ -4189,7 +4189,7 @@ } }, { - "filename": "649s", + "filename": "649s-shock", "rotated": false, "trimmed": true, "sourceSize": { @@ -5386,7 +5386,7 @@ } }, { - "filename": "592-f", + "filename": "592", "rotated": false, "trimmed": true, "sourceSize": { @@ -5428,7 +5428,7 @@ } }, { - "filename": "592", + "filename": "592-f", "rotated": false, "trimmed": true, "sourceSize": { @@ -5470,7 +5470,7 @@ } }, { - "filename": "592s-f", + "filename": "592s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5554,7 +5554,7 @@ } }, { - "filename": "592s", + "filename": "592s-f", "rotated": false, "trimmed": true, "sourceSize": { @@ -7575,6 +7575,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:c42c32af5901dd38172dac51e6ad4d4f:3da8a9f0435764e7b6f9a17292b53fce:20fe181c46701b46ac8f250d40b1bbc1$" + "smartupdate": "$TexturePacker:SmartUpdate:4b1ede56fa38672ee5e2e5de6f39ff48:58f3f9bd48fa9481c3cd7a0cdebb3e00:20fe181c46701b46ac8f250d40b1bbc1$" } } diff --git a/public/images/pokemon_icons_5.png b/public/images/pokemon_icons_5.png index 71990e171..e0a4ebef3 100644 Binary files a/public/images/pokemon_icons_5.png and b/public/images/pokemon_icons_5.png differ diff --git a/public/images/pokemon_icons_6.json b/public/images/pokemon_icons_6.json index f0d7a46c7..ca7a24eaa 100644 --- a/public/images/pokemon_icons_6.json +++ b/public/images/pokemon_icons_6.json @@ -4,8 +4,8 @@ "image": "pokemon_icons_6.png", "format": "RGBA8888", "size": { - "w": 254, - "h": 557 + "w": 249, + "h": 574 }, "scale": 1, "frames": [ @@ -136,7 +136,7 @@ } }, { - "filename": "716-neutral", + "filename": "716-active", "rotated": false, "trimmed": true, "sourceSize": { @@ -157,7 +157,7 @@ } }, { - "filename": "716s-neutral", + "filename": "716-neutral", "rotated": false, "trimmed": true, "sourceSize": { @@ -177,6 +177,48 @@ "h": 30 } }, + { + "filename": "716s-active", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 29, + "h": 30 + }, + "frame": { + "x": 0, + "y": 205, + "w": 29, + "h": 30 + } + }, + { + "filename": "716s-neutral", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 29, + "h": 30 + }, + "frame": { + "x": 0, + "y": 235, + "w": 29, + "h": 30 + } + }, { "filename": "718", "rotated": false, @@ -193,7 +235,7 @@ }, "frame": { "x": 0, - "y": 205, + "y": 265, "w": 28, "h": 30 } @@ -214,7 +256,7 @@ }, "frame": { "x": 0, - "y": 235, + "y": 295, "w": 28, "h": 30 } @@ -277,7 +319,7 @@ }, "frame": { "x": 0, - "y": 265, + "y": 325, "w": 28, "h": 29 } @@ -298,7 +340,7 @@ }, "frame": { "x": 0, - "y": 294, + "y": 354, "w": 28, "h": 29 } @@ -319,7 +361,7 @@ }, "frame": { "x": 0, - "y": 323, + "y": 383, "w": 27, "h": 29 } @@ -340,7 +382,7 @@ }, "frame": { "x": 0, - "y": 352, + "y": 412, "w": 27, "h": 29 } @@ -429,6 +471,27 @@ "h": 27 } }, + { + "filename": "676-diamond", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 24, + "h": 28 + }, + "frame": { + "x": 225, + "y": 0, + "w": 24, + "h": 28 + } + }, { "filename": "717", "rotated": false, @@ -445,7 +508,7 @@ }, "frame": { "x": 0, - "y": 381, + "y": 441, "w": 30, "h": 27 } @@ -466,7 +529,7 @@ }, "frame": { "x": 0, - "y": 408, + "y": 468, "w": 30, "h": 27 } @@ -487,7 +550,7 @@ }, "frame": { "x": 0, - "y": 435, + "y": 495, "w": 30, "h": 25 } @@ -508,7 +571,7 @@ }, "frame": { "x": 0, - "y": 460, + "y": 520, "w": 30, "h": 25 } @@ -529,95 +592,11 @@ }, "frame": { "x": 0, - "y": 485, + "y": 545, "w": 30, "h": 24 } }, - { - "filename": "668s-f", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 30, - "h": 24 - }, - "frame": { - "x": 0, - "y": 509, - "w": 30, - "h": 24 - } - }, - { - "filename": "675", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 28, - "h": 24 - }, - "frame": { - "x": 0, - "y": 533, - "w": 28, - "h": 24 - } - }, - { - "filename": "675s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 28, - "h": 24 - }, - "frame": { - "x": 28, - "y": 533, - "w": 28, - "h": 24 - } - }, - { - "filename": "671-blue", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 26, - "h": 27 - }, - "frame": { - "x": 225, - "y": 0, - "w": 26, - "h": 27 - } - }, { "filename": "691", "rotated": false, @@ -661,7 +640,7 @@ } }, { - "filename": "715", + "filename": "675", "rotated": false, "trimmed": true, "sourceSize": { @@ -669,7 +648,7 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, + "x": 7, "y": 4, "w": 28, "h": 24 @@ -702,6 +681,48 @@ "h": 23 } }, + { + "filename": "675s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 28, + "h": 24 + }, + "frame": { + "x": 196, + "y": 27, + "w": 28, + "h": 24 + } + }, + { + "filename": "721", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 25, + "h": 27 + }, + "frame": { + "x": 224, + "y": 28, + "w": 25, + "h": 27 + } + }, { "filename": "680s", "rotated": false, @@ -717,14 +738,14 @@ "h": 23 }, "frame": { - "x": 196, - "y": 27, + "x": 70, + "y": 48, "w": 31, "h": 23 } }, { - "filename": "707", + "filename": "658-ash", "rotated": false, "trimmed": true, "sourceSize": { @@ -733,15 +754,15 @@ }, "spriteSourceSize": { "x": 6, - "y": 5, - "w": 27, - "h": 24 + "y": 7, + "w": 30, + "h": 23 }, "frame": { - "x": 227, - "y": 27, - "w": 27, - "h": 24 + "x": 101, + "y": 48, + "w": 30, + "h": 23 } }, { @@ -759,8 +780,8 @@ "h": 22 }, "frame": { - "x": 70, - "y": 48, + "x": 131, + "y": 49, "w": 31, "h": 22 } @@ -780,33 +801,12 @@ "h": 22 }, "frame": { - "x": 101, - "y": 48, + "x": 162, + "y": 50, "w": 31, "h": 22 } }, - { - "filename": "658-ash", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 30, - "h": 23 - }, - "frame": { - "x": 132, - "y": 49, - "w": 30, - "h": 23 - } - }, { "filename": "658", "rotated": false, @@ -822,8 +822,50 @@ "h": 22 }, "frame": { - "x": 162, - "y": 50, + "x": 193, + "y": 51, + "w": 30, + "h": 22 + } + }, + { + "filename": "671-blue", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 26, + "h": 27 + }, + "frame": { + "x": 223, + "y": 55, + "w": 26, + "h": 27 + } + }, + { + "filename": "658s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 30, + "h": 22 + }, + "frame": { + "x": 38, + "y": 54, "w": 30, "h": 22 } @@ -843,14 +885,14 @@ "h": 23 }, "frame": { - "x": 192, - "y": 50, + "x": 35, + "y": 76, "w": 30, "h": 23 } }, { - "filename": "658s", + "filename": "668s-f", "rotated": false, "trimmed": true, "sourceSize": { @@ -858,16 +900,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 8, + "x": 7, + "y": 4, "w": 30, - "h": 22 + "h": 24 }, "frame": { - "x": 222, - "y": 51, + "x": 32, + "y": 99, "w": 30, - "h": 22 + "h": 24 } }, { @@ -885,29 +927,8 @@ "h": 22 }, "frame": { - "x": 38, - "y": 54, - "w": 30, - "h": 22 - } - }, - { - "filename": "697s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 30, - "h": 22 - }, - "frame": { - "x": 35, - "y": 76, + "x": 32, + "y": 123, "w": 30, "h": 22 } @@ -927,33 +948,12 @@ "h": 27 }, "frame": { - "x": 32, - "y": 98, + "x": 29, + "y": 145, "w": 26, "h": 27 } }, - { - "filename": "652", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 26, - "h": 24 - }, - "frame": { - "x": 32, - "y": 125, - "w": 26, - "h": 24 - } - }, { "filename": "671-red", "rotated": false, @@ -970,7 +970,7 @@ }, "frame": { "x": 29, - "y": 149, + "y": 172, "w": 26, "h": 27 } @@ -991,53 +991,11 @@ }, "frame": { "x": 29, - "y": 176, + "y": 199, "w": 26, "h": 27 } }, - { - "filename": "676-diamond", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 24, - "h": 28 - }, - "frame": { - "x": 58, - "y": 98, - "w": 24, - "h": 28 - } - }, - { - "filename": "652s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 26, - "h": 24 - }, - "frame": { - "x": 58, - "y": 126, - "w": 26, - "h": 24 - } - }, { "filename": "671-yellow", "rotated": false, @@ -1053,12 +1011,33 @@ "h": 27 }, "frame": { - "x": 55, - "y": 150, + "x": 29, + "y": 226, "w": 26, "h": 27 } }, + { + "filename": "652", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 26, + "h": 24 + }, + "frame": { + "x": 29, + "y": 253, + "w": 26, + "h": 24 + } + }, { "filename": "671s-blue", "rotated": false, @@ -1074,33 +1053,12 @@ "h": 27 }, "frame": { - "x": 55, - "y": 177, + "x": 28, + "y": 277, "w": 26, "h": 27 } }, - { - "filename": "650", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 17, - "h": 22 - }, - "frame": { - "x": 65, - "y": 76, - "w": 17, - "h": 22 - } - }, { "filename": "671s-orange", "rotated": false, @@ -1116,8 +1074,8 @@ "h": 27 }, "frame": { - "x": 82, - "y": 70, + "x": 28, + "y": 304, "w": 26, "h": 27 } @@ -1137,155 +1095,8 @@ "h": 27 }, "frame": { - "x": 82, - "y": 97, - "w": 26, - "h": 27 - } - }, - { - "filename": "676s-diamond", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 24, - "h": 28 - }, - "frame": { - "x": 108, - "y": 70, - "w": 24, - "h": 28 - } - }, - { - "filename": "671s-white", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 26, - "h": 27 - }, - "frame": { - "x": 132, - "y": 72, - "w": 26, - "h": 27 - } - }, - { - "filename": "671s-yellow", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 26, - "h": 27 - }, - "frame": { - "x": 158, - "y": 72, - "w": 26, - "h": 27 - } - }, - { - "filename": "676-dandy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 24, - "h": 26 - }, - "frame": { - "x": 108, - "y": 98, - "w": 24, - "h": 26 - } - }, - { - "filename": "715s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 28, - "h": 24 - }, - "frame": { - "x": 132, - "y": 99, - "w": 28, - "h": 24 - } - }, - { - "filename": "676-star", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 26, - "h": 27 - }, - "frame": { - "x": 84, - "y": 124, - "w": 26, - "h": 27 - } - }, - { - "filename": "676s-star", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 26, - "h": 27 - }, - "frame": { - "x": 81, - "y": 151, + "x": 28, + "y": 331, "w": 26, "h": 27 } @@ -1305,12 +1116,75 @@ "h": 25 }, "frame": { - "x": 81, - "y": 178, + "x": 28, + "y": 358, "w": 26, "h": 25 } }, + { + "filename": "671s-white", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 26, + "h": 27 + }, + "frame": { + "x": 27, + "y": 383, + "w": 26, + "h": 27 + } + }, + { + "filename": "671s-yellow", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 26, + "h": 27 + }, + "frame": { + "x": 27, + "y": 410, + "w": 26, + "h": 27 + } + }, + { + "filename": "676s-diamond", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 24, + "h": 28 + }, + "frame": { + "x": 30, + "y": 437, + "w": 24, + "h": 28 + } + }, { "filename": "676", "rotated": false, @@ -1326,14 +1200,56 @@ "h": 27 }, "frame": { - "x": 110, - "y": 124, + "x": 30, + "y": 465, "w": 24, "h": 27 } }, { - "filename": "721", + "filename": "676-star", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 26, + "h": 27 + }, + "frame": { + "x": 30, + "y": 492, + "w": 26, + "h": 27 + } + }, + { + "filename": "676s-star", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 26, + "h": 27 + }, + "frame": { + "x": 30, + "y": 519, + "w": 26, + "h": 27 + } + }, + { + "filename": "652s", "rotated": false, "trimmed": true, "sourceSize": { @@ -1342,14 +1258,77 @@ }, "spriteSourceSize": { "x": 6, - "y": 2, - "w": 25, + "y": 4, + "w": 26, + "h": 24 + }, + "frame": { + "x": 30, + "y": 546, + "w": 26, + "h": 24 + } + }, + { + "filename": "676s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 24, "h": 27 }, "frame": { - "x": 107, - "y": 151, - "w": 25, + "x": 55, + "y": 145, + "w": 24, + "h": 27 + } + }, + { + "filename": "699", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 24, + "h": 27 + }, + "frame": { + "x": 55, + "y": 172, + "w": 24, + "h": 27 + } + }, + { + "filename": "699s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 24, + "h": 27 + }, + "frame": { + "x": 55, + "y": 199, + "w": 24, "h": 27 } }, @@ -1368,8 +1347,8 @@ "h": 27 }, "frame": { - "x": 134, - "y": 123, + "x": 55, + "y": 226, "w": 25, "h": 27 } @@ -1389,8 +1368,8 @@ "h": 25 }, "frame": { - "x": 107, - "y": 178, + "x": 55, + "y": 253, "w": 26, "h": 25 } @@ -1410,8 +1389,8 @@ "h": 25 }, "frame": { - "x": 160, - "y": 99, + "x": 54, + "y": 278, "w": 26, "h": 25 } @@ -1431,33 +1410,12 @@ "h": 25 }, "frame": { - "x": 159, - "y": 124, + "x": 54, + "y": 303, "w": 26, "h": 25 } }, - { - "filename": "676-heart", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 25, - "h": 26 - }, - "frame": { - "x": 184, - "y": 73, - "w": 25, - "h": 26 - } - }, { "filename": "666-elegant", "rotated": false, @@ -1473,33 +1431,12 @@ "h": 25 }, "frame": { - "x": 209, - "y": 73, + "x": 54, + "y": 328, "w": 26, "h": 25 } }, - { - "filename": "683", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 19, - "h": 23 - }, - "frame": { - "x": 235, - "y": 73, - "w": 19, - "h": 23 - } - }, { "filename": "666-fancy", "rotated": false, @@ -1514,750 +1451,15 @@ "w": 26, "h": 25 }, - "frame": { - "x": 186, - "y": 99, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-garden", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 185, - "y": 124, - "w": 26, - "h": 25 - } - }, - { - "filename": "676-pharaoh", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 24, - "h": 26 - }, - "frame": { - "x": 212, - "y": 98, - "w": 24, - "h": 26 - } - }, - { - "filename": "679", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 4, - "w": 18, - "h": 24 - }, - "frame": { - "x": 236, - "y": 96, - "w": 18, - "h": 24 - } - }, - { - "filename": "666-high-plains", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 211, - "y": 124, - "w": 26, - "h": 25 - } - }, - { - "filename": "698", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 17, - "h": 24 - }, - "frame": { - "x": 237, - "y": 120, - "w": 17, - "h": 24 - } - }, - { - "filename": "698s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 17, - "h": 24 - }, - "frame": { - "x": 237, - "y": 144, - "w": 17, - "h": 24 - } - }, - { - "filename": "676s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 24, - "h": 27 - }, - "frame": { - "x": 132, - "y": 151, - "w": 24, - "h": 27 - } - }, - { - "filename": "666-icy-snow", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 133, - "y": 178, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-jungle", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 29, - "y": 203, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-marine", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 28, - "y": 228, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-meadow", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 28, - "y": 253, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-modern", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 28, - "y": 278, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-monsoon", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 55, - "y": 204, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-ocean", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 81, - "y": 203, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-poke-ball", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 107, - "y": 203, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-polar", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 133, - "y": 203, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-river", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, "frame": { "x": 54, - "y": 229, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-sandstorm", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 54, - "y": 254, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-savanna", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 54, - "y": 279, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-sun", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 28, - "y": 303, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-tundra", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 27, - "y": 328, - "w": 26, - "h": 25 - } - }, - { - "filename": "666s-archipelago", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 27, "y": 353, "w": 26, "h": 25 } }, { - "filename": "666s-continental", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 54, - "y": 304, - "w": 26, - "h": 25 - } - }, - { - "filename": "666s-elegant", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 53, - "y": 329, - "w": 26, - "h": 25 - } - }, - { - "filename": "666s-fancy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 53, - "y": 354, - "w": 26, - "h": 25 - } - }, - { - "filename": "711-large", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 25 - }, - "frame": { - "x": 30, - "y": 378, - "w": 23, - "h": 25 - } - }, - { - "filename": "666s-garden", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 53, - "y": 379, - "w": 26, - "h": 25 - } - }, - { - "filename": "711-super", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 23, - "h": 25 - }, - "frame": { - "x": 30, - "y": 403, - "w": 23, - "h": 25 - } - }, - { - "filename": "666s-high-plains", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 53, - "y": 404, - "w": 26, - "h": 25 - } - }, - { - "filename": "711s-large", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 25 - }, - "frame": { - "x": 30, - "y": 428, - "w": 23, - "h": 25 - } - }, - { - "filename": "666s-icy-snow", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 53, - "y": 429, - "w": 26, - "h": 25 - } - }, - { - "filename": "711s-super", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 23, - "h": 25 - }, - "frame": { - "x": 30, - "y": 453, - "w": 23, - "h": 25 - } - }, - { - "filename": "666s-jungle", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 53, - "y": 454, - "w": 26, - "h": 25 - } - }, - { - "filename": "657", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 23, - "h": 22 - }, - "frame": { - "x": 30, - "y": 478, - "w": 23, - "h": 22 - } - }, - { - "filename": "699", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 24, - "h": 27 - }, - "frame": { - "x": 30, - "y": 500, - "w": 24, - "h": 27 - } - }, - { - "filename": "708", + "filename": "697s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2266,19 +1468,19 @@ }, "spriteSourceSize": { "x": 6, - "y": 7, - "w": 25, - "h": 21 + "y": 6, + "w": 30, + "h": 22 }, "frame": { - "x": 53, - "y": 479, - "w": 25, - "h": 21 + "x": 68, + "y": 71, + "w": 30, + "h": 22 } }, { - "filename": "699s", + "filename": "715", "rotated": false, "trimmed": true, "sourceSize": { @@ -2286,20 +1488,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 24, - "h": 27 + "x": 6, + "y": 4, + "w": 28, + "h": 24 }, "frame": { - "x": 54, - "y": 500, - "w": 24, - "h": 27 + "x": 98, + "y": 71, + "w": 28, + "h": 24 } }, { - "filename": "676s-dandy", + "filename": "715s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2307,16 +1509,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 24, - "h": 26 + "x": 6, + "y": 4, + "w": 28, + "h": 24 }, "frame": { - "x": 56, - "y": 527, - "w": 24, - "h": 26 + "x": 126, + "y": 71, + "w": 28, + "h": 24 } }, { @@ -2334,8 +1536,8 @@ "h": 23 }, "frame": { - "x": 159, - "y": 149, + "x": 154, + "y": 72, "w": 27, "h": 23 } @@ -2355,14 +1557,14 @@ "h": 23 }, "frame": { - "x": 186, - "y": 149, + "x": 181, + "y": 73, "w": 27, "h": 23 } }, { - "filename": "676-matron", + "filename": "705", "rotated": false, "trimmed": true, "sourceSize": { @@ -2370,41 +1572,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 24, - "h": 25 - }, - "frame": { - "x": 213, - "y": 149, - "w": 24, - "h": 25 - } - }, - { - "filename": "650s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, + "x": 13, "y": 6, - "w": 17, + "w": 15, "h": 22 }, "frame": { - "x": 237, - "y": 168, - "w": 17, + "x": 208, + "y": 73, + "w": 15, "h": 22 } }, { - "filename": "666s-marine", + "filename": "666-garden", "rotated": false, "trimmed": true, "sourceSize": { @@ -2418,14 +1599,14 @@ "h": 25 }, "frame": { - "x": 159, - "y": 172, + "x": 223, + "y": 82, "w": 26, "h": 25 } }, { - "filename": "666s-meadow", + "filename": "666-high-plains", "rotated": false, "trimmed": true, "sourceSize": { @@ -2439,14 +1620,14 @@ "h": 25 }, "frame": { - "x": 185, - "y": 172, + "x": 54, + "y": 378, "w": 26, "h": 25 } }, { - "filename": "666s-modern", + "filename": "666-icy-snow", "rotated": false, "trimmed": true, "sourceSize": { @@ -2460,14 +1641,14 @@ "h": 25 }, "frame": { - "x": 211, - "y": 174, + "x": 53, + "y": 403, "w": 26, "h": 25 } }, { - "filename": "666s-monsoon", + "filename": "676-heart", "rotated": false, "trimmed": true, "sourceSize": { @@ -2477,18 +1658,18 @@ "spriteSourceSize": { "x": 8, "y": 2, - "w": 26, - "h": 25 + "w": 25, + "h": 26 }, "frame": { - "x": 159, - "y": 197, - "w": 26, - "h": 25 + "x": 54, + "y": 428, + "w": 25, + "h": 26 } }, { - "filename": "666s-ocean", + "filename": "676s-heart", "rotated": false, "trimmed": true, "sourceSize": { @@ -2498,18 +1679,18 @@ "spriteSourceSize": { "x": 8, "y": 2, - "w": 26, - "h": 25 + "w": 25, + "h": 26 }, "frame": { - "x": 185, - "y": 197, - "w": 26, - "h": 25 + "x": 54, + "y": 454, + "w": 25, + "h": 26 } }, { - "filename": "666s-poke-ball", + "filename": "676-dandy", "rotated": false, "trimmed": true, "sourceSize": { @@ -2519,18 +1700,18 @@ "spriteSourceSize": { "x": 8, "y": 2, - "w": 26, - "h": 25 + "w": 24, + "h": 26 }, "frame": { - "x": 211, - "y": 199, - "w": 26, - "h": 25 + "x": 56, + "y": 480, + "w": 24, + "h": 26 } }, { - "filename": "710-large", + "filename": "676-pharaoh", "rotated": false, "trimmed": true, "sourceSize": { @@ -2538,20 +1719,62 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 8, + "x": 8, + "y": 2, + "w": 24, + "h": 26 + }, + "frame": { + "x": 56, + "y": 506, + "w": 24, + "h": 26 + } + }, + { + "filename": "676s-dandy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 24, + "h": 26 + }, + "frame": { + "x": 56, + "y": 532, + "w": 24, + "h": 26 + } + }, + { + "filename": "684", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 12, "w": 17, - "h": 20 + "h": 16 }, "frame": { - "x": 237, - "y": 190, + "x": 56, + "y": 558, "w": 17, - "h": 20 + "h": 16 } }, { - "filename": "710s-large", + "filename": "684s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2559,16 +1782,58 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 8, + "x": 11, + "y": 12, "w": 17, - "h": 20 + "h": 16 }, "frame": { - "x": 237, - "y": 210, + "x": 73, + "y": 558, "w": 17, - "h": 20 + "h": 16 + } + }, + { + "filename": "707", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 27, + "h": 24 + }, + "frame": { + "x": 65, + "y": 93, + "w": 27, + "h": 24 + } + }, + { + "filename": "666-jungle", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 62, + "y": 117, + "w": 26, + "h": 25 } }, { @@ -2586,75 +1851,12 @@ "h": 24 }, "frame": { - "x": 159, - "y": 222, + "x": 92, + "y": 95, "w": 27, "h": 24 } }, - { - "filename": "676-debutante", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 25, - "h": 25 - }, - "frame": { - "x": 186, - "y": 222, - "w": 25, - "h": 25 - } - }, - { - "filename": "666s-polar", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 211, - "y": 224, - "w": 26, - "h": 25 - } - }, - { - "filename": "653", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 17, - "h": 19 - }, - "frame": { - "x": 237, - "y": 230, - "w": 17, - "h": 19 - } - }, { "filename": "713", "rotated": false, @@ -2670,8 +1872,8 @@ "h": 24 }, "frame": { - "x": 81, - "y": 228, + "x": 119, + "y": 95, "w": 27, "h": 24 } @@ -2691,14 +1893,98 @@ "h": 24 }, "frame": { - "x": 108, - "y": 228, + "x": 146, + "y": 95, "w": 27, "h": 24 } }, { - "filename": "676s-matron", + "filename": "666-marine", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 88, + "y": 119, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-meadow", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 114, + "y": 119, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-modern", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 140, + "y": 119, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-monsoon", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 173, + "y": 96, + "w": 26, + "h": 25 + } + }, + { + "filename": "676-matron", "rotated": false, "trimmed": true, "sourceSize": { @@ -2712,12 +1998,537 @@ "h": 25 }, "frame": { - "x": 135, - "y": 228, + "x": 199, + "y": 96, "w": 24, "h": 25 } }, + { + "filename": "666-ocean", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 223, + "y": 107, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-poke-ball", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 166, + "y": 121, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-polar", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 192, + "y": 121, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-river", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 79, + "y": 144, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-sandstorm", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 79, + "y": 169, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-savanna", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 105, + "y": 144, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-sun", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 79, + "y": 194, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-tundra", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 105, + "y": 169, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-archipelago", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 131, + "y": 144, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-continental", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 105, + "y": 194, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-elegant", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 131, + "y": 169, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-fancy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 131, + "y": 194, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-garden", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 80, + "y": 219, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-high-plains", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 106, + "y": 219, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-icy-snow", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 132, + "y": 219, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-jungle", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 81, + "y": 244, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-marine", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 107, + "y": 244, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-meadow", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 133, + "y": 244, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-modern", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 157, + "y": 146, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-monsoon", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 157, + "y": 171, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-ocean", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 183, + "y": 146, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-poke-ball", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 183, + "y": 171, + "w": 26, + "h": 25 + } + }, + { + "filename": "700", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 22, + "h": 23 + }, + "frame": { + "x": 157, + "y": 196, + "w": 22, + "h": 23 + } + }, + { + "filename": "666s-polar", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 179, + "y": 196, + "w": 26, + "h": 25 + } + }, + { + "filename": "711", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 158, + "y": 219, + "w": 21, + "h": 23 + } + }, { "filename": "666s-river", "rotated": false, @@ -2733,12 +2544,33 @@ "h": 25 }, "frame": { - "x": 80, - "y": 252, + "x": 179, + "y": 221, "w": 26, "h": 25 } }, + { + "filename": "685", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 20, + "h": 23 + }, + "frame": { + "x": 159, + "y": 242, + "w": 20, + "h": 23 + } + }, { "filename": "666s-sandstorm", "rotated": false, @@ -2754,8 +2586,8 @@ "h": 25 }, "frame": { - "x": 80, - "y": 277, + "x": 179, + "y": 246, "w": 26, "h": 25 } @@ -2775,8 +2607,8 @@ "h": 25 }, "frame": { - "x": 106, - "y": 252, + "x": 218, + "y": 132, "w": 26, "h": 25 } @@ -2796,12 +2628,33 @@ "h": 25 }, "frame": { - "x": 80, - "y": 302, + "x": 209, + "y": 157, "w": 26, "h": 25 } }, + { + "filename": "664", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 7, + "w": 14, + "h": 21 + }, + "frame": { + "x": 235, + "y": 157, + "w": 14, + "h": 21 + } + }, { "filename": "666s-tundra", "rotated": false, @@ -2817,12 +2670,75 @@ "h": 25 }, "frame": { - "x": 106, - "y": 277, + "x": 209, + "y": 182, "w": 26, "h": 25 } }, + { + "filename": "664s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 7, + "w": 14, + "h": 21 + }, + "frame": { + "x": 235, + "y": 178, + "w": 14, + "h": 21 + } + }, + { + "filename": "676-debutante", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 25, + "h": 25 + }, + "frame": { + "x": 205, + "y": 207, + "w": 25, + "h": 25 + } + }, + { + "filename": "683", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 19, + "h": 23 + }, + "frame": { + "x": 230, + "y": 207, + "w": 19, + "h": 23 + } + }, { "filename": "676-kabuki", "rotated": false, @@ -2838,14 +2754,14 @@ "h": 25 }, "frame": { - "x": 106, - "y": 302, + "x": 205, + "y": 232, "w": 25, "h": 25 } }, { - "filename": "676s-heart", + "filename": "683s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2853,16 +2769,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 25, - "h": 26 + "x": 11, + "y": 5, + "w": 19, + "h": 23 }, "frame": { - "x": 132, + "x": 230, + "y": 230, + "w": 19, + "h": 23 + } + }, + { + "filename": "670-blue", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 22 + }, + "frame": { + "x": 230, "y": 253, - "w": 25, - "h": 26 + "w": 19, + "h": 22 } }, { @@ -2880,12 +2817,33 @@ "h": 25 }, "frame": { - "x": 132, - "y": 279, + "x": 205, + "y": 257, "w": 25, "h": 25 } }, + { + "filename": "670-orange", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 22 + }, + "frame": { + "x": 230, + "y": 275, + "w": 19, + "h": 22 + } + }, { "filename": "676s-debutante", "rotated": false, @@ -2901,8 +2859,8 @@ "h": 25 }, "frame": { - "x": 131, - "y": 304, + "x": 81, + "y": 269, "w": 25, "h": 25 } @@ -2922,8 +2880,8 @@ "h": 25 }, "frame": { - "x": 159, - "y": 246, + "x": 106, + "y": 269, "w": 25, "h": 25 } @@ -2943,50 +2901,8 @@ "h": 25 }, "frame": { - "x": 157, - "y": 271, - "w": 25, - "h": 25 - } - }, - { - "filename": "709", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 25, - "h": 25 - }, - "frame": { - "x": 184, - "y": 247, - "w": 25, - "h": 25 - } - }, - { - "filename": "709s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 25, - "h": 25 - }, - "frame": { - "x": 182, - "y": 272, + "x": 131, + "y": 269, "w": 25, "h": 25 } @@ -3006,14 +2922,14 @@ "h": 26 }, "frame": { - "x": 209, - "y": 249, + "x": 80, + "y": 294, "w": 24, "h": 26 } }, { - "filename": "711", + "filename": "709", "rotated": false, "trimmed": true, "sourceSize": { @@ -3021,20 +2937,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 21, - "h": 23 + "x": 8, + "y": 3, + "w": 25, + "h": 25 }, "frame": { - "x": 233, - "y": 249, - "w": 21, - "h": 23 + "x": 104, + "y": 294, + "w": 25, + "h": 25 } }, { - "filename": "711s", + "filename": "709s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3042,16 +2958,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 21, - "h": 23 + "x": 8, + "y": 3, + "w": 25, + "h": 25 }, "frame": { - "x": 233, - "y": 272, - "w": 21, - "h": 23 + "x": 129, + "y": 294, + "w": 25, + "h": 25 + } + }, + { + "filename": "676s-matron", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 24, + "h": 25 + }, + "frame": { + "x": 80, + "y": 320, + "w": 24, + "h": 25 } }, { @@ -3069,54 +3006,12 @@ "h": 25 }, "frame": { - "x": 207, - "y": 275, + "x": 104, + "y": 319, "w": 24, "h": 25 } }, - { - "filename": "657s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 23, - "h": 22 - }, - "frame": { - "x": 231, - "y": 295, - "w": 23, - "h": 22 - } - }, - { - "filename": "708s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 25, - "h": 21 - }, - "frame": { - "x": 157, - "y": 296, - "w": 25, - "h": 21 - } - }, { "filename": "687s", "rotated": false, @@ -3132,8 +3027,8 @@ "h": 25 }, "frame": { - "x": 182, - "y": 297, + "x": 80, + "y": 345, "w": 24, "h": 25 } @@ -3153,8 +3048,8 @@ "h": 24 }, "frame": { - "x": 206, - "y": 300, + "x": 104, + "y": 344, "w": 24, "h": 24 } @@ -3174,14 +3069,14 @@ "h": 24 }, "frame": { - "x": 230, - "y": 317, + "x": 128, + "y": 319, "w": 24, "h": 24 } }, { - "filename": "692", + "filename": "711-large", "rotated": false, "trimmed": true, "sourceSize": { @@ -3189,125 +3084,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 11, - "w": 24, - "h": 17 - }, - "frame": { - "x": 156, - "y": 317, - "w": 24, - "h": 17 - } - }, - { - "filename": "692s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 11, - "w": 24, - "h": 17 - }, - "frame": { - "x": 180, - "y": 322, - "w": 24, - "h": 17 - } - }, - { - "filename": "673", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, + "x": 9, + "y": 4, "w": 23, - "h": 22 - }, - "frame": { - "x": 204, - "y": 324, - "w": 23, - "h": 22 - } - }, - { - "filename": "659", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 16, - "h": 25 - }, - "frame": { - "x": 78, - "y": 479, - "w": 16, - "h": 25 - } - }, - { - "filename": "683s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 19, - "h": 23 - }, - "frame": { - "x": 78, - "y": 504, - "w": 19, - "h": 23 - } - }, - { - "filename": "659s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 16, "h": 25 }, "frame": { "x": 80, - "y": 527, - "w": 16, + "y": 370, + "w": 23, "h": 25 } }, { - "filename": "673s", + "filename": "711-super", "rotated": false, "trimmed": true, "sourceSize": { @@ -3315,20 +3105,41 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 6, + "x": 9, + "y": 3, + "w": 23, + "h": 25 + }, + "frame": { + "x": 128, + "y": 343, + "w": 23, + "h": 25 + } + }, + { + "filename": "657", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, "w": 23, "h": 22 }, "frame": { - "x": 227, - "y": 341, + "x": 80, + "y": 395, "w": 23, "h": 22 } }, { - "filename": "679s", + "filename": "711s-large", "rotated": false, "trimmed": true, "sourceSize": { @@ -3336,16 +3147,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 14, + "x": 9, "y": 4, - "w": 18, - "h": 24 + "w": 23, + "h": 25 }, "frame": { "x": 79, - "y": 329, - "w": 18, - "h": 24 + "y": 417, + "w": 23, + "h": 25 + } + }, + { + "filename": "711s-super", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 23, + "h": 25 + }, + "frame": { + "x": 79, + "y": 442, + "w": 23, + "h": 25 } }, { @@ -3363,8 +3195,8 @@ "h": 24 }, "frame": { - "x": 97, - "y": 327, + "x": 80, + "y": 467, "w": 22, "h": 24 } @@ -3384,33 +3216,12 @@ "h": 24 }, "frame": { - "x": 79, - "y": 353, + "x": 80, + "y": 491, "w": 22, "h": 24 } }, - { - "filename": "700", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 22, - "h": 23 - }, - "frame": { - "x": 79, - "y": 377, - "w": 22, - "h": 23 - } - }, { "filename": "700s", "rotated": false, @@ -3426,12 +3237,558 @@ "h": 23 }, "frame": { - "x": 79, - "y": 400, + "x": 80, + "y": 515, "w": 22, "h": 23 } }, + { + "filename": "662", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 80, + "y": 538, + "w": 22, + "h": 20 + } + }, + { + "filename": "682", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 15, + "h": 16 + }, + "frame": { + "x": 90, + "y": 558, + "w": 15, + "h": 16 + } + }, + { + "filename": "654", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 20, + "h": 22 + }, + "frame": { + "x": 159, + "y": 265, + "w": 20, + "h": 22 + } + }, + { + "filename": "708", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 179, + "y": 271, + "w": 25, + "h": 21 + } + }, + { + "filename": "708s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 204, + "y": 282, + "w": 25, + "h": 21 + } + }, + { + "filename": "685s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 20, + "h": 23 + }, + "frame": { + "x": 229, + "y": 297, + "w": 20, + "h": 23 + } + }, + { + "filename": "657s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 23, + "h": 22 + }, + "frame": { + "x": 156, + "y": 287, + "w": 23, + "h": 22 + } + }, + { + "filename": "692", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 11, + "w": 24, + "h": 17 + }, + "frame": { + "x": 179, + "y": 292, + "w": 24, + "h": 17 + } + }, + { + "filename": "692s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 11, + "w": 24, + "h": 17 + }, + "frame": { + "x": 154, + "y": 309, + "w": 24, + "h": 17 + } + }, + { + "filename": "673", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 23, + "h": 22 + }, + "frame": { + "x": 178, + "y": 309, + "w": 23, + "h": 22 + } + }, + { + "filename": "673s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 23, + "h": 22 + }, + "frame": { + "x": 152, + "y": 326, + "w": 23, + "h": 22 + } + }, + { + "filename": "2670", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 151, + "y": 348, + "w": 23, + "h": 21 + } + }, + { + "filename": "701", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 9, + "w": 23, + "h": 19 + }, + "frame": { + "x": 175, + "y": 331, + "w": 23, + "h": 19 + } + }, + { + "filename": "701s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 9, + "w": 23, + "h": 19 + }, + "frame": { + "x": 174, + "y": 350, + "w": 23, + "h": 19 + } + }, + { + "filename": "2670s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 203, + "y": 303, + "w": 23, + "h": 21 + } + }, + { + "filename": "662s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 201, + "y": 324, + "w": 22, + "h": 20 + } + }, + { + "filename": "659", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 16, + "h": 25 + }, + "frame": { + "x": 103, + "y": 370, + "w": 16, + "h": 25 + } + }, + { + "filename": "711s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 119, + "y": 368, + "w": 21, + "h": 23 + } + }, + { + "filename": "650", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 17, + "h": 22 + }, + "frame": { + "x": 103, + "y": 395, + "w": 17, + "h": 22 + } + }, + { + "filename": "679", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 4, + "w": 18, + "h": 24 + }, + "frame": { + "x": 102, + "y": 417, + "w": 18, + "h": 24 + } + }, + { + "filename": "679s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 4, + "w": 18, + "h": 24 + }, + "frame": { + "x": 102, + "y": 441, + "w": 18, + "h": 24 + } + }, + { + "filename": "659s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 16, + "h": 25 + }, + "frame": { + "x": 102, + "y": 465, + "w": 16, + "h": 25 + } + }, + { + "filename": "688", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 102, + "y": 490, + "w": 16, + "h": 24 + } + }, + { + "filename": "688s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 102, + "y": 514, + "w": 16, + "h": 24 + } + }, + { + "filename": "667", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 102, + "y": 538, + "w": 21, + "h": 20 + } + }, + { + "filename": "682s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 15, + "h": 16 + }, + "frame": { + "x": 105, + "y": 558, + "w": 15, + "h": 16 + } + }, { "filename": "651", "rotated": false, @@ -3447,8 +3804,8 @@ "h": 22 }, "frame": { - "x": 79, - "y": 423, + "x": 120, + "y": 391, "w": 21, "h": 22 } @@ -3468,56 +3825,14 @@ "h": 22 }, "frame": { - "x": 79, - "y": 445, + "x": 120, + "y": 413, "w": 21, "h": 22 } }, { - "filename": "685", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 20, - "h": 23 - }, - "frame": { - "x": 101, - "y": 351, - "w": 20, - "h": 23 - } - }, - { - "filename": "685s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 20, - "h": 23 - }, - "frame": { - "x": 101, - "y": 374, - "w": 20, - "h": 23 - } - }, - { - "filename": "654", + "filename": "678", "rotated": false, "trimmed": true, "sourceSize": { @@ -3527,13 +3842,13 @@ "spriteSourceSize": { "x": 10, "y": 6, - "w": 20, + "w": 21, "h": 22 }, "frame": { - "x": 101, - "y": 397, - "w": 20, + "x": 120, + "y": 435, + "w": 21, "h": 22 } }, @@ -3552,140 +3867,14 @@ "h": 22 }, "frame": { - "x": 119, - "y": 329, + "x": 140, + "y": 369, "w": 21, "h": 22 } }, { - "filename": "688", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 140, - "y": 329, - "w": 16, - "h": 24 - } - }, - { - "filename": "670-blue", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 22 - }, - "frame": { - "x": 121, - "y": 351, - "w": 19, - "h": 22 - } - }, - { - "filename": "701", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 9, - "w": 23, - "h": 19 - }, - "frame": { - "x": 156, - "y": 334, - "w": 23, - "h": 19 - } - }, - { - "filename": "2670", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 23, - "h": 21 - }, - "frame": { - "x": 140, - "y": 353, - "w": 23, - "h": 21 - } - }, - { - "filename": "670-orange", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 22 - }, - "frame": { - "x": 121, - "y": 373, - "w": 19, - "h": 22 - } - }, - { - "filename": "2670s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 23, - "h": 21 - }, - "frame": { - "x": 140, - "y": 374, - "w": 23, - "h": 21 - } - }, - { - "filename": "678", + "filename": "678s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3699,8 +3888,8 @@ "h": 22 }, "frame": { - "x": 121, - "y": 395, + "x": 161, + "y": 369, "w": 21, "h": 22 } @@ -3720,222 +3909,12 @@ "h": 22 }, "frame": { - "x": 142, - "y": 395, + "x": 141, + "y": 391, "w": 21, "h": 22 } }, - { - "filename": "688s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 163, - "y": 353, - "w": 16, - "h": 24 - } - }, - { - "filename": "678s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 21, - "h": 22 - }, - "frame": { - "x": 179, - "y": 339, - "w": 21, - "h": 22 - } - }, - { - "filename": "654s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 20, - "h": 22 - }, - "frame": { - "x": 163, - "y": 377, - "w": 20, - "h": 22 - } - }, - { - "filename": "662", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, - "h": 20 - }, - "frame": { - "x": 163, - "y": 399, - "w": 22, - "h": 20 - } - }, - { - "filename": "684", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 12, - "w": 17, - "h": 16 - }, - "frame": { - "x": 179, - "y": 361, - "w": 17, - "h": 16 - } - }, - { - "filename": "670-red", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 22 - }, - "frame": { - "x": 183, - "y": 377, - "w": 19, - "h": 22 - } - }, - { - "filename": "662s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, - "h": 20 - }, - "frame": { - "x": 185, - "y": 399, - "w": 22, - "h": 20 - } - }, - { - "filename": "696", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 20, - "h": 17 - }, - "frame": { - "x": 207, - "y": 346, - "w": 20, - "h": 17 - } - }, - { - "filename": "701s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 9, - "w": 23, - "h": 19 - }, - "frame": { - "x": 121, - "y": 417, - "w": 23, - "h": 19 - } - }, - { - "filename": "696s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 20, - "h": 17 - }, - "frame": { - "x": 101, - "y": 419, - "w": 20, - "h": 17 - } - }, { "filename": "719", "rotated": false, @@ -3951,8 +3930,8 @@ "h": 22 }, "frame": { - "x": 100, - "y": 436, + "x": 141, + "y": 413, "w": 21, "h": 22 } @@ -3972,12 +3951,54 @@ "h": 22 }, "frame": { - "x": 121, - "y": 436, + "x": 141, + "y": 435, "w": 21, "h": 22 } }, + { + "filename": "654s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 20, + "h": 22 + }, + "frame": { + "x": 162, + "y": 391, + "w": 20, + "h": 22 + } + }, + { + "filename": "670-red", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 22 + }, + "frame": { + "x": 162, + "y": 413, + "w": 19, + "h": 22 + } + }, { "filename": "670-white", "rotated": false, @@ -3993,14 +4014,14 @@ "h": 22 }, "frame": { - "x": 144, - "y": 417, + "x": 162, + "y": 435, "w": 19, "h": 22 } }, { - "filename": "667", + "filename": "698", "rotated": false, "trimmed": true, "sourceSize": { @@ -4008,20 +4029,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, - "h": 20 + "x": 11, + "y": 4, + "w": 17, + "h": 24 }, "frame": { - "x": 163, - "y": 419, - "w": 21, - "h": 20 + "x": 182, + "y": 369, + "w": 17, + "h": 24 } }, { - "filename": "667s", + "filename": "650s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4029,41 +4050,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, - "h": 20 - }, - "frame": { - "x": 184, - "y": 419, - "w": 21, - "h": 20 - } - }, - { - "filename": "714", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, + "x": 12, "y": 6, - "w": 21, - "h": 20 + "w": 17, + "h": 22 }, "frame": { - "x": 142, - "y": 439, - "w": 21, - "h": 20 + "x": 182, + "y": 393, + "w": 17, + "h": 22 } }, { - "filename": "714s", + "filename": "698s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4071,20 +4071,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 21, - "h": 20 + "x": 11, + "y": 4, + "w": 17, + "h": 24 }, "frame": { - "x": 163, - "y": 439, - "w": 21, - "h": 20 + "x": 181, + "y": 415, + "w": 17, + "h": 24 } }, { - "filename": "710-super", + "filename": "653", "rotated": false, "trimmed": true, "sourceSize": { @@ -4092,16 +4092,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 21 + "x": 11, + "y": 9, + "w": 17, + "h": 19 }, "frame": { - "x": 184, + "x": 181, "y": 439, - "w": 20, - "h": 21 + "w": 17, + "h": 19 } }, { @@ -4119,14 +4119,14 @@ "h": 17 }, "frame": { - "x": 100, - "y": 458, + "x": 120, + "y": 457, "w": 22, "h": 17 } }, { - "filename": "710s-super", + "filename": "667s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4135,57 +4135,15 @@ }, "spriteSourceSize": { "x": 10, - "y": 7, - "w": 20, - "h": 21 - }, - "frame": { - "x": 122, - "y": 458, - "w": 20, - "h": 21 - } - }, - { - "filename": "720", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, "y": 8, "w": 21, - "h": 19 + "h": 20 }, "frame": { - "x": 142, - "y": 459, + "x": 118, + "y": 474, "w": 21, - "h": 19 - } - }, - { - "filename": "720s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 21, - "h": 19 - }, - "frame": { - "x": 163, - "y": 459, - "w": 21, - "h": 19 + "h": 20 } }, { @@ -4203,8 +4161,8 @@ "h": 22 }, "frame": { - "x": 184, - "y": 460, + "x": 118, + "y": 494, "w": 19, "h": 22 } @@ -4224,29 +4182,8 @@ "h": 22 }, "frame": { - "x": 94, - "y": 475, - "w": 19, - "h": 22 - } - }, - { - "filename": "670s-orange", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 22 - }, - "frame": { - "x": 97, - "y": 497, + "x": 118, + "y": 516, "w": 19, "h": 22 } @@ -4266,12 +4203,54 @@ "h": 17 }, "frame": { - "x": 113, - "y": 479, + "x": 142, + "y": 457, "w": 22, "h": 17 } }, + { + "filename": "714", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 21, + "h": 20 + }, + "frame": { + "x": 139, + "y": 474, + "w": 21, + "h": 20 + } + }, + { + "filename": "670s-orange", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 22 + }, + "frame": { + "x": 137, + "y": 494, + "w": 19, + "h": 22 + } + }, { "filename": "670s-red", "rotated": false, @@ -4287,12 +4266,96 @@ "h": 22 }, "frame": { - "x": 116, - "y": 496, + "x": 137, + "y": 516, "w": 19, "h": 22 } }, + { + "filename": "714s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 21, + "h": 20 + }, + "frame": { + "x": 123, + "y": 538, + "w": 21, + "h": 20 + } + }, + { + "filename": "653s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 17, + "h": 19 + }, + "frame": { + "x": 164, + "y": 457, + "w": 17, + "h": 19 + } + }, + { + "filename": "656", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 10, + "w": 18, + "h": 19 + }, + "frame": { + "x": 181, + "y": 458, + "w": 18, + "h": 19 + } + }, + { + "filename": "720", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 21, + "h": 19 + }, + "frame": { + "x": 160, + "y": 476, + "w": 21, + "h": 19 + } + }, { "filename": "670s-white", "rotated": false, @@ -4308,8 +4371,8 @@ "h": 22 }, "frame": { - "x": 135, - "y": 479, + "x": 156, + "y": 495, "w": 19, "h": 22 } @@ -4329,33 +4392,12 @@ "h": 22 }, "frame": { - "x": 154, - "y": 478, + "x": 156, + "y": 517, "w": 19, "h": 22 } }, - { - "filename": "656", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 10, - "w": 18, - "h": 19 - }, - "frame": { - "x": 135, - "y": 501, - "w": 18, - "h": 19 - } - }, { "filename": "656s", "rotated": false, @@ -4371,14 +4413,14 @@ "h": 19 }, "frame": { - "x": 97, - "y": 519, + "x": 181, + "y": 477, "w": 18, "h": 19 } }, { - "filename": "653s", + "filename": "710-super", "rotated": false, "trimmed": true, "sourceSize": { @@ -4386,20 +4428,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 17, - "h": 19 + "x": 10, + "y": 7, + "w": 20, + "h": 21 }, "frame": { - "x": 96, - "y": 538, - "w": 17, - "h": 19 + "x": 175, + "y": 496, + "w": 20, + "h": 21 } }, { - "filename": "710", + "filename": "710s-super", "rotated": false, "trimmed": true, "sourceSize": { @@ -4407,58 +4449,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 9, - "w": 17, - "h": 19 + "x": 10, + "y": 7, + "w": 20, + "h": 21 }, "frame": { - "x": 113, - "y": 538, - "w": 17, - "h": 19 - } - }, - { - "filename": "674", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 9, - "w": 15, - "h": 19 - }, - "frame": { - "x": 115, - "y": 519, - "w": 15, - "h": 19 - } - }, - { - "filename": "711-small", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 18, - "h": 22 - }, - "frame": { - "x": 130, - "y": 520, - "w": 18, - "h": 22 + "x": 175, + "y": 517, + "w": 20, + "h": 21 } }, { @@ -4476,14 +4476,14 @@ "h": 15 }, "frame": { - "x": 130, - "y": 542, + "x": 120, + "y": 558, "w": 18, "h": 15 } }, { - "filename": "705", + "filename": "720s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4491,16 +4491,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, - "y": 6, - "w": 15, - "h": 22 + "x": 9, + "y": 8, + "w": 21, + "h": 19 }, "frame": { - "x": 148, - "y": 520, - "w": 15, - "h": 22 + "x": 144, + "y": 539, + "w": 21, + "h": 19 } }, { @@ -4518,14 +4518,14 @@ "h": 15 }, "frame": { - "x": 148, - "y": 542, + "x": 138, + "y": 558, "w": 18, "h": 15 } }, { - "filename": "674s", + "filename": "674", "rotated": false, "trimmed": true, "sourceSize": { @@ -4539,33 +4539,12 @@ "h": 19 }, "frame": { - "x": 153, - "y": 501, + "x": 165, + "y": 539, "w": 15, "h": 19 } }, - { - "filename": "705s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 6, - "w": 15, - "h": 22 - }, - "frame": { - "x": 163, - "y": 520, - "w": 15, - "h": 22 - } - }, { "filename": "686", "rotated": false, @@ -4581,117 +4560,12 @@ "h": 20 }, "frame": { - "x": 168, - "y": 500, + "x": 180, + "y": 538, "w": 18, "h": 20 } }, - { - "filename": "672", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 10, - "w": 17, - "h": 18 - }, - "frame": { - "x": 173, - "y": 482, - "w": 17, - "h": 18 - } - }, - { - "filename": "664", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 7, - "w": 14, - "h": 21 - }, - "frame": { - "x": 190, - "y": 482, - "w": 14, - "h": 21 - } - }, - { - "filename": "686s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 20 - }, - "frame": { - "x": 186, - "y": 503, - "w": 18, - "h": 20 - } - }, - { - "filename": "690", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 18, - "h": 21 - }, - "frame": { - "x": 178, - "y": 523, - "w": 18, - "h": 21 - } - }, - { - "filename": "664s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 7, - "w": 14, - "h": 21 - }, - "frame": { - "x": 196, - "y": 523, - "w": 14, - "h": 21 - } - }, { "filename": "703", "rotated": false, @@ -4707,8 +4581,8 @@ "h": 13 }, "frame": { - "x": 166, - "y": 544, + "x": 156, + "y": 558, "w": 14, "h": 13 } @@ -4728,14 +4602,14 @@ "h": 13 }, "frame": { - "x": 180, - "y": 544, + "x": 170, + "y": 558, "w": 14, "h": 13 } }, { - "filename": "711s-small", + "filename": "705s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4743,18 +4617,81 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, + "x": 13, "y": 6, - "w": 18, + "w": 15, "h": 22 }, "frame": { - "x": 203, - "y": 460, - "w": 18, + "x": 195, + "y": 496, + "w": 15, "h": 22 } }, + { + "filename": "686s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 18, + "h": 20 + }, + "frame": { + "x": 195, + "y": 518, + "w": 18, + "h": 20 + } + }, + { + "filename": "690", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 18, + "h": 21 + }, + "frame": { + "x": 198, + "y": 538, + "w": 18, + "h": 21 + } + }, + { + "filename": "704", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 14, + "w": 12, + "h": 14 + }, + "frame": { + "x": 184, + "y": 558, + "w": 12, + "h": 14 + } + }, { "filename": "690s", "rotated": false, @@ -4770,12 +4707,306 @@ "h": 21 }, "frame": { - "x": 204, - "y": 439, + "x": 223, + "y": 324, "w": 18, "h": 21 } }, + { + "filename": "696", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 20, + "h": 17 + }, + "frame": { + "x": 198, + "y": 344, + "w": 20, + "h": 17 + } + }, + { + "filename": "711-small", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 18, + "h": 22 + }, + "frame": { + "x": 199, + "y": 361, + "w": 18, + "h": 22 + } + }, + { + "filename": "711s-small", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 18, + "h": 22 + }, + "frame": { + "x": 199, + "y": 383, + "w": 18, + "h": 22 + } + }, + { + "filename": "696s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 20, + "h": 17 + }, + "frame": { + "x": 218, + "y": 345, + "w": 20, + "h": 17 + } + }, + { + "filename": "710-large", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 17, + "h": 20 + }, + "frame": { + "x": 217, + "y": 362, + "w": 17, + "h": 20 + } + }, + { + "filename": "674s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 15, + "h": 19 + }, + "frame": { + "x": 234, + "y": 362, + "w": 15, + "h": 19 + } + }, + { + "filename": "710s-large", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 17, + "h": 20 + }, + "frame": { + "x": 217, + "y": 382, + "w": 17, + "h": 20 + } + }, + { + "filename": "669-blue", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 15, + "h": 18 + }, + "frame": { + "x": 234, + "y": 381, + "w": 15, + "h": 18 + } + }, + { + "filename": "669-orange", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 15, + "h": 18 + }, + "frame": { + "x": 234, + "y": 399, + "w": 15, + "h": 18 + } + }, + { + "filename": "672", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 10, + "w": 17, + "h": 18 + }, + "frame": { + "x": 217, + "y": 402, + "w": 17, + "h": 18 + } + }, + { + "filename": "694", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 11, + "w": 18, + "h": 17 + }, + "frame": { + "x": 199, + "y": 405, + "w": 18, + "h": 17 + } + }, + { + "filename": "669-red", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 15, + "h": 18 + }, + "frame": { + "x": 234, + "y": 417, + "w": 15, + "h": 18 + } + }, + { + "filename": "710", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 17, + "h": 19 + }, + "frame": { + "x": 198, + "y": 422, + "w": 17, + "h": 19 + } + }, + { + "filename": "694s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 11, + "w": 18, + "h": 17 + }, + "frame": { + "x": 198, + "y": 441, + "w": 18, + "h": 17 + } + }, { "filename": "710s", "rotated": false, @@ -4791,8 +5022,8 @@ "h": 19 }, "frame": { - "x": 204, - "y": 482, + "x": 199, + "y": 458, "w": 17, "h": 19 } @@ -4812,117 +5043,12 @@ "h": 18 }, "frame": { - "x": 204, - "y": 501, + "x": 199, + "y": 477, "w": 17, "h": 18 } }, - { - "filename": "669-blue", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 15, - "h": 18 - }, - "frame": { - "x": 210, - "y": 519, - "w": 15, - "h": 18 - } - }, - { - "filename": "665", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 16, - "h": 17 - }, - "frame": { - "x": 210, - "y": 537, - "w": 16, - "h": 17 - } - }, - { - "filename": "704", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 14, - "w": 12, - "h": 14 - }, - "frame": { - "x": 196, - "y": 363, - "w": 12, - "h": 14 - } - }, - { - "filename": "694", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 11, - "w": 18, - "h": 17 - }, - "frame": { - "x": 208, - "y": 363, - "w": 18, - "h": 17 - } - }, - { - "filename": "694s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 11, - "w": 18, - "h": 17 - }, - "frame": { - "x": 226, - "y": 363, - "w": 18, - "h": 17 - } - }, { "filename": "712", "rotated": false, @@ -4938,12 +5064,33 @@ "h": 18 }, "frame": { - "x": 202, - "y": 380, + "x": 217, + "y": 420, "w": 17, "h": 18 } }, + { + "filename": "669-white", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 15, + "h": 18 + }, + "frame": { + "x": 234, + "y": 435, + "w": 15, + "h": 18 + } + }, { "filename": "712s", "rotated": false, @@ -4959,8 +5106,8 @@ "h": 18 }, "frame": { - "x": 219, - "y": 380, + "x": 216, + "y": 438, "w": 17, "h": 18 } @@ -4980,54 +5127,12 @@ "h": 18 }, "frame": { - "x": 207, - "y": 398, + "x": 233, + "y": 453, "w": 16, "h": 18 } }, - { - "filename": "669-orange", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 15, - "h": 18 - }, - "frame": { - "x": 223, - "y": 398, - "w": 15, - "h": 18 - } - }, - { - "filename": "669-red", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 15, - "h": 18 - }, - "frame": { - "x": 236, - "y": 380, - "w": 15, - "h": 18 - } - }, { "filename": "677s", "rotated": false, @@ -5043,14 +5148,14 @@ "h": 18 }, "frame": { - "x": 238, - "y": 398, + "x": 216, + "y": 456, "w": 16, "h": 18 } }, { - "filename": "669-white", + "filename": "665", "rotated": false, "trimmed": true, "sourceSize": { @@ -5058,16 +5163,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 15, - "h": 18 + "x": 12, + "y": 11, + "w": 16, + "h": 17 }, "frame": { - "x": 205, - "y": 419, - "w": 15, - "h": 18 + "x": 216, + "y": 474, + "w": 16, + "h": 17 } }, { @@ -5085,33 +5190,12 @@ "h": 17 }, "frame": { - "x": 220, - "y": 416, + "x": 232, + "y": 471, "w": 16, "h": 17 } }, - { - "filename": "684s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 12, - "w": 17, - "h": 16 - }, - "frame": { - "x": 236, - "y": 416, - "w": 17, - "h": 16 - } - }, { "filename": "669-yellow", "rotated": false, @@ -5127,8 +5211,8 @@ "h": 18 }, "frame": { - "x": 222, - "y": 433, + "x": 210, + "y": 495, "w": 15, "h": 18 } @@ -5148,8 +5232,8 @@ "h": 18 }, "frame": { - "x": 237, - "y": 432, + "x": 213, + "y": 513, "w": 15, "h": 18 } @@ -5169,8 +5253,8 @@ "h": 18 }, "frame": { - "x": 222, - "y": 451, + "x": 216, + "y": 531, "w": 15, "h": 18 } @@ -5190,50 +5274,8 @@ "h": 18 }, "frame": { - "x": 237, - "y": 450, - "w": 15, - "h": 18 - } - }, - { - "filename": "669s-white", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 15, - "h": 18 - }, - "frame": { - "x": 221, - "y": 469, - "w": 15, - "h": 18 - } - }, - { - "filename": "669s-yellow", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 15, - "h": 18 - }, - "frame": { - "x": 221, - "y": 487, + "x": 216, + "y": 549, "w": 15, "h": 18 } @@ -5253,12 +5295,54 @@ "h": 14 }, "frame": { - "x": 221, - "y": 505, + "x": 196, + "y": 559, "w": 12, "h": 14 } }, + { + "filename": "669s-white", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 15, + "h": 18 + }, + "frame": { + "x": 225, + "y": 491, + "w": 15, + "h": 18 + } + }, + { + "filename": "669s-yellow", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 15, + "h": 18 + }, + "frame": { + "x": 228, + "y": 509, + "w": 15, + "h": 18 + } + }, { "filename": "710-small", "rotated": false, @@ -5274,8 +5358,8 @@ "h": 17 }, "frame": { - "x": 225, - "y": 519, + "x": 231, + "y": 527, "w": 15, "h": 17 } @@ -5295,53 +5379,11 @@ "h": 17 }, "frame": { - "x": 226, - "y": 536, + "x": 231, + "y": 544, "w": 15, "h": 17 } - }, - { - "filename": "682", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 12, - "w": 15, - "h": 16 - }, - "frame": { - "x": 236, - "y": 469, - "w": 15, - "h": 16 - } - }, - { - "filename": "682s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 12, - "w": 15, - "h": 16 - }, - "frame": { - "x": 236, - "y": 485, - "w": 15, - "h": 16 - } } ] } @@ -5349,6 +5391,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:a80f4550917ab6469d19d3cdd7fc8ebc:a52ccf05d060a2fd0a793e2f02508109:96737d38f2029744a75c1ee001bc1929$" + "smartupdate": "$TexturePacker:SmartUpdate:eae96c5465e40fb532263c57b34ceef9:99443d59d3d788579059799020ee2aef:96737d38f2029744a75c1ee001bc1929$" } } diff --git a/public/images/pokemon_icons_6.png b/public/images/pokemon_icons_6.png index 46ff8597c..c2ba77b59 100644 Binary files a/public/images/pokemon_icons_6.png and b/public/images/pokemon_icons_6.png differ diff --git a/public/images/pokemon_icons_7.json b/public/images/pokemon_icons_7.json index a57910d93..d4b52c7ab 100644 --- a/public/images/pokemon_icons_7.json +++ b/public/images/pokemon_icons_7.json @@ -4,8 +4,8 @@ "image": "pokemon_icons_7.png", "format": "RGBA8888", "size": { - "w": 254, - "h": 640 + "w": 502, + "h": 323 }, "scale": 1, "frames": [ @@ -324,27 +324,6 @@ "h": 29 } }, - { - "filename": "798s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 31, - "h": 29 - }, - "frame": { - "x": 0, - "y": 293, - "w": 31, - "h": 29 - } - }, { "filename": "795", "rotated": false, @@ -361,7 +340,7 @@ }, "frame": { "x": 0, - "y": 322, + "y": 293, "w": 28, "h": 30 } @@ -381,14 +360,14 @@ "h": 30 }, "frame": { - "x": 0, - "y": 352, + "x": 28, + "y": 293, "w": 28, "h": 30 } }, { - "filename": "800", + "filename": "798s", "rotated": false, "trimmed": true, "sourceSize": { @@ -396,79 +375,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 28, - "h": 30 + "x": 4, + "y": 1, + "w": 31, + "h": 29 }, "frame": { - "x": 0, - "y": 382, - "w": 28, - "h": 30 - } - }, - { - "filename": "800s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, + "x": 112, "y": 0, - "w": 28, - "h": 30 - }, - "frame": { - "x": 0, - "y": 412, - "w": 28, - "h": 30 - } - }, - { - "filename": "805", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 28, - "h": 30 - }, - "frame": { - "x": 0, - "y": 442, - "w": 28, - "h": 30 - } - }, - { - "filename": "805s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 28, - "h": 30 - }, - "frame": { - "x": 0, - "y": 472, - "w": 28, - "h": 30 + "w": 31, + "h": 29 } }, { @@ -486,7 +402,7 @@ "h": 28 }, "frame": { - "x": 112, + "x": 143, "y": 0, "w": 30, "h": 28 @@ -507,8 +423,8 @@ "h": 28 }, "frame": { - "x": 108, - "y": 28, + "x": 173, + "y": 0, "w": 30, "h": 28 } @@ -528,7 +444,7 @@ "h": 28 }, "frame": { - "x": 142, + "x": 203, "y": 0, "w": 29, "h": 28 @@ -549,117 +465,12 @@ "h": 28 }, "frame": { - "x": 138, - "y": 28, + "x": 232, + "y": 0, "w": 29, "h": 28 } }, - { - "filename": "773-bug", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 0, - "y": 502, - "w": 26, - "h": 30 - } - }, - { - "filename": "773-dark", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 0, - "y": 532, - "w": 26, - "h": 30 - } - }, - { - "filename": "773-dragon", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 0, - "y": 562, - "w": 26, - "h": 30 - } - }, - { - "filename": "773-electric", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 0, - "y": 592, - "w": 26, - "h": 30 - } - }, - { - "filename": "752", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 23, - "h": 18 - }, - "frame": { - "x": 0, - "y": 622, - "w": 23, - "h": 18 - } - }, { "filename": "784", "rotated": false, @@ -675,7 +486,7 @@ "h": 27 }, "frame": { - "x": 171, + "x": 261, "y": 0, "w": 29, "h": 27 @@ -696,14 +507,14 @@ "h": 27 }, "frame": { - "x": 200, + "x": 290, "y": 0, "w": 29, "h": 27 } }, { - "filename": "764", + "filename": "730", "rotated": false, "trimmed": true, "sourceSize": { @@ -711,15 +522,351 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, + "x": 6, + "y": 2, + "w": 28, + "h": 27 + }, + "frame": { + "x": 319, "y": 0, - "w": 25, + "w": 28, + "h": 27 + } + }, + { + "filename": "730s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 28, + "h": 27 + }, + "frame": { + "x": 347, + "y": 0, + "w": 28, + "h": 27 + } + }, + { + "filename": "740", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 32, + "h": 23 + }, + "frame": { + "x": 375, + "y": 0, + "w": 32, + "h": 23 + } + }, + { + "filename": "740s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 32, + "h": 23 + }, + "frame": { + "x": 407, + "y": 0, + "w": 32, + "h": 23 + } + }, + { + "filename": "800", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 28, "h": 30 }, "frame": { - "x": 229, + "x": 34, + "y": 85, + "w": 28, + "h": 30 + } + }, + { + "filename": "800s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, "y": 0, - "w": 25, + "w": 28, + "h": 30 + }, + "frame": { + "x": 34, + "y": 115, + "w": 28, + "h": 30 + } + }, + { + "filename": "805", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 0, + "w": 28, + "h": 30 + }, + "frame": { + "x": 32, + "y": 145, + "w": 28, + "h": 30 + } + }, + { + "filename": "805s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 0, + "w": 28, + "h": 30 + }, + "frame": { + "x": 32, + "y": 175, + "w": 28, + "h": 30 + } + }, + { + "filename": "773", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 31, + "y": 205, + "w": 26, + "h": 30 + } + }, + { + "filename": "773-bug", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 31, + "y": 235, + "w": 26, + "h": 30 + } + }, + { + "filename": "792", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 1, + "w": 28, + "h": 28 + }, + "frame": { + "x": 31, + "y": 265, + "w": 28, + "h": 28 + } + }, + { + "filename": "773-dark", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 56, + "y": 293, + "w": 26, + "h": 30 + } + }, + { + "filename": "2038", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 30, + "h": 25 + }, + "frame": { + "x": 439, + "y": 0, + "w": 30, + "h": 25 + } + }, + { + "filename": "2038s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 30, + "h": 25 + }, + "frame": { + "x": 469, + "y": 0, + "w": 30, + "h": 25 + } + }, + { + "filename": "792s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 1, + "w": 28, + "h": 28 + }, + "frame": { + "x": 108, + "y": 29, + "w": 28, + "h": 28 + } + }, + { + "filename": "773-dragon", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 70, + "y": 57, + "w": 26, + "h": 30 + } + }, + { + "filename": "773-electric", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 96, + "y": 57, + "w": 26, "h": 30 } }, @@ -738,8 +885,8 @@ "h": 30 }, "frame": { - "x": 34, - "y": 85, + "x": 62, + "y": 87, "w": 26, "h": 30 } @@ -759,8 +906,8 @@ "h": 30 }, "frame": { - "x": 34, - "y": 115, + "x": 88, + "y": 87, "w": 26, "h": 30 } @@ -780,8 +927,8 @@ "h": 30 }, "frame": { - "x": 32, - "y": 145, + "x": 62, + "y": 117, "w": 26, "h": 30 } @@ -801,8 +948,8 @@ "h": 30 }, "frame": { - "x": 32, - "y": 175, + "x": 88, + "y": 117, "w": 26, "h": 30 } @@ -822,8 +969,8 @@ "h": 30 }, "frame": { - "x": 31, - "y": 205, + "x": 60, + "y": 147, "w": 26, "h": 30 } @@ -843,8 +990,8 @@ "h": 30 }, "frame": { - "x": 31, - "y": 235, + "x": 86, + "y": 147, "w": 26, "h": 30 } @@ -864,33 +1011,12 @@ "h": 30 }, "frame": { - "x": 31, - "y": 265, + "x": 60, + "y": 177, "w": 26, "h": 30 } }, - { - "filename": "730", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 28, - "h": 27 - }, - "frame": { - "x": 31, - "y": 295, - "w": 28, - "h": 27 - } - }, { "filename": "773-ice", "rotated": false, @@ -906,8 +1032,8 @@ "h": 30 }, "frame": { - "x": 28, - "y": 322, + "x": 86, + "y": 177, "w": 26, "h": 30 } @@ -927,8 +1053,8 @@ "h": 30 }, "frame": { - "x": 28, - "y": 352, + "x": 57, + "y": 207, "w": 26, "h": 30 } @@ -948,12 +1074,54 @@ "h": 30 }, "frame": { - "x": 28, - "y": 382, + "x": 83, + "y": 207, "w": 26, "h": 30 } }, + { + "filename": "2026", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 26, + "h": 28 + }, + "frame": { + "x": 57, + "y": 237, + "w": 26, + "h": 28 + } + }, + { + "filename": "772", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 25, + "h": 28 + }, + "frame": { + "x": 59, + "y": 265, + "w": 25, + "h": 28 + } + }, { "filename": "773-rock", "rotated": false, @@ -969,12 +1137,54 @@ "h": 30 }, "frame": { - "x": 28, - "y": 412, + "x": 82, + "y": 293, "w": 26, "h": 30 } }, + { + "filename": "2026s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 26, + "h": 28 + }, + "frame": { + "x": 83, + "y": 237, + "w": 26, + "h": 28 + } + }, + { + "filename": "772s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 25, + "h": 28 + }, + "frame": { + "x": 84, + "y": 265, + "w": 25, + "h": 28 + } + }, { "filename": "773-steel", "rotated": false, @@ -990,12 +1200,33 @@ "h": 30 }, "frame": { - "x": 28, - "y": 442, + "x": 108, + "y": 293, "w": 26, "h": 30 } }, + { + "filename": "764", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 0, + "w": 25, + "h": 30 + }, + "frame": { + "x": 122, + "y": 57, + "w": 25, + "h": 30 + } + }, { "filename": "773-water", "rotated": false, @@ -1011,449 +1242,8 @@ "h": 30 }, "frame": { - "x": 28, - "y": 472, - "w": 26, - "h": 30 - } - }, - { - "filename": "773", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 26, - "y": 502, - "w": 26, - "h": 30 - } - }, - { - "filename": "773s-bug", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 26, - "y": 532, - "w": 26, - "h": 30 - } - }, - { - "filename": "773s-dark", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 26, - "y": 562, - "w": 26, - "h": 30 - } - }, - { - "filename": "773s-dragon", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 26, - "y": 592, - "w": 26, - "h": 30 - } - }, - { - "filename": "752s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 23, - "h": 18 - }, - "frame": { - "x": 23, - "y": 622, - "w": 23, - "h": 18 - } - }, - { - "filename": "792", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 28, - "h": 28 - }, - "frame": { - "x": 70, - "y": 57, - "w": 28, - "h": 28 - } - }, - { - "filename": "773s-electric", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 60, - "y": 85, - "w": 26, - "h": 30 - } - }, - { - "filename": "773s-fairy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 60, - "y": 115, - "w": 26, - "h": 30 - } - }, - { - "filename": "773s-fighting", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 58, - "y": 145, - "w": 26, - "h": 30 - } - }, - { - "filename": "773s-fire", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 58, - "y": 175, - "w": 26, - "h": 30 - } - }, - { - "filename": "773s-flying", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 57, - "y": 205, - "w": 26, - "h": 30 - } - }, - { - "filename": "773s-ghost", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 57, - "y": 235, - "w": 26, - "h": 30 - } - }, - { - "filename": "773s-grass", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 57, - "y": 265, - "w": 26, - "h": 30 - } - }, - { - "filename": "730s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 28, - "h": 27 - }, - "frame": { - "x": 59, - "y": 295, - "w": 28, - "h": 27 - } - }, - { - "filename": "773s-ground", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 54, - "y": 322, - "w": 26, - "h": 30 - } - }, - { - "filename": "773s-ice", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 54, - "y": 352, - "w": 26, - "h": 30 - } - }, - { - "filename": "773s-poison", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 54, - "y": 382, - "w": 26, - "h": 30 - } - }, - { - "filename": "773s-psychic", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 54, - "y": 412, - "w": 26, - "h": 30 - } - }, - { - "filename": "773s-rock", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 54, - "y": 442, - "w": 26, - "h": 30 - } - }, - { - "filename": "773s-steel", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 54, - "y": 472, - "w": 26, - "h": 30 - } - }, - { - "filename": "773s-water", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 52, - "y": 502, + "x": 114, + "y": 87, "w": 26, "h": 30 } @@ -1473,8 +1263,407 @@ "h": 30 }, "frame": { - "x": 52, - "y": 532, + "x": 114, + "y": 117, + "w": 26, + "h": 30 + } + }, + { + "filename": "773s-bug", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 112, + "y": 147, + "w": 26, + "h": 30 + } + }, + { + "filename": "773s-dark", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 112, + "y": 177, + "w": 26, + "h": 30 + } + }, + { + "filename": "773s-dragon", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 109, + "y": 207, + "w": 26, + "h": 30 + } + }, + { + "filename": "773s-electric", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 109, + "y": 237, + "w": 26, + "h": 30 + } + }, + { + "filename": "785", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 28, + "h": 26 + }, + "frame": { + "x": 109, + "y": 267, + "w": 28, + "h": 26 + } + }, + { + "filename": "773s-fairy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 134, + "y": 293, + "w": 26, + "h": 30 + } + }, + { + "filename": "801", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 2, + "w": 20, + "h": 28 + }, + "frame": { + "x": 136, + "y": 29, + "w": 20, + "h": 28 + } + }, + { + "filename": "773s-fighting", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 156, + "y": 28, + "w": 26, + "h": 30 + } + }, + { + "filename": "773s-fire", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 182, + "y": 28, + "w": 26, + "h": 30 + } + }, + { + "filename": "773s-flying", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 208, + "y": 28, + "w": 26, + "h": 30 + } + }, + { + "filename": "773s-ghost", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 234, + "y": 28, + "w": 26, + "h": 30 + } + }, + { + "filename": "773s-grass", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 147, + "y": 58, + "w": 26, + "h": 30 + } + }, + { + "filename": "773s-ground", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 173, + "y": 58, + "w": 26, + "h": 30 + } + }, + { + "filename": "773s-ice", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 199, + "y": 58, + "w": 26, + "h": 30 + } + }, + { + "filename": "773s-poison", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 225, + "y": 58, + "w": 26, + "h": 30 + } + }, + { + "filename": "773s-psychic", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 140, + "y": 88, + "w": 26, + "h": 30 + } + }, + { + "filename": "773s-rock", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 166, + "y": 88, + "w": 26, + "h": 30 + } + }, + { + "filename": "773s-steel", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 192, + "y": 88, + "w": 26, + "h": 30 + } + }, + { + "filename": "773s-water", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 218, + "y": 88, "w": 26, "h": 30 } @@ -1494,495 +1683,12 @@ "h": 30 }, "frame": { - "x": 52, - "y": 562, + "x": 140, + "y": 118, "w": 25, "h": 30 } }, - { - "filename": "794", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 25, - "h": 29 - }, - "frame": { - "x": 52, - "y": 592, - "w": 25, - "h": 29 - } - }, - { - "filename": "780", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 27, - "h": 19 - }, - "frame": { - "x": 52, - "y": 621, - "w": 27, - "h": 19 - } - }, - { - "filename": "2103", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 21, - "h": 30 - }, - "frame": { - "x": 86, - "y": 85, - "w": 21, - "h": 30 - } - }, - { - "filename": "2103s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 21, - "h": 30 - }, - "frame": { - "x": 86, - "y": 115, - "w": 21, - "h": 30 - } - }, - { - "filename": "794s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 25, - "h": 29 - }, - "frame": { - "x": 84, - "y": 145, - "w": 25, - "h": 29 - } - }, - { - "filename": "772", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 25, - "h": 28 - }, - "frame": { - "x": 84, - "y": 174, - "w": 25, - "h": 28 - } - }, - { - "filename": "772s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 25, - "h": 28 - }, - "frame": { - "x": 98, - "y": 57, - "w": 25, - "h": 28 - } - }, - { - "filename": "792s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 28, - "h": 28 - }, - "frame": { - "x": 123, - "y": 56, - "w": 28, - "h": 28 - } - }, - { - "filename": "796", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 18, - "h": 29 - }, - "frame": { - "x": 107, - "y": 85, - "w": 18, - "h": 29 - } - }, - { - "filename": "2026", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 26, - "h": 28 - }, - "frame": { - "x": 125, - "y": 84, - "w": 26, - "h": 28 - } - }, - { - "filename": "796s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 18, - "h": 29 - }, - "frame": { - "x": 107, - "y": 114, - "w": 18, - "h": 29 - } - }, - { - "filename": "2026s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 26, - "h": 28 - }, - "frame": { - "x": 125, - "y": 112, - "w": 26, - "h": 28 - } - }, - { - "filename": "801-original", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 20, - "h": 28 - }, - "frame": { - "x": 151, - "y": 56, - "w": 20, - "h": 28 - } - }, - { - "filename": "801", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 20, - "h": 28 - }, - "frame": { - "x": 151, - "y": 84, - "w": 20, - "h": 28 - } - }, - { - "filename": "801s-original", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 20, - "h": 28 - }, - "frame": { - "x": 151, - "y": 112, - "w": 20, - "h": 28 - } - }, - { - "filename": "801s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 20, - "h": 28 - }, - "frame": { - "x": 109, - "y": 143, - "w": 20, - "h": 28 - } - }, - { - "filename": "740", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 32, - "h": 23 - }, - "frame": { - "x": 129, - "y": 140, - "w": 32, - "h": 23 - } - }, - { - "filename": "783", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 21, - "h": 27 - }, - "frame": { - "x": 109, - "y": 171, - "w": 21, - "h": 27 - } - }, - { - "filename": "2038", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 30, - "h": 25 - }, - "frame": { - "x": 130, - "y": 163, - "w": 30, - "h": 25 - } - }, - { - "filename": "740s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 32, - "h": 23 - }, - "frame": { - "x": 130, - "y": 188, - "w": 32, - "h": 23 - } - }, - { - "filename": "745-midnight", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 21, - "h": 24 - }, - "frame": { - "x": 109, - "y": 198, - "w": 21, - "h": 24 - } - }, - { - "filename": "725", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 25, - "h": 21 - }, - "frame": { - "x": 84, - "y": 202, - "w": 25, - "h": 21 - } - }, - { - "filename": "785", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 28, - "h": 26 - }, - "frame": { - "x": 83, - "y": 223, - "w": 28, - "h": 26 - } - }, { "filename": "785s", "rotated": false, @@ -1998,75 +1704,12 @@ "h": 26 }, "frame": { - "x": 83, - "y": 249, + "x": 165, + "y": 118, "w": 28, "h": 26 } }, - { - "filename": "789", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 23, - "h": 20 - }, - "frame": { - "x": 83, - "y": 275, - "w": 23, - "h": 20 - } - }, - { - "filename": "783s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 21, - "h": 27 - }, - "frame": { - "x": 87, - "y": 295, - "w": 21, - "h": 27 - } - }, - { - "filename": "2038s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 30, - "h": 25 - }, - "frame": { - "x": 80, - "y": 322, - "w": 30, - "h": 25 - } - }, { "filename": "2075", "rotated": false, @@ -2082,12 +1725,96 @@ "h": 24 }, "frame": { - "x": 80, - "y": 347, + "x": 193, + "y": 118, "w": 29, "h": 24 } }, + { + "filename": "794", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 25, + "h": 29 + }, + "frame": { + "x": 138, + "y": 148, + "w": 25, + "h": 29 + } + }, + { + "filename": "794s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 25, + "h": 29 + }, + "frame": { + "x": 138, + "y": 177, + "w": 25, + "h": 29 + } + }, + { + "filename": "726", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 222, + "y": 118, + "w": 23, + "h": 24 + } + }, + { + "filename": "2103", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 0, + "w": 21, + "h": 30 + }, + "frame": { + "x": 251, + "y": 58, + "w": 21, + "h": 30 + } + }, { "filename": "2075s", "rotated": false, @@ -2103,8 +1830,8 @@ "h": 24 }, "frame": { - "x": 80, - "y": 371, + "x": 244, + "y": 88, "w": 29, "h": 24 } @@ -2124,12 +1851,33 @@ "h": 25 }, "frame": { - "x": 80, - "y": 395, + "x": 245, + "y": 112, "w": 26, "h": 25 } }, + { + "filename": "2103s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 0, + "w": 21, + "h": 30 + }, + "frame": { + "x": 260, + "y": 28, + "w": 21, + "h": 30 + } + }, { "filename": "748s", "rotated": false, @@ -2145,8 +1893,8 @@ "h": 25 }, "frame": { - "x": 80, - "y": 420, + "x": 281, + "y": 27, "w": 26, "h": 25 } @@ -2166,8 +1914,8 @@ "h": 25 }, "frame": { - "x": 80, - "y": 445, + "x": 307, + "y": 27, "w": 26, "h": 25 } @@ -2187,14 +1935,14 @@ "h": 25 }, "frame": { - "x": 80, - "y": 470, + "x": 333, + "y": 27, "w": 26, "h": 25 } }, { - "filename": "766", + "filename": "724", "rotated": false, "trimmed": true, "sourceSize": { @@ -2202,37 +1950,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, + "x": 11, "y": 4, - "w": 24, - "h": 26 + "w": 19, + "h": 25 }, "frame": { - "x": 111, - "y": 222, - "w": 24, - "h": 26 - } - }, - { - "filename": "766s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 24, - "h": 26 - }, - "frame": { - "x": 111, - "y": 248, - "w": 24, - "h": 26 + "x": 359, + "y": 27, + "w": 19, + "h": 25 } }, { @@ -2250,8 +1977,8 @@ "h": 25 }, "frame": { - "x": 135, - "y": 211, + "x": 378, + "y": 23, "w": 25, "h": 25 } @@ -2271,159 +1998,12 @@ "h": 25 }, "frame": { - "x": 135, - "y": 236, + "x": 403, + "y": 23, "w": 25, "h": 25 } }, - { - "filename": "725s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 25, - "h": 21 - }, - "frame": { - "x": 135, - "y": 261, - "w": 25, - "h": 21 - } - }, - { - "filename": "724", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 19, - "h": 25 - }, - "frame": { - "x": 161, - "y": 140, - "w": 19, - "h": 25 - } - }, - { - "filename": "745", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 160, - "y": 165, - "w": 25, - "h": 23 - } - }, - { - "filename": "726", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 162, - "y": 188, - "w": 23, - "h": 24 - } - }, - { - "filename": "750", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 25, - "h": 24 - }, - "frame": { - "x": 160, - "y": 212, - "w": 25, - "h": 24 - } - }, - { - "filename": "750s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 25, - "h": 24 - }, - "frame": { - "x": 160, - "y": 236, - "w": 25, - "h": 24 - } - }, - { - "filename": "745s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 160, - "y": 260, - "w": 25, - "h": 23 - } - }, { "filename": "746-school", "rotated": false, @@ -2439,8 +2019,8 @@ "h": 22 }, "frame": { - "x": 80, - "y": 495, + "x": 428, + "y": 25, "w": 28, "h": 22 } @@ -2460,14 +2040,14 @@ "h": 22 }, "frame": { - "x": 78, - "y": 517, + "x": 456, + "y": 25, "w": 28, "h": 22 } }, { - "filename": "765", + "filename": "796", "rotated": false, "trimmed": true, "sourceSize": { @@ -2475,20 +2055,104 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 28, - "h": 21 + "x": 10, + "y": 1, + "w": 18, + "h": 29 }, "frame": { - "x": 78, - "y": 539, - "w": 28, - "h": 21 + "x": 484, + "y": 25, + "w": 18, + "h": 29 } }, { - "filename": "758", + "filename": "796s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 1, + "w": 18, + "h": 29 + }, + "frame": { + "x": 272, + "y": 58, + "w": 18, + "h": 29 + } + }, + { + "filename": "766", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 24, + "h": 26 + }, + "frame": { + "x": 290, + "y": 52, + "w": 24, + "h": 26 + } + }, + { + "filename": "766s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 24, + "h": 26 + }, + "frame": { + "x": 314, + "y": 52, + "w": 24, + "h": 26 + } + }, + { + "filename": "750", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 25, + "h": 24 + }, + "frame": { + "x": 338, + "y": 52, + "w": 25, + "h": 24 + } + }, + { + "filename": "724s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2497,15 +2161,15 @@ }, "spriteSourceSize": { "x": 11, - "y": 6, - "w": 24, - "h": 22 + "y": 4, + "w": 19, + "h": 25 }, "frame": { - "x": 111, - "y": 274, - "w": 24, - "h": 22 + "x": 273, + "y": 87, + "w": 19, + "h": 25 } }, { @@ -2523,14 +2187,14 @@ "h": 26 }, "frame": { - "x": 108, - "y": 296, + "x": 271, + "y": 112, "w": 23, "h": 26 } }, { - "filename": "776s", + "filename": "750s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2540,35 +2204,14 @@ "spriteSourceSize": { "x": 8, "y": 4, - "w": 23, - "h": 26 + "w": 25, + "h": 24 }, "frame": { - "x": 110, - "y": 322, - "w": 23, - "h": 26 - } - }, - { - "filename": "787", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 22, - "h": 26 - }, - "frame": { - "x": 109, - "y": 348, - "w": 22, - "h": 26 + "x": 292, + "y": 78, + "w": 25, + "h": 24 } }, { @@ -2586,14 +2229,14 @@ "h": 24 }, "frame": { - "x": 109, - "y": 374, + "x": 317, + "y": 78, "w": 23, "h": 24 } }, { - "filename": "2028", + "filename": "776s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2603,39 +2246,18 @@ "spriteSourceSize": { "x": 8, "y": 4, - "w": 25, - "h": 24 + "w": 23, + "h": 26 }, "frame": { - "x": 106, - "y": 398, - "w": 25, - "h": 24 + "x": 340, + "y": 76, + "w": 23, + "h": 26 } }, { - "filename": "2028s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 25, - "h": 24 - }, - "frame": { - "x": 106, - "y": 422, - "w": 25, - "h": 24 - } - }, - { - "filename": "787s", + "filename": "801-original", "rotated": false, "trimmed": true, "sourceSize": { @@ -2645,18 +2267,18 @@ "spriteSourceSize": { "x": 10, "y": 2, - "w": 22, - "h": 26 + "w": 20, + "h": 28 }, "frame": { - "x": 106, - "y": 446, - "w": 22, - "h": 26 + "x": 363, + "y": 52, + "w": 20, + "h": 28 } }, { - "filename": "768", + "filename": "765", "rotated": false, "trimmed": true, "sourceSize": { @@ -2664,16 +2286,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 23 + "x": 6, + "y": 7, + "w": 28, + "h": 21 }, "frame": { - "x": 106, - "y": 472, - "w": 24, - "h": 23 + "x": 383, + "y": 48, + "w": 28, + "h": 21 } }, { @@ -2691,176 +2313,8 @@ "h": 24 }, "frame": { - "x": 108, - "y": 495, - "w": 23, - "h": 24 - } - }, - { - "filename": "788", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 22, - "h": 26 - }, - "frame": { - "x": 106, - "y": 519, - "w": 22, - "h": 26 - } - }, - { - "filename": "734", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 25, - "h": 16 - }, - "frame": { - "x": 135, - "y": 282, - "w": 25, - "h": 16 - } - }, - { - "filename": "727s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 131, - "y": 298, - "w": 23, - "h": 24 - } - }, - { - "filename": "788s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 22, - "h": 26 - }, - "frame": { - "x": 133, - "y": 322, - "w": 22, - "h": 26 - } - }, - { - "filename": "803", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 23, - "h": 25 - }, - "frame": { - "x": 131, - "y": 348, - "w": 23, - "h": 25 - } - }, - { - "filename": "803s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 23, - "h": 25 - }, - "frame": { - "x": 132, - "y": 373, - "w": 23, - "h": 25 - } - }, - { - "filename": "729", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 23, - "h": 24 - }, - "frame": { - "x": 131, - "y": 398, - "w": 23, - "h": 24 - } - }, - { - "filename": "729s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 23, - "h": 24 - }, - "frame": { - "x": 131, - "y": 422, + "x": 363, + "y": 80, "w": 23, "h": 24 } @@ -2880,119 +2334,14 @@ "h": 21 }, "frame": { - "x": 128, - "y": 446, + "x": 294, + "y": 102, "w": 28, "h": 21 } }, { - "filename": "768s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 23 - }, - "frame": { - "x": 130, - "y": 467, - "w": 24, - "h": 23 - } - }, - { - "filename": "770", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 131, - "y": 490, - "w": 23, - "h": 24 - } - }, - { - "filename": "734s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 25, - "h": 16 - }, - "frame": { - "x": 160, - "y": 283, - "w": 25, - "h": 16 - } - }, - { - "filename": "2105", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 23 - }, - "frame": { - "x": 154, - "y": 299, - "w": 24, - "h": 23 - } - }, - { - "filename": "770s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 155, - "y": 322, - "w": 23, - "h": 24 - } - }, - { - "filename": "733", + "filename": "725", "rotated": false, "trimmed": true, "sourceSize": { @@ -3002,16 +2351,37 @@ "spriteSourceSize": { "x": 8, "y": 7, - "w": 23, + "w": 25, "h": 21 }, "frame": { - "x": 106, - "y": 545, - "w": 23, + "x": 322, + "y": 102, + "w": 25, "h": 21 } }, + { + "filename": "780", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 27, + "h": 19 + }, + "frame": { + "x": 294, + "y": 123, + "w": 27, + "h": 19 + } + }, { "filename": "780s", "rotated": false, @@ -3027,14 +2397,14 @@ "h": 19 }, "frame": { - "x": 79, - "y": 560, + "x": 321, + "y": 123, "w": 27, "h": 19 } }, { - "filename": "806", + "filename": "723", "rotated": false, "trimmed": true, "sourceSize": { @@ -3042,20 +2412,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 25 + "x": 11, + "y": 5, + "w": 17, + "h": 22 }, "frame": { - "x": 77, - "y": 579, - "w": 22, - "h": 25 + "x": 411, + "y": 48, + "w": 17, + "h": 22 } }, { - "filename": "778-busted", + "filename": "745", "rotated": false, "trimmed": true, "sourceSize": { @@ -3063,41 +2433,167 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 12, - "w": 21, - "h": 16 - }, - "frame": { - "x": 77, - "y": 604, - "w": 21, - "h": 16 - } - }, - { - "filename": "789s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, + "x": 8, "y": 6, - "w": 23, - "h": 20 + "w": 25, + "h": 23 }, "frame": { - "x": 79, - "y": 620, - "w": 23, - "h": 20 + "x": 428, + "y": 47, + "w": 25, + "h": 23 } }, { - "filename": "733s", + "filename": "745s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 25, + "h": 23 + }, + "frame": { + "x": 453, + "y": 47, + "w": 25, + "h": 23 + } + }, + { + "filename": "768", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 24, + "h": 23 + }, + "frame": { + "x": 478, + "y": 54, + "w": 24, + "h": 23 + } + }, + { + "filename": "2028", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 25, + "h": 24 + }, + "frame": { + "x": 386, + "y": 69, + "w": 25, + "h": 24 + } + }, + { + "filename": "2028s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 25, + "h": 24 + }, + "frame": { + "x": 411, + "y": 70, + "w": 25, + "h": 24 + } + }, + { + "filename": "727s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 436, + "y": 70, + "w": 23, + "h": 24 + } + }, + { + "filename": "781", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 19, + "h": 25 + }, + "frame": { + "x": 459, + "y": 70, + "w": 19, + "h": 25 + } + }, + { + "filename": "768s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 24, + "h": 23 + }, + "frame": { + "x": 478, + "y": 77, + "w": 24, + "h": 23 + } + }, + { + "filename": "725s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3107,13 +2603,13 @@ "spriteSourceSize": { "x": 8, "y": 7, - "w": 23, + "w": 25, "h": 21 }, "frame": { - "x": 106, - "y": 566, - "w": 23, + "x": 386, + "y": 93, + "w": 25, "h": 21 } }, @@ -3132,35 +2628,14 @@ "h": 22 }, "frame": { - "x": 99, - "y": 587, + "x": 411, + "y": 94, "w": 25, "h": 22 } }, { - "filename": "806s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 25 - }, - "frame": { - "x": 102, - "y": 609, - "w": 22, - "h": 25 - } - }, - { - "filename": "724s", + "filename": "729", "rotated": false, "trimmed": true, "sourceSize": { @@ -3169,78 +2644,15 @@ }, "spriteSourceSize": { "x": 11, - "y": 4, - "w": 19, - "h": 25 + "y": 5, + "w": 23, + "h": 24 }, "frame": { - "x": 178, - "y": 299, - "w": 19, - "h": 25 - } - }, - { - "filename": "732", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 22 - }, - "frame": { - "x": 178, - "y": 324, - "w": 19, - "h": 22 - } - }, - { - "filename": "781", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 19, - "h": 25 - }, - "frame": { - "x": 124, - "y": 587, - "w": 19, - "h": 25 - } - }, - { - "filename": "732s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 22 - }, - "frame": { - "x": 124, - "y": 612, - "w": 19, - "h": 22 + "x": 436, + "y": 94, + "w": 23, + "h": 24 } }, { @@ -3258,12 +2670,222 @@ "h": 25 }, "frame": { - "x": 167, - "y": 28, + "x": 459, + "y": 95, "w": 19, "h": 25 } }, + { + "filename": "2105", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 24, + "h": 23 + }, + "frame": { + "x": 478, + "y": 100, + "w": 24, + "h": 23 + } + }, + { + "filename": "761", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 16, + "h": 19 + }, + "frame": { + "x": 347, + "y": 102, + "w": 16, + "h": 19 + } + }, + { + "filename": "729s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 23, + "h": 24 + }, + "frame": { + "x": 363, + "y": 104, + "w": 23, + "h": 24 + } + }, + { + "filename": "734", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 10, + "w": 25, + "h": 16 + }, + "frame": { + "x": 386, + "y": 114, + "w": 25, + "h": 16 + } + }, + { + "filename": "734s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 10, + "w": 25, + "h": 16 + }, + "frame": { + "x": 411, + "y": 116, + "w": 25, + "h": 16 + } + }, + { + "filename": "733", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 436, + "y": 118, + "w": 23, + "h": 21 + } + }, + { + "filename": "732", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 22 + }, + "frame": { + "x": 459, + "y": 120, + "w": 19, + "h": 22 + } + }, + { + "filename": "2105s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 24, + "h": 23 + }, + "frame": { + "x": 478, + "y": 123, + "w": 24, + "h": 23 + } + }, + { + "filename": "2050", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 15, + "h": 18 + }, + "frame": { + "x": 348, + "y": 121, + "w": 15, + "h": 18 + } + }, + { + "filename": "733s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 363, + "y": 128, + "w": 23, + "h": 21 + } + }, { "filename": "2020s", "rotated": false, @@ -3279,14 +2901,14 @@ "h": 22 }, "frame": { - "x": 186, - "y": 27, + "x": 386, + "y": 130, "w": 25, "h": 22 } }, { - "filename": "741-pau", + "filename": "758", "rotated": false, "trimmed": true, "sourceSize": { @@ -3294,15 +2916,15 @@ "h": 30 }, "spriteSourceSize": { - "x": 14, + "x": 11, "y": 6, - "w": 18, + "w": 24, "h": 22 }, "frame": { - "x": 211, - "y": 27, - "w": 18, + "x": 411, + "y": 132, + "w": 24, "h": 22 } }, @@ -3321,14 +2943,14 @@ "h": 22 }, "frame": { - "x": 229, - "y": 30, + "x": 435, + "y": 139, "w": 24, "h": 22 } }, { - "filename": "786", + "filename": "732s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3336,163 +2958,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 20, - "h": 25 + "x": 10, + "y": 6, + "w": 19, + "h": 22 }, "frame": { - "x": 171, - "y": 53, - "w": 20, - "h": 25 - } - }, - { - "filename": "786s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 20, - "h": 25 - }, - "frame": { - "x": 171, - "y": 78, - "w": 20, - "h": 25 - } - }, - { - "filename": "735", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 20, - "h": 24 - }, - "frame": { - "x": 171, - "y": 103, - "w": 20, - "h": 24 - } - }, - { - "filename": "2051", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 191, - "y": 49, - "w": 23, - "h": 24 - } - }, - { - "filename": "2051s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 191, - "y": 73, - "w": 23, - "h": 24 - } - }, - { - "filename": "756", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 24 - }, - "frame": { - "x": 191, - "y": 97, - "w": 22, - "h": 24 - } - }, - { - "filename": "746", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 18, - "h": 13 - }, - "frame": { - "x": 171, - "y": 127, - "w": 18, - "h": 13 - } - }, - { - "filename": "755", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 4, - "w": 13, - "h": 24 - }, - "frame": { - "x": 214, - "y": 49, - "w": 13, - "h": 24 + "x": 459, + "y": 142, + "w": 19, + "h": 22 } }, { @@ -3510,14 +2985,14 @@ "h": 22 }, "frame": { - "x": 227, - "y": 52, + "x": 478, + "y": 146, "w": 24, "h": 22 } }, { - "filename": "755s", + "filename": "801s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3525,20 +3000,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 14, - "y": 4, - "w": 13, - "h": 24 + "x": 10, + "y": 2, + "w": 20, + "h": 28 }, "frame": { - "x": 214, - "y": 73, - "w": 13, - "h": 24 + "x": 135, + "y": 207, + "w": 20, + "h": 28 } }, { - "filename": "2105s", + "filename": "801s-original", "rotated": false, "trimmed": true, "sourceSize": { @@ -3546,20 +3021,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 23 + "x": 10, + "y": 2, + "w": 20, + "h": 28 }, "frame": { - "x": 227, - "y": 74, - "w": 24, - "h": 23 + "x": 135, + "y": 235, + "w": 20, + "h": 28 } }, { - "filename": "756s", + "filename": "783", "rotated": false, "trimmed": true, "sourceSize": { @@ -3568,502 +3043,19 @@ }, "spriteSourceSize": { "x": 9, - "y": 5, - "w": 22, - "h": 24 - }, - "frame": { - "x": 213, - "y": 97, - "w": 22, - "h": 24 - } - }, - { - "filename": "744", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 19, - "h": 22 - }, - "frame": { - "x": 235, - "y": 97, - "w": 19, - "h": 22 - } - }, - { - "filename": "744s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 19, - "h": 22 - }, - "frame": { - "x": 235, - "y": 119, - "w": 19, - "h": 22 - } - }, - { - "filename": "735s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 20, - "h": 24 - }, - "frame": { - "x": 180, - "y": 140, - "w": 20, - "h": 24 - } - }, - { - "filename": "745s-midnight", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, + "y": 3, "w": 21, - "h": 24 + "h": 27 }, "frame": { - "x": 185, - "y": 164, - "w": 21, - "h": 24 - } - }, - { - "filename": "763", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 21, - "h": 24 - }, - "frame": { - "x": 185, - "y": 188, - "w": 21, - "h": 24 - } - }, - { - "filename": "763s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 21, - "h": 24 - }, - "frame": { - "x": 185, - "y": 212, - "w": 21, - "h": 24 - } - }, - { - "filename": "793", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 21, - "h": 24 - }, - "frame": { - "x": 185, - "y": 236, - "w": 21, - "h": 24 - } - }, - { - "filename": "793s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 21, - "h": 24 - }, - "frame": { - "x": 185, - "y": 260, - "w": 21, - "h": 24 - } - }, - { - "filename": "2074", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 24, - "h": 15 - }, - "frame": { - "x": 185, - "y": 284, - "w": 24, - "h": 15 - } - }, - { - "filename": "760", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 4, - "w": 17, - "h": 24 - }, - "frame": { - "x": 197, - "y": 299, - "w": 17, - "h": 24 - } - }, - { - "filename": "749", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 21, - "h": 23 - }, - "frame": { - "x": 214, - "y": 121, - "w": 21, - "h": 23 - } - }, - { - "filename": "742", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 5, - "w": 19, - "h": 20 - }, - "frame": { - "x": 235, - "y": 141, - "w": 19, - "h": 20 - } - }, - { - "filename": "741-sensu", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 5, - "w": 17, - "h": 23 - }, - "frame": { - "x": 197, - "y": 323, - "w": 17, - "h": 23 - } - }, - { - "filename": "749s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 21, - "h": 23 - }, - "frame": { - "x": 214, - "y": 144, - "w": 21, - "h": 23 - } - }, - { - "filename": "742s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 5, - "w": 19, - "h": 20 - }, - "frame": { - "x": 235, - "y": 161, - "w": 19, - "h": 20 - } - }, - { - "filename": "802", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 4, - "w": 22, - "h": 24 - }, - "frame": { - "x": 206, - "y": 167, - "w": 22, - "h": 24 - } - }, - { - "filename": "802s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 4, - "w": 22, - "h": 24 - }, - "frame": { - "x": 206, - "y": 191, - "w": 22, - "h": 24 - } - }, - { - "filename": "807", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 22, - "h": 24 - }, - "frame": { - "x": 206, - "y": 215, - "w": 22, - "h": 24 - } - }, - { - "filename": "807s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 22, - "h": 24 - }, - "frame": { - "x": 206, - "y": 239, - "w": 22, - "h": 24 - } - }, - { - "filename": "738", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 21 - }, - "frame": { - "x": 206, + "x": 137, "y": 263, - "w": 22, - "h": 21 + "w": 21, + "h": 27 } }, { - "filename": "2053s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 24, - "h": 22 - }, - "frame": { - "x": 228, - "y": 181, - "w": 24, - "h": 22 - } - }, - { - "filename": "769", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 23, - "h": 22 - }, - "frame": { - "x": 228, - "y": 203, - "w": 23, - "h": 22 - } - }, - { - "filename": "769s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 23, - "h": 22 - }, - "frame": { - "x": 228, - "y": 225, - "w": 23, - "h": 22 - } - }, - { - "filename": "782", + "filename": "783s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4072,103 +3064,19 @@ }, "spriteSourceSize": { "x": 9, - "y": 5, - "w": 22, - "h": 23 - }, - "frame": { - "x": 228, - "y": 247, - "w": 22, - "h": 23 - } - }, - { - "filename": "2074s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 13, - "w": 24, - "h": 15 - }, - "frame": { - "x": 209, - "y": 284, - "w": 24, - "h": 15 - } - }, - { - "filename": "2076", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, + "y": 3, "w": 21, - "h": 23 + "h": 27 }, "frame": { - "x": 233, - "y": 270, + "x": 155, + "y": 206, "w": 21, - "h": 23 + "h": 27 } }, { - "filename": "2076s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 21, - "h": 23 - }, - "frame": { - "x": 233, - "y": 293, - "w": 21, - "h": 23 - } - }, - { - "filename": "757", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 19, - "h": 18 - }, - "frame": { - "x": 214, - "y": 299, - "w": 19, - "h": 18 - } - }, - { - "filename": "2019", + "filename": "787", "rotated": false, "trimmed": true, "sourceSize": { @@ -4177,40 +3085,19 @@ }, "spriteSourceSize": { "x": 10, - "y": 5, - "w": 21, - "h": 21 + "y": 2, + "w": 22, + "h": 26 }, "frame": { - "x": 233, - "y": 316, - "w": 21, - "h": 21 + "x": 155, + "y": 233, + "w": 22, + "h": 26 } }, { - "filename": "757s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 19, - "h": 18 - }, - "frame": { - "x": 214, - "y": 317, - "w": 19, - "h": 18 - } - }, - { - "filename": "790", + "filename": "787s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4219,61 +3106,19 @@ }, "spriteSourceSize": { "x": 10, - "y": 7, - "w": 21, - "h": 19 + "y": 2, + "w": 22, + "h": 26 }, "frame": { - "x": 191, - "y": 121, - "w": 21, - "h": 19 + "x": 158, + "y": 259, + "w": 22, + "h": 26 } }, { - "filename": "751", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 14, - "h": 20 - }, - "frame": { - "x": 200, - "y": 140, - "w": 14, - "h": 20 - } - }, - { - "filename": "737", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 18, - "h": 19 - }, - "frame": { - "x": 214, - "y": 335, - "w": 18, - "h": 19 - } - }, - { - "filename": "782s", + "filename": "788", "rotated": false, "trimmed": true, "sourceSize": { @@ -4282,15 +3127,15 @@ }, "spriteSourceSize": { "x": 9, - "y": 5, + "y": 2, "w": 22, - "h": 23 + "h": 26 }, "frame": { - "x": 232, - "y": 337, + "x": 160, + "y": 285, "w": 22, - "h": 23 + "h": 26 } }, { @@ -4308,8 +3153,8 @@ "h": 14 }, "frame": { - "x": 131, - "y": 514, + "x": 245, + "y": 137, "w": 24, "h": 14 } @@ -4329,14 +3174,539 @@ "h": 14 }, "frame": { - "x": 128, - "y": 528, + "x": 269, + "y": 138, "w": 24, "h": 14 } }, { - "filename": "738s", + "filename": "2053s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 24, + "h": 22 + }, + "frame": { + "x": 293, + "y": 142, + "w": 24, + "h": 22 + } + }, + { + "filename": "769", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 23, + "h": 22 + }, + "frame": { + "x": 317, + "y": 142, + "w": 23, + "h": 22 + } + }, + { + "filename": "769s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 23, + "h": 22 + }, + "frame": { + "x": 340, + "y": 142, + "w": 23, + "h": 22 + } + }, + { + "filename": "752", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 23, + "h": 18 + }, + "frame": { + "x": 363, + "y": 149, + "w": 23, + "h": 18 + } + }, + { + "filename": "2074", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 13, + "w": 24, + "h": 15 + }, + "frame": { + "x": 386, + "y": 152, + "w": 24, + "h": 15 + } + }, + { + "filename": "2074s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 13, + "w": 24, + "h": 15 + }, + "frame": { + "x": 410, + "y": 154, + "w": 24, + "h": 15 + } + }, + { + "filename": "752s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 23, + "h": 18 + }, + "frame": { + "x": 434, + "y": 161, + "w": 23, + "h": 18 + } + }, + { + "filename": "745-midnight", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 21, + "h": 24 + }, + "frame": { + "x": 457, + "y": 164, + "w": 21, + "h": 24 + } + }, + { + "filename": "770", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 478, + "y": 168, + "w": 23, + "h": 24 + } + }, + { + "filename": "722", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 163, + "y": 188, + "w": 17, + "h": 18 + } + }, + { + "filename": "735", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 20, + "h": 24 + }, + "frame": { + "x": 163, + "y": 164, + "w": 20, + "h": 24 + } + }, + { + "filename": "789", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 23, + "h": 20 + }, + "frame": { + "x": 165, + "y": 144, + "w": 23, + "h": 20 + } + }, + { + "filename": "788s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 22, + "h": 26 + }, + "frame": { + "x": 176, + "y": 206, + "w": 22, + "h": 26 + } + }, + { + "filename": "803", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 23, + "h": 25 + }, + "frame": { + "x": 177, + "y": 232, + "w": 23, + "h": 25 + } + }, + { + "filename": "786", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 20, + "h": 25 + }, + "frame": { + "x": 180, + "y": 257, + "w": 20, + "h": 25 + } + }, + { + "filename": "786s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 20, + "h": 25 + }, + "frame": { + "x": 182, + "y": 282, + "w": 20, + "h": 25 + } + }, + { + "filename": "778-busted", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 12, + "w": 21, + "h": 16 + }, + "frame": { + "x": 182, + "y": 307, + "w": 21, + "h": 16 + } + }, + { + "filename": "757", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 19, + "h": 18 + }, + "frame": { + "x": 180, + "y": 188, + "w": 19, + "h": 18 + } + }, + { + "filename": "735s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 20, + "h": 24 + }, + "frame": { + "x": 183, + "y": 164, + "w": 20, + "h": 24 + } + }, + { + "filename": "728", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 17, + "h": 20 + }, + "frame": { + "x": 188, + "y": 144, + "w": 17, + "h": 20 + } + }, + { + "filename": "770s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 205, + "y": 142, + "w": 23, + "h": 24 + } + }, + { + "filename": "760", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 4, + "w": 17, + "h": 24 + }, + "frame": { + "x": 228, + "y": 142, + "w": 17, + "h": 24 + } + }, + { + "filename": "803s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 23, + "h": 25 + }, + "frame": { + "x": 203, + "y": 166, + "w": 23, + "h": 25 + } + }, + { + "filename": "806", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 25 + }, + "frame": { + "x": 226, + "y": 166, + "w": 22, + "h": 25 + } + }, + { + "filename": "789s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 23, + "h": 20 + }, + "frame": { + "x": 199, + "y": 191, + "w": 23, + "h": 20 + } + }, + { + "filename": "738", "rotated": false, "trimmed": true, "sourceSize": { @@ -4350,12 +3720,243 @@ "h": 21 }, "frame": { - "x": 129, - "y": 542, + "x": 198, + "y": 211, "w": 22, "h": 21 } }, + { + "filename": "806s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 25 + }, + "frame": { + "x": 200, + "y": 232, + "w": 22, + "h": 25 + } + }, + { + "filename": "756", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 24 + }, + "frame": { + "x": 200, + "y": 257, + "w": 22, + "h": 24 + } + }, + { + "filename": "745s-midnight", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 21, + "h": 24 + }, + "frame": { + "x": 202, + "y": 281, + "w": 21, + "h": 24 + } + }, + { + "filename": "2027", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 21, + "h": 18 + }, + "frame": { + "x": 203, + "y": 305, + "w": 21, + "h": 18 + } + }, + { + "filename": "2051", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 222, + "y": 191, + "w": 23, + "h": 24 + } + }, + { + "filename": "778s-busted", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 12, + "w": 21, + "h": 16 + }, + "frame": { + "x": 220, + "y": 215, + "w": 21, + "h": 16 + } + }, + { + "filename": "756s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 24 + }, + "frame": { + "x": 222, + "y": 231, + "w": 22, + "h": 24 + } + }, + { + "filename": "802", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 4, + "w": 22, + "h": 24 + }, + "frame": { + "x": 222, + "y": 255, + "w": 22, + "h": 24 + } + }, + { + "filename": "763", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 21, + "h": 24 + }, + "frame": { + "x": 223, + "y": 279, + "w": 21, + "h": 24 + } + }, + { + "filename": "747", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 22, + "h": 20 + }, + "frame": { + "x": 224, + "y": 303, + "w": 22, + "h": 20 + } + }, + { + "filename": "746", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 18, + "h": 13 + }, + "frame": { + "x": 245, + "y": 151, + "w": 18, + "h": 13 + } + }, { "filename": "760s", "rotated": false, @@ -4371,14 +3972,140 @@ "h": 24 }, "frame": { - "x": 129, - "y": 563, + "x": 248, + "y": 164, "w": 17, "h": 24 } }, { - "filename": "741s-sensu", + "filename": "2051s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 265, + "y": 152, + "w": 23, + "h": 24 + } + }, + { + "filename": "738s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 22, + "h": 21 + }, + "frame": { + "x": 265, + "y": 176, + "w": 22, + "h": 21 + } + }, + { + "filename": "743", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 5, + "w": 20, + "h": 22 + }, + "frame": { + "x": 245, + "y": 191, + "w": 20, + "h": 22 + } + }, + { + "filename": "747s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 22, + "h": 20 + }, + "frame": { + "x": 265, + "y": 197, + "w": 22, + "h": 20 + } + }, + { + "filename": "782", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 23 + }, + "frame": { + "x": 288, + "y": 164, + "w": 22, + "h": 23 + } + }, + { + "filename": "782s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 23 + }, + "frame": { + "x": 310, + "y": 164, + "w": 22, + "h": 23 + } + }, + { + "filename": "802s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4387,17 +4114,605 @@ }, "spriteSourceSize": { "x": 13, + "y": 4, + "w": 22, + "h": 24 + }, + "frame": { + "x": 287, + "y": 187, + "w": 22, + "h": 24 + } + }, + { + "filename": "807", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 22, + "h": 24 + }, + "frame": { + "x": 309, + "y": 187, + "w": 22, + "h": 24 + } + }, + { + "filename": "807s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 22, + "h": 24 + }, + "frame": { + "x": 332, + "y": 164, + "w": 22, + "h": 24 + } + }, + { + "filename": "749", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, "y": 5, - "w": 17, + "w": 21, "h": 23 }, "frame": { - "x": 146, - "y": 563, - "w": 17, + "x": 331, + "y": 188, + "w": 21, "h": 23 } }, + { + "filename": "2037", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 22, + "h": 21 + }, + "frame": { + "x": 354, + "y": 167, + "w": 22, + "h": 21 + } + }, + { + "filename": "749s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 352, + "y": 188, + "w": 21, + "h": 23 + } + }, + { + "filename": "2037s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 22, + "h": 21 + }, + "frame": { + "x": 376, + "y": 167, + "w": 22, + "h": 21 + } + }, + { + "filename": "763s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 21, + "h": 24 + }, + "frame": { + "x": 373, + "y": 188, + "w": 21, + "h": 24 + } + }, + { + "filename": "755", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 4, + "w": 13, + "h": 24 + }, + "frame": { + "x": 394, + "y": 188, + "w": 13, + "h": 24 + } + }, + { + "filename": "790", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 21, + "h": 19 + }, + "frame": { + "x": 398, + "y": 169, + "w": 21, + "h": 19 + } + }, + { + "filename": "2050s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 15, + "h": 18 + }, + "frame": { + "x": 419, + "y": 169, + "w": 15, + "h": 18 + } + }, + { + "filename": "755s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 4, + "w": 13, + "h": 24 + }, + "frame": { + "x": 407, + "y": 188, + "w": 13, + "h": 24 + } + }, + { + "filename": "793", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 21, + "h": 24 + }, + "frame": { + "x": 420, + "y": 187, + "w": 21, + "h": 24 + } + }, + { + "filename": "761s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 16, + "h": 19 + }, + "frame": { + "x": 441, + "y": 179, + "w": 16, + "h": 19 + } + }, + { + "filename": "775", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 21, + "h": 20 + }, + "frame": { + "x": 457, + "y": 188, + "w": 21, + "h": 20 + } + }, + { + "filename": "775s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 21, + "h": 20 + }, + "frame": { + "x": 478, + "y": 192, + "w": 21, + "h": 20 + } + }, + { + "filename": "751", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 14, + "h": 20 + }, + "frame": { + "x": 441, + "y": 198, + "w": 14, + "h": 20 + } + }, + { + "filename": "779", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 21, + "h": 20 + }, + "frame": { + "x": 420, + "y": 211, + "w": 21, + "h": 20 + } + }, + { + "filename": "779s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 21, + "h": 20 + }, + "frame": { + "x": 455, + "y": 208, + "w": 21, + "h": 20 + } + }, + { + "filename": "751s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 14, + "h": 20 + }, + "frame": { + "x": 441, + "y": 218, + "w": 14, + "h": 20 + } + }, + { + "filename": "790s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 21, + "h": 19 + }, + "frame": { + "x": 476, + "y": 212, + "w": 21, + "h": 19 + } + }, + { + "filename": "793s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 21, + "h": 24 + }, + "frame": { + "x": 455, + "y": 228, + "w": 21, + "h": 24 + } + }, + { + "filename": "2019", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 21, + "h": 21 + }, + "frame": { + "x": 476, + "y": 231, + "w": 21, + "h": 21 + } + }, + { + "filename": "2019s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 21, + "h": 21 + }, + "frame": { + "x": 287, + "y": 211, + "w": 21, + "h": 21 + } + }, + { + "filename": "2052", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 21, + "h": 21 + }, + "frame": { + "x": 308, + "y": 211, + "w": 21, + "h": 21 + } + }, + { + "filename": "2052s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 21, + "h": 21 + }, + "frame": { + "x": 329, + "y": 211, + "w": 21, + "h": 21 + } + }, + { + "filename": "2076", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 350, + "y": 211, + "w": 21, + "h": 23 + } + }, + { + "filename": "2076s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 371, + "y": 212, + "w": 21, + "h": 23 + } + }, + { + "filename": "743s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 5, + "w": 20, + "h": 22 + }, + "frame": { + "x": 392, + "y": 212, + "w": 20, + "h": 22 + } + }, { "filename": "739", "rotated": false, @@ -4413,12 +4728,159 @@ "h": 21 }, "frame": { - "x": 151, - "y": 542, + "x": 245, + "y": 213, "w": 20, "h": 21 } }, + { + "filename": "754", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 20, + "h": 22 + }, + "frame": { + "x": 244, + "y": 234, + "w": 20, + "h": 22 + } + }, + { + "filename": "754s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 20, + "h": 22 + }, + "frame": { + "x": 244, + "y": 256, + "w": 20, + "h": 22 + } + }, + { + "filename": "739s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 20, + "h": 21 + }, + "frame": { + "x": 244, + "y": 278, + "w": 20, + "h": 21 + } + }, + { + "filename": "2027s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 21, + "h": 18 + }, + "frame": { + "x": 265, + "y": 217, + "w": 21, + "h": 18 + } + }, + { + "filename": "744", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 19, + "h": 22 + }, + "frame": { + "x": 264, + "y": 235, + "w": 19, + "h": 22 + } + }, + { + "filename": "744s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 19, + "h": 22 + }, + "frame": { + "x": 264, + "y": 257, + "w": 19, + "h": 22 + } + }, + { + "filename": "741-pompom", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 20 + }, + "frame": { + "x": 264, + "y": 279, + "w": 20, + "h": 20 + } + }, { "filename": "762", "rotated": false, @@ -4434,8 +4896,8 @@ "h": 23 }, "frame": { - "x": 163, - "y": 563, + "x": 246, + "y": 299, "w": 18, "h": 23 } @@ -4455,14 +4917,14 @@ "h": 23 }, "frame": { - "x": 143, - "y": 587, + "x": 264, + "y": 299, "w": 18, "h": 23 } }, { - "filename": "743", + "filename": "741-sensu", "rotated": false, "trimmed": true, "sourceSize": { @@ -4470,15 +4932,57 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, + "x": 13, "y": 5, - "w": 20, + "w": 17, + "h": 23 + }, + "frame": { + "x": 283, + "y": 235, + "w": 17, + "h": 23 + } + }, + { + "filename": "728s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 17, + "h": 20 + }, + "frame": { + "x": 283, + "y": 258, + "w": 17, + "h": 20 + } + }, + { + "filename": "741-pau", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 6, + "w": 18, "h": 22 }, "frame": { - "x": 161, - "y": 586, - "w": 20, + "x": 300, + "y": 232, + "w": 18, "h": 22 } }, @@ -4497,14 +5001,14 @@ "h": 22 }, "frame": { - "x": 143, - "y": 610, + "x": 318, + "y": 232, "w": 18, "h": 22 } }, { - "filename": "743s", + "filename": "741s-pompom", "rotated": false, "trimmed": true, "sourceSize": { @@ -4512,37 +5016,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 5, + "x": 10, + "y": 7, "w": 20, - "h": 22 + "h": 20 }, "frame": { - "x": 161, - "y": 608, + "x": 300, + "y": 254, "w": 20, - "h": 22 - } - }, - { - "filename": "723", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 17, - "h": 22 - }, - "frame": { - "x": 154, - "y": 467, - "w": 17, - "h": 22 + "h": 20 } }, { @@ -4560,98 +5043,14 @@ "h": 22 }, "frame": { - "x": 154, - "y": 489, + "x": 284, + "y": 278, "w": 17, "h": 22 } }, { - "filename": "722", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 17, - "h": 18 - }, - "frame": { - "x": 155, - "y": 511, - "w": 17, - "h": 18 - } - }, - { - "filename": "746s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 18, - "h": 13 - }, - "frame": { - "x": 152, - "y": 529, - "w": 18, - "h": 13 - } - }, - { - "filename": "747", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 22, - "h": 20 - }, - "frame": { - "x": 155, - "y": 346, - "w": 22, - "h": 20 - } - }, - { - "filename": "747s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 22, - "h": 20 - }, - "frame": { - "x": 177, - "y": 346, - "w": 22, - "h": 20 - } - }, - { - "filename": "2050", + "filename": "741s-sensu", "rotated": false, "trimmed": true, "sourceSize": { @@ -4660,57 +5059,15 @@ }, "spriteSourceSize": { "x": 13, - "y": 10, - "w": 15, - "h": 18 + "y": 5, + "w": 17, + "h": 23 }, "frame": { - "x": 199, - "y": 346, - "w": 15, - "h": 18 - } - }, - { - "filename": "2037", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 22, - "h": 21 - }, - "frame": { - "x": 155, - "y": 366, - "w": 22, - "h": 21 - } - }, - { - "filename": "2037s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 22, - "h": 21 - }, - "frame": { - "x": 177, - "y": 366, - "w": 22, - "h": 21 + "x": 282, + "y": 300, + "w": 17, + "h": 23 } }, { @@ -4728,14 +5085,14 @@ "h": 22 }, "frame": { - "x": 199, - "y": 364, + "x": 320, + "y": 254, "w": 17, "h": 22 } }, { - "filename": "775", + "filename": "742", "rotated": false, "trimmed": true, "sourceSize": { @@ -4743,20 +5100,62 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 21, + "x": 12, + "y": 5, + "w": 19, "h": 20 }, "frame": { - "x": 155, - "y": 387, - "w": 21, + "x": 301, + "y": 274, + "w": 19, "h": 20 } }, { - "filename": "754", + "filename": "722s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 320, + "y": 276, + "w": 17, + "h": 18 + } + }, + { + "filename": "753", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 8, + "w": 14, + "h": 19 + }, + "frame": { + "x": 336, + "y": 232, + "w": 14, + "h": 19 + } + }, + { + "filename": "2088", "rotated": false, "trimmed": true, "sourceSize": { @@ -4765,40 +5164,19 @@ }, "spriteSourceSize": { "x": 10, - "y": 6, - "w": 20, - "h": 22 + "y": 10, + "w": 21, + "h": 18 }, "frame": { - "x": 154, - "y": 407, - "w": 20, - "h": 22 + "x": 350, + "y": 234, + "w": 21, + "h": 18 } }, { - "filename": "775s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 21, - "h": 20 - }, - "frame": { - "x": 176, - "y": 387, - "w": 21, - "h": 20 - } - }, - { - "filename": "754s", + "filename": "2088s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4807,19 +5185,19 @@ }, "spriteSourceSize": { "x": 10, - "y": 6, - "w": 20, - "h": 22 + "y": 10, + "w": 21, + "h": 18 }, "frame": { - "x": 174, - "y": 407, - "w": 20, - "h": 22 + "x": 371, + "y": 235, + "w": 21, + "h": 18 } }, { - "filename": "778s-busted", + "filename": "742s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4827,16 +5205,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 12, - "w": 21, - "h": 16 + "x": 12, + "y": 5, + "w": 19, + "h": 20 }, "frame": { - "x": 154, - "y": 429, - "w": 21, - "h": 16 + "x": 392, + "y": 234, + "w": 19, + "h": 20 + } + }, + { + "filename": "757s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 19, + "h": 18 + }, + "frame": { + "x": 301, + "y": 294, + "w": 19, + "h": 18 } }, { @@ -4854,222 +5253,12 @@ "h": 22 }, "frame": { - "x": 156, - "y": 445, + "x": 320, + "y": 294, "w": 17, "h": 22 } }, - { - "filename": "739s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 20, - "h": 21 - }, - "frame": { - "x": 175, - "y": 429, - "w": 20, - "h": 21 - } - }, - { - "filename": "779", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 21, - "h": 20 - }, - "frame": { - "x": 173, - "y": 450, - "w": 21, - "h": 20 - } - }, - { - "filename": "2019s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 21, - "h": 21 - }, - "frame": { - "x": 171, - "y": 470, - "w": 21, - "h": 21 - } - }, - { - "filename": "779s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 21, - "h": 20 - }, - "frame": { - "x": 171, - "y": 491, - "w": 21, - "h": 20 - } - }, - { - "filename": "741-pompom", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 20 - }, - "frame": { - "x": 172, - "y": 511, - "w": 20, - "h": 20 - } - }, - { - "filename": "761", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 16, - "h": 19 - }, - "frame": { - "x": 216, - "y": 354, - "w": 16, - "h": 19 - } - }, - { - "filename": "790s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 21, - "h": 19 - }, - "frame": { - "x": 232, - "y": 360, - "w": 21, - "h": 19 - } - }, - { - "filename": "761s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 16, - "h": 19 - }, - "frame": { - "x": 216, - "y": 373, - "w": 16, - "h": 19 - } - }, - { - "filename": "2027", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 10, - "w": 21, - "h": 18 - }, - "frame": { - "x": 232, - "y": 379, - "w": 21, - "h": 18 - } - }, - { - "filename": "2052", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 21, - "h": 21 - }, - "frame": { - "x": 171, - "y": 531, - "w": 21, - "h": 21 - } - }, { "filename": "778", "rotated": false, @@ -5085,8 +5274,8 @@ "h": 22 }, "frame": { - "x": 194, - "y": 407, + "x": 337, + "y": 252, "w": 17, "h": 22 } @@ -5106,14 +5295,14 @@ "h": 22 }, "frame": { - "x": 195, - "y": 429, + "x": 354, + "y": 252, "w": 17, "h": 22 } }, { - "filename": "728", + "filename": "737", "rotated": false, "trimmed": true, "sourceSize": { @@ -5121,16 +5310,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, + "x": 12, "y": 8, - "w": 17, - "h": 20 + "w": 18, + "h": 19 }, "frame": { - "x": 197, - "y": 387, - "w": 17, - "h": 20 + "x": 337, + "y": 274, + "w": 18, + "h": 19 } }, { @@ -5148,180 +5337,12 @@ "h": 19 }, "frame": { - "x": 194, - "y": 451, + "x": 371, + "y": 253, "w": 18, "h": 19 } }, - { - "filename": "2052s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 21, - "h": 21 - }, - "frame": { - "x": 192, - "y": 470, - "w": 21, - "h": 21 - } - }, - { - "filename": "741s-pompom", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 20 - }, - "frame": { - "x": 192, - "y": 491, - "w": 20, - "h": 20 - } - }, - { - "filename": "2027s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 10, - "w": 21, - "h": 18 - }, - "frame": { - "x": 192, - "y": 511, - "w": 21, - "h": 18 - } - }, - { - "filename": "2088", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 10, - "w": 21, - "h": 18 - }, - "frame": { - "x": 192, - "y": 529, - "w": 21, - "h": 18 - } - }, - { - "filename": "771", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 11, - "w": 18, - "h": 13 - }, - "frame": { - "x": 214, - "y": 392, - "w": 18, - "h": 13 - } - }, - { - "filename": "2088s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 10, - "w": 21, - "h": 18 - }, - "frame": { - "x": 232, - "y": 397, - "w": 21, - "h": 18 - } - }, - { - "filename": "771s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 11, - "w": 18, - "h": 13 - }, - "frame": { - "x": 214, - "y": 405, - "w": 18, - "h": 13 - } - }, - { - "filename": "728s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 17, - "h": 20 - }, - "frame": { - "x": 212, - "y": 418, - "w": 17, - "h": 20 - } - }, { "filename": "741", "rotated": false, @@ -5337,33 +5358,12 @@ "h": 19 }, "frame": { - "x": 212, - "y": 438, + "x": 337, + "y": 293, "w": 17, "h": 19 } }, - { - "filename": "736", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 12, - "w": 17, - "h": 13 - }, - "frame": { - "x": 212, - "y": 457, - "w": 17, - "h": 13 - } - }, { "filename": "741s", "rotated": false, @@ -5379,75 +5379,12 @@ "h": 19 }, "frame": { - "x": 213, - "y": 470, + "x": 355, + "y": 274, "w": 17, "h": 19 } }, - { - "filename": "751s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 14, - "h": 20 - }, - "frame": { - "x": 229, - "y": 418, - "w": 14, - "h": 20 - } - }, - { - "filename": "753", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 8, - "w": 14, - "h": 19 - }, - "frame": { - "x": 229, - "y": 438, - "w": 14, - "h": 19 - } - }, - { - "filename": "736s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 12, - "w": 17, - "h": 13 - }, - "frame": { - "x": 229, - "y": 457, - "w": 17, - "h": 13 - } - }, { "filename": "759", "rotated": false, @@ -5463,33 +5400,12 @@ "h": 19 }, "frame": { - "x": 230, - "y": 470, + "x": 354, + "y": 293, "w": 17, "h": 19 } }, - { - "filename": "722s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 17, - "h": 18 - }, - "frame": { - "x": 192, - "y": 547, - "w": 17, - "h": 18 - } - }, { "filename": "759s", "rotated": false, @@ -5505,8 +5421,8 @@ "h": 19 }, "frame": { - "x": 181, - "y": 565, + "x": 372, + "y": 272, "w": 17, "h": 19 } @@ -5526,201 +5442,12 @@ "h": 19 }, "frame": { - "x": 181, - "y": 584, + "x": 389, + "y": 254, "w": 17, "h": 19 } }, - { - "filename": "777s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 17, - "h": 19 - }, - "frame": { - "x": 181, - "y": 603, - "w": 17, - "h": 19 - } - }, - { - "filename": "774-blue", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 18 - }, - "frame": { - "x": 181, - "y": 622, - "w": 17, - "h": 18 - } - }, - { - "filename": "753s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 8, - "w": 14, - "h": 19 - }, - "frame": { - "x": 198, - "y": 565, - "w": 14, - "h": 19 - } - }, - { - "filename": "774-green", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 18 - }, - "frame": { - "x": 198, - "y": 584, - "w": 17, - "h": 18 - } - }, - { - "filename": "774-indigo", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 18 - }, - "frame": { - "x": 198, - "y": 602, - "w": 17, - "h": 18 - } - }, - { - "filename": "774-orange", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 18 - }, - "frame": { - "x": 198, - "y": 620, - "w": 17, - "h": 18 - } - }, - { - "filename": "774-red", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 18 - }, - "frame": { - "x": 209, - "y": 547, - "w": 17, - "h": 18 - } - }, - { - "filename": "774-violet", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 18 - }, - "frame": { - "x": 212, - "y": 565, - "w": 17, - "h": 18 - } - }, - { - "filename": "774-yellow", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 18 - }, - "frame": { - "x": 215, - "y": 583, - "w": 17, - "h": 18 - } - }, { "filename": "774", "rotated": false, @@ -5736,155 +5463,8 @@ "h": 18 }, "frame": { - "x": 215, - "y": 601, - "w": 17, - "h": 18 - } - }, - { - "filename": "774s-blue", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 18 - }, - "frame": { - "x": 215, - "y": 619, - "w": 17, - "h": 18 - } - }, - { - "filename": "774s-green", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 18 - }, - "frame": { - "x": 212, - "y": 491, - "w": 17, - "h": 18 - } - }, - { - "filename": "774s-indigo", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 18 - }, - "frame": { - "x": 229, - "y": 489, - "w": 17, - "h": 18 - } - }, - { - "filename": "774s-orange", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 18 - }, - "frame": { - "x": 213, - "y": 509, - "w": 17, - "h": 18 - } - }, - { - "filename": "774s-red", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 18 - }, - "frame": { - "x": 213, - "y": 527, - "w": 17, - "h": 18 - } - }, - { - "filename": "774s-violet", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 18 - }, - "frame": { - "x": 230, - "y": 507, - "w": 17, - "h": 18 - } - }, - { - "filename": "774s-yellow", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 18 - }, - "frame": { - "x": 230, - "y": 525, + "x": 389, + "y": 273, "w": 17, "h": 18 } @@ -5904,14 +5484,77 @@ "h": 18 }, "frame": { - "x": 226, - "y": 545, + "x": 389, + "y": 273, "w": 17, "h": 18 } }, { - "filename": "2050s", + "filename": "753s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 8, + "w": 14, + "h": 19 + }, + "frame": { + "x": 406, + "y": 254, + "w": 14, + "h": 19 + } + }, + { + "filename": "774-blue", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 406, + "y": 273, + "w": 17, + "h": 18 + } + }, + { + "filename": "746s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 18, + "h": 13 + }, + "frame": { + "x": 423, + "y": 231, + "w": 18, + "h": 13 + } + }, + { + "filename": "777s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5920,14 +5563,245 @@ }, "spriteSourceSize": { "x": 13, - "y": 10, - "w": 15, + "y": 8, + "w": 17, + "h": 19 + }, + "frame": { + "x": 420, + "y": 244, + "w": 17, + "h": 19 + } + }, + { + "filename": "771", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 11, + "w": 18, + "h": 13 + }, + "frame": { + "x": 437, + "y": 244, + "w": 18, + "h": 13 + } + }, + { + "filename": "771s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 11, + "w": 18, + "h": 13 + }, + "frame": { + "x": 437, + "y": 257, + "w": 18, + "h": 13 + } + }, + { + "filename": "774-green", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, "h": 18 }, "frame": { - "x": 229, - "y": 563, - "w": 15, + "x": 455, + "y": 252, + "w": 17, + "h": 18 + } + }, + { + "filename": "774-indigo", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 472, + "y": 252, + "w": 17, + "h": 18 + } + }, + { + "filename": "736", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 17, + "h": 13 + }, + "frame": { + "x": 372, + "y": 291, + "w": 17, + "h": 13 + } + }, + { + "filename": "736s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 17, + "h": 13 + }, + "frame": { + "x": 389, + "y": 291, + "w": 17, + "h": 13 + } + }, + { + "filename": "774-orange", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 406, + "y": 291, + "w": 17, + "h": 18 + } + }, + { + "filename": "774-red", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 371, + "y": 304, + "w": 17, + "h": 18 + } + }, + { + "filename": "774-violet", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 388, + "y": 304, + "w": 17, + "h": 18 + } + }, + { + "filename": "774-yellow", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 423, + "y": 270, + "w": 17, + "h": 18 + } + }, + { + "filename": "774s-blue", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 423, + "y": 288, + "w": 17, "h": 18 } }, @@ -5946,12 +5820,54 @@ "h": 17 }, "frame": { - "x": 232, - "y": 581, + "x": 423, + "y": 306, "w": 17, "h": 17 } }, + { + "filename": "774s-green", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 440, + "y": 270, + "w": 17, + "h": 18 + } + }, + { + "filename": "774s-indigo", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 440, + "y": 288, + "w": 17, + "h": 18 + } + }, { "filename": "808s", "rotated": false, @@ -5967,11 +5883,95 @@ "h": 17 }, "frame": { - "x": 232, - "y": 598, + "x": 440, + "y": 306, "w": 17, "h": 17 } + }, + { + "filename": "774s-orange", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 457, + "y": 270, + "w": 17, + "h": 18 + } + }, + { + "filename": "774s-red", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 457, + "y": 288, + "w": 17, + "h": 18 + } + }, + { + "filename": "774s-violet", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 474, + "y": 270, + "w": 17, + "h": 18 + } + }, + { + "filename": "774s-yellow", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 474, + "y": 288, + "w": 17, + "h": 18 + } } ] } @@ -5979,6 +5979,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:c38095b3202450975a37d1aed2dcc8d4:c27a941914c4e4cca37e27cc54ccb54f:2e7c5873ead8fd8fce82a0b3fcc86b42$" + "smartupdate": "$TexturePacker:SmartUpdate:8e8bd4d6d941cb88610eb6155fd86133:38ee262ea69421a5e49109e3abfe85dd:2e7c5873ead8fd8fce82a0b3fcc86b42$" } } diff --git a/public/images/pokemon_icons_7.png b/public/images/pokemon_icons_7.png index 883200448..40c3e96a5 100644 Binary files a/public/images/pokemon_icons_7.png and b/public/images/pokemon_icons_7.png differ diff --git a/public/images/pokemon_icons_8.json b/public/images/pokemon_icons_8.json index 430d114ff..bac1c6fbe 100644 --- a/public/images/pokemon_icons_8.json +++ b/public/images/pokemon_icons_8.json @@ -4,8 +4,8 @@ "image": "pokemon_icons_8.png", "format": "RGBA8888", "size": { - "w": 254, - "h": 798 + "w": 508, + "h": 386 }, "scale": 1, "frames": [ @@ -282,6 +282,27 @@ "h": 24 } }, + { + "filename": "4083s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 1, + "y": 3, + "w": 38, + "h": 24 + }, + "frame": { + "x": 217, + "y": 0, + "w": 38, + "h": 24 + } + }, { "filename": "815-gigantamax", "rotated": false, @@ -450,132 +471,6 @@ "h": 30 } }, - { - "filename": "874", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 30, - "h": 30 - }, - "frame": { - "x": 0, - "y": 384, - "w": 30, - "h": 30 - } - }, - { - "filename": "874s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 30, - "h": 30 - }, - "frame": { - "x": 0, - "y": 414, - "w": 30, - "h": 30 - } - }, - { - "filename": "849-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 29, - "h": 30 - }, - "frame": { - "x": 0, - "y": 444, - "w": 29, - "h": 30 - } - }, - { - "filename": "849s-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 29, - "h": 30 - }, - "frame": { - "x": 0, - "y": 474, - "w": 29, - "h": 30 - } - }, - { - "filename": "858-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 29, - "h": 30 - }, - "frame": { - "x": 0, - "y": 504, - "w": 29, - "h": 30 - } - }, - { - "filename": "858s-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 29, - "h": 30 - }, - "frame": { - "x": 0, - "y": 534, - "w": 29, - "h": 30 - } - }, { "filename": "823-gigantamax", "rotated": false, @@ -639,6 +534,69 @@ "h": 28 } }, + { + "filename": "834", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 3, + "w": 34, + "h": 23 + }, + "frame": { + "x": 255, + "y": 0, + "w": 34, + "h": 23 + } + }, + { + "filename": "834s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 3, + "w": 34, + "h": 23 + }, + "frame": { + "x": 289, + "y": 0, + "w": 34, + "h": 23 + } + }, + { + "filename": "890s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 1, + "w": 33, + "h": 28 + }, + "frame": { + "x": 34, + "y": 117, + "w": 33, + "h": 28 + } + }, { "filename": "905-incarnate", "rotated": false, @@ -654,8 +612,8 @@ "h": 29 }, "frame": { - "x": 0, - "y": 564, + "x": 31, + "y": 145, "w": 32, "h": 29 } @@ -675,222 +633,12 @@ "h": 29 }, "frame": { - "x": 0, - "y": 593, + "x": 31, + "y": 174, "w": 32, "h": 29 } }, - { - "filename": "851-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 32, - "h": 28 - }, - "frame": { - "x": 0, - "y": 622, - "w": 32, - "h": 28 - } - }, - { - "filename": "851s-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 32, - "h": 28 - }, - "frame": { - "x": 0, - "y": 650, - "w": 32, - "h": 28 - } - }, - { - "filename": "890s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 33, - "h": 28 - }, - "frame": { - "x": 0, - "y": 678, - "w": 33, - "h": 28 - } - }, - { - "filename": "867", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 31, - "h": 27 - }, - "frame": { - "x": 0, - "y": 706, - "w": 31, - "h": 27 - } - }, - { - "filename": "867s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 31, - "h": 27 - }, - "frame": { - "x": 0, - "y": 733, - "w": 31, - "h": 27 - } - }, - { - "filename": "834", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 34, - "h": 23 - }, - "frame": { - "x": 217, - "y": 0, - "w": 34, - "h": 23 - } - }, - { - "filename": "864", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 30, - "h": 27 - }, - "frame": { - "x": 0, - "y": 760, - "w": 30, - "h": 27 - } - }, - { - "filename": "4083s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 38, - "h": 24 - }, - "frame": { - "x": 34, - "y": 117, - "w": 38, - "h": 24 - } - }, - { - "filename": "834s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 34, - "h": 23 - }, - "frame": { - "x": 179, - "y": 24, - "w": 34, - "h": 23 - } - }, - { - "filename": "893-dada", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 33, - "h": 24 - }, - "frame": { - "x": 178, - "y": 47, - "w": 33, - "h": 24 - } - }, { "filename": "893", "rotated": false, @@ -906,14 +654,14 @@ "h": 24 }, "frame": { - "x": 145, - "y": 56, + "x": 323, + "y": 0, "w": 33, "h": 24 } }, { - "filename": "893s-dada", + "filename": "893-dada", "rotated": false, "trimmed": true, "sourceSize": { @@ -927,8 +675,8 @@ "h": 24 }, "frame": { - "x": 178, - "y": 71, + "x": 356, + "y": 0, "w": 33, "h": 24 } @@ -948,14 +696,14 @@ "h": 24 }, "frame": { - "x": 75, - "y": 56, + "x": 389, + "y": 0, "w": 33, "h": 24 } }, { - "filename": "864s", + "filename": "893s-dada", "rotated": false, "trimmed": true, "sourceSize": { @@ -963,125 +711,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 30, - "h": 27 - }, - "frame": { - "x": 70, - "y": 80, - "w": 30, - "h": 27 - } - }, - { - "filename": "902", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 32, + "x": 3, + "y": 3, + "w": 33, "h": 24 }, "frame": { - "x": 108, - "y": 57, - "w": 32, + "x": 422, + "y": 0, + "w": 33, "h": 24 } }, { - "filename": "887", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 30, - "h": 26 - }, - "frame": { - "x": 100, - "y": 81, - "w": 30, - "h": 26 - } - }, - { - "filename": "879-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 27, - "h": 30 - }, - "frame": { - "x": 72, - "y": 107, - "w": 27, - "h": 30 - } - }, - { - "filename": "879s-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 27, - "h": 30 - }, - "frame": { - "x": 99, - "y": 107, - "w": 27, - "h": 30 - } - }, - { - "filename": "813", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 17, - "h": 26 - }, - "frame": { - "x": 130, - "y": 81, - "w": 17, - "h": 26 - } - }, - { - "filename": "870", + "filename": "851-gigantamax", "rotated": false, "trimmed": true, "sourceSize": { @@ -1090,334 +733,19 @@ }, "spriteSourceSize": { "x": 4, - "y": 3, - "w": 31, - "h": 23 - }, - "frame": { - "x": 147, - "y": 80, - "w": 31, - "h": 23 - } - }, - { - "filename": "839-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, "y": 0, - "w": 25, - "h": 30 - }, - "frame": { - "x": 126, - "y": 107, - "w": 25, - "h": 30 - } - }, - { - "filename": "884-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 27, - "h": 30 - }, - "frame": { - "x": 151, - "y": 103, - "w": 27, - "h": 30 - } - }, - { - "filename": "884s-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 27, - "h": 30 - }, - "frame": { - "x": 178, - "y": 95, - "w": 27, - "h": 30 - } - }, - { - "filename": "839s-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 25, - "h": 30 - }, - "frame": { - "x": 205, - "y": 95, - "w": 25, - "h": 30 - } - }, - { - "filename": "898-ice", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 24, - "h": 29 - }, - "frame": { - "x": 230, - "y": 23, - "w": 24, - "h": 29 - } - }, - { - "filename": "869-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 0, - "w": 17, - "h": 30 - }, - "frame": { - "x": 213, - "y": 24, - "w": 17, - "h": 30 - } - }, - { - "filename": "898s-ice", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 24, - "h": 29 - }, - "frame": { - "x": 230, - "y": 52, - "w": 24, - "h": 29 - } - }, - { - "filename": "876", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 24 - }, - "frame": { - "x": 211, - "y": 54, - "w": 19, - "h": 24 - } - }, - { - "filename": "6157", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 24, - "h": 27 - }, - "frame": { - "x": 230, - "y": 81, - "w": 24, - "h": 27 - } - }, - { - "filename": "852", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 17 - }, - "frame": { - "x": 211, - "y": 78, - "w": 19, - "h": 17 - } - }, - { - "filename": "6157s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 24, - "h": 27 - }, - "frame": { - "x": 230, - "y": 108, - "w": 24, - "h": 27 - } - }, - { - "filename": "902s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, "w": 32, - "h": 24 + "h": 28 }, "frame": { - "x": 178, - "y": 125, + "x": 455, + "y": 0, "w": 32, - "h": 24 + "h": 28 } }, { - "filename": "863", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 20, - "h": 24 - }, - "frame": { - "x": 210, - "y": 125, - "w": 20, - "h": 24 - } - }, - { - "filename": "845", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 24, - "h": 26 - }, - "frame": { - "x": 230, - "y": 135, - "w": 24, - "h": 26 - } - }, - { - "filename": "823", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 27, - "h": 24 - }, - "frame": { - "x": 151, - "y": 133, - "w": 27, - "h": 24 - } - }, - { - "filename": "870s", + "filename": "851s-gigantamax", "rotated": false, "trimmed": true, "sourceSize": { @@ -1426,1002 +754,15 @@ }, "spriteSourceSize": { "x": 4, - "y": 3, - "w": 31, - "h": 23 - }, - "frame": { - "x": 178, - "y": 149, - "w": 31, - "h": 23 - } - }, - { - "filename": "814", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 21, - "h": 23 - }, - "frame": { - "x": 209, - "y": 149, - "w": 21, - "h": 23 - } - }, - { - "filename": "845s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 24, - "h": 26 - }, - "frame": { - "x": 230, - "y": 161, - "w": 24, - "h": 26 - } - }, - { - "filename": "902-female", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 31, - "h": 22 - }, - "frame": { - "x": 72, - "y": 137, - "w": 31, - "h": 22 - } - }, - { - "filename": "902s-female", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 31, - "h": 22 - }, - "frame": { - "x": 103, - "y": 137, - "w": 31, - "h": 22 - } - }, - { - "filename": "813s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 17, - "h": 26 - }, - "frame": { - "x": 134, - "y": 137, - "w": 17, - "h": 26 - } - }, - { - "filename": "823s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 27, - "h": 24 - }, - "frame": { - "x": 151, - "y": 157, - "w": 27, - "h": 24 - } - }, - { - "filename": "6503", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 31, - "h": 23 - }, - "frame": { - "x": 178, - "y": 172, - "w": 31, - "h": 23 - } - }, - { - "filename": "814s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 21, - "h": 23 - }, - "frame": { - "x": 209, - "y": 172, - "w": 21, - "h": 23 - } - }, - { - "filename": "892-gigantamax-rapid", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 24, - "h": 26 - }, - "frame": { - "x": 230, - "y": 187, - "w": 24, - "h": 26 - } - }, - { - "filename": "6503s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 31, - "h": 23 - }, - "frame": { - "x": 34, - "y": 141, - "w": 31, - "h": 23 - } - }, - { - "filename": "4110", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 29, - "h": 28 - }, - "frame": { - "x": 31, - "y": 164, - "w": 29, - "h": 28 - } - }, - { - "filename": "826-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 30, - "h": 25 - }, - "frame": { - "x": 31, - "y": 192, - "w": 30, - "h": 25 - } - }, - { - "filename": "4110s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 29, - "h": 28 - }, - "frame": { - "x": 30, - "y": 217, - "w": 29, - "h": 28 - } - }, - { - "filename": "834-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 29, - "h": 27 - }, - "frame": { - "x": 30, - "y": 245, - "w": 29, - "h": 27 - } - }, - { - "filename": "834s-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 29, - "h": 27 - }, - "frame": { - "x": 30, - "y": 272, - "w": 29, - "h": 27 - } - }, - { - "filename": "845-gulping", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 29, - "h": 27 - }, - "frame": { - "x": 30, - "y": 299, - "w": 29, - "h": 27 - } - }, - { - "filename": "845s-gulping", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 29, - "h": 27 - }, - "frame": { - "x": 30, - "y": 326, - "w": 29, - "h": 27 - } - }, - { - "filename": "861-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 30, - "y": 353, - "w": 26, - "h": 30 - } - }, - { - "filename": "861s-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 30, - "y": 383, - "w": 26, - "h": 30 - } - }, - { - "filename": "898-shadow", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 30, - "y": 413, - "w": 26, - "h": 30 - } - }, - { - "filename": "4555-zen", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 25, + "w": 32, "h": 28 }, "frame": { - "x": 60, - "y": 164, - "w": 25, - "h": 28 - } - }, - { - "filename": "887s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 30, - "h": 26 - }, - "frame": { - "x": 85, - "y": 159, - "w": 30, - "h": 26 - } - }, - { - "filename": "826", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 25, - "h": 27 - }, - "frame": { - "x": 61, - "y": 192, - "w": 25, - "h": 27 - } - }, - { - "filename": "898s-shadow", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, + "x": 455, "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 59, - "y": 219, - "w": 26, - "h": 30 - } - }, - { - "filename": "4555", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 25, - "h": 30 - }, - "frame": { - "x": 59, - "y": 249, - "w": 25, - "h": 30 - } - }, - { - "filename": "4555s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 25, - "h": 30 - }, - "frame": { - "x": 59, - "y": 279, - "w": 25, - "h": 30 - } - }, - { - "filename": "4555s-zen", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 25, + "w": 32, "h": 28 - }, - "frame": { - "x": 59, - "y": 309, - "w": 25, - "h": 28 - } - }, - { - "filename": "905-therian", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 86, - "y": 185, - "w": 28, - "h": 27 - } - }, - { - "filename": "876s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 24 - }, - "frame": { - "x": 115, - "y": 159, - "w": 19, - "h": 24 - } - }, - { - "filename": "859", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 17, - "h": 20 - }, - "frame": { - "x": 134, - "y": 163, - "w": 17, - "h": 20 - } - }, - { - "filename": "828", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 27, - "h": 24 - }, - "frame": { - "x": 151, - "y": 181, - "w": 27, - "h": 24 - } - }, - { - "filename": "812", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 26, - "h": 24 - }, - "frame": { - "x": 59, - "y": 337, - "w": 26, - "h": 24 - } - }, - { - "filename": "905s-therian", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 56, - "y": 361, - "w": 28, - "h": 27 - } - }, - { - "filename": "6059", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 28, - "h": 27 - }, - "frame": { - "x": 56, - "y": 388, - "w": 28, - "h": 27 - } - }, - { - "filename": "6059s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 28, - "h": 27 - }, - "frame": { - "x": 56, - "y": 415, - "w": 28, - "h": 27 - } - }, - { - "filename": "826s-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 30, - "h": 25 - }, - "frame": { - "x": 178, - "y": 195, - "w": 30, - "h": 25 - } - }, - { - "filename": "818", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 22, - "h": 27 - }, - "frame": { - "x": 208, - "y": 195, - "w": 22, - "h": 27 - } - }, - { - "filename": "892s-gigantamax-rapid", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 24, - "h": 26 - }, - "frame": { - "x": 230, - "y": 213, - "w": 24, - "h": 26 - } - }, - { - "filename": "888", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 28, - "h": 23 - }, - "frame": { - "x": 86, - "y": 212, - "w": 28, - "h": 23 - } - }, - { - "filename": "894", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 30, - "h": 23 - }, - "frame": { - "x": 85, - "y": 235, - "w": 30, - "h": 23 - } - }, - { - "filename": "895", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 28, - "h": 26 - }, - "frame": { - "x": 84, - "y": 258, - "w": 28, - "h": 26 - } - }, - { - "filename": "895s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 28, - "h": 26 - }, - "frame": { - "x": 84, - "y": 284, - "w": 28, - "h": 26 - } - }, - { - "filename": "889", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 26, - "h": 27 - }, - "frame": { - "x": 84, - "y": 310, - "w": 26, - "h": 27 - } - }, - { - "filename": "812s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 26, - "h": 24 - }, - "frame": { - "x": 85, - "y": 337, - "w": 26, - "h": 24 - } - }, - { - "filename": "889s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 26, - "h": 27 - }, - "frame": { - "x": 84, - "y": 361, - "w": 26, - "h": 27 - } - }, - { - "filename": "826s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 25, - "h": 27 - }, - "frame": { - "x": 84, - "y": 388, - "w": 25, - "h": 27 - } - }, - { - "filename": "862", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 25, - "h": 27 - }, - "frame": { - "x": 84, - "y": 415, - "w": 25, - "h": 27 } }, { @@ -2439,12 +780,138 @@ "h": 30 }, "frame": { - "x": 112, - "y": 258, + "x": 487, + "y": 0, "w": 21, "h": 30 } }, + { + "filename": "842-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 0, + "w": 21, + "h": 30 + }, + "frame": { + "x": 487, + "y": 0, + "w": 21, + "h": 30 + } + }, + { + "filename": "902", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 32, + "h": 24 + }, + "frame": { + "x": 75, + "y": 56, + "w": 32, + "h": 24 + } + }, + { + "filename": "874", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 0, + "w": 30, + "h": 30 + }, + "frame": { + "x": 70, + "y": 80, + "w": 30, + "h": 30 + } + }, + { + "filename": "902s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 32, + "h": 24 + }, + "frame": { + "x": 107, + "y": 57, + "w": 32, + "h": 24 + } + }, + { + "filename": "874s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 0, + "w": 30, + "h": 30 + }, + "frame": { + "x": 100, + "y": 81, + "w": 30, + "h": 30 + } + }, + { + "filename": "716-active", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 29, + "h": 30 + }, + "frame": { + "x": 130, + "y": 81, + "w": 29, + "h": 30 + } + }, { "filename": "811", "rotated": false, @@ -2460,14 +927,14 @@ "h": 24 }, "frame": { - "x": 112, - "y": 288, + "x": 139, + "y": 57, "w": 22, "h": 24 } }, { - "filename": "839", + "filename": "716s-active", "rotated": false, "trimmed": true, "sourceSize": { @@ -2475,83 +942,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 25, - "h": 25 - }, - "frame": { - "x": 110, - "y": 312, - "w": 25, - "h": 25 - } - }, - { - "filename": "817", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 24, - "h": 24 - }, - "frame": { - "x": 111, - "y": 337, - "w": 24, - "h": 24 - } - }, - { - "filename": "862s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 25, - "h": 27 - }, - "frame": { - "x": 110, - "y": 361, - "w": 25, - "h": 27 - } - }, - { - "filename": "892-gigantamax-single", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, + "x": 4, "y": 0, - "w": 23, - "h": 29 + "w": 29, + "h": 30 }, "frame": { - "x": 109, - "y": 388, - "w": 23, - "h": 29 + "x": 161, + "y": 56, + "w": 29, + "h": 30 } }, { - "filename": "839s", + "filename": "867", "rotated": false, "trimmed": true, "sourceSize": { @@ -2559,146 +963,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 25, - "h": 25 - }, - "frame": { - "x": 109, - "y": 417, - "w": 25, - "h": 25 - } - }, - { - "filename": "881", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 18, - "h": 23 - }, - "frame": { - "x": 133, - "y": 183, - "w": 18, - "h": 23 - } - }, - { - "filename": "810", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 114, - "y": 185, - "w": 19, - "h": 23 - } - }, - { - "filename": "818s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, + "x": 4, "y": 1, - "w": 22, + "w": 31, "h": 27 }, "frame": { - "x": 114, - "y": 208, - "w": 22, + "x": 159, + "y": 86, + "w": 31, "h": 27 } }, { - "filename": "816", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 23 - }, - "frame": { - "x": 115, - "y": 235, - "w": 22, - "h": 23 - } - }, - { - "filename": "815", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 0, - "w": 15, - "h": 29 - }, - "frame": { - "x": 136, - "y": 206, - "w": 15, - "h": 29 - } - }, - { - "filename": "828s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 27, - "h": 24 - }, - "frame": { - "x": 151, - "y": 205, - "w": 27, - "h": 24 - } - }, - { - "filename": "894s", + "filename": "4110", "rotated": false, "trimmed": true, "sourceSize": { @@ -2707,61 +985,19 @@ }, "spriteSourceSize": { "x": 5, - "y": 3, - "w": 30, - "h": 23 + "y": 1, + "w": 29, + "h": 28 }, "frame": { "x": 178, - "y": 220, - "w": 30, - "h": 23 + "y": 28, + "w": 29, + "h": 28 } }, { - "filename": "811s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 24 - }, - "frame": { - "x": 208, - "y": 222, - "w": 22, - "h": 24 - } - }, - { - "filename": "817s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 24, - "h": 24 - }, - "frame": { - "x": 230, - "y": 239, - "w": 24, - "h": 24 - } - }, - { - "filename": "841", + "filename": "849-gigantamax", "rotated": false, "trimmed": true, "sourceSize": { @@ -2770,19 +1006,19 @@ }, "spriteSourceSize": { "x": 6, - "y": 3, - "w": 27, - "h": 24 + "y": 0, + "w": 29, + "h": 30 }, "frame": { - "x": 151, - "y": 229, - "w": 27, - "h": 24 + "x": 207, + "y": 24, + "w": 29, + "h": 30 } }, { - "filename": "875-no-ice", + "filename": "839-gigantamax", "rotated": false, "trimmed": true, "sourceSize": { @@ -2790,16 +1026,163 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, - "y": 3, - "w": 14, - "h": 23 + "x": 7, + "y": 0, + "w": 25, + "h": 30 }, "frame": { - "x": 137, - "y": 235, - "w": 14, - "h": 23 + "x": 236, + "y": 24, + "w": 25, + "h": 30 + } + }, + { + "filename": "839s-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 25, + "h": 30 + }, + "frame": { + "x": 236, + "y": 24, + "w": 25, + "h": 30 + } + }, + { + "filename": "849s-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 0, + "w": 29, + "h": 30 + }, + "frame": { + "x": 261, + "y": 23, + "w": 29, + "h": 30 + } + }, + { + "filename": "858-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 0, + "w": 29, + "h": 30 + }, + "frame": { + "x": 290, + "y": 23, + "w": 29, + "h": 30 + } + }, + { + "filename": "858s-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 0, + "w": 29, + "h": 30 + }, + "frame": { + "x": 319, + "y": 24, + "w": 29, + "h": 30 + } + }, + { + "filename": "867s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 1, + "w": 31, + "h": 27 + }, + "frame": { + "x": 348, + "y": 24, + "w": 31, + "h": 27 + } + }, + { + "filename": "864", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 30, + "h": 27 + }, + "frame": { + "x": 379, + "y": 24, + "w": 30, + "h": 27 + } + }, + { + "filename": "864s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 30, + "h": 27 + }, + "frame": { + "x": 409, + "y": 24, + "w": 30, + "h": 27 } }, { @@ -2817,71 +1200,8 @@ "h": 30 }, "frame": { - "x": 133, - "y": 258, - "w": 21, - "h": 30 - } - }, - { - "filename": "892s-gigantamax-single", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 23, - "h": 29 - }, - "frame": { - "x": 154, - "y": 253, - "w": 23, - "h": 29 - } - }, - { - "filename": "820", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 23, - "h": 24 - }, - "frame": { - "x": 134, - "y": 288, - "w": 23, - "h": 24 - } - }, - { - "filename": "842-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 0, - "w": 21, - "h": 30 - }, - "frame": { - "x": 135, - "y": 312, + "x": 190, + "y": 56, "w": 21, "h": 30 } @@ -2901,14 +1221,245 @@ "h": 30 }, "frame": { - "x": 135, - "y": 342, + "x": 190, + "y": 56, "w": 21, "h": 30 } }, { - "filename": "869s-gigantamax", + "filename": "879-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 0, + "w": 27, + "h": 30 + }, + "frame": { + "x": 211, + "y": 54, + "w": 27, + "h": 30 + } + }, + { + "filename": "861-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 238, + "y": 54, + "w": 26, + "h": 30 + } + }, + { + "filename": "879s-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 0, + "w": 27, + "h": 30 + }, + "frame": { + "x": 264, + "y": 53, + "w": 27, + "h": 30 + } + }, + { + "filename": "884-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 0, + "w": 27, + "h": 30 + }, + "frame": { + "x": 291, + "y": 53, + "w": 27, + "h": 30 + } + }, + { + "filename": "4110s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 29, + "h": 28 + }, + "frame": { + "x": 318, + "y": 54, + "w": 29, + "h": 28 + } + }, + { + "filename": "818", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 1, + "w": 22, + "h": 27 + }, + "frame": { + "x": 190, + "y": 86, + "w": 22, + "h": 27 + } + }, + { + "filename": "834-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 29, + "h": 27 + }, + "frame": { + "x": 212, + "y": 84, + "w": 29, + "h": 27 + } + }, + { + "filename": "826", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 25, + "h": 27 + }, + "frame": { + "x": 241, + "y": 84, + "w": 25, + "h": 27 + } + }, + { + "filename": "834s-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 29, + "h": 27 + }, + "frame": { + "x": 266, + "y": 83, + "w": 29, + "h": 27 + } + }, + { + "filename": "826s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 25, + "h": 27 + }, + "frame": { + "x": 295, + "y": 83, + "w": 25, + "h": 27 + } + }, + { + "filename": "884s-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 0, + "w": 27, + "h": 30 + }, + "frame": { + "x": 320, + "y": 82, + "w": 27, + "h": 30 + } + }, + { + "filename": "849", "rotated": false, "trimmed": true, "sourceSize": { @@ -2917,17 +1468,227 @@ }, "spriteSourceSize": { "x": 12, + "y": 2, + "w": 16, + "h": 25 + }, + "frame": { + "x": 439, + "y": 24, + "w": 16, + "h": 25 + } + }, + { + "filename": "870", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 3, + "w": 31, + "h": 23 + }, + "frame": { + "x": 455, + "y": 28, + "w": 31, + "h": 23 + } + }, + { + "filename": "818s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 1, + "w": 22, + "h": 27 + }, + "frame": { + "x": 486, + "y": 30, + "w": 22, + "h": 27 + } + }, + { + "filename": "826-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 3, + "w": 30, + "h": 25 + }, + "frame": { + "x": 70, + "y": 110, + "w": 30, + "h": 25 + } + }, + { + "filename": "826s-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 3, + "w": 30, + "h": 25 + }, + "frame": { + "x": 100, + "y": 111, + "w": 30, + "h": 25 + } + }, + { + "filename": "845-gulping", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 29, + "h": 27 + }, + "frame": { + "x": 130, + "y": 111, + "w": 29, + "h": 27 + } + }, + { + "filename": "887", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 2, + "w": 30, + "h": 26 + }, + "frame": { + "x": 159, + "y": 113, + "w": 30, + "h": 26 + } + }, + { + "filename": "845", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 24, + "h": 26 + }, + "frame": { + "x": 189, + "y": 113, + "w": 24, + "h": 26 + } + }, + { + "filename": "845s-gulping", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 29, + "h": 27 + }, + "frame": { + "x": 213, + "y": 111, + "w": 29, + "h": 27 + } + }, + { + "filename": "861s-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, "y": 0, - "w": 17, + "w": 26, "h": 30 }, "frame": { - "x": 157, - "y": 282, - "w": 17, + "x": 242, + "y": 111, + "w": 26, "h": 30 } }, + { + "filename": "887s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 2, + "w": 30, + "h": 26 + }, + "frame": { + "x": 268, + "y": 110, + "w": 30, + "h": 26 + } + }, { "filename": "899", "rotated": false, @@ -2943,12 +1704,1125 @@ "h": 27 }, "frame": { - "x": 156, - "y": 312, + "x": 298, + "y": 110, "w": 22, "h": 27 } }, + { + "filename": "895", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 28, + "h": 26 + }, + "frame": { + "x": 320, + "y": 112, + "w": 28, + "h": 26 + } + }, + { + "filename": "870s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 3, + "w": 31, + "h": 23 + }, + "frame": { + "x": 67, + "y": 135, + "w": 31, + "h": 23 + } + }, + { + "filename": "898-shadow", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 63, + "y": 158, + "w": 26, + "h": 30 + } + }, + { + "filename": "902-female", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 31, + "h": 22 + }, + "frame": { + "x": 98, + "y": 136, + "w": 31, + "h": 22 + } + }, + { + "filename": "898s-shadow", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 89, + "y": 158, + "w": 26, + "h": 30 + } + }, + { + "filename": "894", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 3, + "w": 30, + "h": 23 + }, + "frame": { + "x": 129, + "y": 138, + "w": 30, + "h": 23 + } + }, + { + "filename": "902s-female", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 31, + "h": 22 + }, + "frame": { + "x": 159, + "y": 139, + "w": 31, + "h": 22 + } + }, + { + "filename": "6503", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 31, + "h": 23 + }, + "frame": { + "x": 63, + "y": 188, + "w": 31, + "h": 23 + } + }, + { + "filename": "812", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 26, + "h": 24 + }, + "frame": { + "x": 190, + "y": 139, + "w": 26, + "h": 24 + } + }, + { + "filename": "842", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 216, + "y": 138, + "w": 26, + "h": 25 + } + }, + { + "filename": "812s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 26, + "h": 24 + }, + "frame": { + "x": 242, + "y": 141, + "w": 26, + "h": 24 + } + }, + { + "filename": "905-therian", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 28, + "h": 27 + }, + "frame": { + "x": 268, + "y": 136, + "w": 28, + "h": 27 + } + }, + { + "filename": "845s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 24, + "h": 26 + }, + "frame": { + "x": 296, + "y": 137, + "w": 24, + "h": 26 + } + }, + { + "filename": "895s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 28, + "h": 26 + }, + "frame": { + "x": 320, + "y": 138, + "w": 28, + "h": 26 + } + }, + { + "filename": "811s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 24 + }, + "frame": { + "x": 94, + "y": 188, + "w": 22, + "h": 24 + } + }, + { + "filename": "905s-therian", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 28, + "h": 27 + }, + "frame": { + "x": 115, + "y": 161, + "w": 28, + "h": 27 + } + }, + { + "filename": "6059", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 2, + "w": 28, + "h": 27 + }, + "frame": { + "x": 143, + "y": 161, + "w": 28, + "h": 27 + } + }, + { + "filename": "6503s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 31, + "h": 23 + }, + "frame": { + "x": 116, + "y": 188, + "w": 31, + "h": 23 + } + }, + { + "filename": "817", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 24, + "h": 24 + }, + "frame": { + "x": 147, + "y": 188, + "w": 24, + "h": 24 + } + }, + { + "filename": "869-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 0, + "w": 17, + "h": 30 + }, + "frame": { + "x": 171, + "y": 161, + "w": 17, + "h": 30 + } + }, + { + "filename": "6059s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 2, + "w": 28, + "h": 27 + }, + "frame": { + "x": 188, + "y": 163, + "w": 28, + "h": 27 + } + }, + { + "filename": "889", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 26, + "h": 27 + }, + "frame": { + "x": 216, + "y": 163, + "w": 26, + "h": 27 + } + }, + { + "filename": "842s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 242, + "y": 165, + "w": 26, + "h": 25 + } + }, + { + "filename": "889s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 26, + "h": 27 + }, + "frame": { + "x": 268, + "y": 163, + "w": 26, + "h": 27 + } + }, + { + "filename": "862", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 25, + "h": 27 + }, + "frame": { + "x": 294, + "y": 163, + "w": 25, + "h": 27 + } + }, + { + "filename": "904", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 28, + "h": 25 + }, + "frame": { + "x": 319, + "y": 164, + "w": 28, + "h": 25 + } + }, + { + "filename": "810", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 171, + "y": 191, + "w": 19, + "h": 23 + } + }, + { + "filename": "894s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 3, + "w": 30, + "h": 23 + }, + "frame": { + "x": 190, + "y": 190, + "w": 30, + "h": 23 + } + }, + { + "filename": "888", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 28, + "h": 23 + }, + "frame": { + "x": 220, + "y": 190, + "w": 28, + "h": 23 + } + }, + { + "filename": "888s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 28, + "h": 23 + }, + "frame": { + "x": 248, + "y": 190, + "w": 28, + "h": 23 + } + }, + { + "filename": "901", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 28, + "h": 23 + }, + "frame": { + "x": 276, + "y": 190, + "w": 28, + "h": 23 + } + }, + { + "filename": "810s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 304, + "y": 190, + "w": 19, + "h": 23 + } + }, + { + "filename": "817s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 24, + "h": 24 + }, + "frame": { + "x": 323, + "y": 189, + "w": 24, + "h": 24 + } + }, + { + "filename": "869s-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 0, + "w": 17, + "h": 30 + }, + "frame": { + "x": 347, + "y": 54, + "w": 17, + "h": 30 + } + }, + { + "filename": "4555", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 25, + "h": 30 + }, + "frame": { + "x": 364, + "y": 51, + "w": 25, + "h": 30 + } + }, + { + "filename": "4555s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 25, + "h": 30 + }, + "frame": { + "x": 389, + "y": 51, + "w": 25, + "h": 30 + } + }, + { + "filename": "898-ice", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 24, + "h": 29 + }, + "frame": { + "x": 414, + "y": 51, + "w": 24, + "h": 29 + } + }, + { + "filename": "4555-zen", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 25, + "h": 28 + }, + "frame": { + "x": 347, + "y": 84, + "w": 25, + "h": 28 + } + }, + { + "filename": "898s-ice", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 24, + "h": 29 + }, + "frame": { + "x": 348, + "y": 112, + "w": 24, + "h": 29 + } + }, + { + "filename": "904s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 28, + "h": 25 + }, + "frame": { + "x": 372, + "y": 81, + "w": 28, + "h": 25 + } + }, + { + "filename": "4555s-zen", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 25, + "h": 28 + }, + "frame": { + "x": 372, + "y": 106, + "w": 25, + "h": 28 + } + }, + { + "filename": "823", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 27, + "h": 24 + }, + "frame": { + "x": 348, + "y": 141, + "w": 27, + "h": 24 + } + }, + { + "filename": "862s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 25, + "h": 27 + }, + "frame": { + "x": 347, + "y": 165, + "w": 25, + "h": 27 + } + }, + { + "filename": "823s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 27, + "h": 24 + }, + "frame": { + "x": 347, + "y": 192, + "w": 27, + "h": 24 + } + }, + { + "filename": "892-gigantamax-single", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 23, + "h": 29 + }, + "frame": { + "x": 375, + "y": 134, + "w": 23, + "h": 29 + } + }, + { + "filename": "813", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 2, + "w": 17, + "h": 26 + }, + "frame": { + "x": 400, + "y": 81, + "w": 17, + "h": 26 + } + }, + { + "filename": "892s-gigantamax-single", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 23, + "h": 29 + }, + "frame": { + "x": 417, + "y": 80, + "w": 23, + "h": 29 + } + }, + { + "filename": "4199", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 1, + "w": 20, + "h": 27 + }, + "frame": { + "x": 397, + "y": 107, + "w": 20, + "h": 27 + } + }, + { + "filename": "839", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 2, + "w": 25, + "h": 25 + }, + "frame": { + "x": 417, + "y": 109, + "w": 25, + "h": 25 + } + }, + { + "filename": "828", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 27, + "h": 24 + }, + "frame": { + "x": 398, + "y": 134, + "w": 27, + "h": 24 + } + }, + { + "filename": "813s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 2, + "w": 17, + "h": 26 + }, + "frame": { + "x": 425, + "y": 134, + "w": 17, + "h": 26 + } + }, + { + "filename": "828s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 27, + "h": 24 + }, + "frame": { + "x": 438, + "y": 51, + "w": 27, + "h": 24 + } + }, + { + "filename": "903", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 1, + "w": 21, + "h": 27 + }, + "frame": { + "x": 465, + "y": 51, + "w": 21, + "h": 27 + } + }, { "filename": "899s", "rotated": false, @@ -2964,96 +2838,12 @@ "h": 27 }, "frame": { - "x": 156, - "y": 339, + "x": 486, + "y": 57, "w": 22, "h": 27 } }, - { - "filename": "888s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 28, - "h": 23 - }, - "frame": { - "x": 178, - "y": 243, - "w": 28, - "h": 23 - } - }, - { - "filename": "827", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 21 - }, - "frame": { - "x": 206, - "y": 246, - "w": 24, - "h": 21 - } - }, - { - "filename": "896", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 24, - "h": 24 - }, - "frame": { - "x": 230, - "y": 263, - "w": 24, - "h": 24 - } - }, - { - "filename": "901", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 28, - "h": 23 - }, - "frame": { - "x": 177, - "y": 266, - "w": 28, - "h": 23 - } - }, { "filename": "861", "rotated": false, @@ -3069,287 +2859,14 @@ "h": 26 }, "frame": { - "x": 205, - "y": 267, + "x": 440, + "y": 75, "w": 25, "h": 26 } }, { - "filename": "896s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 24, - "h": 24 - }, - "frame": { - "x": 230, - "y": 287, - "w": 24, - "h": 24 - } - }, - { - "filename": "901s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 28, - "h": 23 - }, - "frame": { - "x": 174, - "y": 289, - "w": 28, - "h": 23 - } - }, - { - "filename": "904", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 28, - "h": 25 - }, - "frame": { - "x": 202, - "y": 293, - "w": 28, - "h": 25 - } - }, - { - "filename": "4080", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 24, - "h": 23 - }, - "frame": { - "x": 230, - "y": 311, - "w": 24, - "h": 23 - } - }, - { - "filename": "4080s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 24, - "h": 23 - }, - "frame": { - "x": 178, - "y": 312, - "w": 24, - "h": 23 - } - }, - { - "filename": "904s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 28, - "h": 25 - }, - "frame": { - "x": 202, - "y": 318, - "w": 28, - "h": 25 - } - }, - { - "filename": "827s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 21 - }, - "frame": { - "x": 230, - "y": 334, - "w": 24, - "h": 21 - } - }, - { - "filename": "4077", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 21 - }, - "frame": { - "x": 178, - "y": 335, - "w": 24, - "h": 21 - } - }, - { - "filename": "4145", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 28, - "h": 23 - }, - "frame": { - "x": 202, - "y": 343, - "w": 28, - "h": 23 - } - }, - { - "filename": "4077s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 21 - }, - "frame": { - "x": 230, - "y": 355, - "w": 24, - "h": 21 - } - }, - { - "filename": "885", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 24, - "h": 17 - }, - "frame": { - "x": 178, - "y": 356, - "w": 24, - "h": 17 - } - }, - { - "filename": "4145s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 28, - "h": 23 - }, - "frame": { - "x": 202, - "y": 366, - "w": 28, - "h": 23 - } - }, - { - "filename": "6211", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 9, - "w": 24, - "h": 19 - }, - "frame": { - "x": 230, - "y": 376, - "w": 24, - "h": 19 - } - }, - { - "filename": "816s", + "filename": "814", "rotated": false, "trimmed": true, "sourceSize": { @@ -3359,18 +2876,18 @@ "spriteSourceSize": { "x": 9, "y": 3, - "w": 22, + "w": 21, "h": 23 }, "frame": { - "x": 135, - "y": 372, - "w": 22, + "x": 465, + "y": 78, + "w": 21, "h": 23 } }, { - "filename": "903", + "filename": "858", "rotated": false, "trimmed": true, "sourceSize": { @@ -3378,62 +2895,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 21, - "h": 27 + "x": 9, + "y": 2, + "w": 22, + "h": 25 }, "frame": { - "x": 157, - "y": 366, - "w": 21, - "h": 27 + "x": 486, + "y": 84, + "w": 22, + "h": 25 } }, { - "filename": "6211s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 9, - "w": 24, - "h": 19 - }, - "frame": { - "x": 178, - "y": 373, - "w": 24, - "h": 19 - } - }, - { - "filename": "873", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 25, - "h": 22 - }, - "frame": { - "x": 132, - "y": 395, - "w": 25, - "h": 22 - } - }, - { - "filename": "842", + "filename": "841", "rotated": false, "trimmed": true, "sourceSize": { @@ -3442,59 +2917,17 @@ }, "spriteSourceSize": { "x": 6, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 134, - "y": 417, - "w": 26, - "h": 25 - } - }, - { - "filename": "820s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, "y": 3, - "w": 23, + "w": 27, "h": 24 }, "frame": { - "x": 157, - "y": 393, - "w": 23, + "x": 442, + "y": 101, + "w": 27, "h": 24 } }, - { - "filename": "842s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 180, - "y": 392, - "w": 26, - "h": 25 - } - }, { "filename": "841s", "rotated": false, @@ -3510,14 +2943,14 @@ "h": 24 }, "frame": { - "x": 160, - "y": 417, + "x": 442, + "y": 125, "w": 27, "h": 24 } }, { - "filename": "892", + "filename": "6724", "rotated": false, "trimmed": true, "sourceSize": { @@ -3525,15 +2958,204 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, + "x": 11, + "y": 1, + "w": 17, + "h": 28 + }, + "frame": { + "x": 469, + "y": 101, + "w": 17, + "h": 28 + } + }, + { + "filename": "858s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, "y": 2, - "w": 23, + "w": 22, "h": 25 }, "frame": { - "x": 206, - "y": 389, - "w": 23, + "x": 486, + "y": 109, + "w": 22, + "h": 25 + } + }, + { + "filename": "859", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 17, + "h": 20 + }, + "frame": { + "x": 469, + "y": 129, + "w": 17, + "h": 20 + } + }, + { + "filename": "884", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 22, + "h": 25 + }, + "frame": { + "x": 486, + "y": 134, + "w": 22, + "h": 25 + } + }, + { + "filename": "901s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 28, + "h": 23 + }, + "frame": { + "x": 442, + "y": 149, + "w": 28, + "h": 23 + } + }, + { + "filename": "833", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 3, + "w": 16, + "h": 23 + }, + "frame": { + "x": 470, + "y": 149, + "w": 16, + "h": 23 + } + }, + { + "filename": "884s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 22, + "h": 25 + }, + "frame": { + "x": 486, + "y": 159, + "w": 22, + "h": 25 + } + }, + { + "filename": "847", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 27, + "h": 16 + }, + "frame": { + "x": 398, + "y": 158, + "w": 27, + "h": 16 + } + }, + { + "filename": "829", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 17, + "h": 18 + }, + "frame": { + "x": 425, + "y": 160, + "w": 17, + "h": 18 + } + }, + { + "filename": "6706", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 26, + "h": 25 + }, + "frame": { + "x": 372, + "y": 165, + "w": 26, "h": 25 } }, @@ -3552,12 +3174,117 @@ "h": 26 }, "frame": { - "x": 229, - "y": 395, + "x": 374, + "y": 190, "w": 25, "h": 26 } }, + { + "filename": "847s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 27, + "h": 16 + }, + "frame": { + "x": 398, + "y": 174, + "w": 27, + "h": 16 + } + }, + { + "filename": "6706s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 26, + "h": 25 + }, + "frame": { + "x": 399, + "y": 190, + "w": 26, + "h": 25 + } + }, + { + "filename": "6724s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 1, + "w": 17, + "h": 28 + }, + "frame": { + "x": 425, + "y": 178, + "w": 17, + "h": 28 + } + }, + { + "filename": "4145", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 28, + "h": 23 + }, + "frame": { + "x": 442, + "y": 172, + "w": 28, + "h": 23 + } + }, + { + "filename": "833s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 3, + "w": 16, + "h": 23 + }, + "frame": { + "x": 470, + "y": 172, + "w": 16, + "h": 23 + } + }, { "filename": "838", "rotated": false, @@ -3573,14 +3300,14 @@ "h": 24 }, "frame": { - "x": 187, - "y": 417, + "x": 486, + "y": 184, "w": 22, "h": 24 } }, { - "filename": "4199", + "filename": "4145s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3588,20 +3315,83 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 20, - "h": 27 + "x": 6, + "y": 3, + "w": 28, + "h": 23 }, "frame": { - "x": 209, - "y": 414, - "w": 20, - "h": 27 + "x": 442, + "y": 195, + "w": 28, + "h": 23 } }, { - "filename": "900", + "filename": "849s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 2, + "w": 16, + "h": 25 + }, + "frame": { + "x": 470, + "y": 195, + "w": 16, + "h": 25 + } + }, + { + "filename": "838s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 24 + }, + "frame": { + "x": 486, + "y": 208, + "w": 22, + "h": 24 + } + }, + { + "filename": "829s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 17, + "h": 18 + }, + "frame": { + "x": 425, + "y": 206, + "w": 17, + "h": 18 + } + }, + { + "filename": "880", "rotated": false, "trimmed": true, "sourceSize": { @@ -3610,15 +3400,204 @@ }, "spriteSourceSize": { "x": 7, - "y": 3, - "w": 25, - "h": 25 + "y": 4, + "w": 26, + "h": 22 }, "frame": { - "x": 229, - "y": 421, - "w": 25, - "h": 25 + "x": 399, + "y": 215, + "w": 26, + "h": 22 + } + }, + { + "filename": "4146", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 28, + "h": 18 + }, + "frame": { + "x": 442, + "y": 218, + "w": 28, + "h": 18 + } + }, + { + "filename": "868", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 16, + "h": 17 + }, + "frame": { + "x": 470, + "y": 220, + "w": 16, + "h": 17 + } + }, + { + "filename": "816", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 23 + }, + "frame": { + "x": 486, + "y": 232, + "w": 22, + "h": 23 + } + }, + { + "filename": "854", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 14 + }, + "frame": { + "x": 425, + "y": 224, + "w": 17, + "h": 14 + } + }, + { + "filename": "4146s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 28, + "h": 18 + }, + "frame": { + "x": 442, + "y": 236, + "w": 28, + "h": 18 + } + }, + { + "filename": "6549", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 5, + "w": 16, + "h": 23 + }, + "frame": { + "x": 470, + "y": 237, + "w": 16, + "h": 23 + } + }, + { + "filename": "816s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 23 + }, + "frame": { + "x": 486, + "y": 255, + "w": 22, + "h": 23 + } + }, + { + "filename": "815", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 0, + "w": 15, + "h": 29 + }, + "frame": { + "x": 30, + "y": 204, + "w": 15, + "h": 29 + } + }, + { + "filename": "881", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 18, + "h": 23 + }, + "frame": { + "x": 45, + "y": 203, + "w": 18, + "h": 23 } }, { @@ -3636,14 +3615,14 @@ "h": 29 }, "frame": { - "x": 31, - "y": 706, + "x": 30, + "y": 233, "w": 15, "h": 29 } }, { - "filename": "849", + "filename": "903s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3651,16 +3630,58 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 16, - "h": 25 + "x": 10, + "y": 1, + "w": 21, + "h": 27 }, "frame": { - "x": 31, - "y": 735, - "w": 16, - "h": 25 + "x": 45, + "y": 226, + "w": 21, + "h": 27 + } + }, + { + "filename": "846", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 25, + "h": 15 + }, + "frame": { + "x": 63, + "y": 211, + "w": 25, + "h": 15 + } + }, + { + "filename": "6157", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 1, + "w": 24, + "h": 27 + }, + "frame": { + "x": 66, + "y": 226, + "w": 24, + "h": 27 } }, { @@ -3679,13 +3700,13 @@ }, "frame": { "x": 30, - "y": 760, + "y": 262, "w": 17, "h": 27 } }, { - "filename": "850", + "filename": "875s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3693,309 +3714,15 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 21, - "h": 10 - }, - "frame": { - "x": 0, - "y": 787, - "w": 21, - "h": 10 - } - }, - { - "filename": "850s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 21, - "h": 10 - }, - "frame": { - "x": 21, - "y": 787, - "w": 21, - "h": 10 - } - }, - { - "filename": "4146", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 28, - "h": 18 - }, - "frame": { - "x": 56, - "y": 442, - "w": 28, - "h": 18 - } - }, - { - "filename": "4146s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 28, - "h": 18 - }, - "frame": { - "x": 84, - "y": 442, - "w": 28, - "h": 18 - } - }, - { - "filename": "4078", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 27, - "h": 23 - }, - "frame": { - "x": 112, - "y": 442, - "w": 27, - "h": 23 - } - }, - { - "filename": "838s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 24 - }, - "frame": { - "x": 139, - "y": 442, - "w": 22, - "h": 24 - } - }, - { - "filename": "6706", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 26, - "h": 25 - }, - "frame": { - "x": 161, - "y": 441, - "w": 26, - "h": 25 - } - }, - { - "filename": "6706s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 26, - "h": 25 - }, - "frame": { - "x": 187, - "y": 441, - "w": 26, - "h": 25 - } - }, - { - "filename": "849s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 16, - "h": 25 - }, - "frame": { - "x": 213, - "y": 441, - "w": 16, - "h": 25 - } - }, - { - "filename": "900s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 25, - "h": 25 - }, - "frame": { - "x": 229, - "y": 446, - "w": 25, - "h": 25 - } - }, - { - "filename": "880", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 26, - "h": 22 - }, - "frame": { - "x": 30, - "y": 443, - "w": 26, - "h": 22 - } - }, - { - "filename": "886", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 26, - "h": 24 - }, - "frame": { - "x": 29, - "y": 465, - "w": 26, - "h": 24 - } - }, - { - "filename": "886s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 26, - "h": 24 - }, - "frame": { - "x": 29, - "y": 489, - "w": 26, - "h": 24 - } - }, - { - "filename": "897", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 26, - "h": 24 - }, - "frame": { - "x": 29, - "y": 513, - "w": 26, - "h": 24 - } - }, - { - "filename": "903s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, + "x": 11, "y": 1, - "w": 21, + "w": 17, "h": 27 }, "frame": { - "x": 29, - "y": 537, - "w": 21, + "x": 30, + "y": 289, + "w": 17, "h": 27 } }, @@ -4014,14 +3741,14 @@ "h": 27 }, "frame": { - "x": 32, - "y": 564, + "x": 30, + "y": 316, "w": 20, "h": 27 } }, { - "filename": "858", + "filename": "6157s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4030,82 +3757,19 @@ }, "spriteSourceSize": { "x": 9, - "y": 2, - "w": 22, - "h": 25 - }, - "frame": { - "x": 32, - "y": 591, - "w": 22, - "h": 25 - } - }, - { - "filename": "858s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 22, - "h": 25 - }, - "frame": { - "x": 32, - "y": 616, - "w": 22, - "h": 25 - } - }, - { - "filename": "884", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 22, - "h": 25 - }, - "frame": { - "x": 32, - "y": 641, - "w": 22, - "h": 25 - } - }, - { - "filename": "875s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, "y": 1, - "w": 17, + "w": 24, "h": 27 }, "frame": { - "x": 50, - "y": 537, - "w": 17, + "x": 30, + "y": 343, + "w": 24, "h": 27 } }, { - "filename": "884s", + "filename": "4263", "rotated": false, "trimmed": true, "sourceSize": { @@ -4114,15 +3778,162 @@ }, "spriteSourceSize": { "x": 9, - "y": 2, + "y": 7, "w": 22, + "h": 16 + }, + "frame": { + "x": 30, + "y": 370, + "w": 22, + "h": 16 + } + }, + { + "filename": "839s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 2, + "w": 25, "h": 25 }, + "frame": { + "x": 47, + "y": 253, + "w": 25, + "h": 25 + } + }, + { + "filename": "892-gigantamax-rapid", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 24, + "h": 26 + }, + "frame": { + "x": 47, + "y": 278, + "w": 24, + "h": 26 + } + }, + { + "filename": "892", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 23, + "h": 25 + }, + "frame": { + "x": 72, + "y": 253, + "w": 23, + "h": 25 + } + }, + { + "filename": "892s-gigantamax-rapid", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 24, + "h": 26 + }, + "frame": { + "x": 71, + "y": 278, + "w": 24, + "h": 26 + } + }, + { + "filename": "4263s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 22, + "h": 16 + }, "frame": { "x": 52, - "y": 564, + "y": 370, "w": 22, - "h": 25 + "h": 16 + } + }, + { + "filename": "886", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 26, + "h": 24 + }, + "frame": { + "x": 50, + "y": 304, + "w": 26, + "h": 24 + } + }, + { + "filename": "846s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 25, + "h": 15 + }, + "frame": { + "x": 50, + "y": 328, + "w": 25, + "h": 15 } }, { @@ -4141,11 +3952,179 @@ }, "frame": { "x": 54, - "y": 589, + "y": 343, "w": 23, "h": 25 } }, + { + "filename": "820", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 23, + "h": 24 + }, + "frame": { + "x": 76, + "y": 304, + "w": 23, + "h": 24 + } + }, + { + "filename": "4618", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 22, + "h": 18 + }, + "frame": { + "x": 74, + "y": 368, + "w": 22, + "h": 18 + } + }, + { + "filename": "4079", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 8, + "w": 26, + "h": 14 + }, + "frame": { + "x": 75, + "y": 328, + "w": 26, + "h": 14 + } + }, + { + "filename": "900", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 25, + "h": 25 + }, + "frame": { + "x": 77, + "y": 342, + "w": 25, + "h": 25 + } + }, + { + "filename": "844", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 25, + "h": 19 + }, + "frame": { + "x": 96, + "y": 367, + "w": 25, + "h": 19 + } + }, + { + "filename": "4079s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 14, + "w": 26, + "h": 14 + }, + "frame": { + "x": 88, + "y": 212, + "w": 26, + "h": 14 + } + }, + { + "filename": "900s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 25, + "h": 25 + }, + "frame": { + "x": 90, + "y": 226, + "w": 25, + "h": 25 + } + }, + { + "filename": "820s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 23, + "h": 24 + }, + "frame": { + "x": 95, + "y": 251, + "w": 23, + "h": 24 + } + }, { "filename": "866", "rotated": false, @@ -4161,12 +4140,54 @@ "h": 24 }, "frame": { - "x": 54, - "y": 614, + "x": 95, + "y": 275, "w": 23, "h": 24 } }, + { + "filename": "863", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 20, + "h": 24 + }, + "frame": { + "x": 99, + "y": 299, + "w": 20, + "h": 24 + } + }, + { + "filename": "822", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 19 + }, + "frame": { + "x": 101, + "y": 323, + "w": 22, + "h": 19 + } + }, { "filename": "866s", "rotated": false, @@ -4182,140 +4203,14 @@ "h": 24 }, "frame": { - "x": 54, - "y": 638, + "x": 102, + "y": 342, "w": 23, "h": 24 } }, { - "filename": "897s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 26, - "h": 24 - }, - "frame": { - "x": 33, - "y": 666, - "w": 26, - "h": 24 - } - }, - { - "filename": "847", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 27, - "h": 16 - }, - "frame": { - "x": 33, - "y": 690, - "w": 27, - "h": 16 - } - }, - { - "filename": "6724", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 1, - "w": 17, - "h": 28 - }, - "frame": { - "x": 46, - "y": 706, - "w": 17, - "h": 28 - } - }, - { - "filename": "6724s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 1, - "w": 17, - "h": 28 - }, - "frame": { - "x": 47, - "y": 734, - "w": 17, - "h": 28 - } - }, - { - "filename": "863s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 20, - "h": 24 - }, - "frame": { - "x": 47, - "y": 762, - "w": 20, - "h": 24 - } - }, - { - "filename": "810s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 59, - "y": 662, - "w": 19, - "h": 23 - } - }, - { - "filename": "819", + "filename": "835", "rotated": false, "trimmed": true, "sourceSize": { @@ -4324,61 +4219,19 @@ }, "spriteSourceSize": { "x": 9, - "y": 4, + "y": 5, "w": 22, - "h": 21 + "h": 20 }, "frame": { - "x": 60, - "y": 685, + "x": 121, + "y": 366, "w": 22, - "h": 21 + "h": 20 } }, { - "filename": "830", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 63, - "y": 706, - "w": 19, - "h": 23 - } - }, - { - "filename": "830s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 64, - "y": 729, - "w": 19, - "h": 23 - } - }, - { - "filename": "847s", + "filename": "4078", "rotated": false, "trimmed": true, "sourceSize": { @@ -4387,15 +4240,15 @@ }, "spriteSourceSize": { "x": 6, - "y": 7, + "y": 3, "w": 27, - "h": 16 + "h": 23 }, "frame": { - "x": 56, - "y": 460, + "x": 190, + "y": 213, "w": 27, - "h": 16 + "h": 23 } }, { @@ -4413,8 +4266,8 @@ "h": 23 }, "frame": { - "x": 55, - "y": 476, + "x": 217, + "y": 213, "w": 27, "h": 23 } @@ -4434,33 +4287,12 @@ "h": 23 }, "frame": { - "x": 55, - "y": 499, + "x": 244, + "y": 213, "w": 27, "h": 23 } }, - { - "filename": "846", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 25, - "h": 15 - }, - "frame": { - "x": 55, - "y": 522, - "w": 25, - "h": 15 - } - }, { "filename": "6713s", "rotated": false, @@ -4476,14 +4308,14 @@ "h": 23 }, "frame": { - "x": 83, - "y": 460, + "x": 271, + "y": 213, "w": 27, "h": 23 } }, { - "filename": "879", + "filename": "886s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4493,13 +4325,34 @@ "spriteSourceSize": { "x": 7, "y": 3, - "w": 25, + "w": 26, + "h": 24 + }, + "frame": { + "x": 298, + "y": 213, + "w": 26, + "h": 24 + } + }, + { + "filename": "853", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 23, "h": 23 }, "frame": { - "x": 82, - "y": 483, - "w": 25, + "x": 324, + "y": 213, + "w": 23, "h": 23 } }, @@ -4518,8 +4371,8 @@ "h": 22 }, "frame": { - "x": 110, - "y": 465, + "x": 347, + "y": 216, "w": 26, "h": 22 } @@ -4539,8 +4392,8 @@ "h": 22 }, "frame": { - "x": 136, - "y": 466, + "x": 373, + "y": 216, "w": 26, "h": 22 } @@ -4560,14 +4413,14 @@ "h": 22 }, "frame": { - "x": 162, - "y": 466, + "x": 399, + "y": 237, "w": 26, "h": 22 } }, { - "filename": "873s", + "filename": "877", "rotated": false, "trimmed": true, "sourceSize": { @@ -4575,314 +4428,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, + "x": 11, "y": 4, - "w": 25, - "h": 22 - }, - "frame": { - "x": 188, - "y": 466, - "w": 25, - "h": 22 - } - }, - { - "filename": "833", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 16, - "h": 23 - }, - "frame": { - "x": 213, - "y": 466, - "w": 16, - "h": 23 - } - }, - { - "filename": "879s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 25, - "h": 23 - }, - "frame": { - "x": 229, - "y": 471, - "w": 25, - "h": 23 - } - }, - { - "filename": "844", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 25, - "h": 19 - }, - "frame": { - "x": 82, - "y": 506, - "w": 25, - "h": 19 - } - }, - { - "filename": "6571", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 25, - "h": 23 - }, - "frame": { - "x": 107, - "y": 487, - "w": 25, - "h": 23 - } - }, - { - "filename": "878", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 25, - "h": 22 - }, - "frame": { - "x": 132, - "y": 488, - "w": 25, - "h": 22 - } - }, - { - "filename": "878s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 25, - "h": 22 - }, - "frame": { - "x": 157, - "y": 488, - "w": 25, - "h": 22 - } - }, - { - "filename": "6571s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 25, - "h": 23 - }, - "frame": { - "x": 182, - "y": 488, - "w": 25, - "h": 23 - } - }, - { - "filename": "832", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 22, - "h": 22 - }, - "frame": { - "x": 207, - "y": 489, - "w": 22, - "h": 22 - } - }, - { - "filename": "844s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 25, - "h": 19 - }, - "frame": { - "x": 229, - "y": 494, - "w": 25, - "h": 19 - } - }, - { - "filename": "846s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 25, - "h": 15 - }, - "frame": { - "x": 107, - "y": 510, - "w": 25, - "h": 15 - } - }, - { - "filename": "4079", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 8, - "w": 26, - "h": 14 - }, - "frame": { - "x": 132, - "y": 510, - "w": 26, - "h": 14 - } - }, - { - "filename": "885s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 24, - "h": 17 - }, - "frame": { - "x": 158, - "y": 510, - "w": 24, - "h": 17 - } - }, - { - "filename": "6628", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 10, - "w": 25, - "h": 19 - }, - "frame": { - "x": 182, - "y": 511, - "w": 25, - "h": 19 - } - }, - { - "filename": "819s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 22, + "w": 17, "h": 21 }, "frame": { - "x": 207, - "y": 511, - "w": 22, + "x": 425, + "y": 238, + "w": 17, "h": 21 } }, { - "filename": "6628s", + "filename": "897", "rotated": false, "trimmed": true, "sourceSize": { @@ -4891,103 +4450,19 @@ }, "spriteSourceSize": { "x": 7, - "y": 10, - "w": 25, - "h": 19 - }, - "frame": { - "x": 229, - "y": 513, - "w": 25, - "h": 19 - } - }, - { - "filename": "833s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, "y": 3, - "w": 16, - "h": 23 - }, - "frame": { - "x": 67, - "y": 537, - "w": 16, - "h": 23 - } - }, - { - "filename": "853", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 23, - "h": 23 - }, - "frame": { - "x": 83, - "y": 525, - "w": 23, - "h": 23 - } - }, - { - "filename": "853s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 23, - "h": 23 - }, - "frame": { - "x": 106, - "y": 525, - "w": 23, - "h": 23 - } - }, - { - "filename": "4079s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 14, "w": 26, - "h": 14 + "h": 24 }, "frame": { - "x": 83, - "y": 548, + "x": 442, + "y": 254, "w": 26, - "h": 14 + "h": 24 } }, { - "filename": "822", + "filename": "843", "rotated": false, "trimmed": true, "sourceSize": { @@ -4995,15 +4470,15 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, + "x": 11, "y": 5, - "w": 22, + "w": 18, "h": 19 }, "frame": { - "x": 109, - "y": 548, - "w": 22, + "x": 468, + "y": 260, + "w": 18, "h": 19 } }, @@ -5022,14 +4497,266 @@ "h": 23 }, "frame": { - "x": 74, - "y": 562, + "x": 486, + "y": 278, "w": 22, "h": 23 } }, { - "filename": "855s", + "filename": "897s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 26, + "h": 24 + }, + "frame": { + "x": 116, + "y": 211, + "w": 26, + "h": 24 + } + }, + { + "filename": "879", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 25, + "h": 23 + }, + "frame": { + "x": 142, + "y": 212, + "w": 25, + "h": 23 + } + }, + { + "filename": "853s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 23, + "h": 23 + }, + "frame": { + "x": 167, + "y": 214, + "w": 23, + "h": 23 + } + }, + { + "filename": "4562", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 22, + "h": 16 + }, + "frame": { + "x": 115, + "y": 235, + "w": 22, + "h": 16 + } + }, + { + "filename": "863s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 20, + "h": 24 + }, + "frame": { + "x": 118, + "y": 251, + "w": 20, + "h": 24 + } + }, + { + "filename": "896", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 24, + "h": 24 + }, + "frame": { + "x": 118, + "y": 275, + "w": 24, + "h": 24 + } + }, + { + "filename": "896s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 24, + "h": 24 + }, + "frame": { + "x": 119, + "y": 299, + "w": 24, + "h": 24 + } + }, + { + "filename": "822s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 19 + }, + "frame": { + "x": 123, + "y": 323, + "w": 22, + "h": 19 + } + }, + { + "filename": "876", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 24 + }, + "frame": { + "x": 125, + "y": 342, + "w": 19, + "h": 24 + } + }, + { + "filename": "835s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 20 + }, + "frame": { + "x": 143, + "y": 366, + "w": 22, + "h": 20 + } + }, + { + "filename": "876s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 24 + }, + "frame": { + "x": 144, + "y": 342, + "w": 19, + "h": 24 + } + }, + { + "filename": "4562s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 22, + "h": 16 + }, + "frame": { + "x": 137, + "y": 235, + "w": 22, + "h": 16 + } + }, + { + "filename": "814s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5039,18 +4766,81 @@ "spriteSourceSize": { "x": 9, "y": 3, - "w": 22, + "w": 21, "h": 23 }, "frame": { - "x": 77, - "y": 585, - "w": 22, + "x": 138, + "y": 251, + "w": 21, "h": 23 } }, { - "filename": "860", + "filename": "879s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 25, + "h": 23 + }, + "frame": { + "x": 159, + "y": 237, + "w": 25, + "h": 23 + } + }, + { + "filename": "830", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 142, + "y": 274, + "w": 19, + "h": 23 + } + }, + { + "filename": "830s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 143, + "y": 297, + "w": 19, + "h": 23 + } + }, + { + "filename": "832", "rotated": false, "trimmed": true, "sourceSize": { @@ -5059,19 +4849,19 @@ }, "spriteSourceSize": { "x": 9, - "y": 3, + "y": 4, "w": 22, - "h": 23 + "h": 22 }, "frame": { - "x": 77, - "y": 608, + "x": 145, + "y": 320, "w": 22, - "h": 23 + "h": 22 } }, { - "filename": "860s", + "filename": "854s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5079,268 +4869,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 23 + "x": 11, + "y": 8, + "w": 17, + "h": 14 }, "frame": { - "x": 77, - "y": 631, - "w": 22, - "h": 23 - } - }, - { - "filename": "876-female", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 23 - }, - "frame": { - "x": 78, - "y": 654, - "w": 22, - "h": 23 - } - }, - { - "filename": "856", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 82, - "y": 677, - "w": 19, - "h": 23 - } - }, - { - "filename": "856s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 82, - "y": 700, - "w": 19, - "h": 23 - } - }, - { - "filename": "869-caramel-swirl", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 83, - "y": 723, - "w": 19, - "h": 23 - } - }, - { - "filename": "4618", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 18 - }, - "frame": { - "x": 96, - "y": 567, - "w": 22, - "h": 18 - } - }, - { - "filename": "869-lemon-cream", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 99, - "y": 585, - "w": 19, - "h": 23 - } - }, - { - "filename": "869-matcha-cream", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 99, - "y": 608, - "w": 19, - "h": 23 - } - }, - { - "filename": "869-mint-cream", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 99, - "y": 631, - "w": 19, - "h": 23 - } - }, - { - "filename": "869-rainbow-swirl", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 100, - "y": 654, - "w": 19, - "h": 23 - } - }, - { - "filename": "869-ruby-cream", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 101, - "y": 677, - "w": 19, - "h": 23 - } - }, - { - "filename": "869-ruby-swirl", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 101, - "y": 700, - "w": 19, - "h": 23 - } - }, - { - "filename": "869-salted-cream", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 102, - "y": 723, - "w": 19, - "h": 23 + "x": 159, + "y": 260, + "w": 17, + "h": 14 } }, { @@ -5358,8 +4896,8 @@ "h": 23 }, "frame": { - "x": 118, - "y": 567, + "x": 161, + "y": 274, "w": 15, "h": 23 } @@ -5379,14 +4917,14 @@ "h": 23 }, "frame": { - "x": 118, - "y": 590, + "x": 162, + "y": 297, "w": 15, "h": 23 } }, { - "filename": "869", + "filename": "832s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5394,20 +4932,62 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, + "x": 9, + "y": 4, + "w": 22, + "h": 22 + }, + "frame": { + "x": 167, + "y": 320, + "w": 22, + "h": 22 + } + }, + { + "filename": "6571", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 25, "h": 23 }, "frame": { - "x": 118, - "y": 613, - "w": 19, + "x": 163, + "y": 342, + "w": 25, "h": 23 } }, { - "filename": "825", + "filename": "827", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 21 + }, + "frame": { + "x": 165, + "y": 365, + "w": 24, + "h": 21 + } + }, + { + "filename": "831", "rotated": false, "trimmed": true, "sourceSize": { @@ -5416,19 +4996,61 @@ }, "spriteSourceSize": { "x": 10, + "y": 5, + "w": 20, + "h": 19 + }, + "frame": { + "x": 177, + "y": 301, + "w": 20, + "h": 19 + } + }, + { + "filename": "855s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 23 + }, + "frame": { + "x": 176, + "y": 260, + "w": 22, + "h": 23 + } + }, + { + "filename": "4618s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, "y": 6, - "w": 20, + "w": 22, "h": 18 }, "frame": { - "x": 118, - "y": 636, - "w": 20, + "x": 177, + "y": 283, + "w": 22, "h": 18 } }, { - "filename": "869s-caramel-swirl", + "filename": "856", "rotated": false, "trimmed": true, "sourceSize": { @@ -5442,14 +5064,77 @@ "h": 23 }, "frame": { - "x": 119, - "y": 654, + "x": 184, + "y": 237, "w": 19, "h": 23 } }, { - "filename": "869s-lemon-cream", + "filename": "6571s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 25, + "h": 23 + }, + "frame": { + "x": 203, + "y": 236, + "w": 25, + "h": 23 + } + }, + { + "filename": "873", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 25, + "h": 22 + }, + "frame": { + "x": 228, + "y": 236, + "w": 25, + "h": 22 + } + }, + { + "filename": "873s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 25, + "h": 22 + }, + "frame": { + "x": 253, + "y": 236, + "w": 25, + "h": 22 + } + }, + { + "filename": "856s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5463,14 +5148,14 @@ "h": 23 }, "frame": { - "x": 120, - "y": 677, + "x": 278, + "y": 236, "w": 19, "h": 23 } }, { - "filename": "869s-matcha-cream", + "filename": "878", "rotated": false, "trimmed": true, "sourceSize": { @@ -5478,20 +5163,83 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, + "x": 7, + "y": 4, + "w": 25, + "h": 22 + }, + "frame": { + "x": 297, + "y": 237, + "w": 25, + "h": 22 + } + }, + { + "filename": "836", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 22, + "h": 22 + }, + "frame": { + "x": 189, + "y": 320, + "w": 22, + "h": 22 + } + }, + { + "filename": "4080", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, "y": 3, - "w": 19, + "w": 24, "h": 23 }, "frame": { - "x": 120, - "y": 700, - "w": 19, + "x": 188, + "y": 342, + "w": 24, "h": 23 } }, { - "filename": "869s-mint-cream", + "filename": "827s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 21 + }, + "frame": { + "x": 189, + "y": 365, + "w": 24, + "h": 21 + } + }, + { + "filename": "831s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5500,19 +5248,292 @@ }, "spriteSourceSize": { "x": 10, + "y": 5, + "w": 20, + "h": 19 + }, + "frame": { + "x": 197, + "y": 301, + "w": 20, + "h": 19 + } + }, + { + "filename": "836s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 22, + "h": 22 + }, + "frame": { + "x": 199, + "y": 279, + "w": 22, + "h": 22 + } + }, + { + "filename": "844s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 25, + "h": 19 + }, + "frame": { + "x": 198, + "y": 260, + "w": 25, + "h": 19 + } + }, + { + "filename": "857", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 22, + "h": 22 + }, + "frame": { + "x": 211, + "y": 320, + "w": 22, + "h": 22 + } + }, + { + "filename": "860", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, "y": 3, - "w": 19, + "w": 22, "h": 23 }, "frame": { - "x": 121, - "y": 723, - "w": 19, + "x": 212, + "y": 342, + "w": 22, "h": 23 } }, { - "filename": "869s-rainbow-swirl", + "filename": "4077", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 21 + }, + "frame": { + "x": 213, + "y": 365, + "w": 24, + "h": 21 + } + }, + { + "filename": "843s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 18, + "h": 19 + }, + "frame": { + "x": 217, + "y": 301, + "w": 18, + "h": 19 + } + }, + { + "filename": "857s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 22, + "h": 22 + }, + "frame": { + "x": 221, + "y": 279, + "w": 22, + "h": 22 + } + }, + { + "filename": "4222", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 21, + "h": 20 + }, + "frame": { + "x": 223, + "y": 259, + "w": 21, + "h": 20 + } + }, + { + "filename": "878s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 25, + "h": 22 + }, + "frame": { + "x": 244, + "y": 258, + "w": 25, + "h": 22 + } + }, + { + "filename": "4077s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 21 + }, + "frame": { + "x": 243, + "y": 280, + "w": 24, + "h": 21 + } + }, + { + "filename": "6628", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 10, + "w": 25, + "h": 19 + }, + "frame": { + "x": 235, + "y": 301, + "w": 25, + "h": 19 + } + }, + { + "filename": "883", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 23, + "h": 21 + }, + "frame": { + "x": 233, + "y": 320, + "w": 23, + "h": 21 + } + }, + { + "filename": "860s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 23 + }, + "frame": { + "x": 234, + "y": 341, + "w": 22, + "h": 23 + } + }, + { + "filename": "898", "rotated": false, "trimmed": true, "sourceSize": { @@ -5521,17 +5542,101 @@ }, "spriteSourceSize": { "x": 10, - "y": 3, + "y": 4, "w": 19, + "h": 22 + }, + "frame": { + "x": 237, + "y": 364, + "w": 19, + "h": 22 + } + }, + { + "filename": "4080s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 24, "h": 23 }, "frame": { - "x": 67, - "y": 752, - "w": 19, + "x": 269, + "y": 259, + "w": 24, "h": 23 } }, + { + "filename": "876-female", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 23 + }, + "frame": { + "x": 293, + "y": 259, + "w": 22, + "h": 23 + } + }, + { + "filename": "6628s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 10, + "w": 25, + "h": 19 + }, + "frame": { + "x": 267, + "y": 282, + "w": 25, + "h": 19 + } + }, + { + "filename": "6211", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 9, + "w": 24, + "h": 19 + }, + "frame": { + "x": 260, + "y": 301, + "w": 24, + "h": 19 + } + }, { "filename": "876s-female", "rotated": false, @@ -5547,8 +5652,8 @@ "h": 23 }, "frame": { - "x": 67, - "y": 775, + "x": 256, + "y": 320, "w": 22, "h": 23 } @@ -5568,12 +5673,75 @@ "h": 23 }, "frame": { - "x": 86, - "y": 746, + "x": 256, + "y": 343, "w": 22, "h": 23 } }, + { + "filename": "4264", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 20 + }, + "frame": { + "x": 256, + "y": 366, + "w": 22, + "h": 20 + } + }, + { + "filename": "883s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 23, + "h": 21 + }, + "frame": { + "x": 292, + "y": 282, + "w": 23, + "h": 21 + } + }, + { + "filename": "885", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 24, + "h": 17 + }, + "frame": { + "x": 284, + "y": 303, + "w": 24, + "h": 17 + } + }, { "filename": "882s", "rotated": false, @@ -5589,14 +5757,14 @@ "h": 23 }, "frame": { - "x": 108, - "y": 746, + "x": 278, + "y": 320, "w": 22, "h": 23 } }, { - "filename": "832s", + "filename": "819", "rotated": false, "trimmed": true, "sourceSize": { @@ -5607,17 +5775,17 @@ "x": 9, "y": 4, "w": 22, - "h": 22 + "h": 21 }, "frame": { - "x": 89, - "y": 769, + "x": 278, + "y": 343, "w": 22, - "h": 22 + "h": 21 } }, { - "filename": "836", + "filename": "898s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5625,20 +5793,41 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, + "x": 10, "y": 4, - "w": 22, + "w": 19, "h": 22 }, "frame": { - "x": 111, - "y": 769, - "w": 22, + "x": 278, + "y": 364, + "w": 19, "h": 22 } }, { - "filename": "869s-ruby-cream", + "filename": "891", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 18, + "h": 22 + }, + "frame": { + "x": 297, + "y": 364, + "w": 18, + "h": 22 + } + }, + { + "filename": "869", "rotated": false, "trimmed": true, "sourceSize": { @@ -5652,14 +5841,14 @@ "h": 23 }, "frame": { - "x": 130, - "y": 746, + "x": 300, + "y": 320, "w": 19, "h": 23 } }, { - "filename": "836s", + "filename": "819s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5670,17 +5859,59 @@ "x": 9, "y": 4, "w": 22, + "h": 21 + }, + "frame": { + "x": 300, + "y": 343, + "w": 22, + "h": 21 + } + }, + { + "filename": "891s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 18, "h": 22 }, "frame": { - "x": 133, - "y": 769, - "w": 22, + "x": 315, + "y": 364, + "w": 18, "h": 22 } }, { - "filename": "869s-ruby-swirl", + "filename": "837", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 20, + "h": 17 + }, + "frame": { + "x": 308, + "y": 303, + "w": 20, + "h": 17 + } + }, + { + "filename": "869-caramel-swirl", "rotated": false, "trimmed": true, "sourceSize": { @@ -5694,14 +5925,77 @@ "h": 23 }, "frame": { - "x": 129, - "y": 525, + "x": 319, + "y": 320, "w": 19, "h": 23 } }, { - "filename": "822s", + "filename": "848", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 18, + "h": 21 + }, + "frame": { + "x": 322, + "y": 343, + "w": 18, + "h": 21 + } + }, + { + "filename": "6570", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 18, + "h": 22 + }, + "frame": { + "x": 333, + "y": 364, + "w": 18, + "h": 22 + } + }, + { + "filename": "869-lemon-cream", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 315, + "y": 259, + "w": 19, + "h": 23 + } + }, + { + "filename": "4052", "rotated": false, "trimmed": true, "sourceSize": { @@ -5710,19 +6004,61 @@ }, "spriteSourceSize": { "x": 9, - "y": 5, - "w": 22, + "y": 4, + "w": 21, + "h": 21 + }, + "frame": { + "x": 315, + "y": 282, + "w": 21, + "h": 21 + } + }, + { + "filename": "6570s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 18, + "h": 22 + }, + "frame": { + "x": 322, + "y": 237, + "w": 18, + "h": 22 + } + }, + { + "filename": "6211s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 9, + "w": 24, "h": 19 }, "frame": { - "x": 131, - "y": 548, - "w": 22, + "x": 340, + "y": 238, + "w": 24, "h": 19 } }, { - "filename": "857", + "filename": "885s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5730,20 +6066,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 22, - "h": 22 + "x": 8, + "y": 6, + "w": 24, + "h": 17 }, "frame": { - "x": 133, - "y": 567, - "w": 22, - "h": 22 + "x": 364, + "y": 238, + "w": 24, + "h": 17 } }, { - "filename": "857s", + "filename": "837s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5751,20 +6087,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 22, - "h": 22 + "x": 10, + "y": 6, + "w": 20, + "h": 17 }, "frame": { - "x": 133, - "y": 589, - "w": 22, - "h": 22 + "x": 328, + "y": 303, + "w": 20, + "h": 17 } }, { - "filename": "869s-salted-cream", + "filename": "869-matcha-cream", "rotated": false, "trimmed": true, "sourceSize": { @@ -5778,8 +6114,197 @@ "h": 23 }, "frame": { - "x": 137, - "y": 611, + "x": 338, + "y": 320, + "w": 19, + "h": 23 + } + }, + { + "filename": "848s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 18, + "h": 21 + }, + "frame": { + "x": 340, + "y": 343, + "w": 18, + "h": 21 + } + }, + { + "filename": "6705", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 6, + "w": 15, + "h": 22 + }, + "frame": { + "x": 351, + "y": 364, + "w": 15, + "h": 22 + } + }, + { + "filename": "869-mint-cream", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 334, + "y": 259, + "w": 19, + "h": 23 + } + }, + { + "filename": "877-hangry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 17, + "h": 21 + }, + "frame": { + "x": 336, + "y": 282, + "w": 17, + "h": 21 + } + }, + { + "filename": "869-rainbow-swirl", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 353, + "y": 257, + "w": 19, + "h": 23 + } + }, + { + "filename": "869-ruby-cream", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 353, + "y": 280, + "w": 19, + "h": 23 + } + }, + { + "filename": "852", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 17 + }, + "frame": { + "x": 348, + "y": 303, + "w": 19, + "h": 17 + } + }, + { + "filename": "869-ruby-swirl", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 372, + "y": 255, + "w": 19, + "h": 23 + } + }, + { + "filename": "869-salted-cream", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 372, + "y": 278, "w": 19, "h": 23 } @@ -5799,119 +6324,14 @@ "h": 23 }, "frame": { - "x": 138, - "y": 634, + "x": 357, + "y": 320, "w": 19, "h": 23 } }, { - "filename": "835", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 20 - }, - "frame": { - "x": 138, - "y": 657, - "w": 22, - "h": 20 - } - }, - { - "filename": "883", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 23, - "h": 21 - }, - "frame": { - "x": 139, - "y": 677, - "w": 23, - "h": 21 - } - }, - { - "filename": "883s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 23, - "h": 21 - }, - "frame": { - "x": 139, - "y": 698, - "w": 23, - "h": 21 - } - }, - { - "filename": "835s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 20 - }, - "frame": { - "x": 140, - "y": 719, - "w": 22, - "h": 20 - } - }, - { - "filename": "4052", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 21, - "h": 21 - }, - "frame": { - "x": 148, - "y": 527, - "w": 21, - "h": 21 - } - }, - { - "filename": "831", + "filename": "869s-caramel-swirl", "rotated": false, "trimmed": true, "sourceSize": { @@ -5920,40 +6340,19 @@ }, "spriteSourceSize": { "x": 10, - "y": 5, - "w": 20, - "h": 19 - }, - "frame": { - "x": 153, - "y": 548, - "w": 20, - "h": 19 - } - }, - { - "filename": "881s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, "y": 3, - "w": 18, + "w": 19, "h": 23 }, "frame": { - "x": 155, - "y": 567, - "w": 18, + "x": 357, + "y": 320, + "w": 19, "h": 23 } }, { - "filename": "848", + "filename": "869s-lemon-cream", "rotated": false, "trimmed": true, "sourceSize": { @@ -5961,125 +6360,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 18, - "h": 21 - }, - "frame": { - "x": 155, - "y": 590, - "w": 18, - "h": 21 - } - }, - { - "filename": "6549", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 5, - "w": 16, - "h": 23 - }, - "frame": { - "x": 156, - "y": 611, - "w": 16, - "h": 23 - } - }, - { - "filename": "6549s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 5, - "w": 16, - "h": 23 - }, - "frame": { - "x": 157, - "y": 634, - "w": 16, - "h": 23 - } - }, - { - "filename": "859s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 17, - "h": 20 - }, - "frame": { - "x": 160, - "y": 657, - "w": 17, - "h": 20 - } - }, - { - "filename": "875s-no-ice", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, + "x": 10, "y": 3, - "w": 14, + "w": 19, "h": 23 }, "frame": { - "x": 162, - "y": 677, - "w": 14, + "x": 357, + "y": 320, + "w": 19, "h": 23 } }, { - "filename": "891", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 18, - "h": 22 - }, - "frame": { - "x": 162, - "y": 700, - "w": 18, - "h": 22 - } - }, - { - "filename": "825s", + "filename": "869s-matcha-cream", "rotated": false, "trimmed": true, "sourceSize": { @@ -6088,82 +6382,19 @@ }, "spriteSourceSize": { "x": 10, - "y": 6, - "w": 20, - "h": 18 - }, - "frame": { - "x": 162, - "y": 722, - "w": 20, - "h": 18 - } - }, - { - "filename": "4618s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 18 - }, - "frame": { - "x": 169, - "y": 530, - "w": 22, - "h": 18 - } - }, - { - "filename": "891s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 18, - "h": 22 - }, - "frame": { - "x": 173, - "y": 548, - "w": 18, - "h": 22 - } - }, - { - "filename": "898", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, + "y": 3, "w": 19, - "h": 22 + "h": 23 }, "frame": { - "x": 173, - "y": 570, + "x": 357, + "y": 320, "w": 19, - "h": 22 + "h": 23 } }, { - "filename": "831s", + "filename": "869s-mint-cream", "rotated": false, "trimmed": true, "sourceSize": { @@ -6172,15 +6403,99 @@ }, "spriteSourceSize": { "x": 10, - "y": 5, - "w": 20, - "h": 19 + "y": 3, + "w": 19, + "h": 23 }, "frame": { - "x": 173, - "y": 592, - "w": 20, - "h": 19 + "x": 357, + "y": 320, + "w": 19, + "h": 23 + } + }, + { + "filename": "869s-rainbow-swirl", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 357, + "y": 320, + "w": 19, + "h": 23 + } + }, + { + "filename": "869s-ruby-cream", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 357, + "y": 320, + "w": 19, + "h": 23 + } + }, + { + "filename": "869s-ruby-swirl", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 357, + "y": 320, + "w": 19, + "h": 23 + } + }, + { + "filename": "869s-salted-cream", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 357, + "y": 320, + "w": 19, + "h": 23 } }, { @@ -6198,35 +6513,14 @@ "h": 21 }, "frame": { - "x": 172, - "y": 611, + "x": 358, + "y": 343, "w": 21, "h": 21 } }, { - "filename": "898s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 19, - "h": 22 - }, - "frame": { - "x": 173, - "y": 632, - "w": 19, - "h": 22 - } - }, - { - "filename": "6705", + "filename": "6705s", "rotated": false, "trimmed": true, "sourceSize": { @@ -6240,33 +6534,12 @@ "h": 22 }, "frame": { - "x": 191, - "y": 530, + "x": 366, + "y": 364, "w": 15, "h": 22 } }, - { - "filename": "4264", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 20 - }, - "frame": { - "x": 206, - "y": 532, - "w": 22, - "h": 20 - } - }, { "filename": "4264s", "rotated": false, @@ -6282,54 +6555,12 @@ "h": 20 }, "frame": { - "x": 228, - "y": 532, + "x": 391, + "y": 259, "w": 22, "h": 20 } }, - { - "filename": "4263", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 22, - "h": 16 - }, - "frame": { - "x": 191, - "y": 552, - "w": 22, - "h": 16 - } - }, - { - "filename": "4222", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 21, - "h": 20 - }, - "frame": { - "x": 192, - "y": 568, - "w": 21, - "h": 20 - } - }, { "filename": "4144", "rotated": false, @@ -6345,14 +6576,35 @@ "h": 19 }, "frame": { - "x": 213, - "y": 552, + "x": 391, + "y": 279, "w": 22, "h": 19 } }, { - "filename": "4122", + "filename": "881s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 18, + "h": 23 + }, + "frame": { + "x": 413, + "y": 259, + "w": 18, + "h": 23 + } + }, + { + "filename": "821", "rotated": false, "trimmed": true, "sourceSize": { @@ -6361,61 +6613,19 @@ }, "spriteSourceSize": { "x": 10, - "y": 5, + "y": 7, "w": 19, - "h": 19 + "h": 16 }, "frame": { - "x": 235, - "y": 552, + "x": 413, + "y": 282, "w": 19, - "h": 19 + "h": 16 } }, { - "filename": "4144s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 19 - }, - "frame": { - "x": 213, - "y": 571, - "w": 22, - "h": 19 - } - }, - { - "filename": "4122s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 19, - "h": 19 - }, - "frame": { - "x": 235, - "y": 571, - "w": 19, - "h": 19 - } - }, - { - "filename": "6570", + "filename": "840", "rotated": false, "trimmed": true, "sourceSize": { @@ -6425,165 +6635,18 @@ "spriteSourceSize": { "x": 12, "y": 6, - "w": 18, - "h": 22 + "w": 15, + "h": 17 }, "frame": { - "x": 193, - "y": 588, - "w": 18, - "h": 22 + "x": 367, + "y": 303, + "w": 15, + "h": 17 } }, { - "filename": "6570s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 18, - "h": 22 - }, - "frame": { - "x": 193, - "y": 610, - "w": 18, - "h": 22 - } - }, - { - "filename": "848s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 18, - "h": 21 - }, - "frame": { - "x": 192, - "y": 632, - "w": 18, - "h": 21 - } - }, - { - "filename": "4222s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 21, - "h": 20 - }, - "frame": { - "x": 211, - "y": 590, - "w": 21, - "h": 20 - } - }, - { - "filename": "4263s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 22, - "h": 16 - }, - "frame": { - "x": 232, - "y": 590, - "w": 22, - "h": 16 - } - }, - { - "filename": "4562", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 22, - "h": 16 - }, - "frame": { - "x": 232, - "y": 606, - "w": 22, - "h": 16 - } - }, - { - "filename": "6058", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 21, - "h": 20 - }, - "frame": { - "x": 211, - "y": 610, - "w": 21, - "h": 20 - } - }, - { - "filename": "4562s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 22, - "h": 16 - }, - "frame": { - "x": 232, - "y": 622, - "w": 22, - "h": 16 - } - }, - { - "filename": "6705s", + "filename": "875-no-ice", "rotated": false, "trimmed": true, "sourceSize": { @@ -6592,78 +6655,15 @@ }, "spriteSourceSize": { "x": 13, - "y": 6, - "w": 15, - "h": 22 + "y": 3, + "w": 14, + "h": 23 }, "frame": { - "x": 177, - "y": 654, - "w": 15, - "h": 22 - } - }, - { - "filename": "877-hangry", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 17, - "h": 21 - }, - "frame": { - "x": 192, - "y": 653, - "w": 17, - "h": 21 - } - }, - { - "filename": "6058s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 21, - "h": 20 - }, - "frame": { - "x": 211, - "y": 630, - "w": 21, - "h": 20 - } - }, - { - "filename": "837", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 20, - "h": 17 - }, - "frame": { - "x": 232, - "y": 638, - "w": 20, - "h": 17 + "x": 376, + "y": 320, + "w": 14, + "h": 23 } }, { @@ -6681,8 +6681,8 @@ "h": 21 }, "frame": { - "x": 176, - "y": 677, + "x": 379, + "y": 343, "w": 15, "h": 21 } @@ -6702,35 +6702,14 @@ "h": 21 }, "frame": { - "x": 180, - "y": 698, + "x": 381, + "y": 364, "w": 15, "h": 21 } }, { - "filename": "877", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 17, - "h": 21 - }, - "frame": { - "x": 182, - "y": 719, - "w": 17, - "h": 21 - } - }, - { - "filename": "837s", + "filename": "4122", "rotated": false, "trimmed": true, "sourceSize": { @@ -6739,145 +6718,19 @@ }, "spriteSourceSize": { "x": 10, - "y": 6, - "w": 20, - "h": 17 + "y": 5, + "w": 19, + "h": 19 }, "frame": { - "x": 210, - "y": 650, - "w": 20, - "h": 17 + "x": 382, + "y": 301, + "w": 19, + "h": 19 } }, { - "filename": "821", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 19, - "h": 16 - }, - "frame": { - "x": 230, - "y": 655, - "w": 19, - "h": 16 - } - }, - { - "filename": "821s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 19, - "h": 16 - }, - "frame": { - "x": 209, - "y": 667, - "w": 19, - "h": 16 - } - }, - { - "filename": "852s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 17 - }, - "frame": { - "x": 228, - "y": 671, - "w": 19, - "h": 17 - } - }, - { - "filename": "829", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 17, - "h": 18 - }, - "frame": { - "x": 192, - "y": 674, - "w": 17, - "h": 18 - } - }, - { - "filename": "871", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 17 - }, - "frame": { - "x": 209, - "y": 683, - "w": 19, - "h": 17 - } - }, - { - "filename": "871s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 17 - }, - "frame": { - "x": 228, - "y": 688, - "w": 19, - "h": 17 - } - }, - { - "filename": "6100", + "filename": "875s-no-ice", "rotated": false, "trimmed": true, "sourceSize": { @@ -6886,19 +6739,19 @@ }, "spriteSourceSize": { "x": 13, - "y": 14, + "y": 3, "w": 14, - "h": 14 + "h": 23 }, "frame": { - "x": 195, - "y": 692, + "x": 390, + "y": 320, "w": 14, - "h": 14 + "h": 23 } }, { - "filename": "843", + "filename": "4144s", "rotated": false, "trimmed": true, "sourceSize": { @@ -6906,20 +6759,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, + "x": 9, "y": 5, - "w": 18, + "w": 22, "h": 19 }, "frame": { - "x": 209, - "y": 700, - "w": 18, + "x": 401, + "y": 298, + "w": 22, "h": 19 } }, { - "filename": "843s", + "filename": "4222s", "rotated": false, "trimmed": true, "sourceSize": { @@ -6927,58 +6780,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, + "x": 9, "y": 5, - "w": 18, - "h": 19 + "w": 21, + "h": 20 }, "frame": { - "x": 227, - "y": 705, - "w": 18, - "h": 19 - } - }, - { - "filename": "877s-hangry", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 17, - "h": 21 - }, - "frame": { - "x": 199, - "y": 719, - "w": 17, - "h": 21 - } - }, - { - "filename": "829s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 17, - "h": 18 - }, - "frame": { - "x": 216, - "y": 724, - "w": 17, - "h": 18 + "x": 404, + "y": 317, + "w": 21, + "h": 20 } }, { @@ -6996,12 +6807,54 @@ "h": 21 }, "frame": { - "x": 233, - "y": 724, + "x": 394, + "y": 343, "w": 17, "h": 21 } }, + { + "filename": "877s-hangry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 17, + "h": 21 + }, + "frame": { + "x": 396, + "y": 364, + "w": 17, + "h": 21 + } + }, + { + "filename": "6549s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 5, + "w": 16, + "h": 23 + }, + "frame": { + "x": 411, + "y": 337, + "w": 16, + "h": 23 + } + }, { "filename": "6215", "rotated": false, @@ -7017,12 +6870,75 @@ "h": 21 }, "frame": { - "x": 149, - "y": 745, + "x": 413, + "y": 360, "w": 17, "h": 21 } }, + { + "filename": "4122s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 19, + "h": 19 + }, + "frame": { + "x": 423, + "y": 298, + "w": 19, + "h": 19 + } + }, + { + "filename": "859s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 17, + "h": 20 + }, + "frame": { + "x": 425, + "y": 317, + "w": 17, + "h": 20 + } + }, + { + "filename": "6058", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 432, + "y": 278, + "w": 21, + "h": 20 + } + }, { "filename": "6215s", "rotated": false, @@ -7038,138 +6954,12 @@ "h": 21 }, "frame": { - "x": 166, - "y": 740, + "x": 427, + "y": 337, "w": 17, "h": 21 } }, - { - "filename": "868", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 16, - "h": 17 - }, - "frame": { - "x": 183, - "y": 740, - "w": 16, - "h": 17 - } - }, - { - "filename": "4554", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 17, - "h": 15 - }, - "frame": { - "x": 199, - "y": 740, - "w": 17, - "h": 15 - } - }, - { - "filename": "854", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 14 - }, - "frame": { - "x": 216, - "y": 742, - "w": 17, - "h": 14 - } - }, - { - "filename": "854s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 14 - }, - "frame": { - "x": 233, - "y": 745, - "w": 17, - "h": 14 - } - }, - { - "filename": "840", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 15, - "h": 17 - }, - "frame": { - "x": 155, - "y": 766, - "w": 15, - "h": 17 - } - }, - { - "filename": "4554s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 17, - "h": 15 - }, - "frame": { - "x": 155, - "y": 783, - "w": 17, - "h": 15 - } - }, { "filename": "840s", "rotated": false, @@ -7185,8 +6975,8 @@ "h": 17 }, "frame": { - "x": 170, - "y": 761, + "x": 453, + "y": 278, "w": 15, "h": 17 } @@ -7206,14 +6996,14 @@ "h": 17 }, "frame": { - "x": 185, - "y": 757, + "x": 468, + "y": 279, "w": 16, "h": 17 } }, { - "filename": "6100s", + "filename": "6058s", "rotated": false, "trimmed": true, "sourceSize": { @@ -7221,16 +7011,142 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, - "y": 14, - "w": 14, - "h": 14 + "x": 11, + "y": 8, + "w": 21, + "h": 20 }, "frame": { - "x": 201, - "y": 755, - "w": 14, - "h": 14 + "x": 430, + "y": 358, + "w": 21, + "h": 20 + } + }, + { + "filename": "825", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 20, + "h": 18 + }, + "frame": { + "x": 442, + "y": 298, + "w": 20, + "h": 18 + } + }, + { + "filename": "825s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 20, + "h": 18 + }, + "frame": { + "x": 442, + "y": 316, + "w": 20, + "h": 18 + } + }, + { + "filename": "852s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 17 + }, + "frame": { + "x": 444, + "y": 334, + "w": 19, + "h": 17 + } + }, + { + "filename": "871", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 17 + }, + "frame": { + "x": 462, + "y": 296, + "w": 19, + "h": 17 + } + }, + { + "filename": "871s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 17 + }, + "frame": { + "x": 462, + "y": 313, + "w": 19, + "h": 17 + } + }, + { + "filename": "821s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 19, + "h": 16 + }, + "frame": { + "x": 481, + "y": 301, + "w": 19, + "h": 16 } }, { @@ -7248,12 +7164,33 @@ "h": 14 }, "frame": { - "x": 215, - "y": 756, + "x": 481, + "y": 317, "w": 17, "h": 14 } }, + { + "filename": "4554", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 17, + "h": 15 + }, + "frame": { + "x": 463, + "y": 330, + "w": 17, + "h": 15 + } + }, { "filename": "872s", "rotated": false, @@ -7269,12 +7206,75 @@ "h": 14 }, "frame": { - "x": 232, - "y": 759, + "x": 480, + "y": 331, "w": 17, "h": 14 } }, + { + "filename": "850", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 10, + "w": 21, + "h": 10 + }, + "frame": { + "x": 463, + "y": 345, + "w": 21, + "h": 10 + } + }, + { + "filename": "850s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 10, + "w": 21, + "h": 10 + }, + "frame": { + "x": 484, + "y": 345, + "w": 21, + "h": 10 + } + }, + { + "filename": "4554s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 17, + "h": 15 + }, + "frame": { + "x": 451, + "y": 355, + "w": 17, + "h": 15 + } + }, { "filename": "6101", "rotated": false, @@ -7290,8 +7290,8 @@ "h": 16 }, "frame": { - "x": 172, - "y": 778, + "x": 451, + "y": 370, "w": 16, "h": 16 } @@ -7311,11 +7311,53 @@ "h": 16 }, "frame": { - "x": 188, - "y": 774, + "x": 467, + "y": 370, "w": 16, "h": 16 } + }, + { + "filename": "6100", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 14, + "w": 14, + "h": 14 + }, + "frame": { + "x": 468, + "y": 355, + "w": 14, + "h": 14 + } + }, + { + "filename": "6100s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 14, + "w": 14, + "h": 14 + }, + "frame": { + "x": 482, + "y": 355, + "w": 14, + "h": 14 + } } ] } @@ -7323,6 +7365,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:76f12e2db074120d5e364d7bac497210:e1ea47956220c560d403105ff317eb1a:8190d2ecf16422e962cfb1a751b5e1fc$" + "smartupdate": "$TexturePacker:SmartUpdate:c7db0232f46f4f968b13cb4a8cdb7bce:bcba724c9d58839d9045773dbcc992bc:8190d2ecf16422e962cfb1a751b5e1fc$" } } diff --git a/public/images/pokemon_icons_8.png b/public/images/pokemon_icons_8.png index 70b4e280c..0ef0389a5 100644 Binary files a/public/images/pokemon_icons_8.png and b/public/images/pokemon_icons_8.png differ diff --git a/public/images/pokemon_icons_9.json b/public/images/pokemon_icons_9.json index 27e28bf34..80bd5556f 100644 --- a/public/images/pokemon_icons_9.json +++ b/public/images/pokemon_icons_9.json @@ -5,7 +5,7 @@ "format": "RGBA8888", "size": { "w": 248, - "h": 636 + "h": 604 }, "scale": 1, "frames": [ @@ -382,7 +382,7 @@ }, "frame": { "x": 0, - "y": 300, + "y": 270, "w": 30, "h": 30 } @@ -550,7 +550,7 @@ }, "frame": { "x": 0, - "y": 330, + "y": 300, "w": 30, "h": 28 } @@ -571,7 +571,7 @@ }, "frame": { "x": 0, - "y": 358, + "y": 328, "w": 30, "h": 28 } @@ -592,7 +592,7 @@ }, "frame": { "x": 0, - "y": 386, + "y": 356, "w": 27, "h": 30 } @@ -613,7 +613,7 @@ }, "frame": { "x": 0, - "y": 416, + "y": 386, "w": 27, "h": 30 } @@ -697,7 +697,7 @@ }, "frame": { "x": 0, - "y": 446, + "y": 416, "w": 27, "h": 29 } @@ -718,7 +718,7 @@ }, "frame": { "x": 0, - "y": 475, + "y": 445, "w": 27, "h": 29 } @@ -739,7 +739,7 @@ }, "frame": { "x": 0, - "y": 504, + "y": 474, "w": 29, "h": 28 } @@ -760,7 +760,7 @@ }, "frame": { "x": 0, - "y": 532, + "y": 502, "w": 29, "h": 28 } @@ -781,7 +781,7 @@ }, "frame": { "x": 0, - "y": 560, + "y": 530, "w": 29, "h": 27 } @@ -802,13 +802,13 @@ }, "frame": { "x": 0, - "y": 587, + "y": 557, "w": 29, "h": 27 } }, { - "filename": "1024-terastal", + "filename": "924", "rotated": false, "trimmed": true, "sourceSize": { @@ -816,16 +816,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 32, - "h": 22 + "x": 5, + "y": 8, + "w": 29, + "h": 20 }, "frame": { "x": 0, - "y": 614, - "w": 32, - "h": 22 + "y": 584, + "w": 29, + "h": 20 } }, { @@ -934,7 +934,7 @@ } }, { - "filename": "1024s-terastal", + "filename": "1024-terastal", "rotated": false, "trimmed": true, "sourceSize": { @@ -954,6 +954,27 @@ "h": 22 } }, + { + "filename": "1024s-terastal", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 6, + "w": 32, + "h": 22 + }, + "frame": { + "x": 125, + "y": 75, + "w": 32, + "h": 22 + } + }, { "filename": "1025", "rotated": false, @@ -969,8 +990,8 @@ "h": 24 }, "frame": { - "x": 125, - "y": 75, + "x": 157, + "y": 77, "w": 32, "h": 24 } @@ -990,14 +1011,14 @@ "h": 24 }, "frame": { - "x": 157, + "x": 189, "y": 77, "w": 32, "h": 24 } }, { - "filename": "992", + "filename": "994", "rotated": false, "trimmed": true, "sourceSize": { @@ -1005,37 +1026,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 30, - "h": 26 + "x": 8, + "y": 1, + "w": 27, + "h": 28 }, "frame": { - "x": 189, - "y": 77, - "w": 30, - "h": 26 - } - }, - { - "filename": "8128-blaze", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 29, - "h": 27 - }, - "frame": { - "x": 219, + "x": 221, "y": 78, - "w": 29, - "h": 27 + "w": 27, + "h": 28 } }, { @@ -1054,7 +1054,7 @@ }, "frame": { "x": 27, - "y": 386, + "y": 356, "w": 23, "h": 30 } @@ -1075,7 +1075,7 @@ }, "frame": { "x": 27, - "y": 416, + "y": 386, "w": 23, "h": 30 } @@ -1096,7 +1096,7 @@ }, "frame": { "x": 27, - "y": 446, + "y": 416, "w": 25, "h": 30 } @@ -1117,7 +1117,7 @@ }, "frame": { "x": 27, - "y": 476, + "y": 446, "w": 25, "h": 28 } @@ -1138,7 +1138,7 @@ }, "frame": { "x": 29, - "y": 504, + "y": 474, "w": 25, "h": 30 } @@ -1159,13 +1159,13 @@ }, "frame": { "x": 29, - "y": 534, + "y": 504, "w": 25, "h": 28 } }, { - "filename": "994", + "filename": "994s", "rotated": false, "trimmed": true, "sourceSize": { @@ -1180,13 +1180,13 @@ }, "frame": { "x": 29, - "y": 562, + "y": 532, "w": 27, "h": 28 } }, { - "filename": "8128-aqua", + "filename": "1003", "rotated": false, "trimmed": true, "sourceSize": { @@ -1194,20 +1194,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 5, + "x": 6, + "y": 0, "w": 28, - "h": 24 + "h": 28 }, "frame": { "x": 29, - "y": 590, + "y": 560, "w": 28, - "h": 24 + "h": 28 } }, { - "filename": "925-four", + "filename": "953", "rotated": false, "trimmed": true, "sourceSize": { @@ -1215,16 +1215,58 @@ "h": 30 }, "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 29, - "h": 22 + "x": 8, + "y": 12, + "w": 24, + "h": 16 }, "frame": { - "x": 32, - "y": 614, - "w": 29, - "h": 22 + "x": 29, + "y": 588, + "w": 24, + "h": 16 + } + }, + { + "filename": "953s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 12, + "w": 24, + "h": 16 + }, + "frame": { + "x": 53, + "y": 588, + "w": 24, + "h": 16 + } + }, + { + "filename": "992", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 30, + "h": 26 + }, + "frame": { + "x": 31, + "y": 118, + "w": 30, + "h": 26 } }, { @@ -1242,12 +1284,75 @@ "h": 26 }, "frame": { - "x": 62, - "y": 86, + "x": 30, + "y": 144, "w": 30, "h": 26 } }, + { + "filename": "1003s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 0, + "w": 28, + "h": 28 + }, + "frame": { + "x": 30, + "y": 170, + "w": 28, + "h": 28 + } + }, + { + "filename": "8128-blaze", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 29, + "h": 27 + }, + "frame": { + "x": 30, + "y": 198, + "w": 29, + "h": 27 + } + }, + { + "filename": "8128s-blaze", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 29, + "h": 27 + }, + "frame": { + "x": 30, + "y": 225, + "w": 29, + "h": 27 + } + }, { "filename": "993", "rotated": false, @@ -1263,8 +1368,8 @@ "h": 25 }, "frame": { - "x": 92, - "y": 97, + "x": 30, + "y": 252, "w": 30, "h": 25 } @@ -1284,8 +1389,8 @@ "h": 25 }, "frame": { - "x": 122, - "y": 99, + "x": 30, + "y": 277, "w": 30, "h": 25 } @@ -1305,516 +1410,12 @@ "h": 25 }, "frame": { - "x": 152, - "y": 101, + "x": 30, + "y": 302, "w": 29, "h": 25 } }, - { - "filename": "1022s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 29, - "h": 25 - }, - "frame": { - "x": 181, - "y": 103, - "w": 29, - "h": 25 - } - }, - { - "filename": "8128s-blaze", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 29, - "h": 27 - }, - "frame": { - "x": 210, - "y": 105, - "w": 29, - "h": 27 - } - }, - { - "filename": "924", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 8, - "w": 29, - "h": 20 - }, - "frame": { - "x": 61, - "y": 112, - "w": 29, - "h": 20 - } - }, - { - "filename": "924s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 8, - "w": 29, - "h": 20 - }, - "frame": { - "x": 90, - "y": 122, - "w": 29, - "h": 20 - } - }, - { - "filename": "925-three", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 8, - "w": 29, - "h": 20 - }, - "frame": { - "x": 119, - "y": 124, - "w": 29, - "h": 20 - } - }, - { - "filename": "925s-four", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 29, - "h": 22 - }, - "frame": { - "x": 148, - "y": 126, - "w": 29, - "h": 22 - } - }, - { - "filename": "925s-three", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 8, - "w": 29, - "h": 20 - }, - "frame": { - "x": 177, - "y": 128, - "w": 29, - "h": 20 - } - }, - { - "filename": "976", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 10, - "w": 29, - "h": 18 - }, - "frame": { - "x": 206, - "y": 132, - "w": 29, - "h": 18 - } - }, - { - "filename": "935", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 7, - "w": 13, - "h": 21 - }, - "frame": { - "x": 235, - "y": 132, - "w": 13, - "h": 21 - } - }, - { - "filename": "976s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 10, - "w": 29, - "h": 18 - }, - "frame": { - "x": 61, - "y": 132, - "w": 29, - "h": 18 - } - }, - { - "filename": "911", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 28, - "h": 23 - }, - "frame": { - "x": 90, - "y": 142, - "w": 28, - "h": 23 - } - }, - { - "filename": "911s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 28, - "h": 23 - }, - "frame": { - "x": 118, - "y": 144, - "w": 28, - "h": 23 - } - }, - { - "filename": "990", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 28, - "h": 23 - }, - "frame": { - "x": 146, - "y": 148, - "w": 28, - "h": 23 - } - }, - { - "filename": "990s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 28, - "h": 23 - }, - "frame": { - "x": 174, - "y": 148, - "w": 28, - "h": 23 - } - }, - { - "filename": "1003", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 28, - "h": 28 - }, - "frame": { - "x": 202, - "y": 150, - "w": 28, - "h": 28 - } - }, - { - "filename": "906", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 18, - "h": 19 - }, - "frame": { - "x": 230, - "y": 153, - "w": 18, - "h": 19 - } - }, - { - "filename": "906s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 18, - "h": 19 - }, - "frame": { - "x": 230, - "y": 172, - "w": 18, - "h": 19 - } - }, - { - "filename": "950", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 11, - "w": 28, - "h": 17 - }, - "frame": { - "x": 31, - "y": 118, - "w": 28, - "h": 17 - } - }, - { - "filename": "1003s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 28, - "h": 28 - }, - "frame": { - "x": 30, - "y": 135, - "w": 28, - "h": 28 - } - }, - { - "filename": "994s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 27, - "h": 28 - }, - "frame": { - "x": 30, - "y": 163, - "w": 27, - "h": 28 - } - }, - { - "filename": "979", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 27, - "h": 26 - }, - "frame": { - "x": 30, - "y": 191, - "w": 27, - "h": 26 - } - }, - { - "filename": "979s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 27, - "h": 26 - }, - "frame": { - "x": 30, - "y": 217, - "w": 27, - "h": 26 - } - }, - { - "filename": "989", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 25, - "h": 27 - }, - "frame": { - "x": 30, - "y": 243, - "w": 25, - "h": 27 - } - }, - { - "filename": "989s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 25, - "h": 27 - }, - "frame": { - "x": 30, - "y": 270, - "w": 25, - "h": 27 - } - }, { "filename": "964-hero", "rotated": false, @@ -1831,11 +1432,32 @@ }, "frame": { "x": 30, - "y": 297, + "y": 327, "w": 22, "h": 29 } }, + { + "filename": "954", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 0, + "w": 21, + "h": 29 + }, + "frame": { + "x": 52, + "y": 327, + "w": 21, + "h": 29 + } + }, { "filename": "964s-hero", "rotated": false, @@ -1851,8 +1473,8 @@ "h": 29 }, "frame": { - "x": 30, - "y": 326, + "x": 50, + "y": 356, "w": 22, "h": 29 } @@ -1872,14 +1494,14 @@ "h": 29 }, "frame": { - "x": 30, - "y": 355, + "x": 50, + "y": 385, "w": 22, "h": 29 } }, { - "filename": "950s", + "filename": "954s", "rotated": false, "trimmed": true, "sourceSize": { @@ -1887,163 +1509,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 11, - "w": 28, - "h": 17 - }, - "frame": { - "x": 58, - "y": 150, - "w": 28, - "h": 17 - } - }, - { - "filename": "8128s-aqua", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 28, - "h": 24 - }, - "frame": { - "x": 57, - "y": 167, - "w": 28, - "h": 24 - } - }, - { - "filename": "968", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, + "x": 9, "y": 0, - "w": 23, - "h": 28 - }, - "frame": { - "x": 57, - "y": 191, - "w": 23, - "h": 28 - } - }, - { - "filename": "914", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 24, - "h": 25 - }, - "frame": { - "x": 57, - "y": 219, - "w": 24, - "h": 25 - } - }, - { - "filename": "968s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 23, - "h": 28 - }, - "frame": { - "x": 55, - "y": 244, - "w": 23, - "h": 28 - } - }, - { - "filename": "914s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 24, - "h": 25 - }, - "frame": { - "x": 55, - "y": 272, - "w": 24, - "h": 25 - } - }, - { - "filename": "998", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 25, - "h": 26 + "w": 21, + "h": 29 }, "frame": { "x": 52, - "y": 297, - "w": 25, - "h": 26 - } - }, - { - "filename": "998s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 25, - "h": 26 - }, - "frame": { - "x": 52, - "y": 323, - "w": 25, - "h": 26 + "y": 414, + "w": 21, + "h": 29 } }, { @@ -2062,7 +1537,7 @@ }, "frame": { "x": 52, - "y": 349, + "y": 443, "w": 22, "h": 29 } @@ -2082,14 +1557,14 @@ "h": 28 }, "frame": { - "x": 80, - "y": 191, + "x": 54, + "y": 472, "w": 20, "h": 28 } }, { - "filename": "908", + "filename": "936s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2098,14 +1573,581 @@ }, "spriteSourceSize": { "x": 10, - "y": 2, + "y": 0, "w": 20, + "h": 28 + }, + "frame": { + "x": 54, + "y": 500, + "w": 20, + "h": 28 + } + }, + { + "filename": "968", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 23, + "h": 28 + }, + "frame": { + "x": 56, + "y": 528, + "w": 23, + "h": 28 + } + }, + { + "filename": "968s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 23, + "h": 28 + }, + "frame": { + "x": 57, + "y": 556, + "w": 23, + "h": 28 + } + }, + { + "filename": "924s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 8, + "w": 29, + "h": 20 + }, + "frame": { + "x": 77, + "y": 584, + "w": 29, + "h": 20 + } + }, + { + "filename": "914", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 24, + "h": 25 + }, + "frame": { + "x": 59, + "y": 302, + "w": 24, + "h": 25 + } + }, + { + "filename": "1023", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 1, + "w": 20, + "h": 28 + }, + "frame": { + "x": 73, + "y": 327, + "w": 20, + "h": 28 + } + }, + { + "filename": "925-four", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 29, + "h": 22 + }, + "frame": { + "x": 62, + "y": 86, + "w": 29, + "h": 22 + } + }, + { + "filename": "1022s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 29, + "h": 25 + }, + "frame": { + "x": 61, + "y": 108, + "w": 29, + "h": 25 + } + }, + { + "filename": "925-three", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 8, + "w": 29, + "h": 20 + }, + "frame": { + "x": 61, + "y": 133, + "w": 29, + "h": 20 + } + }, + { + "filename": "925s-four", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 29, + "h": 22 + }, + "frame": { + "x": 60, + "y": 153, + "w": 29, + "h": 22 + } + }, + { + "filename": "911", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 28, + "h": 23 + }, + "frame": { + "x": 58, + "y": 175, + "w": 28, + "h": 23 + } + }, + { + "filename": "979", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 2, + "w": 27, "h": 26 }, "frame": { - "x": 81, - "y": 219, - "w": 20, + "x": 59, + "y": 198, + "w": 27, + "h": 26 + } + }, + { + "filename": "979s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 2, + "w": 27, + "h": 26 + }, + "frame": { + "x": 59, + "y": 224, + "w": 27, + "h": 26 + } + }, + { + "filename": "989", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 25, + "h": 27 + }, + "frame": { + "x": 60, + "y": 250, + "w": 25, + "h": 27 + } + }, + { + "filename": "914s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 24, + "h": 25 + }, + "frame": { + "x": 60, + "y": 277, + "w": 24, + "h": 25 + } + }, + { + "filename": "925s-three", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 8, + "w": 29, + "h": 20 + }, + "frame": { + "x": 91, + "y": 97, + "w": 29, + "h": 20 + } + }, + { + "filename": "989s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 25, + "h": 27 + }, + "frame": { + "x": 90, + "y": 117, + "w": 25, + "h": 27 + } + }, + { + "filename": "911s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 28, + "h": 23 + }, + "frame": { + "x": 120, + "y": 97, + "w": 28, + "h": 23 + } + }, + { + "filename": "8128-aqua", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 28, + "h": 24 + }, + "frame": { + "x": 115, + "y": 120, + "w": 28, + "h": 24 + } + }, + { + "filename": "976", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 10, + "w": 29, + "h": 18 + }, + "frame": { + "x": 90, + "y": 144, + "w": 29, + "h": 18 + } + }, + { + "filename": "916-female", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 119, + "y": 144, + "w": 25, + "h": 21 + } + }, + { + "filename": "976s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 10, + "w": 29, + "h": 18 + }, + "frame": { + "x": 89, + "y": 162, + "w": 29, + "h": 18 + } + }, + { + "filename": "8128s-aqua", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 28, + "h": 24 + }, + "frame": { + "x": 86, + "y": 180, + "w": 28, + "h": 24 + } + }, + { + "filename": "990", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 28, + "h": 23 + }, + "frame": { + "x": 86, + "y": 204, + "w": 28, + "h": 23 + } + }, + { + "filename": "990s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 28, + "h": 23 + }, + "frame": { + "x": 86, + "y": 227, + "w": 28, + "h": 23 + } + }, + { + "filename": "998", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 2, + "w": 25, + "h": 26 + }, + "frame": { + "x": 85, + "y": 250, + "w": 25, + "h": 26 + } + }, + { + "filename": "950", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 11, + "w": 28, + "h": 17 + }, + "frame": { + "x": 118, + "y": 165, + "w": 28, + "h": 17 + } + }, + { + "filename": "998s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 2, + "w": 25, + "h": 26 + }, + "frame": { + "x": 114, + "y": 182, + "w": 25, "h": 26 } }, @@ -2124,14 +2166,14 @@ "h": 27 }, "frame": { - "x": 78, - "y": 245, + "x": 114, + "y": 208, "w": 24, "h": 27 } }, { - "filename": "1016s", + "filename": "916", "rotated": false, "trimmed": true, "sourceSize": { @@ -2139,100 +2181,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 24, - "h": 27 + "x": 7, + "y": 9, + "w": 25, + "h": 19 }, "frame": { - "x": 79, - "y": 272, - "w": 24, - "h": 27 - } - }, - { - "filename": "954", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 0, - "w": 21, - "h": 29 - }, - "frame": { - "x": 77, - "y": 299, - "w": 21, - "h": 29 - } - }, - { - "filename": "910", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 21, - "h": 21 - }, - "frame": { - "x": 77, - "y": 328, - "w": 21, - "h": 21 - } - }, - { - "filename": "954s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 0, - "w": 21, - "h": 29 - }, - "frame": { - "x": 74, - "y": 349, - "w": 21, - "h": 29 - } - }, - { - "filename": "918", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 22, - "h": 24 - }, - "frame": { - "x": 85, - "y": 167, - "w": 22, - "h": 24 + "x": 114, + "y": 235, + "w": 25, + "h": 19 } }, { @@ -2250,96 +2208,12 @@ "h": 22 }, "frame": { - "x": 107, - "y": 167, + "x": 110, + "y": 254, "w": 27, "h": 22 } }, - { - "filename": "936s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 20, - "h": 28 - }, - "frame": { - "x": 100, - "y": 191, - "w": 20, - "h": 28 - } - }, - { - "filename": "908s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 20, - "h": 26 - }, - "frame": { - "x": 101, - "y": 219, - "w": 20, - "h": 26 - } - }, - { - "filename": "1000", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 22, - "h": 27 - }, - "frame": { - "x": 102, - "y": 245, - "w": 22, - "h": 27 - } - }, - { - "filename": "1000s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 22, - "h": 27 - }, - "frame": { - "x": 103, - "y": 272, - "w": 22, - "h": 27 - } - }, { "filename": "972s", "rotated": false, @@ -2355,453 +2229,12 @@ "h": 22 }, "frame": { - "x": 98, - "y": 299, + "x": 148, + "y": 101, "w": 27, "h": 22 } }, - { - "filename": "1006", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 22, - "h": 27 - }, - "frame": { - "x": 98, - "y": 321, - "w": 22, - "h": 27 - } - }, - { - "filename": "1023", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 20, - "h": 28 - }, - "frame": { - "x": 120, - "y": 189, - "w": 20, - "h": 28 - } - }, - { - "filename": "1023s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 20, - "h": 28 - }, - "frame": { - "x": 121, - "y": 217, - "w": 20, - "h": 28 - } - }, - { - "filename": "1006s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 22, - "h": 27 - }, - "frame": { - "x": 124, - "y": 245, - "w": 22, - "h": 27 - } - }, - { - "filename": "982", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 22, - "h": 26 - }, - "frame": { - "x": 125, - "y": 272, - "w": 22, - "h": 26 - } - }, - { - "filename": "918s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 22, - "h": 24 - }, - "frame": { - "x": 125, - "y": 298, - "w": 22, - "h": 24 - } - }, - { - "filename": "1017-hearthflame-mask-tera", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 25, - "h": 24 - }, - "frame": { - "x": 120, - "y": 322, - "w": 25, - "h": 24 - } - }, - { - "filename": "985", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 27, - "h": 21 - }, - "frame": { - "x": 52, - "y": 378, - "w": 27, - "h": 21 - } - }, - { - "filename": "1017-hearthflame-mask", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 25, - "h": 24 - }, - "frame": { - "x": 50, - "y": 399, - "w": 25, - "h": 24 - } - }, - { - "filename": "961", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 23, - "h": 23 - }, - "frame": { - "x": 50, - "y": 423, - "w": 23, - "h": 23 - } - }, - { - "filename": "982s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 22, - "h": 26 - }, - "frame": { - "x": 52, - "y": 446, - "w": 22, - "h": 26 - } - }, - { - "filename": "1010", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 21, - "h": 26 - }, - "frame": { - "x": 52, - "y": 472, - "w": 21, - "h": 26 - } - }, - { - "filename": "1010s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 21, - "h": 26 - }, - "frame": { - "x": 54, - "y": 498, - "w": 21, - "h": 26 - } - }, - { - "filename": "949", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 20, - "h": 25 - }, - "frame": { - "x": 54, - "y": 524, - "w": 20, - "h": 25 - } - }, - { - "filename": "907", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 17, - "h": 22 - }, - "frame": { - "x": 79, - "y": 378, - "w": 17, - "h": 22 - } - }, - { - "filename": "920", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 23 - }, - "frame": { - "x": 75, - "y": 400, - "w": 22, - "h": 23 - } - }, - { - "filename": "961s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 23, - "h": 23 - }, - "frame": { - "x": 73, - "y": 423, - "w": 23, - "h": 23 - } - }, - { - "filename": "987", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 74, - "y": 446, - "w": 24, - "h": 24 - } - }, - { - "filename": "949s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 20, - "h": 25 - }, - "frame": { - "x": 56, - "y": 549, - "w": 20, - "h": 25 - } - }, - { - "filename": "953", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 12, - "w": 24, - "h": 16 - }, - "frame": { - "x": 56, - "y": 574, - "w": 24, - "h": 16 - } - }, - { - "filename": "987s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 57, - "y": 590, - "w": 24, - "h": 24 - } - }, { "filename": "956s", "rotated": false, @@ -2817,14 +2250,14 @@ "h": 22 }, "frame": { - "x": 61, - "y": 614, + "x": 175, + "y": 101, "w": 26, "h": 22 } }, { - "filename": "973", + "filename": "908", "rotated": false, "trimmed": true, "sourceSize": { @@ -2832,20 +2265,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, + "x": 10, "y": 2, - "w": 15, + "w": 20, "h": 26 }, "frame": { - "x": 73, - "y": 472, - "w": 15, + "x": 201, + "y": 101, + "w": 20, "h": 26 } }, { - "filename": "973s", + "filename": "985", "rotated": false, "trimmed": true, "sourceSize": { @@ -2853,289 +2286,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 15, - "h": 26 + "x": 9, + "y": 7, + "w": 27, + "h": 21 }, "frame": { - "x": 75, - "y": 498, - "w": 15, - "h": 26 - } - }, - { - "filename": "962", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 25 - }, - "frame": { - "x": 74, - "y": 524, - "w": 19, - "h": 25 - } - }, - { - "filename": "962s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 25 - }, - "frame": { - "x": 76, - "y": 549, - "w": 19, - "h": 25 - } - }, - { - "filename": "923", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 19, - "h": 24 - }, - "frame": { - "x": 88, - "y": 470, - "w": 19, - "h": 24 - } - }, - { - "filename": "923s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 19, - "h": 24 - }, - "frame": { - "x": 90, - "y": 494, - "w": 19, - "h": 24 - } - }, - { - "filename": "991", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 20, - "h": 24 - }, - "frame": { - "x": 93, - "y": 518, - "w": 20, - "h": 24 - } - }, - { - "filename": "991s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 20, - "h": 24 - }, - "frame": { - "x": 95, - "y": 542, - "w": 20, - "h": 24 - } - }, - { - "filename": "946", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 19, - "h": 16 - }, - "frame": { - "x": 80, - "y": 574, - "w": 19, - "h": 16 - } - }, - { - "filename": "1013-unremarkable", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 20, - "h": 24 - }, - "frame": { - "x": 81, - "y": 590, - "w": 20, - "h": 24 - } - }, - { - "filename": "1012-counterfeit", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 26, - "h": 22 - }, - "frame": { - "x": 87, - "y": 614, - "w": 26, - "h": 22 - } - }, - { - "filename": "1013s-unremarkable", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 20, - "h": 24 - }, - "frame": { - "x": 99, - "y": 566, - "w": 20, - "h": 24 - } - }, - { - "filename": "1017-cornerstone-mask-tera", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 101, - "y": 590, - "w": 24, - "h": 24 - } - }, - { - "filename": "1012s-counterfeit", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 26, - "h": 22 - }, - "frame": { - "x": 113, - "y": 614, - "w": 26, - "h": 22 - } - }, - { - "filename": "921", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 16, - "h": 18 - }, - "frame": { - "x": 134, - "y": 171, - "w": 16, - "h": 18 + "x": 221, + "y": 106, + "w": 27, + "h": 21 } }, { @@ -3153,33 +2313,12 @@ "h": 21 }, "frame": { - "x": 150, - "y": 171, + "x": 143, + "y": 123, "w": 27, "h": 21 } }, - { - "filename": "916-female", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 25, - "h": 21 - }, - "frame": { - "x": 177, - "y": 171, - "w": 25, - "h": 21 - } - }, { "filename": "1002", "rotated": false, @@ -3195,14 +2334,14 @@ "h": 21 }, "frame": { - "x": 202, - "y": 178, + "x": 144, + "y": 144, "w": 27, "h": 21 } }, { - "filename": "1011", + "filename": "1002s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3210,18 +2349,312 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 19, + "x": 6, + "y": 7, + "w": 27, + "h": 21 + }, + "frame": { + "x": 170, + "y": 123, + "w": 27, + "h": 21 + } + }, + { + "filename": "1012-counterfeit", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 26, "h": 22 }, "frame": { - "x": 229, - "y": 191, - "w": 19, + "x": 171, + "y": 144, + "w": 26, "h": 22 } }, + { + "filename": "1016s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 24, + "h": 27 + }, + "frame": { + "x": 197, + "y": 127, + "w": 24, + "h": 27 + } + }, + { + "filename": "1000", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 1, + "w": 22, + "h": 27 + }, + "frame": { + "x": 221, + "y": 127, + "w": 22, + "h": 27 + } + }, + { + "filename": "916s-female", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 146, + "y": 165, + "w": 25, + "h": 21 + } + }, + { + "filename": "1012s-counterfeit", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 26, + "h": 22 + }, + "frame": { + "x": 171, + "y": 166, + "w": 26, + "h": 22 + } + }, + { + "filename": "1000s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 1, + "w": 22, + "h": 27 + }, + "frame": { + "x": 197, + "y": 154, + "w": 22, + "h": 27 + } + }, + { + "filename": "1006", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 1, + "w": 22, + "h": 27 + }, + "frame": { + "x": 219, + "y": 154, + "w": 22, + "h": 27 + } + }, + { + "filename": "945", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 25, + "h": 22 + }, + "frame": { + "x": 139, + "y": 186, + "w": 25, + "h": 22 + } + }, + { + "filename": "1006s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 1, + "w": 22, + "h": 27 + }, + "frame": { + "x": 138, + "y": 208, + "w": 22, + "h": 27 + } + }, + { + "filename": "910", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 21, + "h": 21 + }, + "frame": { + "x": 139, + "y": 235, + "w": 21, + "h": 21 + } + }, + { + "filename": "927", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 24, + "h": 21 + }, + "frame": { + "x": 137, + "y": 256, + "w": 24, + "h": 21 + } + }, + { + "filename": "933", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 164, + "y": 188, + "w": 25, + "h": 21 + } + }, + { + "filename": "1017-hearthflame-mask-tera", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 25, + "h": 24 + }, + "frame": { + "x": 160, + "y": 209, + "w": 25, + "h": 24 + } + }, + { + "filename": "1017-hearthflame-mask", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 25, + "h": 24 + }, + "frame": { + "x": 160, + "y": 209, + "w": 25, + "h": 24 + } + }, { "filename": "1017s-hearthflame-mask-tera", "rotated": false, @@ -3237,8 +2670,8 @@ "h": 24 }, "frame": { - "x": 140, - "y": 192, + "x": 160, + "y": 209, "w": 25, "h": 24 } @@ -3258,285 +2691,12 @@ "h": 24 }, "frame": { - "x": 165, - "y": 192, + "x": 160, + "y": 209, "w": 25, "h": 24 } }, - { - "filename": "1002s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 27, - "h": 21 - }, - "frame": { - "x": 141, - "y": 216, - "w": 27, - "h": 21 - } - }, - { - "filename": "916s-female", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 25, - "h": 21 - }, - "frame": { - "x": 168, - "y": 216, - "w": 25, - "h": 21 - } - }, - { - "filename": "1017-cornerstone-mask", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 146, - "y": 237, - "w": 24, - "h": 24 - } - }, - { - "filename": "1017-teal-mask-tera", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 170, - "y": 237, - "w": 24, - "h": 24 - } - }, - { - "filename": "1017-teal-mask", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 147, - "y": 261, - "w": 24, - "h": 24 - } - }, - { - "filename": "1017-wellspring-mask-tera", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 147, - "y": 285, - "w": 24, - "h": 24 - } - }, - { - "filename": "1017-wellspring-mask", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 171, - "y": 261, - "w": 24, - "h": 24 - } - }, - { - "filename": "1017s-cornerstone-mask-tera", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 171, - "y": 285, - "w": 24, - "h": 24 - } - }, - { - "filename": "916", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 9, - "w": 25, - "h": 19 - }, - "frame": { - "x": 147, - "y": 309, - "w": 25, - "h": 19 - } - }, - { - "filename": "916s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 9, - "w": 25, - "h": 19 - }, - "frame": { - "x": 172, - "y": 309, - "w": 25, - "h": 19 - } - }, - { - "filename": "933", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 25, - "h": 21 - }, - "frame": { - "x": 145, - "y": 328, - "w": 25, - "h": 21 - } - }, - { - "filename": "933s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 25, - "h": 21 - }, - "frame": { - "x": 170, - "y": 328, - "w": 25, - "h": 21 - } - }, - { - "filename": "945", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 25, - "h": 22 - }, - "frame": { - "x": 120, - "y": 346, - "w": 25, - "h": 22 - } - }, { "filename": "945s", "rotated": false, @@ -3552,8 +2712,8 @@ "h": 22 }, "frame": { - "x": 95, - "y": 349, + "x": 160, + "y": 233, "w": 25, "h": 22 } @@ -3573,14 +2733,14 @@ "h": 22 }, "frame": { - "x": 145, - "y": 349, + "x": 161, + "y": 255, "w": 25, "h": 22 } }, { - "filename": "952s", + "filename": "949", "rotated": false, "trimmed": true, "sourceSize": { @@ -3588,16 +2748,184 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 25, - "h": 22 + "x": 10, + "y": 3, + "w": 20, + "h": 25 }, "frame": { - "x": 170, - "y": 349, - "w": 25, - "h": 22 + "x": 83, + "y": 302, + "w": 20, + "h": 25 + } + }, + { + "filename": "949s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 20, + "h": 25 + }, + "frame": { + "x": 84, + "y": 277, + "w": 20, + "h": 25 + } + }, + { + "filename": "982", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 2, + "w": 22, + "h": 26 + }, + "frame": { + "x": 104, + "y": 276, + "w": 22, + "h": 26 + } + }, + { + "filename": "982s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 2, + "w": 22, + "h": 26 + }, + "frame": { + "x": 103, + "y": 302, + "w": 22, + "h": 26 + } + }, + { + "filename": "987", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 93, + "y": 328, + "w": 24, + "h": 24 + } + }, + { + "filename": "987s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 126, + "y": 277, + "w": 24, + "h": 24 + } + }, + { + "filename": "1017-cornerstone-mask-tera", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 150, + "y": 277, + "w": 24, + "h": 24 + } + }, + { + "filename": "1017-cornerstone-mask", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 150, + "y": 277, + "w": 24, + "h": 24 + } + }, + { + "filename": "1017s-cornerstone-mask-tera", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 150, + "y": 277, + "w": 24, + "h": 24 } }, { @@ -3615,14 +2943,14 @@ "h": 24 }, "frame": { - "x": 96, - "y": 371, + "x": 150, + "y": 277, "w": 24, "h": 24 } }, { - "filename": "966", + "filename": "908s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3630,20 +2958,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 25, - "h": 21 + "x": 10, + "y": 2, + "w": 20, + "h": 26 }, "frame": { - "x": 120, - "y": 368, - "w": 25, - "h": 21 + "x": 174, + "y": 277, + "w": 20, + "h": 26 } }, { - "filename": "966s", + "filename": "950s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3651,20 +2979,41 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 25, - "h": 21 + "x": 6, + "y": 11, + "w": 28, + "h": 17 }, "frame": { - "x": 145, - "y": 371, - "w": 25, - "h": 21 + "x": 197, + "y": 181, + "w": 28, + "h": 17 } }, { - "filename": "8128", + "filename": "961", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 23, + "h": 23 + }, + "frame": { + "x": 225, + "y": 181, + "w": 23, + "h": 23 + } + }, + { + "filename": "918", "rotated": false, "trimmed": true, "sourceSize": { @@ -3673,15 +3022,78 @@ }, "spriteSourceSize": { "x": 9, - "y": 7, - "w": 25, - "h": 21 + "y": 4, + "w": 22, + "h": 24 }, "frame": { - "x": 170, - "y": 371, - "w": 25, - "h": 21 + "x": 117, + "y": 328, + "w": 22, + "h": 24 + } + }, + { + "filename": "973", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 2, + "w": 15, + "h": 26 + }, + "frame": { + "x": 125, + "y": 302, + "w": 15, + "h": 26 + } + }, + { + "filename": "1017-teal-mask-tera", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 140, + "y": 301, + "w": 24, + "h": 24 + } + }, + { + "filename": "1017-teal-mask", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 140, + "y": 301, + "w": 24, + "h": 24 } }, { @@ -3699,8 +3111,8 @@ "h": 24 }, "frame": { - "x": 97, - "y": 395, + "x": 140, + "y": 301, "w": 24, "h": 24 } @@ -3720,14 +3132,119 @@ "h": 24 }, "frame": { - "x": 121, - "y": 389, + "x": 140, + "y": 301, "w": 24, "h": 24 } }, { - "filename": "8128s", + "filename": "952s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 25, + "h": 22 + }, + "frame": { + "x": 164, + "y": 303, + "w": 25, + "h": 22 + } + }, + { + "filename": "1023s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 1, + "w": 20, + "h": 28 + }, + "frame": { + "x": 185, + "y": 209, + "w": 20, + "h": 28 + } + }, + { + "filename": "991", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 20, + "h": 24 + }, + "frame": { + "x": 205, + "y": 198, + "w": 20, + "h": 24 + } + }, + { + "filename": "961s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 23, + "h": 23 + }, + "frame": { + "x": 225, + "y": 204, + "w": 23, + "h": 23 + } + }, + { + "filename": "931-blue-plumage", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 20 + }, + "frame": { + "x": 205, + "y": 222, + "w": 20, + "h": 20 + } + }, + { + "filename": "986", "rotated": false, "trimmed": true, "sourceSize": { @@ -3736,19 +3253,166 @@ }, "spriteSourceSize": { "x": 9, + "y": 5, + "w": 23, + "h": 23 + }, + "frame": { + "x": 225, + "y": 227, + "w": 23, + "h": 23 + } + }, + { + "filename": "970", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 20, + "h": 16 + }, + "frame": { + "x": 185, + "y": 237, + "w": 20, + "h": 16 + } + }, + { + "filename": "918s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 22, + "h": 24 + }, + "frame": { + "x": 186, + "y": 253, + "w": 22, + "h": 24 + } + }, + { + "filename": "973s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 2, + "w": 15, + "h": 26 + }, + "frame": { + "x": 194, + "y": 277, + "w": 15, + "h": 26 + } + }, + { + "filename": "917", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 22, + "h": 22 + }, + "frame": { + "x": 189, + "y": 303, + "w": 22, + "h": 22 + } + }, + { + "filename": "913", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 17, + "h": 23 + }, + "frame": { + "x": 208, + "y": 242, + "w": 17, + "h": 23 + } + }, + { + "filename": "986s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 23, + "h": 23 + }, + "frame": { + "x": 225, + "y": 250, + "w": 23, + "h": 23 + } + }, + { + "filename": "948", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, "y": 7, - "w": 25, + "w": 16, "h": 21 }, "frame": { - "x": 145, - "y": 392, - "w": 25, + "x": 209, + "y": 265, + "w": 16, "h": 21 } }, { - "filename": "927", + "filename": "947", "rotated": false, "trimmed": true, "sourceSize": { @@ -3757,19 +3421,40 @@ }, "spriteSourceSize": { "x": 8, - "y": 7, - "w": 24, - "h": 21 + "y": 6, + "w": 23, + "h": 22 }, "frame": { - "x": 170, - "y": 392, - "w": 24, - "h": 21 + "x": 225, + "y": 273, + "w": 23, + "h": 22 } }, { - "filename": "927s", + "filename": "957", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 16, + "h": 17 + }, + "frame": { + "x": 209, + "y": 286, + "w": 16, + "h": 17 + } + }, + { + "filename": "947s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3778,15 +3463,141 @@ }, "spriteSourceSize": { "x": 8, - "y": 7, - "w": 24, - "h": 21 + "y": 6, + "w": 23, + "h": 22 }, "frame": { - "x": 121, - "y": 413, + "x": 225, + "y": 295, + "w": 23, + "h": 22 + } + }, + { + "filename": "999-roaming", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 14, + "h": 18 + }, + "frame": { + "x": 211, + "y": 303, + "w": 14, + "h": 18 + } + }, + { + "filename": "916s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 9, + "w": 25, + "h": 19 + }, + "frame": { + "x": 93, + "y": 352, + "w": 25, + "h": 19 + } + }, + { + "filename": "1010", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 21, + "h": 26 + }, + "frame": { + "x": 72, + "y": 356, + "w": 21, + "h": 26 + } + }, + { + "filename": "1010s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 21, + "h": 26 + }, + "frame": { + "x": 72, + "y": 382, + "w": 21, + "h": 26 + } + }, + { + "filename": "1017-wellspring-mask-tera", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, "w": 24, - "h": 21 + "h": 24 + }, + "frame": { + "x": 93, + "y": 371, + "w": 24, + "h": 24 + } + }, + { + "filename": "1017-wellspring-mask", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 93, + "y": 371, + "w": 24, + "h": 24 } }, { @@ -3804,8 +3615,8 @@ "h": 24 }, "frame": { - "x": 145, - "y": 413, + "x": 93, + "y": 371, "w": 24, "h": 24 } @@ -3825,12 +3636,600 @@ "h": 24 }, "frame": { - "x": 169, - "y": 413, + "x": 93, + "y": 371, "w": 24, "h": 24 } }, + { + "filename": "910s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 21, + "h": 21 + }, + "frame": { + "x": 118, + "y": 352, + "w": 21, + "h": 21 + } + }, + { + "filename": "917s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 22, + "h": 22 + }, + "frame": { + "x": 117, + "y": 373, + "w": 22, + "h": 22 + } + }, + { + "filename": "933s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 93, + "y": 395, + "w": 25, + "h": 21 + } + }, + { + "filename": "991s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 20, + "h": 24 + }, + "frame": { + "x": 73, + "y": 408, + "w": 20, + "h": 24 + } + }, + { + "filename": "920", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 23 + }, + "frame": { + "x": 118, + "y": 395, + "w": 22, + "h": 23 + } + }, + { + "filename": "966", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 93, + "y": 416, + "w": 25, + "h": 21 + } + }, + { + "filename": "920s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 23 + }, + "frame": { + "x": 118, + "y": 418, + "w": 22, + "h": 23 + } + }, + { + "filename": "962", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 25 + }, + "frame": { + "x": 74, + "y": 432, + "w": 19, + "h": 25 + } + }, + { + "filename": "966s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 93, + "y": 437, + "w": 25, + "h": 21 + } + }, + { + "filename": "962s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 25 + }, + "frame": { + "x": 74, + "y": 457, + "w": 19, + "h": 25 + } + }, + { + "filename": "8128", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 93, + "y": 458, + "w": 25, + "h": 21 + } + }, + { + "filename": "1013-unremarkable", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 20, + "h": 24 + }, + "frame": { + "x": 118, + "y": 441, + "w": 20, + "h": 24 + } + }, + { + "filename": "923", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 19, + "h": 24 + }, + "frame": { + "x": 74, + "y": 482, + "w": 19, + "h": 24 + } + }, + { + "filename": "1011", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 19, + "h": 22 + }, + "frame": { + "x": 74, + "y": 506, + "w": 19, + "h": 22 + } + }, + { + "filename": "8128s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 93, + "y": 479, + "w": 25, + "h": 21 + } + }, + { + "filename": "927s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 24, + "h": 21 + }, + "frame": { + "x": 93, + "y": 500, + "w": 24, + "h": 21 + } + }, + { + "filename": "1013s-unremarkable", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 20, + "h": 24 + }, + "frame": { + "x": 118, + "y": 465, + "w": 20, + "h": 24 + } + }, + { + "filename": "923s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 19, + "h": 24 + }, + "frame": { + "x": 79, + "y": 528, + "w": 19, + "h": 24 + } + }, + { + "filename": "913s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 17, + "h": 23 + }, + "frame": { + "x": 80, + "y": 552, + "w": 17, + "h": 23 + } + }, + { + "filename": "1011s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 19, + "h": 22 + }, + "frame": { + "x": 98, + "y": 521, + "w": 19, + "h": 22 + } + }, + { + "filename": "931-green-plumage", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 20 + }, + "frame": { + "x": 118, + "y": 489, + "w": 20, + "h": 20 + } + }, + { + "filename": "941", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 21, + "h": 21 + }, + "frame": { + "x": 117, + "y": 509, + "w": 21, + "h": 21 + } + }, + { + "filename": "941s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 21, + "h": 21 + }, + "frame": { + "x": 117, + "y": 530, + "w": 21, + "h": 21 + } + }, + { + "filename": "915", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 11, + "w": 19, + "h": 17 + }, + "frame": { + "x": 98, + "y": 543, + "w": 19, + "h": 17 + } + }, + { + "filename": "931-white-plumage", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 20 + }, + "frame": { + "x": 97, + "y": 560, + "w": 20, + "h": 20 + } + }, + { + "filename": "939", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 21 + }, + "frame": { + "x": 117, + "y": 551, + "w": 20, + "h": 21 + } + }, + { + "filename": "907", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 17, + "h": 22 + }, + "frame": { + "x": 106, + "y": 580, + "w": 17, + "h": 22 + } + }, + { + "filename": "907s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 17, + "h": 22 + }, + "frame": { + "x": 123, + "y": 572, + "w": 17, + "h": 22 + } + }, { "filename": "943", "rotated": false, @@ -3846,33 +4245,12 @@ "h": 20 }, "frame": { - "x": 97, - "y": 419, + "x": 140, + "y": 325, "w": 24, "h": 20 } }, - { - "filename": "986", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 23, - "h": 23 - }, - "frame": { - "x": 98, - "y": 439, - "w": 23, - "h": 23 - } - }, { "filename": "943s", "rotated": false, @@ -3888,8 +4266,8 @@ "h": 20 }, "frame": { - "x": 121, - "y": 434, + "x": 164, + "y": 325, "w": 24, "h": 20 } @@ -3909,8 +4287,8 @@ "h": 20 }, "frame": { - "x": 145, - "y": 437, + "x": 139, + "y": 345, "w": 24, "h": 20 } @@ -3930,14 +4308,14 @@ "h": 20 }, "frame": { - "x": 169, - "y": 437, + "x": 163, + "y": 345, "w": 24, "h": 20 } }, { - "filename": "953s", + "filename": "939s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3945,20 +4323,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 12, - "w": 24, - "h": 16 + "x": 10, + "y": 7, + "w": 20, + "h": 21 }, "frame": { - "x": 121, - "y": 454, - "w": 24, - "h": 16 + "x": 139, + "y": 365, + "w": 20, + "h": 21 } }, { - "filename": "947", + "filename": "971", "rotated": false, "trimmed": true, "sourceSize": { @@ -3966,41 +4344,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 23, - "h": 22 + "x": 10, + "y": 7, + "w": 20, + "h": 21 }, "frame": { - "x": 145, - "y": 457, - "w": 23, - "h": 22 + "x": 159, + "y": 365, + "w": 20, + "h": 21 } }, { - "filename": "947s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 23, - "h": 22 - }, - "frame": { - "x": 168, - "y": 457, - "w": 23, - "h": 22 - } - }, - { - "filename": "986s", + "filename": "1004", "rotated": false, "trimmed": true, "sourceSize": { @@ -4009,40 +4366,19 @@ }, "spriteSourceSize": { "x": 9, - "y": 5, - "w": 23, - "h": 23 + "y": 8, + "w": 21, + "h": 20 }, "frame": { - "x": 107, - "y": 470, - "w": 23, - "h": 23 + "x": 188, + "y": 325, + "w": 21, + "h": 20 } }, { - "filename": "912", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 15, - "h": 19 - }, - "frame": { - "x": 130, - "y": 470, - "w": 15, - "h": 19 - } - }, - { - "filename": "920s", + "filename": "1004s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4051,19 +4387,19 @@ }, "spriteSourceSize": { "x": 9, - "y": 5, - "w": 22, - "h": 23 + "y": 8, + "w": 21, + "h": 20 }, "frame": { - "x": 109, - "y": 493, - "w": 22, - "h": 23 + "x": 187, + "y": 345, + "w": 21, + "h": 20 } }, { - "filename": "913", + "filename": "971s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4071,20 +4407,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 17, - "h": 23 + "x": 10, + "y": 7, + "w": 20, + "h": 21 }, "frame": { - "x": 113, - "y": 516, - "w": 17, - "h": 23 + "x": 179, + "y": 365, + "w": 20, + "h": 21 } }, { - "filename": "913s", + "filename": "931-yellow-plumage", "rotated": false, "trimmed": true, "sourceSize": { @@ -4092,20 +4428,83 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 17, - "h": 23 + "x": 10, + "y": 8, + "w": 20, + "h": 20 }, "frame": { - "x": 115, - "y": 539, - "w": 17, - "h": 23 + "x": 140, + "y": 386, + "w": 20, + "h": 20 } }, { - "filename": "907s", + "filename": "931s-blue-plumage", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 20 + }, + "frame": { + "x": 140, + "y": 406, + "w": 20, + "h": 20 + } + }, + { + "filename": "931s-green-plumage", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 20 + }, + "frame": { + "x": 160, + "y": 386, + "w": 20, + "h": 20 + } + }, + { + "filename": "931s-white-plumage", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 20 + }, + "frame": { + "x": 160, + "y": 406, + "w": 20, + "h": 20 + } + }, + { + "filename": "929", "rotated": false, "trimmed": true, "sourceSize": { @@ -4119,54 +4518,12 @@ "h": 22 }, "frame": { - "x": 131, - "y": 489, + "x": 180, + "y": 386, "w": 17, "h": 22 } }, - { - "filename": "917", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 22 - }, - "frame": { - "x": 148, - "y": 479, - "w": 22, - "h": 22 - } - }, - { - "filename": "917s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 22 - }, - "frame": { - "x": 170, - "y": 479, - "w": 22, - "h": 22 - } - }, { "filename": "963", "rotated": false, @@ -4182,12 +4539,180 @@ "h": 15 }, "frame": { - "x": 148, - "y": 501, + "x": 140, + "y": 426, "w": 22, "h": 15 } }, + { + "filename": "931s-yellow-plumage", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 20 + }, + "frame": { + "x": 138, + "y": 441, + "w": 20, + "h": 20 + } + }, + { + "filename": "929s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 17, + "h": 22 + }, + "frame": { + "x": 138, + "y": 461, + "w": 17, + "h": 22 + } + }, + { + "filename": "1015", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 17, + "h": 21 + }, + "frame": { + "x": 138, + "y": 483, + "w": 17, + "h": 21 + } + }, + { + "filename": "1015s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 17, + "h": 21 + }, + "frame": { + "x": 138, + "y": 504, + "w": 17, + "h": 21 + } + }, + { + "filename": "948s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 16, + "h": 21 + }, + "frame": { + "x": 138, + "y": 525, + "w": 16, + "h": 21 + } + }, + { + "filename": "906", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 18, + "h": 19 + }, + "frame": { + "x": 180, + "y": 408, + "w": 18, + "h": 19 + } + }, + { + "filename": "906s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 18, + "h": 19 + }, + "frame": { + "x": 162, + "y": 426, + "w": 18, + "h": 19 + } + }, + { + "filename": "909", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 18, + "h": 19 + }, + "frame": { + "x": 180, + "y": 427, + "w": 18, + "h": 19 + } + }, { "filename": "963s", "rotated": false, @@ -4203,14 +4728,14 @@ "h": 15 }, "frame": { - "x": 170, - "y": 501, + "x": 158, + "y": 445, "w": 22, "h": 15 } }, { - "filename": "929", + "filename": "909s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4219,19 +4744,19 @@ }, "spriteSourceSize": { "x": 11, - "y": 6, - "w": 17, - "h": 22 + "y": 9, + "w": 18, + "h": 19 }, "frame": { - "x": 119, - "y": 562, - "w": 17, - "h": 22 + "x": 180, + "y": 446, + "w": 18, + "h": 19 } }, { - "filename": "915", + "filename": "935", "rotated": false, "trimmed": true, "sourceSize": { @@ -4239,62 +4764,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 11, - "w": 19, - "h": 17 + "x": 13, + "y": 7, + "w": 13, + "h": 21 }, "frame": { - "x": 190, - "y": 199, - "w": 19, - "h": 17 + "x": 199, + "y": 365, + "w": 13, + "h": 21 } }, { - "filename": "931-blue-plumage", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 20, - "h": 20 - }, - "frame": { - "x": 209, - "y": 199, - "w": 20, - "h": 20 - } - }, - { - "filename": "1011s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 19, - "h": 22 - }, - "frame": { - "x": 229, - "y": 213, - "w": 19, - "h": 22 - } - }, - { - "filename": "948", + "filename": "951", "rotated": false, "trimmed": true, "sourceSize": { @@ -4303,19 +4786,19 @@ }, "spriteSourceSize": { "x": 12, - "y": 7, + "y": 8, "w": 16, - "h": 21 + "h": 20 }, "frame": { - "x": 193, - "y": 216, + "x": 197, + "y": 386, "w": 16, - "h": 21 + "h": 20 } }, { - "filename": "931-green-plumage", + "filename": "951s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4323,20 +4806,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, + "x": 12, "y": 8, - "w": 20, + "w": 16, "h": 20 }, "frame": { - "x": 209, - "y": 219, - "w": 20, + "x": 198, + "y": 406, + "w": 16, "h": 20 } }, { - "filename": "915s", + "filename": "958", "rotated": false, "trimmed": true, "sourceSize": { @@ -4345,206 +4828,17 @@ }, "spriteSourceSize": { "x": 11, - "y": 11, - "w": 19, - "h": 17 - }, - "frame": { - "x": 229, - "y": 235, - "w": 19, - "h": 17 - } - }, - { - "filename": "912s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 15, - "h": 19 - }, - "frame": { - "x": 194, - "y": 237, - "w": 15, - "h": 19 - } - }, - { - "filename": "931-white-plumage", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, "y": 8, - "w": 20, + "w": 17, "h": 20 }, "frame": { - "x": 209, - "y": 239, - "w": 20, + "x": 198, + "y": 426, + "w": 17, "h": 20 } }, - { - "filename": "946s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 19, - "h": 16 - }, - "frame": { - "x": 229, - "y": 252, - "w": 19, - "h": 16 - } - }, - { - "filename": "999-roaming", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 14, - "h": 18 - }, - "frame": { - "x": 195, - "y": 256, - "w": 14, - "h": 18 - } - }, - { - "filename": "931-yellow-plumage", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 20, - "h": 20 - }, - "frame": { - "x": 209, - "y": 259, - "w": 20, - "h": 20 - } - }, - { - "filename": "965", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 19, - "h": 16 - }, - "frame": { - "x": 229, - "y": 268, - "w": 19, - "h": 16 - } - }, - { - "filename": "999s-roaming", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 14, - "h": 18 - }, - "frame": { - "x": 195, - "y": 274, - "w": 14, - "h": 18 - } - }, - { - "filename": "931s-blue-plumage", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 20, - "h": 20 - }, - "frame": { - "x": 209, - "y": 279, - "w": 20, - "h": 20 - } - }, - { - "filename": "965s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 19, - "h": 16 - }, - "frame": { - "x": 229, - "y": 284, - "w": 19, - "h": 16 - } - }, { "filename": "922", "rotated": false, @@ -4560,8 +4854,8 @@ "h": 19 }, "frame": { - "x": 131, - "y": 511, + "x": 198, + "y": 446, "w": 17, "h": 19 } @@ -4581,533 +4875,8 @@ "h": 15 }, "frame": { - "x": 148, - "y": 516, - "w": 22, - "h": 15 - } - }, - { - "filename": "964s-zero", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 13, - "w": 22, - "h": 15 - }, - "frame": { - "x": 170, - "y": 516, - "w": 22, - "h": 15 - } - }, - { - "filename": "948s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 16, - "h": 21 - }, - "frame": { - "x": 132, - "y": 530, - "w": 16, - "h": 21 - } - }, - { - "filename": "910s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 21, - "h": 21 - }, - "frame": { - "x": 148, - "y": 531, - "w": 21, - "h": 21 - } - }, - { - "filename": "941", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 21, - "h": 21 - }, - "frame": { - "x": 169, - "y": 531, - "w": 21, - "h": 21 - } - }, - { - "filename": "929s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 17, - "h": 22 - }, - "frame": { - "x": 125, - "y": 584, - "w": 17, - "h": 22 - } - }, - { - "filename": "938", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 12, - "w": 11, - "h": 16 - }, - "frame": { - "x": 195, - "y": 292, - "w": 11, - "h": 16 - } - }, - { - "filename": "931s-green-plumage", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 20, - "h": 20 - }, - "frame": { - "x": 197, - "y": 308, - "w": 20, - "h": 20 - } - }, - { - "filename": "941s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 21, - "h": 21 - }, - "frame": { - "x": 195, - "y": 328, - "w": 21, - "h": 21 - } - }, - { - "filename": "939", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 21 - }, - "frame": { - "x": 195, - "y": 349, - "w": 20, - "h": 21 - } - }, - { - "filename": "939s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 21 - }, - "frame": { - "x": 195, - "y": 370, - "w": 20, - "h": 21 - } - }, - { - "filename": "935s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 7, - "w": 13, - "h": 21 - }, - "frame": { - "x": 191, - "y": 457, - "w": 13, - "h": 21 - } - }, - { - "filename": "971", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 21 - }, - "frame": { - "x": 192, - "y": 478, - "w": 20, - "h": 21 - } - }, - { - "filename": "971s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 21 - }, - "frame": { - "x": 192, - "y": 499, - "w": 20, - "h": 21 - } - }, - { - "filename": "931s-white-plumage", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 20, - "h": 20 - }, - "frame": { - "x": 192, - "y": 520, - "w": 20, - "h": 20 - } - }, - { - "filename": "974", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 13, - "w": 22, - "h": 15 - }, - "frame": { - "x": 190, - "y": 540, - "w": 22, - "h": 15 - } - }, - { - "filename": "1015", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 17, - "h": 21 - }, - "frame": { - "x": 216, - "y": 328, - "w": 17, - "h": 21 - } - }, - { - "filename": "931s-yellow-plumage", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 20, - "h": 20 - }, - "frame": { - "x": 215, - "y": 349, - "w": 20, - "h": 20 - } - }, - { - "filename": "1004", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 21, - "h": 20 - }, - "frame": { - "x": 215, - "y": 369, - "w": 21, - "h": 20 - } - }, - { - "filename": "960", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 15, - "h": 18 - }, - "frame": { - "x": 233, - "y": 300, - "w": 15, - "h": 18 - } - }, - { - "filename": "960s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 15, - "h": 18 - }, - "frame": { - "x": 233, - "y": 318, - "w": 15, - "h": 18 - } - }, - { - "filename": "928", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 13, - "h": 18 - }, - "frame": { - "x": 235, - "y": 336, - "w": 13, - "h": 18 - } - }, - { - "filename": "951", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 16, - "h": 20 - }, - "frame": { - "x": 217, - "y": 300, - "w": 16, - "h": 20 - } - }, - { - "filename": "974s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 13, - "w": 22, - "h": 15 - }, - "frame": { - "x": 215, - "y": 389, - "w": 22, - "h": 15 - } - }, - { - "filename": "967", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 9, - "w": 20, - "h": 19 - }, - "frame": { - "x": 195, - "y": 391, - "w": 20, - "h": 19 - } - }, - { - "filename": "980", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 22, - "h": 15 - }, - "frame": { - "x": 215, - "y": 404, + "x": 158, + "y": 460, "w": 22, "h": 15 } @@ -5127,54 +4896,12 @@ "h": 19 }, "frame": { - "x": 194, - "y": 410, + "x": 155, + "y": 475, "w": 21, "h": 19 } }, - { - "filename": "1004s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 21, - "h": 20 - }, - "frame": { - "x": 193, - "y": 429, - "w": 21, - "h": 20 - } - }, - { - "filename": "980s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 22, - "h": 15 - }, - "frame": { - "x": 215, - "y": 419, - "w": 22, - "h": 15 - } - }, { "filename": "997s", "rotated": false, @@ -5190,14 +4917,14 @@ "h": 19 }, "frame": { - "x": 214, - "y": 434, + "x": 155, + "y": 494, "w": 21, "h": 19 } }, { - "filename": "928s", + "filename": "964s-zero", "rotated": false, "trimmed": true, "sourceSize": { @@ -5205,20 +4932,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 13, - "h": 18 + "x": 9, + "y": 13, + "w": 22, + "h": 15 }, "frame": { - "x": 235, - "y": 434, - "w": 13, - "h": 18 + "x": 155, + "y": 513, + "w": 22, + "h": 15 } }, { - "filename": "938s", + "filename": "967", "rotated": false, "trimmed": true, "sourceSize": { @@ -5226,16 +4953,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 14, - "y": 12, - "w": 11, - "h": 16 + "x": 10, + "y": 9, + "w": 20, + "h": 19 }, "frame": { - "x": 237, - "y": 354, - "w": 11, - "h": 16 + "x": 154, + "y": 528, + "w": 20, + "h": 19 + } + }, + { + "filename": "974", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 13, + "w": 22, + "h": 15 + }, + "frame": { + "x": 180, + "y": 465, + "w": 22, + "h": 15 } }, { @@ -5253,14 +5001,14 @@ "h": 19 }, "frame": { - "x": 204, - "y": 453, + "x": 176, + "y": 480, "w": 20, "h": 19 } }, { - "filename": "909", + "filename": "940", "rotated": false, "trimmed": true, "sourceSize": { @@ -5269,19 +5017,103 @@ }, "spriteSourceSize": { "x": 11, + "y": 14, + "w": 17, + "h": 14 + }, + "frame": { + "x": 176, + "y": 499, + "w": 17, + "h": 14 + } + }, + { + "filename": "915s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 11, + "w": 19, + "h": 17 + }, + "frame": { + "x": 177, + "y": 513, + "w": 19, + "h": 17 + } + }, + { + "filename": "974s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 13, + "w": 22, + "h": 15 + }, + "frame": { + "x": 174, + "y": 530, + "w": 22, + "h": 15 + } + }, + { + "filename": "912", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, "y": 9, - "w": 18, + "w": 15, "h": 19 }, "frame": { - "x": 224, - "y": 453, - "w": 18, + "x": 202, + "y": 465, + "w": 15, "h": 19 } }, { - "filename": "1015s", + "filename": "980", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 10, + "w": 22, + "h": 15 + }, + "frame": { + "x": 196, + "y": 484, + "w": 22, + "h": 15 + } + }, + { + "filename": "940s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5290,17 +5122,122 @@ }, "spriteSourceSize": { "x": 11, - "y": 7, + "y": 14, "w": 17, + "h": 14 + }, + "frame": { + "x": 193, + "y": 499, + "w": 17, + "h": 14 + } + }, + { + "filename": "935s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 7, + "w": 13, "h": 21 }, "frame": { - "x": 212, - "y": 472, - "w": 17, + "x": 196, + "y": 513, + "w": 13, "h": 21 } }, + { + "filename": "980s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 10, + "w": 22, + "h": 15 + }, + "frame": { + "x": 225, + "y": 317, + "w": 22, + "h": 15 + } + }, + { + "filename": "999s-roaming", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 14, + "h": 18 + }, + "frame": { + "x": 211, + "y": 321, + "w": 14, + "h": 18 + } + }, + { + "filename": "970s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 20, + "h": 16 + }, + "frame": { + "x": 225, + "y": 332, + "w": 20, + "h": 16 + } + }, + { + "filename": "919", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 13, + "w": 16, + "h": 15 + }, + "frame": { + "x": 209, + "y": 339, + "w": 16, + "h": 15 + } + }, { "filename": "942", "rotated": false, @@ -5316,12 +5253,33 @@ "h": 15 }, "frame": { - "x": 229, - "y": 472, + "x": 225, + "y": 348, "w": 19, "h": 15 } }, + { + "filename": "928", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 13, + "h": 18 + }, + "frame": { + "x": 212, + "y": 354, + "w": 13, + "h": 18 + } + }, { "filename": "942s", "rotated": false, @@ -5337,14 +5295,14 @@ "h": 15 }, "frame": { - "x": 229, - "y": 487, + "x": 225, + "y": 363, "w": 19, "h": 15 } }, { - "filename": "958", + "filename": "912s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5352,60 +5310,102 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 20 - }, - "frame": { - "x": 212, - "y": 493, - "w": 17, - "h": 20 - } - }, - { - "filename": "958s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 20 - }, - "frame": { - "x": 212, - "y": 513, - "w": 17, - "h": 20 - } - }, - { - "filename": "909s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, + "x": 13, "y": 9, - "w": 18, + "w": 15, "h": 19 }, "frame": { - "x": 229, - "y": 502, - "w": 18, + "x": 196, + "y": 534, + "w": 15, "h": 19 } }, + { + "filename": "919s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 13, + "w": 16, + "h": 15 + }, + "frame": { + "x": 138, + "y": 546, + "w": 16, + "h": 15 + } + }, + { + "filename": "946", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 19, + "h": 16 + }, + "frame": { + "x": 154, + "y": 547, + "w": 19, + "h": 16 + } + }, + { + "filename": "921", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 16, + "h": 18 + }, + "frame": { + "x": 210, + "y": 499, + "w": 16, + "h": 18 + } + }, + { + "filename": "8194", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 11, + "w": 18, + "h": 17 + }, + "frame": { + "x": 209, + "y": 517, + "w": 18, + "h": 17 + } + }, { "filename": "922s", "rotated": false, @@ -5421,12 +5421,117 @@ "h": 19 }, "frame": { - "x": 212, - "y": 533, + "x": 211, + "y": 534, "w": 17, "h": 19 } }, + { + "filename": "946s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 19, + "h": 16 + }, + "frame": { + "x": 174, + "y": 545, + "w": 19, + "h": 16 + } + }, + { + "filename": "965", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 19, + "h": 16 + }, + "frame": { + "x": 193, + "y": 553, + "w": 19, + "h": 16 + } + }, + { + "filename": "921s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 16, + "h": 18 + }, + "frame": { + "x": 212, + "y": 553, + "w": 16, + "h": 18 + } + }, + { + "filename": "928s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 13, + "h": 18 + }, + "frame": { + "x": 140, + "y": 561, + "w": 13, + "h": 18 + } + }, + { + "filename": "965s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 19, + "h": 16 + }, + "frame": { + "x": 153, + "y": 563, + "w": 19, + "h": 16 + } + }, { "filename": "932", "rotated": false, @@ -5442,8 +5547,8 @@ "h": 19 }, "frame": { - "x": 229, - "y": 521, + "x": 140, + "y": 579, "w": 18, "h": 19 } @@ -5463,14 +5568,14 @@ "h": 19 }, "frame": { - "x": 229, - "y": 540, + "x": 158, + "y": 579, "w": 18, "h": 19 } }, { - "filename": "926", + "filename": "958s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5479,185 +5584,17 @@ }, "spriteSourceSize": { "x": 11, - "y": 13, - "w": 17, - "h": 15 - }, - "frame": { - "x": 212, - "y": 552, - "w": 17, - "h": 15 - } - }, - { - "filename": "969", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 16, - "w": 18, - "h": 12 - }, - "frame": { - "x": 229, - "y": 559, - "w": 18, - "h": 12 - } - }, - { - "filename": "957", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 16, - "h": 17 - }, - "frame": { - "x": 136, - "y": 567, - "w": 16, - "h": 17 - } - }, - { - "filename": "951s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, "y": 8, - "w": 16, + "w": 17, "h": 20 }, "frame": { - "x": 142, - "y": 584, - "w": 16, + "x": 176, + "y": 561, + "w": 17, "h": 20 } }, - { - "filename": "926s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 13, - "w": 17, - "h": 15 - }, - "frame": { - "x": 136, - "y": 552, - "w": 17, - "h": 15 - } - }, - { - "filename": "970", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 20, - "h": 16 - }, - "frame": { - "x": 153, - "y": 552, - "w": 20, - "h": 16 - } - }, - { - "filename": "970s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 20, - "h": 16 - }, - "frame": { - "x": 152, - "y": 568, - "w": 20, - "h": 16 - } - }, - { - "filename": "955", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 12, - "w": 17, - "h": 16 - }, - "frame": { - "x": 173, - "y": 552, - "w": 17, - "h": 16 - } - }, - { - "filename": "8194", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 11, - "w": 18, - "h": 17 - }, - "frame": { - "x": 172, - "y": 568, - "w": 18, - "h": 17 - } - }, { "filename": "8194s", "rotated": false, @@ -5673,14 +5610,14 @@ "h": 17 }, "frame": { - "x": 190, - "y": 555, + "x": 176, + "y": 581, "w": 18, "h": 17 } }, { - "filename": "940", + "filename": "969", "rotated": false, "trimmed": true, "sourceSize": { @@ -5689,19 +5626,19 @@ }, "spriteSourceSize": { "x": 11, - "y": 14, - "w": 17, - "h": 14 + "y": 16, + "w": 18, + "h": 12 }, "frame": { - "x": 190, - "y": 572, - "w": 17, - "h": 14 + "x": 193, + "y": 569, + "w": 18, + "h": 12 } }, { - "filename": "921s", + "filename": "955", "rotated": false, "trimmed": true, "sourceSize": { @@ -5709,37 +5646,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 16, - "h": 18 + "x": 11, + "y": 12, + "w": 17, + "h": 16 }, "frame": { - "x": 158, - "y": 585, - "w": 16, - "h": 18 - } - }, - { - "filename": "957s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 16, - "h": 17 - }, - "frame": { - "x": 174, - "y": 585, - "w": 16, - "h": 17 + "x": 194, + "y": 581, + "w": 17, + "h": 16 } }, { @@ -5757,12 +5673,33 @@ "h": 16 }, "frame": { - "x": 190, - "y": 586, + "x": 211, + "y": 571, "w": 17, "h": 16 } }, + { + "filename": "957s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 16, + "h": 17 + }, + "frame": { + "x": 211, + "y": 587, + "w": 16, + "h": 17 + } + }, { "filename": "969s", "rotated": false, @@ -5778,56 +5715,14 @@ "h": 12 }, "frame": { - "x": 208, - "y": 567, + "x": 226, + "y": 378, "w": 18, "h": 12 } }, { - "filename": "919", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 13, - "w": 16, - "h": 15 - }, - "frame": { - "x": 207, - "y": 579, - "w": 16, - "h": 15 - } - }, - { - "filename": "919s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 13, - "w": 16, - "h": 15 - }, - "frame": { - "x": 207, - "y": 594, - "w": 16, - "h": 15 - } - }, - { - "filename": "940s", + "filename": "926", "rotated": false, "trimmed": true, "sourceSize": { @@ -5836,15 +5731,78 @@ }, "spriteSourceSize": { "x": 11, - "y": 14, + "y": 13, "w": 17, - "h": 14 + "h": 15 }, "frame": { - "x": 226, - "y": 571, + "x": 213, + "y": 390, "w": 17, - "h": 14 + "h": 15 + } + }, + { + "filename": "960", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 15, + "h": 18 + }, + "frame": { + "x": 214, + "y": 405, + "w": 15, + "h": 18 + } + }, + { + "filename": "926s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 13, + "w": 17, + "h": 15 + }, + "frame": { + "x": 230, + "y": 390, + "w": 17, + "h": 15 + } + }, + { + "filename": "960s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 15, + "h": 18 + }, + "frame": { + "x": 229, + "y": 405, + "w": 15, + "h": 18 } }, { @@ -5862,8 +5820,8 @@ "h": 15 }, "frame": { - "x": 223, - "y": 585, + "x": 215, + "y": 423, "w": 16, "h": 15 } @@ -5883,33 +5841,12 @@ "h": 15 }, "frame": { - "x": 223, - "y": 600, + "x": 215, + "y": 438, "w": 16, "h": 15 } }, - { - "filename": "978-curly", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 14, - "w": 15, - "h": 14 - }, - "frame": { - "x": 142, - "y": 604, - "w": 15, - "h": 14 - } - }, { "filename": "996", "rotated": false, @@ -5925,12 +5862,33 @@ "h": 16 }, "frame": { - "x": 139, - "y": 618, + "x": 231, + "y": 423, "w": 15, "h": 16 } }, + { + "filename": "978-curly", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 14, + "w": 15, + "h": 14 + }, + "frame": { + "x": 231, + "y": 439, + "w": 15, + "h": 14 + } + }, { "filename": "996s", "rotated": false, @@ -5946,8 +5904,8 @@ "h": 16 }, "frame": { - "x": 154, - "y": 618, + "x": 217, + "y": 453, "w": 15, "h": 16 } @@ -5967,12 +5925,33 @@ "h": 14 }, "frame": { - "x": 157, - "y": 604, + "x": 217, + "y": 469, "w": 15, "h": 14 } }, + { + "filename": "938", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 12, + "w": 11, + "h": 16 + }, + "frame": { + "x": 218, + "y": 483, + "w": 11, + "h": 16 + } + }, { "filename": "978-stretchy", "rotated": false, @@ -5988,8 +5967,8 @@ "h": 14 }, "frame": { - "x": 169, - "y": 618, + "x": 232, + "y": 453, "w": 15, "h": 14 } @@ -6009,12 +5988,33 @@ "h": 14 }, "frame": { - "x": 174, - "y": 602, + "x": 232, + "y": 467, "w": 15, "h": 14 } }, + { + "filename": "938s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 12, + "w": 11, + "h": 16 + }, + "frame": { + "x": 226, + "y": 499, + "w": 11, + "h": 16 + } + }, { "filename": "978s-droopy", "rotated": false, @@ -6030,8 +6030,8 @@ "h": 14 }, "frame": { - "x": 189, - "y": 602, + "x": 227, + "y": 515, "w": 15, "h": 14 } @@ -6051,8 +6051,8 @@ "h": 14 }, "frame": { - "x": 184, - "y": 616, + "x": 228, + "y": 529, "w": 15, "h": 14 } @@ -6063,6 +6063,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:537db10f730d6587e6eac8b6f843e5ee:b89e39dcf2ffc80674586079d88ed60d:6fb417eff82c0971c86b4818772ba292$" + "smartupdate": "$TexturePacker:SmartUpdate:e795275a3a477a2abaa0caebf537dee7:b89e39dcf2ffc80674586079d88ed60d:6fb417eff82c0971c86b4818772ba292$" } } diff --git a/public/images/pokemon_icons_9.png b/public/images/pokemon_icons_9.png index fca3eb6a9..13a45ac3c 100644 Binary files a/public/images/pokemon_icons_9.png and b/public/images/pokemon_icons_9.png differ diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 14fddfd36..28a09a24d 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -4,7 +4,7 @@ import { NextEncounterPhase, NewBiomeEncounterPhase, SelectBiomePhase, MessagePh import Pokemon, { PlayerPokemon, EnemyPokemon } from './field/pokemon'; import PokemonSpecies, { PokemonSpeciesFilter, allSpecies, getPokemonSpecies, initSpecies, speciesStarters } from './data/pokemon-species'; import * as Utils from './utils'; -import { Modifier, ModifierBar, ConsumablePokemonModifier, ConsumableModifier, PokemonHpRestoreModifier, HealingBoosterModifier, PersistentModifier, PokemonHeldItemModifier, ModifierPredicate, DoubleBattleChanceBoosterModifier, FusePokemonModifier, PokemonFormChangeItemModifier, TerastallizeModifier } from './modifier/modifier'; +import { Modifier, ModifierBar, ConsumablePokemonModifier, ConsumableModifier, PokemonHpRestoreModifier, HealingBoosterModifier, PersistentModifier, PokemonHeldItemModifier, ModifierPredicate, DoubleBattleChanceBoosterModifier, FusePokemonModifier, PokemonFormChangeItemModifier, TerastallizeModifier, overrideModifiers, overrideHeldItems } from './modifier/modifier'; import { PokeballType } from './data/pokeball'; import { initCommonAnims, initMoveAnim, loadCommonAnimAssets, loadMoveAnimAssets, populateAnims } from './data/battle-anims'; import { Phase } from './phase'; @@ -59,7 +59,7 @@ import { SceneBase } from './scene-base'; import CandyBar from './ui/candy-bar'; import { Variant, variantData } from './data/variant'; import { Localizable } from './plugins/i18n'; -import { STARTING_WAVE_OVERRIDE, OPP_SPECIES_OVERRIDE, SEED_OVERRIDE, STARTING_BIOME_OVERRIDE, DOUBLE_BATTLE_OVERRIDE } from './overrides'; +import * as Overrides from './overrides'; import {InputsController} from "./inputs-controller"; import {UiInputs} from "./ui-inputs"; @@ -67,7 +67,7 @@ export const bypassLogin = import.meta.env.VITE_BYPASS_LOGIN === "1"; const DEBUG_RNG = false; -export const startingWave = STARTING_WAVE_OVERRIDE || 1; +export const startingWave = Overrides.STARTING_WAVE_OVERRIDE || 1; const expSpriteKeys: string[] = []; @@ -611,9 +611,11 @@ export default class BattleScene extends SceneBase { } addEnemyPokemon(species: PokemonSpecies, level: integer, trainerSlot: TrainerSlot, boss: boolean = false, dataSource?: PokemonData, postProcess?: (enemyPokemon: EnemyPokemon) => void): EnemyPokemon { - if (OPP_SPECIES_OVERRIDE) - species = getPokemonSpecies(OPP_SPECIES_OVERRIDE); + if (Overrides.OPP_SPECIES_OVERRIDE) + species = getPokemonSpecies(Overrides.OPP_SPECIES_OVERRIDE); const pokemon = new EnemyPokemon(this, species, level, trainerSlot, boss, dataSource); + overrideModifiers(this, false); + overrideHeldItems(this, pokemon, false); if (boss && !dataSource) { const secondaryIvs = Utils.getIvsFromId(Utils.randSeedInt(4294967295)); @@ -704,7 +706,7 @@ export default class BattleScene extends SceneBase { this.gameMode = gameModes[GameModes.CLASSIC]; - this.setSeed(SEED_OVERRIDE || Utils.randomString(24)); + this.setSeed(Overrides.SEED_OVERRIDE || Utils.randomString(24)); console.log('Seed:', this.seed); this.disableMenu = false; @@ -741,7 +743,7 @@ export default class BattleScene extends SceneBase { [ this.luckLabelText, this.luckText ].map(t => t.setVisible(false)); - this.newArena(STARTING_BIOME_OVERRIDE || Biome.TOWN); + this.newArena(Overrides.STARTING_BIOME_OVERRIDE || Biome.TOWN); this.arenaBgTransition.setPosition(0, 0); this.arenaPlayer.setPosition(300, 0); @@ -841,7 +843,7 @@ export default class BattleScene extends SceneBase { } else if (!battleConfig) newDouble = !!double; - if (DOUBLE_BATTLE_OVERRIDE) + if (Overrides.DOUBLE_BATTLE_OVERRIDE) newDouble = true; const lastBattle = this.currentBattle; @@ -1766,6 +1768,19 @@ export default class BattleScene extends SceneBase { }); } + /** + * Removes all modifiers from enemy of PersistentModifier type + */ + clearEnemyModifiers(): void { + const modifiersToRemove = this.enemyModifiers.filter(m => m instanceof PersistentModifier); + for (let m of modifiersToRemove) + this.enemyModifiers.splice(this.enemyModifiers.indexOf(m), 1); + this.updateModifiers(false).then(() => this.updateUIPositions()); + } + + /** + * Removes all modifiers from enemy of PokemonHeldItemModifier type + */ clearEnemyHeldItemModifiers(): void { const modifiersToRemove = this.enemyModifiers.filter(m => m instanceof PokemonHeldItemModifier); for (let m of modifiersToRemove) diff --git a/src/data/ability.ts b/src/data/ability.ts index 0d2c0cc27..f2220c850 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -562,19 +562,28 @@ export class PostDefendStatChangeAbAttr extends PostDefendAbAttr { private stat: BattleStat; private levels: integer; private selfTarget: boolean; + private allOthers: boolean; - constructor(condition: PokemonDefendCondition, stat: BattleStat, levels: integer, selfTarget: boolean = true) { + constructor(condition: PokemonDefendCondition, stat: BattleStat, levels: integer, selfTarget: boolean = true, allOthers: boolean = false) { super(true); this.condition = condition; this.stat = stat; this.levels = levels; this.selfTarget = selfTarget; + this.allOthers = allOthers; } applyPostDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: PokemonMove, hitResult: HitResult, args: any[]): boolean { if (this.condition(pokemon, attacker, move.getMove())) { - pokemon.scene.unshiftPhase(new StatChangePhase(pokemon.scene, (this.selfTarget ? pokemon : attacker).getBattlerIndex(), true, [ this.stat ], this.levels)); + if (this.allOthers) { + let otherPokemon = pokemon.getAlly() ? pokemon.getOpponents().concat([ pokemon.getAlly() ]) : pokemon.getOpponents(); + for (let other of otherPokemon) { + other.scene.unshiftPhase(new StatChangePhase(other.scene, (other).getBattlerIndex(), false, [ this.stat ], this.levels)); + } + return true; + } + pokemon.scene.unshiftPhase(new StatChangePhase(pokemon.scene, (this.selfTarget ? pokemon : attacker).getBattlerIndex(), this.selfTarget, [ this.stat ], this.levels)); return true; } @@ -851,6 +860,36 @@ export class PostDefendAbilityGiveAbAttr extends PostDefendAbAttr { } } +export class PostDefendMoveDisableAbAttr extends PostDefendAbAttr { + private chance: integer; + private attacker: Pokemon; + private move: PokemonMove; + + constructor(chance: integer) { + super(); + + this.chance = chance; + } + + applyPostDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: PokemonMove, hitResult: HitResult, args: any[]): boolean { + if (!attacker.summonData.disabledMove) { + if (move.getMove().checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) && (this.chance === -1 || pokemon.randSeedInt(100) < this.chance) && !attacker.isMax()) { + this.attacker = attacker; + this.move = move; + + attacker.summonData.disabledMove = move.moveId; + attacker.summonData.disabledTurns = 4; + return true; + } + } + return false; + } + + getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string { + return getPokemonMessage(this.attacker, `'s ${this.move.getName()}\nwas disabled!`); + } +} + export class PostStatChangeStatChangeAbAttr extends PostStatChangeAbAttr { private condition: PokemonStatChangeCondition; private statsToChange: BattleStat[]; @@ -2016,13 +2055,30 @@ export class PostTurnAbAttr extends AbAttr { } } +/** + * After the turn ends, resets the status of either the ability holder or their ally + * @param {boolean} allyTarget Whether to target ally, defaults to false (self-target) + */ export class PostTurnResetStatusAbAttr extends PostTurnAbAttr { + private allyTarget: boolean; + private target: Pokemon; + + constructor(allyTarget: boolean = false) { + super(true); + this.allyTarget = allyTarget; + } + applyPostTurn(pokemon: Pokemon, passive: boolean, args: any[]): boolean { - if (pokemon.status) { + if (this.allyTarget) { + this.target = pokemon.getAlly(); + } else { + this.target = pokemon; + } + if (this.target?.status) { - pokemon.scene.queueMessage(getPokemonMessage(pokemon, getStatusEffectHealText(pokemon.status?.effect))); - pokemon.resetStatus(); - pokemon.updateInfo(); + this.target.scene.queueMessage(getPokemonMessage(this.target, getStatusEffectHealText(this.target.status?.effect))); + this.target.resetStatus(false); + this.target.updateInfo(); return true; } @@ -3067,9 +3123,10 @@ export function initAbilities() { .attr(BattleStatMultiplierAbAttr, BattleStat.SPATK, 0.5) .condition((pokemon) => pokemon.getHpRatio() <= 0.5), new Ability(Abilities.CURSED_BODY, 5) - .unimplemented(), + .attr(PostDefendMoveDisableAbAttr, 30) + .bypassFaint(), new Ability(Abilities.HEALER, 5) - .unimplemented(), + .conditionalAttr(pokemon => pokemon.getAlly() && Utils.randSeedInt(10) < 3, PostTurnResetStatusAbAttr, true), new Ability(Abilities.FRIEND_GUARD, 5) .ignorable() .unimplemented(), @@ -3248,7 +3305,7 @@ export function initAbilities() { new Ability(Abilities.EMERGENCY_EXIT, 7) .unimplemented(), new Ability(Abilities.WATER_COMPACTION, 7) - .attr(PostDefendStatChangeAbAttr, (target, user, move) => move.type === Type.WATER, BattleStat.DEF, 2), + .attr(PostDefendStatChangeAbAttr, (target, user, move) => move.type === Type.WATER && move.category !== MoveCategory.STATUS, BattleStat.DEF, 2), new Ability(Abilities.MERCILESS, 7) .unimplemented(), new Ability(Abilities.SHIELDS_DOWN, 7) @@ -3405,7 +3462,8 @@ export function initAbilities() { new Ability(Abilities.BALL_FETCH, 8) .unimplemented(), new Ability(Abilities.COTTON_DOWN, 8) - .unimplemented(), + .attr(PostDefendStatChangeAbAttr, (target, user, move) => move.category !== MoveCategory.STATUS, BattleStat.SPD, -1, false, true) + .bypassFaint(), new Ability(Abilities.PROPELLER_TAIL, 8) .unimplemented(), new Ability(Abilities.MIRROR_ARMOR, 8) diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index 0fea80c37..ba00b0906 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -68,6 +68,17 @@ export class BattlerTag { ? allMoves[this.sourceMove].name : null; } + + /** + * When given a battler tag or json representing one, load the data for it. + * This is meant to be inherited from by any battler tag with custom attributes + * @param {BattlerTag | any} source A battler tag + */ + loadTag(source: BattlerTag | any): void { + this.turnCount = source.turnCount; + this.sourceMove = source.sourceMove; + this.sourceId = source.sourceId; + } } export interface WeatherBattlerTag { @@ -299,6 +310,15 @@ export class SeedTag extends BattlerTag { super(BattlerTagType.SEEDED, BattlerTagLapseType.TURN_END, 1, Moves.LEECH_SEED, sourceId); } + /** + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ + loadTag(source: BattlerTag | any): void { + super.loadTag(source); + this.sourceIndex = source.sourceIndex; + } + canAdd(pokemon: Pokemon): boolean { return !pokemon.isOfType(Type.GRASS); } @@ -404,6 +424,15 @@ export class EncoreTag extends BattlerTag { super(BattlerTagType.ENCORE, BattlerTagLapseType.AFTER_MOVE, 3, Moves.ENCORE, sourceId); } + /** + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ + loadTag(source: BattlerTag | any): void { + super.loadTag(source); + this.moveId = source.moveId as Moves; + } + canAdd(pokemon: Pokemon): boolean { if (pokemon.isMax()) return false; @@ -553,6 +582,15 @@ export abstract class DamagingTrapTag extends TrappedTag { this.commonAnim = commonAnim; } + /** + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ + loadTag(source: BattlerTag | any): void { + super.loadTag(source); + this.commonAnim = source.commonAnim as CommonAnim; + } + canAdd(pokemon: Pokemon): boolean { return !pokemon.isOfType(Type.GHOST) && !pokemon.findTag(t => t instanceof DamagingTrapTag); } @@ -709,6 +747,15 @@ export class ContactDamageProtectedTag extends ProtectedTag { this.damageRatio = damageRatio; } + /** + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ + loadTag(source: BattlerTag | any): void { + super.loadTag(source); + this.damageRatio = source.damageRatio; + } + lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { const ret = super.lapse(pokemon, lapseType); @@ -735,6 +782,16 @@ export class ContactStatChangeProtectedTag extends ProtectedTag { this.levels = levels; } + /** + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ + loadTag(source: BattlerTag | any): void { + super.loadTag(source); + this.stat = source.stat as BattleStat; + this.levels = source.levels; + } + lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { const ret = super.lapse(pokemon, lapseType); @@ -855,6 +912,15 @@ export class AbilityBattlerTag extends BattlerTag { this.ability = ability; } + + /** + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ + loadTag(source: BattlerTag | any): void { + super.loadTag(source); + this.ability = source.ability as Abilities; + } } export class TruantTag extends AbilityBattlerTag { @@ -912,6 +978,16 @@ export class HighestStatBoostTag extends AbilityBattlerTag { super(tagType, ability, BattlerTagLapseType.CUSTOM, 1); } + /** + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ + loadTag(source: BattlerTag | any): void { + super.loadTag(source); + this.stat = source.stat as Stat; + this.multiplier = source.multiplier; + } + onAdd(pokemon: Pokemon): void { super.onAdd(pokemon); @@ -953,6 +1029,15 @@ export class WeatherHighestStatBoostTag extends HighestStatBoostTag implements W super(tagType, ability); this.weatherTypes = weatherTypes; } + + /** + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ + loadTag(source: BattlerTag | any): void { + super.loadTag(source); + this.weatherTypes = source.weatherTypes.map(w => w as WeatherType); + } } export class TerrainHighestStatBoostTag extends HighestStatBoostTag implements TerrainBattlerTag { @@ -962,6 +1047,15 @@ export class TerrainHighestStatBoostTag extends HighestStatBoostTag implements T super(tagType, ability); this.terrainTypes = terrainTypes; } + + /** + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ + loadTag(source: BattlerTag | any): void { + super.loadTag(source); + this.terrainTypes = source.terrainTypes.map(w => w as TerrainType); + } } export class HideSpriteTag extends BattlerTag { @@ -989,6 +1083,15 @@ export class TypeImmuneTag extends BattlerTag { constructor(tagType: BattlerTagType, sourceMove: Moves, immuneType: Type, length: number) { super(tagType, BattlerTagLapseType.TURN_END, 1, sourceMove); } + + /** + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ + loadTag(source: BattlerTag | any): void { + super.loadTag(source); + this.immuneType = source.immuneType as Type; + } } export class MagnetRisenTag extends TypeImmuneTag { @@ -1010,6 +1113,17 @@ export class TypeBoostTag extends BattlerTag { this.oneUse = oneUse; } + /** + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ + loadTag(source: BattlerTag | any): void { + super.loadTag(source); + this.boostedType = source.boostedType as Type; + this.boostValue = source.boostValue; + this.oneUse = source.oneUse; + } + lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { return lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType); } @@ -1056,6 +1170,15 @@ export class SaltCuredTag extends BattlerTag { super(BattlerTagType.SALT_CURED, BattlerTagLapseType.TURN_END, 1, Moves.SALT_CURE, sourceId); } + /** + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ + loadTag(source: BattlerTag | any): void { + super.loadTag(source); + this.sourceIndex = source.sourceIndex; + } + onAdd(pokemon: Pokemon): void { super.onAdd(pokemon); @@ -1091,6 +1214,15 @@ export class CursedTag extends BattlerTag { super(BattlerTagType.CURSED, BattlerTagLapseType.TURN_END, 1, Moves.CURSE, sourceId); } + /** + * When given a battler tag or json representing one, load the data for it. + * @param {BattlerTag | any} source A battler tag + */ + loadTag(source: BattlerTag | any): void { + super.loadTag(source); + this.sourceIndex = source.sourceIndex; + } + onAdd(pokemon: Pokemon): void { super.onAdd(pokemon); @@ -1231,4 +1363,15 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: integer, sourc return new BattlerTag(tagType, BattlerTagLapseType.CUSTOM, turnCount, sourceMove, sourceId); } } - \ No newline at end of file + +/** +* When given a battler tag or json representing one, creates an actual BattlerTag object with the same data. +* @param {BattlerTag | any} source A battler tag +* @return {BattlerTag} The valid battler tag +*/ +export function loadBattlerTag(source: BattlerTag | any): BattlerTag { + const tag = getBattlerTag(source.tagType, source.turnCount, source.sourceMove, source.sourceId); + tag.loadTag(source); + return tag; +} + diff --git a/src/data/dialogue.ts b/src/data/dialogue.ts index ec9fde7eb..830b5f437 100644 --- a/src/data/dialogue.ts +++ b/src/data/dialogue.ts @@ -1920,7 +1920,8 @@ export const trainerTypeDialogue = { }, [TrainerType.WULFRIC]: { encounter: [ - `You know what? We all talk big about what you learn from battling and bonds and all that, but really, I just do it 'cause it's fun. + `You know what? We all talk big about what you learn from battling and bonds and all that… + $But really, I just do it 'cause it's fun. $Who cares about the grandstanding? Let's get to battling!`, ], victory: [ diff --git a/src/data/move.ts b/src/data/move.ts index fd55bc920..6e4e3f60f 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -1,6 +1,6 @@ import { Moves } from "./enums/moves"; import { ChargeAnim, MoveChargeAnim, initMoveAnim, loadMoveAnimAssets } from "./battle-anims"; -import { BattleEndPhase, MovePhase, NewBattlePhase, PokemonHealPhase, StatChangePhase, SwitchSummonPhase } from "../phases"; +import { BattleEndPhase, MovePhase, NewBattlePhase, PartyEffectPhase, PartyStatusCurePhase, PokemonHealPhase, StatChangePhase, SwitchSummonPhase } from "../phases"; import { BattleStat, getBattleStatName } from "./battle-stat"; import { EncoreTag } from "./battler-tags"; import { BattlerTagType } from "./enums/battler-tag-type"; @@ -50,7 +50,8 @@ export enum MoveTarget { ALL, USER_SIDE, ENEMY_SIDE, - BOTH_SIDES + BOTH_SIDES, + PARTY } export enum MoveFlags { @@ -832,6 +833,34 @@ export class HealAttr extends MoveEffectAttr { } } +/** + * Cures the user's party of non-volatile status conditions, ie. Heal Bell, Aromatherapy + * @param {string} message Message to display after using move + * @param {Abilities} abilityCondition Skips mons with this ability, ie. Soundproof + */ +export class PartyStatusCureAttr extends MoveEffectAttr { + private message: string; + private abilityCondition: Abilities; + + constructor(message: string, abilityCondition: Abilities) { + super(); + + this.message = message; + this.abilityCondition = abilityCondition; + } + + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + if (!super.apply(user, target, move, args)) + return false; + + this.addPartyCurePhase(user); + } + + addPartyCurePhase(user: Pokemon) { + user.scene.unshiftPhase(new PartyStatusCurePhase(user.scene, user, this.message, this.abilityCondition)); + } +} + export class SacrificialFullRestoreAttr extends SacrificialAttr { constructor() { super(); @@ -859,6 +888,33 @@ export class SacrificialFullRestoreAttr extends SacrificialAttr { } } +/** + * Attribute used for moves which ignore type-based debuffs from weather, namely Hydro Steam. + * Called during damage calculation after getting said debuff from getAttackTypeMultiplier in the Pokemon class. + */ +export class IgnoreWeatherTypeDebuffAttr extends MoveAttr { + public weather: WeatherType; + constructor(weather: WeatherType){ + super(); + this.weather = weather; + } + /** + * Changes the type-based weather modifier if this move's power would be reduced by it + * @param user Pokemon that used the move + * @param target N/A + * @param move Move with this attribute + * @param args Utils.NumberHolder for arenaAttackTypeMultiplier + * @returns true if the function succeeds + */ + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + const weatherModifier=args[0] as Utils.NumberHolder; + //If the type-based attack power modifier due to weather (e.g. Water moves in Sun) is below 1, set it to 1 + if (user.scene.arena.weather?.weatherType === this.weather) + weatherModifier.value = Math.max(weatherModifier.value, 1); + return true; + } +} + export abstract class WeatherHealAttr extends HealAttr { constructor() { super(0.5); @@ -4003,6 +4059,7 @@ export function getMoveTargets(user: Pokemon, move: Moves): MoveTargetSet { switch (moveTarget) { case MoveTarget.USER: + case MoveTarget.PARTY: set = [ user]; break; case MoveTarget.NEAR_OTHER: @@ -4628,9 +4685,9 @@ export function initMoves() { .condition((user, target, move) => user.status?.effect === StatusEffect.SLEEP) .ignoresVirtual(), new StatusMove(Moves.HEAL_BELL, Type.NORMAL, -1, 5, -1, 0, 2) + .attr(PartyStatusCureAttr, "A bell chimed!", Abilities.SOUNDPROOF) .soundBased() - .target(MoveTarget.USER_AND_ALLIES) - .unimplemented(), + .target(MoveTarget.PARTY), new AttackMove(Moves.RETURN, Type.NORMAL, MoveCategory.PHYSICAL, -1, 100, 20, -1, 0, 2) .attr(FriendshipPowerAttr), new AttackMove(Moves.PRESENT, Type.NORMAL, MoveCategory.PHYSICAL, -1, 90, 15, -1, 0, 2) @@ -4790,7 +4847,7 @@ export function initMoves() { .ignoresVirtual(), new SelfStatusMove(Moves.CHARGE, Type.ELECTRIC, -1, 20, -1, 0, 3) .attr(StatChangeAttr, BattleStat.SPDEF, 1, true) - .attr(AddBattlerTagAttr, BattlerTagType.CHARGED, true, true), + .attr(AddBattlerTagAttr, BattlerTagType.CHARGED, true, false), new StatusMove(Moves.TAUNT, Type.DARK, 100, 20, -1, 0, 3) .unimplemented(), new StatusMove(Moves.HELPING_HAND, Type.NORMAL, -1, 20, -1, 5, 3) @@ -4901,8 +4958,8 @@ export function initMoves() { .attr(MovePowerMultiplierAttr, (user, target, move) => [WeatherType.SUNNY, WeatherType.RAIN, WeatherType.SANDSTORM, WeatherType.HAIL, WeatherType.SNOW, WeatherType.FOG, WeatherType.HEAVY_RAIN, WeatherType.HARSH_SUN].includes(user.scene.arena.weather?.weatherType) && !user.scene.arena.weather?.isEffectSuppressed(user.scene) ? 2 : 1) .ballBombMove(), new StatusMove(Moves.AROMATHERAPY, Type.GRASS, -1, 5, -1, 0, 3) - .target(MoveTarget.USER_AND_ALLIES) - .unimplemented(), + .attr(PartyStatusCureAttr, "A soothing aroma wafted through the area!", Abilities.SAP_SIPPER) + .target(MoveTarget.PARTY), new StatusMove(Moves.FAKE_TEARS, Type.DARK, 100, 20, -1, 0, 3) .attr(StatChangeAttr, BattleStat.SPDEF, -2), new AttackMove(Moves.AIR_CUTTER, Type.FLYING, MoveCategory.SPECIAL, 60, 95, 25, -1, 0, 3) @@ -5753,79 +5810,116 @@ export function initMoves() { .ignoresProtect(), /* Unused */ new AttackMove(Moves.BREAKNECK_BLITZ__PHYSICAL, Type.NORMAL, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.BREAKNECK_BLITZ__SPECIAL, Type.NORMAL, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.ALL_OUT_PUMMELING__PHYSICAL, Type.FIGHTING, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.ALL_OUT_PUMMELING__SPECIAL, Type.FIGHTING, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.SUPERSONIC_SKYSTRIKE__PHYSICAL, Type.FLYING, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.SUPERSONIC_SKYSTRIKE__SPECIAL, Type.FLYING, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.ACID_DOWNPOUR__PHYSICAL, Type.POISON, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.ACID_DOWNPOUR__SPECIAL, Type.POISON, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.TECTONIC_RAGE__PHYSICAL, Type.GROUND, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.TECTONIC_RAGE__SPECIAL, Type.GROUND, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.CONTINENTAL_CRUSH__PHYSICAL, Type.ROCK, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.CONTINENTAL_CRUSH__SPECIAL, Type.ROCK, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.SAVAGE_SPIN_OUT__PHYSICAL, Type.BUG, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.SAVAGE_SPIN_OUT__SPECIAL, Type.BUG, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.NEVER_ENDING_NIGHTMARE__PHYSICAL, Type.GHOST, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.NEVER_ENDING_NIGHTMARE__SPECIAL, Type.GHOST, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.CORKSCREW_CRASH__PHYSICAL, Type.STEEL, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.CORKSCREW_CRASH__SPECIAL, Type.STEEL, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.INFERNO_OVERDRIVE__PHYSICAL, Type.FIRE, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.INFERNO_OVERDRIVE__SPECIAL, Type.FIRE, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.HYDRO_VORTEX__PHYSICAL, Type.WATER, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.HYDRO_VORTEX__SPECIAL, Type.WATER, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.BLOOM_DOOM__PHYSICAL, Type.GRASS, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.BLOOM_DOOM__SPECIAL, Type.GRASS, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.GIGAVOLT_HAVOC__PHYSICAL, Type.ELECTRIC, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.GIGAVOLT_HAVOC__SPECIAL, Type.ELECTRIC, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.SHATTERED_PSYCHE__PHYSICAL, Type.PSYCHIC, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.SHATTERED_PSYCHE__SPECIAL, Type.PSYCHIC, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.SUBZERO_SLAMMER__PHYSICAL, Type.ICE, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.SUBZERO_SLAMMER__SPECIAL, Type.ICE, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.DEVASTATING_DRAKE__PHYSICAL, Type.DRAGON, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.DEVASTATING_DRAKE__SPECIAL, Type.DRAGON, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.BLACK_HOLE_ECLIPSE__PHYSICAL, Type.DARK, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.BLACK_HOLE_ECLIPSE__SPECIAL, Type.DARK, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.TWINKLE_TACKLE__PHYSICAL, Type.FAIRY, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.TWINKLE_TACKLE__SPECIAL, Type.FAIRY, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.CATASTROPIKA, Type.ELECTRIC, MoveCategory.PHYSICAL, 210, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), /* End Unused */ new SelfStatusMove(Moves.SHORE_UP, Type.GROUND, -1, 5, -1, 0, 7) .attr(SandHealAttr) @@ -5933,23 +6027,32 @@ export function initMoves() { /* Unused */ new AttackMove(Moves.SINISTER_ARROW_RAID, Type.GHOST, MoveCategory.PHYSICAL, 180, -1, 1, -1, 0, 7) .makesContact(false) - .partial(), + .partial() + .ignoresVirtual(), new AttackMove(Moves.MALICIOUS_MOONSAULT, Type.DARK, MoveCategory.PHYSICAL, 180, -1, 1, -1, 0, 7) - .partial(), + .partial() + .ignoresVirtual(), new AttackMove(Moves.OCEANIC_OPERETTA, Type.WATER, MoveCategory.SPECIAL, 195, -1, 1, -1, 0, 7) - .partial(), + .partial() + .ignoresVirtual(), new AttackMove(Moves.GUARDIAN_OF_ALOLA, Type.FAIRY, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.SOUL_STEALING_7_STAR_STRIKE, Type.GHOST, MoveCategory.PHYSICAL, 195, -1, 1, -1, 0, 7) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.STOKED_SPARKSURFER, Type.ELECTRIC, MoveCategory.SPECIAL, 175, -1, 1, 100, 0, 7) - .partial(), + .partial() + .ignoresVirtual(), new AttackMove(Moves.PULVERIZING_PANCAKE, Type.NORMAL, MoveCategory.PHYSICAL, 210, -1, 1, -1, 0, 7) - .partial(), + .partial() + .ignoresVirtual(), new SelfStatusMove(Moves.EXTREME_EVOBOOST, Type.NORMAL, -1, 1, 100, 0, 7) - .attr(StatChangeAttr, [ BattleStat.ATK, BattleStat.DEF, BattleStat.SPATK, BattleStat.SPDEF, BattleStat.SPD ], 2, true), + .attr(StatChangeAttr, [ BattleStat.ATK, BattleStat.DEF, BattleStat.SPATK, BattleStat.SPDEF, BattleStat.SPD ], 2, true) + .ignoresVirtual(), new AttackMove(Moves.GENESIS_SUPERNOVA, Type.PSYCHIC, MoveCategory.SPECIAL, 185, -1, 1, -1, 0, 7) - .attr(TerrainChangeAttr, TerrainType.PSYCHIC), + .attr(TerrainChangeAttr, TerrainType.PSYCHIC) + .ignoresVirtual(), /* End Unused */ new AttackMove(Moves.SHELL_TRAP, Type.FIRE, MoveCategory.SPECIAL, 150, 100, 5, -1, -3, 7) .target(MoveTarget.ALL_NEAR_ENEMIES) @@ -5987,7 +6090,8 @@ export function initMoves() { .partial(), /* Unused */ new AttackMove(Moves.TEN_MILLION_VOLT_THUNDERBOLT, Type.ELECTRIC, MoveCategory.SPECIAL, 195, -1, 1, -1, 0, 7) - .partial(), + .partial() + .ignoresVirtual(), /* End Unused */ new AttackMove(Moves.MIND_BLOWN, Type.FIRE, MoveCategory.SPECIAL, 150, 100, 5, -1, 0, 7) .condition(failIfDampCondition) @@ -6003,21 +6107,27 @@ export function initMoves() { /* Unused */ new AttackMove(Moves.LIGHT_THAT_BURNS_THE_SKY, Type.PSYCHIC, MoveCategory.SPECIAL, 200, -1, 1, -1, 0, 7) .attr(PhotonGeyserCategoryAttr) - .ignoresAbilities(), + .ignoresAbilities() + .ignoresVirtual(), new AttackMove(Moves.SEARING_SUNRAZE_SMASH, Type.STEEL, MoveCategory.PHYSICAL, 200, -1, 1, -1, 0, 7) - .ignoresAbilities(), + .ignoresAbilities() + .ignoresVirtual(), new AttackMove(Moves.MENACING_MOONRAZE_MAELSTROM, Type.GHOST, MoveCategory.SPECIAL, 200, -1, 1, -1, 0, 7) - .ignoresAbilities(), + .ignoresAbilities() + .ignoresVirtual(), new AttackMove(Moves.LETS_SNUGGLE_FOREVER, Type.FAIRY, MoveCategory.PHYSICAL, 190, -1, 1, -1, 0, 7) - .partial(), + .partial() + .ignoresVirtual(), new AttackMove(Moves.SPLINTERED_STORMSHARDS, Type.ROCK, MoveCategory.PHYSICAL, 190, -1, 1, -1, 0, 7) .attr(ClearTerrainAttr) - .makesContact(false), + .makesContact(false) + .ignoresVirtual(), new AttackMove(Moves.CLANGOROUS_SOULBLAZE, Type.DRAGON, MoveCategory.SPECIAL, 185, -1, 1, 100, 0, 7) .attr(StatChangeAttr, [ BattleStat.ATK, BattleStat.DEF, BattleStat.SPATK, BattleStat.SPDEF, BattleStat.SPD ], 1, true) .soundBased() .target(MoveTarget.ALL_NEAR_ENEMIES) - .partial(), + .partial() + .ignoresVirtual(), /* End Unused */ new AttackMove(Moves.ZIPPY_ZAP, Type.ELECTRIC, MoveCategory.PHYSICAL, 80, 100, 10, 100, 2, 7) .attr(CritOnlyAttr), @@ -6054,7 +6164,8 @@ export function initMoves() { .punchingMove(), /* Unused */ new SelfStatusMove(Moves.MAX_GUARD, Type.NORMAL, -1, 10, -1, 4, 8) - .attr(ProtectAttr), + .attr(ProtectAttr) + .ignoresVirtual(), /* End Unused */ new AttackMove(Moves.DYNAMAX_CANNON, Type.DRAGON, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 8) .attr(MovePowerMultiplierAttr, (user, target, move) => target.level > 200 ? 2 : 1) @@ -6098,58 +6209,76 @@ export function initMoves() { /* Unused */ new AttackMove(Moves.MAX_FLARE, Type.FIRE, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.MAX_FLUTTERBY, Type.BUG, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.MAX_LIGHTNING, Type.ELECTRIC, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.MAX_STRIKE, Type.NORMAL, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.MAX_KNUCKLE, Type.FIGHTING, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.MAX_PHANTASM, Type.GHOST, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.MAX_HAILSTORM, Type.ICE, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.MAX_OOZE, Type.POISON, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.MAX_GEYSER, Type.WATER, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.MAX_AIRSTREAM, Type.FLYING, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.MAX_STARFALL, Type.FAIRY, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.MAX_WYRMWIND, Type.DRAGON, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.MAX_MINDSTORM, Type.PSYCHIC, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.MAX_ROCKFALL, Type.ROCK, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.MAX_QUAKE, Type.GROUND, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.MAX_DARKNESS, Type.DARK, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.MAX_OVERGROWTH, Type.GRASS, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), new AttackMove(Moves.MAX_STEELSPIKE, Type.STEEL, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8) .target(MoveTarget.NEAR_ENEMY) - .unimplemented(), + .unimplemented() + .ignoresVirtual(), /* End Unused */ new SelfStatusMove(Moves.CLANGOROUS_SOUL, Type.DRAGON, 100, 5, 100, 0, 8) .attr(CutHpStatBoostAttr, [ BattleStat.ATK, BattleStat.DEF, BattleStat.SPATK, BattleStat.SPDEF, BattleStat.SPD ], 1, 3) @@ -6564,7 +6693,8 @@ export function initMoves() { .attr(MovePowerMultiplierAttr, (user, target, move) => user.scene.arena.getTerrainType() === TerrainType.ELECTRIC && user.isGrounded() ? 1.5 : 1) .slicingMove(), new AttackMove(Moves.HYDRO_STEAM, Type.WATER, MoveCategory.SPECIAL, 80, 100, 15, -1, 0, 9) - .partial(), + .attr(IgnoreWeatherTypeDebuffAttr, WeatherType.SUNNY) + .attr(MovePowerMultiplierAttr, (user, target, move) => [WeatherType.SUNNY, WeatherType.HARSH_SUN].includes(user.scene.arena.weather?.weatherType) && !user.scene.arena.weather?.isEffectSuppressed(user.scene) ? 1.5 : 1), new AttackMove(Moves.RUINATION, Type.DARK, MoveCategory.SPECIAL, -1, 90, 10, -1, 0, 9) .attr(TargetHalfHpDamageAttr), new AttackMove(Moves.COLLISION_COURSE, Type.FIGHTING, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 9) diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index 7f33d9ec7..d5581d9cd 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -2313,7 +2313,7 @@ export function initSpecies() { new PokemonSpecies(Species.QUAXWELL, 9, false, false, false, "Practicing Pokémon", Type.WATER, null, 1.2, 21.5, Abilities.TORRENT, Abilities.NONE, Abilities.MOXIE, 410, 70, 85, 65, 65, 60, 65, 45, 50, 144, GrowthRate.MEDIUM_SLOW, 87.5, false), new PokemonSpecies(Species.QUAQUAVAL, 9, false, false, false, "Dancer Pokémon", Type.WATER, Type.FIGHTING, 1.8, 61.9, Abilities.TORRENT, Abilities.NONE, Abilities.MOXIE, 530, 85, 120, 80, 85, 75, 85, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false), new PokemonSpecies(Species.LECHONK, 9, false, false, false, "Hog Pokémon", Type.NORMAL, null, 0.5, 10.2, Abilities.AROMA_VEIL, Abilities.GLUTTONY, Abilities.THICK_FAT, 254, 54, 45, 40, 35, 45, 35, 255, 50, 51, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.OINKOLOGNE, 9, false, false, false, "Hog Pokémon", Type.NORMAL, null, 1, 120, Abilities.LINGERING_AROMA, Abilities.GLUTTONY, Abilities.THICK_FAT, 489, 110, 100, 75, 59, 80, 65, 100, 50, 171, GrowthRate.MEDIUM_FAST, 100, false, false, + new PokemonSpecies(Species.OINKOLOGNE, 9, false, false, false, "Hog Pokémon", Type.NORMAL, null, 1, 120, Abilities.LINGERING_AROMA, Abilities.GLUTTONY, Abilities.THICK_FAT, 489, 110, 100, 75, 59, 80, 65, 100, 50, 171, GrowthRate.MEDIUM_FAST, 50, false, false, new PokemonForm("Male", "male", Type.NORMAL, null, 1, 120, Abilities.LINGERING_AROMA, Abilities.GLUTTONY, Abilities.THICK_FAT, 489, 110, 100, 75, 59, 80, 65, 100, 50, 171, false, ""), new PokemonForm("Female", "female", Type.NORMAL, null, 1, 120, Abilities.AROMA_VEIL, Abilities.GLUTTONY, Abilities.THICK_FAT, 489, 115, 90, 70, 59, 90, 65, 100, 50, 171), ), diff --git a/src/field/arena.ts b/src/field/arena.ts index e8cc98c0a..46b16eed8 100644 --- a/src/field/arena.ts +++ b/src/field/arena.ts @@ -18,7 +18,7 @@ import { TimeOfDay } from "../data/enums/time-of-day"; import { Terrain, TerrainType } from "../data/terrain"; import { PostTerrainChangeAbAttr, PostWeatherChangeAbAttr, applyPostTerrainChangeAbAttrs, applyPostWeatherChangeAbAttrs } from "../data/ability"; import Pokemon from "./pokemon"; -import { WEATHER_OVERRIDE } from '../overrides'; +import * as Overrides from '../overrides'; export class Arena { public scene: BattleScene; @@ -273,6 +273,11 @@ export class Arena { return 131 / 180; } + /** + * Sets weather to the override specified in overrides.ts + * @param weather new weather to set of type WeatherType + * @returns true to force trySetWeather to return true + */ trySetWeatherOverride(weather: WeatherType): boolean { this.weather = new Weather(weather, 0); this.scene.unshiftPhase(new CommonAnimPhase(this.scene, undefined, undefined, CommonAnim.SUNNY + (weather - 1))); @@ -280,10 +285,15 @@ export class Arena { return true } + /** + * Attempts to set a new weather to the battle + * @param weather new weather to set of type WeatherType + * @param hasPokemonSource is the new weather from a pokemon + * @returns true if new weather set, false if no weather provided or attempting to set the same weather as currently in use + */ trySetWeather(weather: WeatherType, hasPokemonSource: boolean): boolean { - // override hook for debugging - if (WEATHER_OVERRIDE) - return this.trySetWeatherOverride(WEATHER_OVERRIDE); + if (Overrides.WEATHER_OVERRIDE) + return this.trySetWeatherOverride(Overrides.WEATHER_OVERRIDE); if (this.weather?.weatherType === (weather || undefined)) return false; @@ -572,7 +582,7 @@ export class Arena { case Biome.TALL_GRASS: return 9.608; case Biome.METROPOLIS: - return 4.867; + return 141.470; case Biome.FOREST: return 4.294; case Biome.SEA: @@ -626,7 +636,7 @@ export class Arena { case Biome.ISLAND: return 2.751; case Biome.LABORATORY: - return 0.797; + return 114.862; case Biome.SLUM: return 1.221; case Biome.SNOWY_FOREST: @@ -636,19 +646,12 @@ export class Arena { } export function getBiomeKey(biome: Biome): string { - switch (biome) { - case Biome.METROPOLIS: - return 'slum'; - case Biome.JUNGLE: - return 'tall_grass'; - case Biome.ISLAND: - return 'beach'; - } return Biome[biome].toLowerCase(); } export function getBiomeHasProps(biomeType: Biome): boolean { switch (biomeType) { + case Biome.METROPOLIS: case Biome.BEACH: case Biome.LAKE: case Biome.SEABED: @@ -666,8 +669,11 @@ export function getBiomeHasProps(biomeType: Biome): boolean { case Biome.WASTELAND: case Biome.ABYSS: case Biome.CONSTRUCTION_SITE: + case Biome.JUNGLE: case Biome.FAIRY_CAVE: case Biome.TEMPLE: + case Biome.SNOWY_FOREST: + case Biome.ISLAND: case Biome.LABORATORY: case Biome.END: return true; diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index f12fc14b1..8afff1b27 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -4,7 +4,7 @@ import { Variant, VariantSet, variantColorCache } from '#app/data/variant'; import { variantData } from '#app/data/variant'; import BattleInfo, { PlayerBattleInfo, EnemyBattleInfo } from '../ui/battle-info'; import { Moves } from "../data/enums/moves"; -import Move, { HighCritAttr, HitsTagAttr, applyMoveAttrs, FixedDamageAttr, VariableAtkAttr, VariablePowerAttr, allMoves, MoveCategory, TypelessAttr, CritOnlyAttr, getMoveTargets, OneHitKOAttr, MultiHitAttr, StatusMoveTypeImmunityAttr, MoveTarget, VariableDefAttr, AttackMove, ModifiedDamageAttr, VariableMoveTypeMultiplierAttr, IgnoreOpponentStatChangesAttr, SacrificialAttr, VariableMoveTypeAttr, VariableMoveCategoryAttr, CounterDamageAttr } from "../data/move"; +import Move, { HighCritAttr, HitsTagAttr, applyMoveAttrs, FixedDamageAttr, VariableAtkAttr, VariablePowerAttr, allMoves, MoveCategory, TypelessAttr, CritOnlyAttr, getMoveTargets, OneHitKOAttr, MultiHitAttr, StatusMoveTypeImmunityAttr, MoveTarget, VariableDefAttr, AttackMove, ModifiedDamageAttr, VariableMoveTypeMultiplierAttr, IgnoreOpponentStatChangesAttr, SacrificialAttr, VariableMoveTypeAttr, VariableMoveCategoryAttr, CounterDamageAttr, IgnoreWeatherTypeDebuffAttr } from "../data/move"; import { default as PokemonSpecies, PokemonSpeciesForm, SpeciesFormKey, getFusedSpeciesName, getPokemonSpecies, getPokemonSpeciesForm, getStarterValueFriendshipCap, speciesStarters, starterPassiveAbilities } from '../data/pokemon-species'; import * as Utils from '../utils'; import { Type, TypeDamageMultiplier, getTypeDamageMultiplier, getTypeRgb } from '../data/type'; @@ -43,7 +43,7 @@ import { Nature, getNatureStatMultiplier } from '../data/nature'; import { SpeciesFormChange, SpeciesFormChangeActiveTrigger, SpeciesFormChangeMoveLearnedTrigger, SpeciesFormChangePostMoveTrigger, SpeciesFormChangeStatusEffectTrigger } from '../data/pokemon-forms'; import { TerrainType } from '../data/terrain'; import { TrainerSlot } from '../data/trainer-config'; -import { ABILITY_OVERRIDE, MOVE_OVERRIDE, MOVE_OVERRIDE_2, OPP_ABILITY_OVERRIDE, OPP_MOVE_OVERRIDE, OPP_MOVE_OVERRIDE_2, OPP_PASSIVE_ABILITY_OVERRIDE, OPP_SHINY_OVERRIDE, OPP_VARIANT_OVERRIDE, PASSIVE_ABILITY_OVERRIDE } from '../overrides'; +import * as Overrides from '../overrides'; import { BerryType } from '../data/berry'; import i18next from '../plugins/i18n'; @@ -725,15 +725,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { ? this.summonData.moveset : this.moveset; - if (MOVE_OVERRIDE && this.isPlayer()) - this.moveset[0] = new PokemonMove(MOVE_OVERRIDE, Math.min(this.moveset[0].ppUsed, allMoves[MOVE_OVERRIDE].pp)); - else if (OPP_MOVE_OVERRIDE && !this.isPlayer()) - this.moveset[0] = new PokemonMove(OPP_MOVE_OVERRIDE, Math.min(this.moveset[0].ppUsed, allMoves[OPP_MOVE_OVERRIDE].pp)); - if (MOVE_OVERRIDE_2 && this.isPlayer()) - this.moveset[1] = new PokemonMove(MOVE_OVERRIDE_2, Math.min(this.moveset[1].ppUsed, allMoves[MOVE_OVERRIDE_2].pp)); - else if (OPP_MOVE_OVERRIDE_2 && !this.isPlayer()) - this.moveset[1] = new PokemonMove(OPP_MOVE_OVERRIDE_2, Math.min(this.moveset[1].ppUsed, allMoves[OPP_MOVE_OVERRIDE_2].pp)); - + // Overrides moveset based on arrays specified in overrides.ts + const overrideArray: Array = this.isPlayer() ? Overrides.MOVESET_OVERRIDE : Overrides.OPP_MOVESET_OVERRIDE; + if (overrideArray.length > 0) { + overrideArray.forEach((move: Moves, index: number) => { + const ppUsed = this.moveset[index]?.ppUp || 0; + this.moveset[index] = new PokemonMove(move, Math.min(ppUsed, allMoves[move].pp)) + }); + } return ret; } @@ -798,10 +797,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { getAbility(ignoreOverride?: boolean): Ability { if (!ignoreOverride && this.summonData?.ability) return allAbilities[this.summonData.ability]; - if (ABILITY_OVERRIDE && this.isPlayer()) - return allAbilities[ABILITY_OVERRIDE]; - if (OPP_ABILITY_OVERRIDE && !this.isPlayer()) - return allAbilities[OPP_ABILITY_OVERRIDE]; + if (Overrides.ABILITY_OVERRIDE && this.isPlayer()) + return allAbilities[Overrides.ABILITY_OVERRIDE]; + if (Overrides.OPP_ABILITY_OVERRIDE && !this.isPlayer()) + return allAbilities[Overrides.OPP_ABILITY_OVERRIDE]; if (this.isFusion()) return allAbilities[this.getFusionSpeciesForm(ignoreOverride).getAbility(this.fusionAbilityIndex)]; let abilityId = this.getSpeciesForm(ignoreOverride).getAbility(this.abilityIndex); @@ -811,10 +810,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } getPassiveAbility(): Ability { - if (PASSIVE_ABILITY_OVERRIDE && this.isPlayer()) - return allAbilities[PASSIVE_ABILITY_OVERRIDE]; - if (OPP_PASSIVE_ABILITY_OVERRIDE && !this.isPlayer()) - return allAbilities[OPP_PASSIVE_ABILITY_OVERRIDE]; + if (Overrides.PASSIVE_ABILITY_OVERRIDE && this.isPlayer()) + return allAbilities[Overrides.PASSIVE_ABILITY_OVERRIDE]; + if (Overrides.OPP_PASSIVE_ABILITY_OVERRIDE && !this.isPlayer()) + return allAbilities[Overrides.OPP_PASSIVE_ABILITY_OVERRIDE]; let starterSpeciesId = this.species.speciesId; while (pokemonPrevolutions.hasOwnProperty(starterSpeciesId)) @@ -822,8 +821,17 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return allAbilities[starterPassiveAbilities[starterSpeciesId]]; } + /** + * Checks if a pokemon has a passive either from: + * - bought with starter candy + * - set by override + * - is a boss pokemon + * @returns whether or not a pokemon should have a passive + */ hasPassive(): boolean { - if ((PASSIVE_ABILITY_OVERRIDE !== Abilities.NONE && this.isPlayer()) || (OPP_PASSIVE_ABILITY_OVERRIDE !== Abilities.NONE && !this.isPlayer())) + // returns override if valid for current case + if ((Overrides.PASSIVE_ABILITY_OVERRIDE !== Abilities.NONE && this.isPlayer()) || + (Overrides.OPP_PASSIVE_ABILITY_OVERRIDE !== Abilities.NONE && !this.isPlayer())) return true; return this.passive || this.isBoss(); } @@ -1045,8 +1053,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { let shinyThreshold = new Utils.IntegerHolder(32); if (thresholdOverride === undefined) { - if (!this.hasTrainer()) + if (!this.hasTrainer()) { + if (new Date() < new Date('2024-05-13')) + shinyThreshold.value *= 3; this.scene.applyModifiers(ShinyRateBoosterModifier, true, shinyThreshold); + } } else shinyThreshold.value = thresholdOverride; @@ -1324,10 +1335,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (typeBoost) { power.value *= typeBoost.boostValue; if (typeBoost.oneUse) { - this.removeTag(typeBoost.tagType); + source.removeTag(typeBoost.tagType); } } - const arenaAttackTypeMultiplier = this.scene.arena.getAttackTypeMultiplier(type, source.isGrounded()); + const arenaAttackTypeMultiplier = new Utils.NumberHolder(this.scene.arena.getAttackTypeMultiplier(type, source.isGrounded())); + applyMoveAttrs(IgnoreWeatherTypeDebuffAttr, source, this, move, arenaAttackTypeMultiplier); if (this.scene.arena.getTerrainType() === TerrainType.GRASSY && this.isGrounded() && type === Type.GROUND && move.moveTarget === MoveTarget.ALL_NEAR_OTHERS) power.value /= 2; applyMoveAttrs(VariablePowerAttr, source, this, move, power); @@ -1372,7 +1384,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (!isCritical) { this.scene.arena.applyTagsForSide(WeakenMoveScreenTag, this.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY, move.category, this.scene.currentBattle.double, screenMultiplier); } - const isTypeImmune = (typeMultiplier.value * arenaAttackTypeMultiplier) === 0; + const isTypeImmune = (typeMultiplier.value * arenaAttackTypeMultiplier.value) === 0; const sourceTypes = source.getTypes(); const matchesSourceType = sourceTypes[0] === type || (sourceTypes.length > 1 && sourceTypes[1] === type); let stabMultiplier = new Utils.NumberHolder(1); @@ -1390,7 +1402,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { applyMoveAttrs(VariableDefAttr, source, this, move, targetDef); if (!isTypeImmune) { - damage.value = Math.ceil(((((2 * source.level / 5 + 2) * power.value * sourceAtk.value / targetDef.value) / 50) + 2) * stabMultiplier.value * typeMultiplier.value * arenaAttackTypeMultiplier * screenMultiplier.value * ((this.scene.randBattleSeedInt(15) + 85) / 100) * criticalMultiplier.value); + damage.value = Math.ceil(((((2 * source.level / 5 + 2) * power.value * sourceAtk.value / targetDef.value) / 50) + 2) * stabMultiplier.value * typeMultiplier.value * arenaAttackTypeMultiplier.value * screenMultiplier.value * ((this.scene.randBattleSeedInt(15) + 85) / 100) * criticalMultiplier.value); if (isPhysical && source.status && source.status.effect === StatusEffect.BURN) { const burnDamageReductionCancelled = new Utils.BooleanHolder(false); applyAbAttrs(BypassBurnDamageReductionAbAttr, source, burnDamageReductionCancelled); @@ -1959,8 +1971,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return true; } - resetStatus(): void { + /** + * Resets the status of a pokemon + * @param revive whether revive should be cured, defaults to true + */ + resetStatus(revive: boolean = true): void { const lastStatus = this.status?.effect; + if (!revive && lastStatus === StatusEffect.FAINT) { + return; + } this.status = undefined; if (lastStatus === StatusEffect.SLEEP) { this.setFrameRate(12); @@ -2685,14 +2704,14 @@ export class EnemyPokemon extends Pokemon { this.generateAndPopulateMoveset(); this.trySetShiny(); - if (OPP_SHINY_OVERRIDE) { + if (Overrides.OPP_SHINY_OVERRIDE) { this.shiny = true; this.initShinySparkle(); } if (this.shiny) { this.variant = this.generateVariant(); - if (OPP_VARIANT_OVERRIDE) - this.variant = OPP_VARIANT_OVERRIDE; + if (Overrides.OPP_VARIANT_OVERRIDE) + this.variant = Overrides.OPP_VARIANT_OVERRIDE; } this.luck = (this.shiny ? this.variant + 1 : 0) + (this.fusionShiny ? this.fusionVariant + 1 : 0); @@ -3225,4 +3244,13 @@ export class PokemonMove { getName(): string { return this.getMove().name; } + + /** + * Copies an existing move or creates a valid PokemonMove object from json representing one + * @param {PokemonMove | any} source The data for the move to copy + * @return {PokemonMove} A valid pokemonmove object + */ + static loadMove(source: PokemonMove | any): PokemonMove { + return new PokemonMove(source.moveId, source.ppUsed, source.ppUp, source.virtual); + } } diff --git a/src/field/trainer.ts b/src/field/trainer.ts index d52085b65..4a7458652 100644 --- a/src/field/trainer.ts +++ b/src/field/trainer.ts @@ -147,6 +147,9 @@ export default class Trainer extends Phaser.GameObjects.Container { const difficultyWaveIndex = this.scene.gameMode.getWaveForDifficulty(waveIndex); let baseLevel = 1 + difficultyWaveIndex / 2 + Math.pow(difficultyWaveIndex / 25, 2); + if (this.isDouble() && partyTemplate.size < 2) + partyTemplate.size = 2; + for (let i = 0; i < partyTemplate.size; i++) { let multiplier = 1; diff --git a/src/game-mode.ts b/src/game-mode.ts index 81db82425..888ae3b3c 100644 --- a/src/game-mode.ts +++ b/src/game-mode.ts @@ -5,7 +5,7 @@ import { Species } from "./data/enums/species"; import PokemonSpecies, { allSpecies } from "./data/pokemon-species"; import { Arena } from "./field/arena"; import * as Utils from "./utils"; -import { STARTING_BIOME_OVERRIDE, STARTING_LEVEL_OVERRIDE, STARTING_MONEY_OVERRIDE } from './overrides'; +import * as Overrides from './overrides'; export enum GameModes { CLASSIC, @@ -45,9 +45,15 @@ export class GameMode implements GameModeConfig { Object.assign(this, config); } + /** + * @returns either: + * - override from overrides.ts + * - 20 for Daily Runs + * - 5 for all other modes + */ getStartingLevel(): integer { - if (STARTING_LEVEL_OVERRIDE) - return STARTING_LEVEL_OVERRIDE; + if (Overrides.STARTING_LEVEL_OVERRIDE) + return Overrides.STARTING_LEVEL_OVERRIDE; switch (this.modeId) { case GameModes.DAILY: return 20; @@ -56,16 +62,28 @@ export class GameMode implements GameModeConfig { } } + /** + * @returns either: + * - override from overrides.ts + * - 1000 + */ getStartingMoney(): integer { - return STARTING_MONEY_OVERRIDE || 1000; + return Overrides.STARTING_MONEY_OVERRIDE || 1000; } + /** + * @param scene current BattleScene + * @returns either: + * - random biome for Daily mode + * - override from overrides.ts + * - Town + */ getStartingBiome(scene: BattleScene): Biome { switch (this.modeId) { case GameModes.DAILY: return scene.generateRandomBiome(this.getWaveForDifficulty(1)); default: - return STARTING_BIOME_OVERRIDE || Biome.TOWN; + return Overrides.STARTING_BIOME_OVERRIDE || Biome.TOWN; } } diff --git a/src/inputs-controller.ts b/src/inputs-controller.ts index 863117a18..de4b80eb1 100644 --- a/src/inputs-controller.ts +++ b/src/inputs-controller.ts @@ -66,6 +66,8 @@ export class InputsController { private gamepadSupport: boolean = true; + private gamepadSupport: boolean = true; + public customGamepadMapping = new Map(); public chosenGamepad: String; private disconnectedGamepads: Array = new Array(); @@ -114,9 +116,9 @@ export class InputsController { if (localStorage.hasOwnProperty('chosenGamepad')) { this.chosenGamepad = localStorage.getItem('chosenGamepad'); } - this.scene.game.events.on(Phaser.Core.Events.BLUR, () => { - this.loseFocus() - }) + this.scene.game.events.on(Phaser.Core.Events.BLUR, () => { + this.loseFocus() + }) if (typeof this.scene.input.gamepad !== 'undefined') { this.scene.input.gamepad.on('connected', function (thisGamepad) { @@ -354,7 +356,6 @@ export class InputsController { return [this.player[this.chosenGamepad]['type'], icons[key]]; } - /** * Handles the 'down' event for gamepad buttons, emitting appropriate events and updating the interaction state. * diff --git a/src/locales/de/battle.ts b/src/locales/de/battle.ts index b48aa1129..656ebb851 100644 --- a/src/locales/de/battle.ts +++ b/src/locales/de/battle.ts @@ -46,7 +46,7 @@ export const battle: SimpleTranslationEntries = { "runAwayCannotEscape": 'You can\'t escape!', "escapeVerbSwitch": "auswechseln", "escapeVerbFlee": "flucht", - "notDisabled": "{{moveName}} ist\nnicht mehr deaktiviert!", + "notDisabled": "{{pokemonName}}'s {{moveName}} ist\nnicht mehr deaktiviert!", "skipItemQuestion": "Are you sure you want to skip taking an item?", "eggHatching": "Oh?", "ivScannerUseQuestion": "Use IV Scanner on {{pokemonName}}?" diff --git a/src/locales/de/pokemon.ts b/src/locales/de/pokemon.ts index 9efecb819..a31d9e01f 100644 --- a/src/locales/de/pokemon.ts +++ b/src/locales/de/pokemon.ts @@ -405,7 +405,7 @@ export const pokemon: SimpleTranslationEntries = { "kricketune": "Zirpeise", "shinx": "Sheinux", "luxio": "Luxio", - "luxray": "Luxray", + "luxray": "Luxtra", "budew": "Knospi", "roserade": "Roserade", "cranidos": "Koknodon", @@ -416,7 +416,7 @@ export const pokemon: SimpleTranslationEntries = { "wormadam": "Burmadame", "mothim": "Moterpel", "combee": "Wadribie", - "vespiquen": "Hornwiesel", + "vespiquen": "Honweisel", "pachirisu": "Pachirisu", "buizel": "Bamelin", "floatzel": "Bojelin", @@ -424,7 +424,7 @@ export const pokemon: SimpleTranslationEntries = { "cherrim": "Kinoso", "shellos": "Schalellos", "gastrodon": "Gastrodon", - "ambipom": "Ambidifel", + "ambipom": "Ambidiffel", "drifloon": "Driftlon", "drifblim": "Drifzepeli", "buneary": "Haspiror", @@ -519,7 +519,7 @@ export const pokemon: SimpleTranslationEntries = { "simipour": "Sodachita", "munna": "Somniam", "musharna": "Somnivora", - "pidove": "Dusslgurr", + "pidove": "Dusselgurr", "tranquill": "Navitaub", "unfezant": "Fasasnob", "blitzle": "Elezeba", @@ -534,11 +534,11 @@ export const pokemon: SimpleTranslationEntries = { "audino": "Ohrdoch", "timburr": "Praktibalk", "gurdurr": "Strepoli", - "conkeldurr": "Meistagriff", + "conkeldurr": "Meistagrif", "tympole": "Schallquap", - "palpitoad": "Membrana", + "palpitoad": "Mebrana", "seismitoad": "Branawarz", - "throh": "Juitesto", + "throh": "Jiutesto", "sawk": "Karadonis", "sewaddle": "Strawickl", "swadloon": "Folikon", @@ -555,7 +555,7 @@ export const pokemon: SimpleTranslationEntries = { "krokorok": "Rokkaiman", "krookodile": "Rabigator", "darumaka": "Flampion", - "darmanitan": "Flampavian", + "darmanitan": "Flampivian", "maractus": "Maracamba", "dwebble": "Lithomith", "crustle": "Castellith", @@ -611,7 +611,7 @@ export const pokemon: SimpleTranslationEntries = { "lampent": "Laternecto", "chandelure": "Skelabra", "axew": "Milza", - "fraxure": "Scharfax", + "fraxure": "Sharfax", "haxorus": "Maxax", "cubchoo": "Petznief", "beartic": "Siberio", @@ -625,7 +625,7 @@ export const pokemon: SimpleTranslationEntries = { "golett": "Golbit", "golurk": "Golgantes", "pawniard": "Gladiantri", - "bisharp": "Ceasurio", + "bisharp": "Caesurio", "bouffalant": "Bisofank", "rufflet": "Geronimatz", "braviary": "Washakwil", @@ -645,7 +645,7 @@ export const pokemon: SimpleTranslationEntries = { "thundurus": "Voltolos", "reshiram": "Reshiram", "zekrom": "Zekrom", - "landorus": "Dementeros", + "landorus": "Demeteros", "kyurem": "Kyurem", "keldeo": "Keldeo", "meloetta": "Meloetta", @@ -675,7 +675,7 @@ export const pokemon: SimpleTranslationEntries = { "skiddo": "Mähikel", "gogoat": "Chevrumm", "pancham": "Pam-Pam", - "pangoro": "Pandrago", + "pangoro": "Pandagro", "furfrou": "Coiffwaff", "espurr": "Psiau", "meowstic": "Psiaugon", @@ -756,7 +756,7 @@ export const pokemon: SimpleTranslationEntries = { "fomantis": "Imantis", "lurantis": "Mantidea", "morelull": "Bubungus", - "shiinotic": "Lamellus", + "shiinotic": "Lamellux", "salandit": "Molunk", "salazzle": "Amfira", "stufful": "Velursi", @@ -776,7 +776,7 @@ export const pokemon: SimpleTranslationEntries = { "silvally": "Amigento", "minior": "Meteno", "komala": "Koalelu", - "turtonator": "Turtonator", + "turtonator": "Tortunator", "togedemaru": "Togedemaru", "mimikyu": "Mimigma", "bruxish": "Knirfish", @@ -810,277 +810,277 @@ export const pokemon: SimpleTranslationEntries = { "zeraora": "Zeraora", "meltan": "Meltan", "melmetal": "Melmetal", - "grookey": "Grookey", - "thwackey": "Thwackey", - "rillaboom": "Rillaboom", - "scorbunny": "Scorbunny", - "raboot": "Raboot", - "cinderace": "Cinderace", - "sobble": "Sobble", - "drizzile": "Drizzile", - "inteleon": "Inteleon", - "skwovet": "Skwovet", - "greedent": "Greedent", - "rookidee": "Rookidee", - "corvisquire": "Corvisquire", - "corviknight": "Corviknight", - "blipbug": "Blipbug", - "dottler": "Dottler", - "orbeetle": "Orbeetle", - "nickit": "Nickit", - "thievul": "Thievul", - "gossifleur": "Gossifleur", - "eldegoss": "Eldegoss", - "wooloo": "Wooloo", - "dubwool": "Dubwool", - "chewtle": "Chewtle", - "drednaw": "Drednaw", - "yamper": "Yamper", - "boltund": "Boltund", - "rolycoly": "Rolycoly", - "carkol": "Carkol", - "coalossal": "Coalossal", - "applin": "Applin", - "flapple": "Flapple", - "appletun": "Appletun", - "silicobra": "Silicobra", - "sandaconda": "Sandaconda", - "cramorant": "Cramorant", - "arrokuda": "Arrokuda", - "barraskewda": "Barraskewda", + "grookey": "Chimpep", + "thwackey": "Chimstix", + "rillaboom": "Gortrom", + "scorbunny": "Hopplo", + "raboot": "Kickerlo", + "cinderace": "Liberlo", + "sobble": "Memmeon", + "drizzile": "Phlegleon", + "inteleon": "Intelleon", + "skwovet": "Raffel", + "greedent": "Schlaraffel", + "rookidee": "Meikro", + "corvisquire": "Kranoviz", + "corviknight": "Krarmor", + "blipbug": "Sensect", + "dottler": "Keradar", + "orbeetle": "Maritellit", + "nickit": "Kleptifux", + "thievul": "Gaunux", + "gossifleur": "Cottini", + "eldegoss": "Cottomi", + "wooloo": "Wolly", + "dubwool": "Zwollock", + "chewtle": "Kamehaps", + "drednaw": "Kamalm", + "yamper": "Voldi", + "boltund": "Bellektro", + "rolycoly": "Klonkett", + "carkol": "Wagong", + "coalossal": "Montecarbo", + "applin": "Knapfel", + "flapple": "Drapfel", + "appletun": "Schlapfel", + "silicobra": "Salanga", + "sandaconda": "Sanaconda", + "cramorant": "Urgl", + "arrokuda": "Pikuda", + "barraskewda": "Barrakiefa", "toxel": "Toxel", - "toxtricity": "Toxtricity", - "sizzlipede": "Sizzlipede", - "centiskorch": "Centiskorch", - "clobbopus": "Clobbopus", - "grapploct": "Grapploct", - "sinistea": "Sinistea", - "polteageist": "Polteageist", - "hatenna": "Hatenna", - "hattrem": "Hattrem", - "hatterene": "Hatterene", - "impidimp": "Impidimp", - "morgrem": "Morgrem", - "grimmsnarl": "Grimmsnarl", - "obstagoon": "Obstagoon", - "perrserker": "Perrserker", - "cursola": "Cursola", - "sirfetchd": "Sirfetch'd", - "mr_rime": "Mr. Rime", - "runerigus": "Runerigus", - "milcery": "Milcery", - "alcremie": "Alcremie", - "falinks": "Falinks", - "pincurchin": "Pincurchin", - "snom": "Snom", - "frosmoth": "Frosmoth", - "stonjourner": "Stonjourner", - "eiscue": "Eiscue", - "indeedee": "Indeedee", + "toxtricity": "Riffex", + "sizzlipede": "Thermopod", + "centiskorch": "Infernopod", + "clobbopus": "Klopptopus", + "grapploct": "Kaocto", + "sinistea": "Fatalitee", + "polteageist": "Mortipot", + "hatenna": "Brimova", + "hattrem": "Brimano", + "hatterene": "Silembrim", + "impidimp": "Bähmon", + "morgrem": "Pelzebub", + "grimmsnarl": "Olangaar", + "obstagoon": "Barrikadax", + "perrserker": "Mauzinger", + "cursola": "Gorgasonn", + "sirfetchd": "Lauchzelot", + "mr_rime": "Pantifrost", + "runerigus": "Oghnatoll", + "milcery": "Hokumil", + "alcremie": "Pokusan", + "falinks": "Legios", + "pincurchin": "Britzigel", + "snom": "Snomnom", + "frosmoth": "Mottineva", + "stonjourner": "Humanolith", + "eiscue": "Kubuin", + "indeedee": "Servol", "morpeko": "Morpeko", - "cufant": "Cufant", - "copperajah": "Copperajah", - "dracozolt": "Dracozolt", - "arctozolt": "Arctozolt", - "dracovish": "Dracovish", - "arctovish": "Arctovish", + "cufant": "Kupfanti", + "copperajah": "Patinaraja", + "dracozolt": "Lectragon", + "arctozolt": "Lecryodon", + "dracovish": "Pescragon", + "arctovish": "Pescryodon", "duraludon": "Duraludon", - "dreepy": "Dreepy", - "drakloak": "Drakloak", - "dragapult": "Dragapult", + "dreepy": "Grolldra", + "drakloak": "Phandra", + "dragapult": "Katapuldra", "zacian": "Zacian", "zamazenta": "Zamazenta", - "eternatus": "Eternatus", - "kubfu": "Kubfu", - "urshifu": "Urshifu", + "eternatus": "Endynalos", + "kubfu": "Dakuma", + "urshifu": "Wulaosu", "zarude": "Zarude", "regieleki": "Regieleki", "regidrago": "Regidrago", - "glastrier": "Glastrier", - "spectrier": "Spectrier", + "glastrier": "Polaross", + "spectrier": "Phantoross", "calyrex": "Calyrex", - "wyrdeer": "Wyrdeer", - "kleavor": "Kleavor", + "wyrdeer": "Damythir", + "kleavor": "Axantor", "ursaluna": "Ursaluna", - "basculegion": "Basculegion", - "sneasler": "Sneasler", - "overqwil": "Overqwil", + "basculegion": "Salmagnis", + "sneasler": "Snieboss", + "overqwil": "Myriador", "enamorus": "Enamorus", - "sprigatito": "Sprigatito", - "floragato": "Floragato", - "meowscarada": "Meowscarada", - "fuecoco": "Fuecoco", - "crocalor": "Crocalor", - "skeledirge": "Skeledirge", - "quaxly": "Quaxly", - "quaxwell": "Quaxwell", - "quaquaval": "Quaquaval", - "lechonk": "Lechonk", - "oinkologne": "Oinkologne", - "tarountula": "Tarountula", - "spidops": "Spidops", - "nymble": "Nymble", - "lokix": "Lokix", - "pawmi": "Pawmi", - "pawmo": "Pawmo", - "pawmot": "Pawmot", - "tandemaus": "Tandemaus", - "maushold": "Maushold", - "fidough": "Fidough", - "dachsbun": "Dachsbun", - "smoliv": "Smoliv", - "dolliv": "Dolliv", - "arboliva": "Arboliva", - "squawkabilly": "Squawkabilly", - "nacli": "Nacli", - "naclstack": "Naclstack", - "garganacl": "Garganacl", - "charcadet": "Charcadet", - "armarouge": "Armarouge", - "ceruledge": "Ceruledge", - "tadbulb": "Tadbulb", - "bellibolt": "Bellibolt", - "wattrel": "Wattrel", - "kilowattrel": "Kilowattrel", - "maschiff": "Maschiff", - "mabosstiff": "Mabosstiff", - "shroodle": "Shroodle", - "grafaiai": "Grafaiai", - "bramblin": "Bramblin", - "brambleghast": "Brambleghast", - "toedscool": "Toedscool", - "toedscruel": "Toedscruel", - "klawf": "Klawf", - "capsakid": "Capsakid", - "scovillain": "Scovillain", - "rellor": "Rellor", - "rabsca": "Rabsca", - "flittle": "Flittle", - "espathra": "Espathra", - "tinkatink": "Tinkatink", - "tinkatuff": "Tinkatuff", - "tinkaton": "Tinkaton", - "wiglett": "Wiglett", - "wugtrio": "Wugtrio", - "bombirdier": "Bombirdier", - "finizen": "Finizen", - "palafin": "Palafin", - "varoom": "Varoom", - "revavroom": "Revavroom", - "cyclizar": "Cyclizar", - "orthworm": "Orthworm", - "glimmet": "Glimmet", - "glimmora": "Glimmora", - "greavard": "Greavard", - "houndstone": "Houndstone", - "flamigo": "Flamigo", - "cetoddle": "Cetoddle", - "cetitan": "Cetitan", - "veluza": "Veluza", - "dondozo": "Dondozo", - "tatsugiri": "Tatsugiri", - "annihilape": "Annihilape", - "clodsire": "Clodsire", + "sprigatito": "Felori", + "floragato": "Feliospa", + "meowscarada": "Maskagato", + "fuecoco": "Krokel", + "crocalor": "Lokroko", + "skeledirge": "Skelokrok", + "quaxly": "Kwaks", + "quaxwell": "Fuentente", + "quaquaval": "Bailonda", + "lechonk": "Ferkuli", + "oinkologne": "Fragrunz", + "tarountula": "Tarundel", + "spidops": "Spinsidias", + "nymble": "Micrick", + "lokix": "Lextremo", + "pawmi": "Pamo", + "pawmo": "Pamamo", + "pawmot": "Pamomamo", + "tandemaus": "Zwieps", + "maushold": "Famieps", + "fidough": "Hefel", + "dachsbun": "Backel", + "smoliv": "Olini", + "dolliv": "Olivinio", + "arboliva": "Olithena", + "squawkabilly": "Krawalloro", + "nacli": "Geosali", + "naclstack": "Sedisal", + "garganacl": "Saltigant", + "charcadet": "Knarbon", + "armarouge": "Crimanzo", + "ceruledge": "Azugladis", + "tadbulb": "Blipp", + "bellibolt": "Wampitz", + "wattrel": "Voltrel", + "kilowattrel": "Voltrean", + "maschiff": "Mobtiff", + "mabosstiff": "Mastifioso", + "shroodle": "Sproxi", + "grafaiai": "Affiti", + "bramblin": "Weherba", + "brambleghast": "Horrerba", + "toedscool": "Tentagra", + "toedscruel": "Tenterra", + "klawf": "Klibbe", + "capsakid": "Chilingel", + "scovillain": "Halupenjo", + "rellor": "Relluk", + "rabsca": "Skarabaks", + "flittle": "Flattutu", + "espathra": "Psiopatra", + "tinkatink": "Forgita", + "tinkatuff": "Tafforgita", + "tinkaton": "Granforgita", + "wiglett": "Schligda", + "wugtrio": "Schligdri", + "bombirdier": "Adebom", + "finizen": "Normifin", + "palafin": "Delfinator", + "varoom": "Knattox", + "revavroom": "Knattatox", + "cyclizar": "Mopex", + "orthworm": "Schlurm", + "glimmet": "Lumispross", + "glimmora": "Lumiflora", + "greavard": "Gruff", + "houndstone": "Friedwuff", + "flamigo": "Flaminkno", + "cetoddle": "Flaniwal", + "cetitan": "Kolowal", + "veluza": "Agiluza", + "dondozo": "Heerashai", + "tatsugiri": "Nigiragi", + "annihilape": "Epitaff", + "clodsire": "Suelord", "farigiraf": "Farigiraf", - "dudunsparce": "Dudunsparce", - "kingambit": "Kingambit", - "great_tusk": "Great Tusk", - "scream_tail": "Scream Tail", - "brute_bonnet": "Brute Bonnet", - "flutter_mane": "Flutter Mane", - "slither_wing": "Slither Wing", - "sandy_shocks": "Sandy Shocks", - "iron_treads": "Iron Treads", - "iron_bundle": "Iron Bundle", - "iron_hands": "Iron Hands", - "iron_jugulis": "Iron Jugulis", - "iron_moth": "Iron Moth", - "iron_thorns": "Iron Thorns", - "frigibax": "Frigibax", - "arctibax": "Arctibax", - "baxcalibur": "Baxcalibur", - "gimmighoul": "Gimmighoul", - "gholdengo": "Gholdengo", - "wo_chien": "Wo-Chien", - "chien_pao": "Chien-Pao", - "ting_lu": "Ting-Lu", - "chi_yu": "Chi-Yu", - "roaring_moon": "Roaring Moon", - "iron_valiant": "Iron Valiant", + "dudunsparce": "Dummimisel", + "kingambit": "Gladimperio", + "great_tusk": "Riesenzahn", + "scream_tail": "Brüllschweif", + "brute_bonnet": "Wutpilz", + "flutter_mane": "Flatterhaar", + "slither_wing": "Kriechflügel", + "sandy_shocks": "Sandfell", + "iron_treads": "Eisenrad", + "iron_bundle": "Eisenbündel", + "iron_hands": "Eisenhand", + "iron_jugulis": "Eisenhals", + "iron_moth": "Eisenfalter", + "iron_thorns": "Eisendorn", + "frigibax": "Frospino", + "arctibax": "Cryospino", + "baxcalibur": "Espinodon", + "gimmighoul": "Gierspenst", + "gholdengo": "Monetigo", + "wo_chien": "Chongjian", + "chien_pao": "Baojian", + "ting_lu": "Dinglu", + "chi_yu": "Yuyu", + "roaring_moon": "Donnersichel", + "iron_valiant": "Eisenkrieger", "koraidon": "Koraidon", "miraidon": "Miraidon", - "walking_wake": "Walking Wake", - "iron_leaves": "Iron Leaves", - "dipplin": "Dipplin", - "poltchageist": "Poltchageist", - "sinistcha": "Sinistcha", - "okidogi": "Okidogi", - "munkidori": "Munkidori", - "fezandipiti": "Fezandipiti", + "walking_wake": "Windewoge", + "iron_leaves": "Eisenblatt", + "dipplin": "Sirapfel", + "poltchageist": "Mortcha", + "sinistcha": "Fatalitcha", + "okidogi": "Boninu", + "munkidori": "Benesaru", + "fezandipiti": "Beatori", "ogerpon": "Ogerpon", - "archaludon": "Archaludon", - "hydrapple": "Hydrapple", - "gouging_fire": "Gouging Fire", - "raging_bolt": "Raging Bolt", - "iron_boulder": "Iron Boulder", - "iron_crown": "Iron Crown", + "archaludon": "Briduradon", + "hydrapple": "Hydrapfel", + "gouging_fire": "Keilflamme", + "raging_bolt": "Furienblitz", + "iron_boulder": "Eisenfels", + "iron_crown": "Eisenhaupt", "terapagos": "Terapagos", - "pecharunt": "Pecharunt", - "alola_rattata": "Rattata", - "alola_raticate": "Raticate", + "pecharunt": "Infamomo", + "alola_rattata": "Rattfratz", + "alola_raticate": "Rattikarl", "alola_raichu": "Raichu", - "alola_sandshrew": "Sandshrew", - "alola_sandslash": "Sandslash", + "alola_sandshrew": "Sandan", + "alola_sandslash": "Sandamer", "alola_vulpix": "Vulpix", - "alola_ninetales": "Ninetales", - "alola_diglett": "Diglett", - "alola_dugtrio": "Dugtrio", - "alola_meowth": "Meowth", - "alola_persian": "Persian", - "alola_geodude": "Geodude", - "alola_graveler": "Graveler", - "alola_golem": "Golem", - "alola_grimer": "Grimer", - "alola_muk": "Muk", - "alola_exeggutor": "Exeggutor", - "alola_marowak": "Marowak", + "alola_ninetales": "Vulnona", + "alola_diglett": "Digda", + "alola_dugtrio": "Digdri", + "alola_meowth": "Mauzi", + "alola_persian": "Snobilikat", + "alola_geodude": "Kleinstein", + "alola_graveler": "Georok", + "alola_golem": "Geowaz", + "alola_grimer": "Sleima", + "alola_muk": "Sleimok", + "alola_exeggutor": "Kokowei", + "alola_marowak": "Knogga", "eternal_floette": "Floette", - "galar_meowth": "Meowth", - "galar_ponyta": "Ponyta", - "galar_rapidash": "Rapidash", - "galar_slowpoke": "Slowpoke", - "galar_slowbro": "Slowbro", - "galar_farfetchd": "Farfetch'd", - "galar_weezing": "Weezing", - "galar_mr_mime": "Mr. Mime", - "galar_articuno": "Articuno", + "galar_meowth": "Mauzi", + "galar_ponyta": "Ponita", + "galar_rapidash": "Gallopa", + "galar_slowpoke": "Flegmon", + "galar_slowbro": "Lahmus", + "galar_farfetchd": "Porenta", + "galar_weezing": "Smogmog", + "galar_mr_mime": "Pantimos", + "galar_articuno": "Arktos", "galar_zapdos": "Zapdos", - "galar_moltres": "Moltres", - "galar_slowking": "Slowking", - "galar_corsola": "Corsola", - "galar_zigzagoon": "Zigzagoon", - "galar_linoone": "Linoone", - "galar_darumaka": "Darumaka", - "galar_darmanitan": "Darmanitan", - "galar_yamask": "Yamask", - "galar_stunfisk": "Stunfisk", - "hisui_growlithe": "Growlithe", - "hisui_arcanine": "Arcanine", - "hisui_voltorb": "Voltorb", - "hisui_electrode": "Electrode", - "hisui_typhlosion": "Typhlosion", - "hisui_qwilfish": "Qwilfish", - "hisui_sneasel": "Sneasel", - "hisui_samurott": "Samurott", - "hisui_lilligant": "Lilligant", + "galar_moltres": "Lavados", + "galar_slowking": "Laschoking", + "galar_corsola": "Corasonn", + "galar_zigzagoon": "Zigzachs", + "galar_linoone": "Geradachs", + "galar_darumaka": "Flampion", + "galar_darmanitan": "Flampivian", + "galar_yamask": "Makabaja", + "galar_stunfisk": "Flunschlik", + "hisui_growlithe": "Fukano", + "hisui_arcanine": "Arkani", + "hisui_voltorb": "Voltobal", + "hisui_electrode": "Lektrobal", + "hisui_typhlosion": "Tornupto", + "hisui_qwilfish": "Baldorfish", + "hisui_sneasel": "Sniebel", + "hisui_samurott": "Admurai", + "hisui_lilligant": "Dressella", "hisui_zorua": "Zorua", "hisui_zoroark": "Zoroark", - "hisui_braviary": "Braviary", - "hisui_sliggoo": "Sliggoo", - "hisui_goodra": "Goodra", - "hisui_avalugg": "Avalugg", - "hisui_decidueye": "Decidueye", + "hisui_braviary": "Washakwil", + "hisui_sliggoo": "Viscargot", + "hisui_goodra": "Viscogon", + "hisui_avalugg": "Arktilas", + "hisui_decidueye": "Silvarro", "paldea_tauros": "Tauros", - "paldea_wooper": "Wooper", + "paldea_wooper": "Felino", "bloodmoon_ursaluna": "Ursaluna", } as const; \ No newline at end of file diff --git a/src/locales/de/starter-select-ui-handler.ts b/src/locales/de/starter-select-ui-handler.ts index c7595cb2f..a982f30d8 100644 --- a/src/locales/de/starter-select-ui-handler.ts +++ b/src/locales/de/starter-select-ui-handler.ts @@ -6,27 +6,27 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n"; * account interactions, descriptive text, etc. */ export const starterSelectUiHandler: SimpleTranslationEntries = { - "confirmStartTeam":'Begin with these Pokémon?', - "growthRate": "Growth Rate:", - "ability": "Ability:", - "passive": "Passive:", - "nature": "Nature:", - "eggMoves": 'Egg Moves', + "confirmStartTeam": "Mit diesen Pokémon losziehen?", + "growthRate": "Wachstum:", + "ability": "Fhgkeit:", + "passive": "Passiv:", + "nature": "Wesen:", + "eggMoves": "Ei-Attacken", "start": "Start", - "addToParty": "Add to Party", - "toggleIVs": 'Toggle IVs', - "manageMoves": 'Manage Moves', - "useCandies": 'Use Candies', - "selectMoveSwapOut": "Select a move to swap out.", - "selectMoveSwapWith": "Select a move to swap with", - "unlockPassive": "Unlock Passive", - "reduceCost": "Reduce Cost", - "cycleShiny": "R: Cycle Shiny", - "cycleForm": 'F: Cycle Form', - "cycleGender": 'G: Cycle Gender', - "cycleAbility": 'E: Cycle Ability', - "cycleNature": 'N: Cycle Nature', - "cycleVariant": 'V: Cycle Variant', - "enablePassive": "Enable Passive", - "disablePassive": "Disable Passive" + "addToParty": "Zum Team hinzufügen", + "toggleIVs": "DVs anzeigen/verbergen", + "manageMoves": "Attacken ändern", + "useCandies": "Bonbons verwenden", + "selectMoveSwapOut": "Wähle die zu ersetzende Attacke.", + "selectMoveSwapWith": "Wähle die gewünschte Attacke.", + "unlockPassive": "Passiv-Skill freischalten", + "reduceCost": "Preis reduzieren", + "cycleShiny": "R: Schillernd Ja/Nein", + "cycleForm": "F: Form ändern", + "cycleGender": "G: Geschlecht ändern", + "cycleAbility": "E: Fähigkeit ändern", + "cycleNature": "N: Wesen Ändern", + "cycleVariant": "V: Seltenheit ändern", + "enablePassive": "Passiv-Skill aktivieren", + "disablePassive": "Passiv-Skill deaktivieren" } \ No newline at end of file diff --git a/src/locales/de/tutorial.ts b/src/locales/de/tutorial.ts index 2773b6710..1c4ada3c1 100644 --- a/src/locales/de/tutorial.ts +++ b/src/locales/de/tutorial.ts @@ -1,42 +1,46 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n"; export const tutorial: SimpleTranslationEntries = { - "intro": `Welcome to PokéRogue! This is a battle-focused Pokémon fangame with roguelite elements. - $This game is not monetized and we claim no ownership of Pokémon nor of the copyrighted assets used. - $The game is a work in progress, but fully playable.\nFor bug reports, please use the Discord community. - $If the game runs slowly, please ensure 'Hardware Acceleration' is turned on in your browser settings.`, + "intro": `Willkommen bei PokéRogue! Dies ist ein kampforientiertes Pokémon-Fangame mit Roguelite-Elementen. + $Dieses Spiel ist nicht monetarisiert. + $Wir erheben keinen Eigentumsanspruch an Pokémon oder\nverwendeten, urheberrechtlich geschützten Inhalten. + $Das Spiel befindet sich noch in der Entwicklung, ist aber voll spielbar. + $Für Fehlerberichte nutze bitte den PokéRogue Discord-Server. + $Sollte das Spiel langsam laufen, überprüfe, ob in deinem Browser "Hardwarebeschleunigung" aktiviert ist.`, - "accessMenu": `To access the menu, press M or Escape while awaiting input.\nThe menu contains settings and various features.`, + "accessMenu": `Nutze M oder Esc, um das Menü zu öffnen. Dort hast du Zugriff auf die Einstellungen und andere Funktionen.`, - "menu": `From this menu you can access the settings. - $From the settings you can change game speed, window style, and other options. - $There are also various other features here, so be sure to check them all!`, + "menu": `In diesem Menü hast du Zugriff auf die Einstellungen. + $Dort kannst du u. A. die Spielgeschwin-\ndigkeit und das Fensterdesign ändern. + $Das Menü verbirgt noch andere Funktionen - probier' sie gerne aus!`, - "starterSelect": `From this screen, you can select your starters.\nThese are your initial party members. - $Each starter has a value. Your party can have up to\n6 members as long as the total does not exceed 10. - $You can also select gender, ability, and form depending on\nthe variants you've caught or hatched. - $The IVs for a species are also the best of every one you've\ncaught or hatched, so try to get lots of the same species!`, + "starterSelect": `Hier kannst du deine Starter-Pokémon auswählen.\nSie begleiten dich am Anfang deines Abenteuers. + $Jeder Starter hat einen Preis. Dein Team kann bis zu sechs\nMitglieder haben, solange der Gesamtpreis max. 10 beträgt. + $Du kannst Geschlecht, Fähigkeit und Form beliebig auswählen,\nsobald du sie mindestens einmal gefangen hast. + $Die DVs ergeben sich aus den Höchstwerten aller Pokémon,\ndie du bereits gefangen hast. + $Es lohnt sich also, das selbe Pokémon mehrmals zu fangen!`, - "pokerus": `A daily random 3 selectable starters have a purple border. - $If you see a starter you own with one of these,\ntry adding it to your party. Be sure to check its summary!`, + "pokerus": `Jeden Tag haben drei zufällige Pokémon einen lila Rahmen. + $Wenn du eins von ihnen besitzt, + $nimm es doch mal mit und sieh dir seinen Bericht an!`, - "statChange": `Stat changes persist across battles as long as your Pokémon aren't recalled. - $Your Pokémon are recalled before a trainer battle and before entering a new biome. - $You can also view the stat changes for the Pokémon on the field by holding C or Shift.`, + "statChange": `Statuswertveränderungen halten solange an, wie dein Pokémon auf dem Feld bleibt. + $Pokémon werden am Anfang eines Trainerkampfes oder bei einem Arealwechsel automatisch zurückgerufen. + $Nutze C oder Shift, um aktuelle Statuswertveränderungen anzuzeigen.`, - "selectItem": `After every battle, you are given a choice of 3 random items.\nYou may only pick one. - $These range from consumables, to Pokémon held items, to passive permanent items. - $Most non-consumable item effects will stack in various ways. - $Some items will only show up if they can be used, such as evolution items. - $You can also transfer held items between Pokémon using the transfer option. - $The transfer option will appear in the bottom right once you have obtained a held item. - $You may purchase consumable items with money, and a larger variety will be available the further you get. - $Be sure to buy these before you pick your random item, as it will progress to the next battle once you do.`, + "selectItem": `Nach jedem Kampf kannst du aus 3 zufälligen Items exakt eines auswählen. + $Es gibt u. A. Heilitems, tragbare Items und Basis-Items, die dir einen permanenten Vorteil verschaffen. + $Die meisten tragbaren und permanenten Items werden stärker, wenn du sie mehrfach sammelst. + $Manche Items, wie Entwicklungssteine, tauchen nur auf, wenn du sie auch nutzen kannst. + $Mithilfe der "Transfer"-Option kannst du Items zwischen deinen Pokémon verschieben. + $Sie erscheint rechts unten, sobald du einem deiner Pokémon dein Item zum Tragen gegeben hast. + $Du kannst Heilitems auch gegen Geld erwerben. Je weiter du kommst, desto mehr stehen dir zur Auswahl. + $Erledige deine Einkäufe als erstes, denn sobald du dein zufälliges Item auswählst, beginnt der nächste Kampf.`, - "eggGacha": `From this screen, you can redeem your vouchers for\nPokémon eggs. - $Eggs have to be hatched and get closer to hatching after\nevery battle. Rarer eggs take longer to hatch. - $Hatched Pokémon also won't be added to your party, they will\nbe added to your starters. - $Pokémon hatched from eggs generally have better IVs than\nwild Pokémon. - $Some Pokémon can only even be obtained from eggs. - $There are 3 different machines to pull from with different\nbonuses, so pick the one that suits you best!`, + "eggGacha": `Hier kannst du deine Gutscheine gegen Pokémon-Eier\ntauschen. + $Eier schlüpfen, nachdem du eine gewisse Anzahl Kämpfe\nabsolviert hast. Je seltener das Ei, desto länger dauert es. + $Geschlüpfte Pokémon werden nicht deinem Team hinzugefügt,\nsondern deinen verfügbaren Startern. + $In der Regel haben sie bessere DVs als in der Wildnis\ngefangene Pokémon. + $Es gibt sogar Pokémon, die du nur aus Eiern erhalten kannst. + $Es gibt drei Gacha-Maschinen mit je unterschiedlichen Boni,\nalso such' dir die aus, die dir am besten gefällt!`, } as const; \ No newline at end of file diff --git a/src/locales/en/battle.ts b/src/locales/en/battle.ts index e307a3a52..7c948e6f0 100644 --- a/src/locales/en/battle.ts +++ b/src/locales/en/battle.ts @@ -46,7 +46,7 @@ export const battle: SimpleTranslationEntries = { "runAwayCannotEscape": 'You can\'t escape!', "escapeVerbSwitch": "switching", "escapeVerbFlee": "fleeing", - "notDisabled": "{{moveName}} is disabled\nno more!", + "notDisabled": "{{pokemonName}}'s {{moveName}} is disabled\nno more!", "skipItemQuestion": "Are you sure you want to skip taking an item?", "eggHatching": "Oh?", "ivScannerUseQuestion": "Use IV Scanner on {{pokemonName}}?" diff --git a/src/locales/es/battle.ts b/src/locales/es/battle.ts index f4bf22bb9..6fdcf4fbc 100644 --- a/src/locales/es/battle.ts +++ b/src/locales/es/battle.ts @@ -46,7 +46,7 @@ export const battle: SimpleTranslationEntries = { "runAwayCannotEscape": "¡No has podido escapar!", "escapeVerbSwitch": "cambiar", "escapeVerbFlee": "huir", - "notDisabled": "¡El movimiento {{moveName}}\nya no está anulado!", + "notDisabled": "¡El movimiento {{moveName}} de {{pokemonName}}\nya no está anulado!", "skipItemQuestion": "¿Estás seguro de que no quieres coger un objeto?", "eggHatching": "¿Y esto?", "ivScannerUseQuestion": "¿Quieres usar el Escáner de IVs en {{pokemonName}}?" diff --git a/src/locales/fr/battle.ts b/src/locales/fr/battle.ts index 56ab69215..e34902b8c 100644 --- a/src/locales/fr/battle.ts +++ b/src/locales/fr/battle.ts @@ -46,7 +46,7 @@ export const battle: SimpleTranslationEntries = { "runAwayCannotEscape": "Fuite impossible !", "escapeVerbSwitch": "le changement", "escapeVerbFlee": "la fuite", - "notDisabled": "{{moveName}} n’est plus sous entrave !", + "notDisabled": "La capacité {{moveName}}\nde {{pokemonName}} n’est plus sous entrave !", "skipItemQuestion": "Êtes-vous sûr·e de ne pas vouloir prendre d’objet ?", "eggHatching": "Oh ?", "ivScannerUseQuestion": "Utiliser le Scanner d’IV sur {{pokemonName}} ?" diff --git a/src/locales/fr/move.ts b/src/locales/fr/move.ts index b6d17252b..2139f96d9 100644 --- a/src/locales/fr/move.ts +++ b/src/locales/fr/move.ts @@ -482,7 +482,7 @@ export const move: MoveTranslationEntries = { effect: "Le lanceur explose en blessant tous les Pokémon autour de lui. Le lanceur tombe K.O." }, "eggBomb": { - name: "Bombe Oeuf", + name: "Bombe Œuf", effect: "De toutes ses forces, le lanceur jette un gros œuf sur l’ennemi pour lui infliger des dégâts." }, "lick": { @@ -1426,7 +1426,7 @@ export const move: MoveTranslationEntries = { effect: "Pendant cinq tours, les Pokémon Vol ou qui ont Lévitation deviennent sensibles aux capacités Sol, et les capacités volantes deviennent inutilisables." }, "miracleEye": { - name: "Oeil Miracle", + name: "Œil Miracle", effect: "Permet de toucher un Pokémon Ténèbres avec les capacités de type Psy ou de toucher un ennemi ayant beaucoup d’esquive." }, "wakeUpSlap": { @@ -1562,8 +1562,8 @@ export const move: MoveTranslationEntries = { effect: "Le lanceur éparpille des pics autour de la cible, ce qui empoisonne les Pokémon entrant au combat de ce côté." }, "heartSwap": { - name: "Permucoeur", - effect: "Cette capacité ne peut pas être utilisée. Il est recommandé de l’oublier, même s’il sera impossible de se la remémorer une fois oubliée." + name: "Permucœur", + effect: "Le lanceur utilise un pouvoir psychique pour échanger ses changements de stats avec la cible." }, "aquaRing": { name: "Anneau Hydro", @@ -2122,7 +2122,7 @@ export const move: MoveTranslationEntries = { effect: "Le lanceur frappe l’ennemi deux fois d’affilée avec les parties les plus robustes de son corps." }, "heartStamp": { - name: "Crève-Coeur", + name: "Crève-Cœur", effect: "Déconcentre l’ennemi avec des mouvements mignons avant de le frapper violemment. Peut aussi l’apeurer (30% de chances)." }, "hornLeech": { @@ -3742,7 +3742,7 @@ export const move: MoveTranslationEntries = { effect: "Le lanceur remue son thé et en bombarde la cible. La moitié des dégâts infligés sont convertis en PV pour le lanceur. Cette capacité peut aussi brûler la cible." }, "syrupBomb": { - name: "Bombe au sirop", + name: "Bombe au Sirop", effect: "Le lanceur jette une bombe qui recouvre la cible de sirop gluant et fait progressivement baisser la Vitesse de la cible pendant trois tours." }, "ivyCudgel": { diff --git a/src/locales/it/battle.ts b/src/locales/it/battle.ts index 247e6e38e..a3cffaa60 100644 --- a/src/locales/it/battle.ts +++ b/src/locales/it/battle.ts @@ -46,7 +46,7 @@ export const battle: SimpleTranslationEntries = { "runAwayCannotEscape": 'Non puoi fuggire!', "escapeVerbSwitch": "cambiando", "escapeVerbFlee": "fuggendo", - "notDisabled": "{{moveName}} non è più\ndisabilitata!", + "notDisabled": "{{pokemonName}}'s {{moveName}} non è più\ndisabilitata!", "skipItemQuestion": "Sei sicuro di non voler prendere nessun oggetto?", "eggHatching": "Oh?", "ivScannerUseQuestion": "Vuoi usare lo scanner di IV su {{pokemonName}}?" diff --git a/src/locales/zh_CN/ability.ts b/src/locales/zh_CN/ability.ts new file mode 100644 index 000000000..4d9944a23 --- /dev/null +++ b/src/locales/zh_CN/ability.ts @@ -0,0 +1,1244 @@ +import { AbilityTranslationEntries } from "#app/plugins/i18n.js"; + +export const ability: AbilityTranslationEntries = { + stench: { + name: "恶臭", + description: "通过释放臭臭的气味，在攻击的时候，有时会使对手畏缩。", + }, + drizzle: { + name: "降雨", + description: "出场时，会将天气变为下雨。", + }, + speedBoost: { + name: "加速", + description: "每一回合速度会变快。", + }, + battleArmor: { + name: "战斗盔甲", + description: "被坚硬的甲壳守护着，不会被对手的攻击击中要害。", + }, + sturdy: { + name: "结实", + description: "在ＨＰ全满时，即使受到招式攻击，也不会被一击打倒。一击必杀的招式也没有效果。", + }, + damp: { + name: "湿气", + description: "通过把周围都弄湿，使谁都无法使用自爆等爆炸类的招式。", + }, + limber: { + name: "柔软", + description: "因为身体柔软，不会变为麻痹状态。", + }, + sandVeil: { + name: "沙隐", + description: "在沙暴的时候，闪避率会提高。", + }, + static: { + name: "静电", + description: "身上带有静电，有时会让接触到的对手麻痹。", + }, + voltAbsorb: { + name: "蓄电", + description: "受到电属性的招式攻击时，不会受到伤害，而是会回复。", + }, + waterAbsorb: { + name: "储水", + description: "受到水属性的招式攻击时，不会受到伤害，而是会回复。", + }, + oblivious: { + name: "迟钝", + description: "因为感觉迟钝，不会变为着迷和被挑衅状态。对威吓也毫不动摇。", + }, + cloudNine: { + name: "无关天气", + description: "任何天气的影响都会消失。", + }, + compoundEyes: { + name: "复眼", + description: "因为拥有复眼，招式的命中率会提高。", + }, + insomnia: { + name: "不眠", + description: "因为有着睡不着的体质，所以不会陷入睡眠状态。", + }, + colorChange: { + name: "变色", + description: "自己的属性会变为从对手处所受招式的属性。", + }, + immunity: { + name: "免疫", + description: "因为体内拥有免疫能力，不会变为中毒状态。", + }, + flashFire: { + name: "引火", + description: "受到火属性的招式攻击时，吸收火焰，自己使出的火属性招式会变强。", + }, + shieldDust: { + name: "鳞粉", + description: "被鳞粉守护着，不会受到招式的追加效果影响。", + }, + ownTempo: { + name: "我行我素", + description: "因为我行我素，不会变为混乱状态。对威吓也毫不动摇。", + }, + suctionCups: { + name: "吸盘", + description: "用吸盘牢牢贴在地面上，让替换宝可梦的招式和道具无效。", + }, + intimidate: { + name: "威吓", + description: "出场时威吓对手，让其退缩，降低对手的攻击。", + }, + shadowTag: { + name: "踩影", + description: "踩住对手的影子使其无法逃走或替换。", + }, + roughSkin: { + name: "粗糙皮肤", + description: "受到攻击时，用粗糙的皮肤弄伤接触到自己的对手。", + }, + wonderGuard: { + name: "神奇守护", + description: "不可思议的力量，只有效果绝佳的招式才能击中。", + }, + levitate: { + name: "飘浮", + description: "从地面浮起，从而不会受到地面属性招式的攻击。", + }, + effectSpore: { + name: "孢子", + description: "受到攻击时，有时会把接触到自己的对手变为中毒、麻痹或睡眠状态。", + }, + synchronize: { + name: "同步", + description: "将自己的中毒、麻痹或灼伤状态传染给对手。", + }, + clearBody: { + name: "恒净之躯", + description: "不会因为对手的招式或特性而被降低能力。", + }, + naturalCure: { + name: "自然回复", + description: "回到同行队伍后，异常状态就会被治愈。", + }, + lightningRod: { + name: "避雷针", + description: "将电属性的招式吸引到自己身上，不会受到伤害，而是会提高特攻。", + }, + sereneGrace: { + name: "天恩", + description: "托天恩的福，招式的追加效果容易出现。", + }, + swiftSwim: { + name: "悠游自如", + description: "下雨天气时，速度会提高。", + }, + chlorophyll: { + name: "叶绿素", + description: "晴朗天气时，速度会提高。", + }, + illuminate: { + name: "发光", + description: "通过让周围变亮来保持命中率不会被降低。", + }, + trace: { + name: "复制", + description: "出场时，复制对手的特性，变为与之相同的特性。", + }, + hugePower: { + name: "大力士", + description: "物理攻击的威力会变为２倍。", + }, + poisonPoint: { + name: "毒刺", + description: "有时会让接触到自己的对手变为中毒状态。", + }, + innerFocus: { + name: "精神力", + description: "拥有经过锻炼的精神，而不会因对手的攻击而畏缩。对威吓也毫不动摇。", + }, + magmaArmor: { + name: "熔岩铠甲", + description: "将炽热的熔岩覆盖在身上，不会变为冰冻状态。", + }, + waterVeil: { + name: "水幕", + description: "将水幕裹在身上，不会变为灼伤状态。", + }, + magnetPull: { + name: "磁力", + description: "用磁力吸住钢属性的宝可梦，使其无法逃走。", + }, + soundproof: { + name: "隔音", + description: "通过屏蔽声音，不受到声音招式的影响。", + }, + rainDish: { + name: "雨盘", + description: "下雨天气时，会缓缓回复ＨＰ。", + }, + sandStream: { + name: "扬沙", + description: "出场时，会把天气变为沙暴。", + }, + pressure: { + name: "压迫感", + description: "给予对手压迫感，大量减少其使用招式的ＰＰ。", + }, + thickFat: { + name: "厚脂肪", + description: "因为被厚厚的脂肪保护着，会让火属性和冰属性的招式伤害减半。", + }, + earlyBird: { + name: "早起", + description: "即使变为睡眠状态，也能以２倍的速度提早醒来。", + }, + flameBody: { + name: "火焰之躯", + description: "有时会让接触到自己的对手变为灼伤状态。", + }, + runAway: { + name: "逃跑", + description: "一定能从野生宝可梦那儿逃走。", + }, + keenEye: { + name: "锐利目光", + description: "多亏了锐利的目光，命中率不会被降低。", + }, + hyperCutter: { + name: "怪力钳", + description: "因为拥有以力量自豪的钳子，不会被对手降低攻击。", + }, + pickup: { + name: "捡拾", + description: "有时会捡来对手用过的道具，冒险过程中也会捡到。", + }, + truant: { + name: "懒惰", + description: "如果使出招式，下一回合就会休息。", + }, + hustle: { + name: "活力", + description: "自己的攻击变高，但命中率会降低。", + }, + cuteCharm: { + name: "迷人之躯", + description: "有时会让接触到自己的对手着迷。", + }, + plus: { + name: "正电", + description: "出场的伙伴之间如果有正电或负电特性的宝可梦，自己的特攻会提高。", + }, + minus: { + name: "负电", + description: "出场的伙伴之间如果有正电或负电特性的宝可梦，自己的特攻会提高。", + }, + forecast: { + name: "阴晴不定", + description: "受天气的影响，会变为水属性、火属性或冰属性中的某一个。", + }, + stickyHold: { + name: "黏着", + description: "因为道具是粘在黏性身体上的，所以不会被对手夺走。", + }, + shedSkin: { + name: "蜕皮", + description: "通过蜕去身上的皮，有时会治愈异常状态。", + }, + guts: { + name: "毅力", + description: "如果变为异常状态，会拿出毅力，攻击会提高。", + }, + marvelScale: { + name: "神奇鳞片", + description: "如果变为异常状态，神奇鳞片会发生反应，防御会提高。", + }, + liquidOoze: { + name: "污泥浆", + description: "吸收了污泥浆的对手会因强烈的恶臭而受到伤害，减少ＨＰ。", + }, + overgrow: { + name: "茂盛", + description: "ＨＰ减少的时候，草属性的招式威力会提高。", + }, + blaze: { + name: "猛火", + description: "ＨＰ减少的时候，火属性的招式威力会提高。", + }, + torrent: { + name: "激流", + description: "ＨＰ减少的时候，水属性的招式威力会提高。", + }, + swarm: { + name: "虫之预感", + description: "ＨＰ减少的时候，虫属性的招式威力会提高。", + }, + rockHead: { + name: "坚硬脑袋", + description: "即使使出会受反作用力伤害的招式，ＨＰ也不会减少。", + }, + drought: { + name: "日照", + description: "出场时，会将天气变为晴朗。", + }, + arenaTrap: { + name: "沙穴", + description: "在战斗中让对手无法逃走。", + }, + vitalSpirit: { + name: "干劲", + description: "通过激发出干劲，不会变为睡眠状态。", + }, + whiteSmoke: { + name: "白色烟雾", + description: "被白色烟雾保护着，不会被对手降低能力。", + }, + purePower: { + name: "瑜伽之力", + description: "因瑜伽的力量，物理攻击的威力会变为２倍。", + }, + shellArmor: { + name: "硬壳盔甲", + description: "被坚硬的壳保护着，对手的攻击不会击中要害。", + }, + airLock: { + name: "气闸", + description: "所有天气的影响都会消失。", + }, + tangledFeet: { + name: "蹒跚", + description: "在混乱状态时，闪避率会提高。", + }, + motorDrive: { + name: "电气引擎", + description: "受到电属性的招式攻击时，不会受到伤害，而是速度会提高。", + }, + rivalry: { + name: "斗争心", + description: "面对性别相同的对手，会燃起斗争心，变得更强。而面对性别不同的，则会变弱。", + }, + steadfast: { + name: "不屈之心", + description: "每次畏缩时，不屈之心就会燃起，速度也会提高。", + }, + snowCloak: { + name: "雪隐", + description: "下雪天气时，闪避率会提高。", + }, + gluttony: { + name: "贪吃鬼", + description: "原本ＨＰ变得很少时才会吃树果，在ＨＰ还有一半时就会把它吃掉。", + }, + angerPoint: { + name: "愤怒穴位", + description: "要害被击中时，会大发雷霆，攻击力变为最大。", + }, + unburden: { + name: "轻装", + description: "失去所持有的道具时，速度会提高。", + }, + heatproof: { + name: "耐热", + description: "耐热的体质会让火属性的招式伤害减半。", + }, + simple: { + name: "单纯", + description: "能力变化会变为平时的２倍。", + }, + drySkin: { + name: "干燥皮肤", + description: "下雨天气时和受到水属性的招式时，ＨＰ会回复。晴朗天气时和受到火属性的招式时，ＨＰ会减少。", + }, + download: { + name: "下载", + description: "比较对手的防御和特防，根据较低的那项能力相应地提高自己的攻击或特攻。", + }, + ironFist: { + name: "铁拳", + description: "使用拳类招式的威力会提高。", + }, + poisonHeal: { + name: "毒疗", + description: "变为中毒状态时，ＨＰ不会减少，反而会增加起来。", + }, + adaptability: { + name: "适应力", + description: "与自身同属性的招式威力会提高。", + }, + skillLink: { + name: "连续攻击", + description: "如果使用连续招式，总是能使出最高次数。", + }, + hydration: { + name: "湿润之躯", + description: "下雨天气时，异常状态会治愈。", + }, + solarPower: { + name: "太阳之力", + description: "晴朗天气时，特攻会提高，而每回合ＨＰ会减少。", + }, + quickFeet: { + name: "飞毛腿", + description: "变为异常状态时，速度会提高。", + }, + normalize: { + name: "一般皮肤", + description: "无论是什么属性的招式，全部会变为一般属性。威力会少量提高。", + }, + sniper: { + name: "狙击手", + description: "击中要害时，威力会变得更强。", + }, + magicGuard: { + name: "魔法防守", + description: "不会受到攻击以外的伤害。", + }, + noGuard: { + name: "无防守", + description: "由于无防守战术，双方使出的招式都必定会击中。", + }, + stall: { + name: "慢出", + description: "使出招式的顺序必定会变为最后。", + }, + technician: { + name: "技术高手", + description: "攻击时可以将低威力招式的威力提高。", + }, + leafGuard: { + name: "叶子防守", + description: "晴朗天气时，不会变为异常状态。", + }, + klutz: { + name: "笨拙", + description: "无法使用持有的道具。", + }, + moldBreaker: { + name: "破格", + description: "可以不受对手特性的干扰，向对手使出招式。", + }, + superLuck: { + name: "超幸运", + description: "因为拥有超幸运，攻击容易击中对手的要害。", + }, + aftermath: { + name: "引爆", + description: "变为濒死时，会对接触到自己的对手造成伤害。", + }, + anticipation: { + name: "危险预知", + description: "可以察觉到对手拥有的危险招式。", + }, + forewarn: { + name: "预知梦", + description: "出场时，只读取１个对手拥有的招式。", + }, + unaware: { + name: "纯朴", + description: "可以无视对手能力的变化，进行攻击。", + }, + tintedLens: { + name: "有色眼镜", + description: 'The Pokémon can use "可以将效果不好的招式以通常的威力使出。" moves to deal regular damage.', + }, + filter: { + name: "过滤", + description: "受到效果绝佳的攻击时，可以减弱其威力。", + }, + slowStart: { + name: "慢启动", + description: "在５回合内，攻击和速度减半。", + }, + scrappy: { + name: "胆量", + description: "一般属性和格斗属性的招式可以击中幽灵属性的宝可梦。对威吓也毫不动摇。", + }, + stormDrain: { + name: "引水", + description: "将水属性的招式引到自己身上，不会受到伤害，而是会提高特攻。", + }, + iceBody: { + name: "冰冻之躯", + description: "下雪天气时，会缓缓回复ＨＰ。", + }, + solidRock: { + name: "坚硬岩石", + description: "受到效果绝佳的攻击时，可以减弱其威力。", + }, + snowWarning: { + name: "降雪", + description: "出场时，会将天气变为下雪。", + }, + honeyGather: { + name: "采蜜", + description: "战斗结束时，有时候会捡来甜甜蜜。", + }, + frisk: { + name: "察觉", + description: "出场时，可以察觉对手的持有物。", + }, + reckless: { + name: "舍身", + description: "自己会因反作用力受伤的招式，其威力会提高。", + }, + multitype: { + name: "多属性", + description: "自己的属性会根据持有的石板而改变。", + }, + flowerGift: { + name: "花之礼", + description: "晴朗天气时，自己与同伴的攻击和特防能力会提高。", + }, + badDreams: { + name: "梦魇", + description: "给予睡眠状态的对手伤害。", + }, + pickpocket: { + name: "顺手牵羊", + description: "盗取接触到自己的对手的道具。", + }, + sheerForce: { + name: "强行", + description: "招式的追加效果消失，但因此能以更高的威力使出招式。", + }, + contrary: { + name: "唱反调", + description: "能力的变化发生逆转，原本提高时会降低，而原本降低时会提高。", + }, + unnerve: { + name: "紧张感", + description: "让对手紧张，使其无法食用树果。", + }, + defiant: { + name: "不服输", + description: "被对手降低能力时，攻击会大幅提高。", + }, + defeatist: { + name: "软弱", + description: "ＨＰ减半时，会变得软弱，攻击和特攻会减半。", + }, + cursedBody: { + name: "诅咒之躯", + description: "受到攻击时，有时会把对手的招式变为定身法状态。", + }, + healer: { + name: "治愈之心", + description: "有时会治愈异常状态的同伴。", + }, + friendGuard: { + name: "友情防守", + description: "可以减少我方的伤害。", + }, + weakArmor: { + name: "碎裂铠甲", + description: "受到物理招式的伤害时，防御会降低，速度会大幅提高。", + }, + heavyMetal: { + name: "重金属", + description: "自身的重量会变为２倍。", + }, + lightMetal: { + name: "轻金属", + description: "自身的重量会减半。", + }, + multiscale: { + name: "多重鳞片", + description: "ＨＰ全满时，受到的伤害会变少。", + }, + toxicBoost: { + name: "中毒激升", + description: "变为中毒状态时，物理招式的威力会提高。", + }, + flareBoost: { + name: "受热激升", + description: "变为灼伤状态时，特殊招式的威力会提高。", + }, + harvest: { + name: "收获", + description: "可以多次制作出已被使用掉的树果。", + }, + telepathy: { + name: "心灵感应", + description: "读取我方的攻击，并闪避其招式伤害。", + }, + moody: { + name: "心情不定", + description: "每一回合，能力中的某项会大幅提高，而某项会降低。", + }, + overcoat: { + name: "防尘", + description: "不会受到沙暴的伤害。也不会受到粉末类和孢子类招式的影响。", + }, + poisonTouch: { + name: "毒手", + description: "只通过接触就有可能让对手变为中毒状态。", + }, + regenerator: { + name: "再生力", + description: "退回同行队伍后，ＨＰ会少量回复。", + }, + bigPecks: { + name: "健壮胸肌", + description: "不会受到防御降低的效果。", + }, + sandRush: { + name: "拨沙", + description: "沙暴天气时，速度会提高。", + }, + wonderSkin: { + name: "奇迹皮肤", + description: "成为不易受到变化招式攻击的身体。", + }, + analytic: { + name: "分析", + description: "如果在最后使出招式，招式的威力会提高。", + }, + illusion: { + name: "幻觉", + description: "假扮成同行队伍中的最后一只宝可梦出场，迷惑对手。", + }, + imposter: { + name: "变身者", + description: "变身为当前面对的宝可梦。", + }, + infiltrator: { + name: "穿透", + description: "可以穿透对手的壁障或替身进行攻击。", + }, + mummy: { + name: "木乃伊", + description: "被对手接触到后，会将对手变为木乃伊。", + }, + moxie: { + name: "自信过度", + description: "如果打倒对手，就会充满自信，攻击会提高。", + }, + justified: { + name: "正义之心", + description: "受到恶属性的招式攻击时，因为正义感，攻击会提高。", + }, + rattled: { + name: "胆怯", + description: "受到恶属性、幽灵属性和虫属性的攻击或威吓时，会因胆怯而速度提高。", + }, + magicBounce: { + name: "魔法镜", + description: "可以不受到由对手使出的变化招式影响，并将其反弹。", + }, + sapSipper: { + name: "食草", + description: "受到草属性的招式攻击时，不会受到伤害，而是攻击会提高。", + }, + prankster: { + name: "恶作剧之心", + description: "可以率先使出变化招式。", + }, + sandForce: { + name: "沙之力", + description: "沙暴天气时，岩石属性、地面属性和钢属性的招式威力会提高。", + }, + ironBarbs: { + name: "铁刺", + description: "用铁刺给予接触到自己的对手伤害。", + }, + zenMode: { + name: "达摩模式", + description: "ＨＰ变为一半以下时，样子会改变。", + }, + victoryStar: { + name: "胜利之星", + description: "自己和同伴的命中率会提高。", + }, + turboblaze: { + name: "涡轮火焰", + description: "可以不受对手特性的干扰，向对手使出招式。", + }, + teravolt: { + name: "兆级电压", + description: "可以不受对手特性的干扰，向对手使出招式。", + }, + aromaVeil: { + name: "芳香幕", + description: "可以防住向自己和同伴发出的心灵攻击。", + }, + flowerVeil: { + name: "花幕", + description: "我方的草属性宝可梦能力不会降低，也不会变为异常状态。", + }, + cheekPouch: { + name: "颊囊", + description: "无论是哪种树果，食用后，ＨＰ都会回复。", + }, + protean: { + name: "变幻自如", + description: "变为与自己使出的招式相同的属性。每次出场战斗仅生效一次。", + }, + furCoat: { + name: "毛皮大衣", + description: "对手给予的物理招式的伤害会减半。", + }, + magician: { + name: "魔术师", + description: "夺走被自己的招式击中的对手的道具。", + }, + bulletproof: { + name: "防弹", + description: "可以防住对手的球和弹类招式。", + }, + competitive: { + name: "好胜", + description: "如果被对手降低能力，特攻会大幅提高。", + }, + strongJaw: { + name: "强壮之颚", + description: "因为颚部强壮，啃咬类招式的威力会提高。", + }, + refrigerate: { + name: "冰冻皮肤", + description: "一般属性的招式会变为冰属性。威力会少量提高。", + }, + sweetVeil: { + name: "甜幕", + description: "自己和同伴的宝可梦不会变为睡眠状态。", + }, + stanceChange: { + name: "战斗切换", + description: "如果使出攻击招式，会变为刀剑形态，如果使出招式“王者盾牌”，会变为盾牌形态。", + }, + galeWings: { + name: "疾风之翼", + description: "ＨＰ全满时，飞行属性的招式可以率先使出。", + }, + megaLauncher: { + name: "超级发射器", + description: "波动和波导类招式的威力会提高。", + }, + grassPelt: { + name: "草之毛皮", + description: "在青草场地时，防御会提高。", + }, + symbiosis: { + name: "共生", + description: "同伴使用道具时，会把自己持有的道具传递给同伴。", + }, + toughClaws: { + name: "硬爪", + description: "接触到对手的招式威力会提高。", + }, + pixilate: { + name: "妖精皮肤", + description: "一般属性的招式会变为妖精属性。威力会少量提高。", + }, + gooey: { + name: "黏滑", + description: "对于用攻击接触到自己的对手，会降低其速度。", + }, + aerilate: { + name: "飞行皮肤", + description: "一般属性的招式会变为飞行属性。威力会少量提高。", + }, + parentalBond: { + name: "亲子爱", + description: "亲子俩可以合计攻击２次。", + }, + darkAura: { + name: "暗黑气场", + description: "全体的恶属性招式变强。", + }, + fairyAura: { + name: "妖精气场", + description: "全体的妖精属性招式变强。", + }, + auraBreak: { + name: "气场破坏", + description: 'The effects of "让气场的效果发生逆转，降低威力。" Abilities are reversed to lower the power of affected moves.', + }, + primordialSea: { + name: "始源之海", + description: "变为不会受到火属性攻击的天气。", + }, + desolateLand: { + name: "终结之地", + description: "变为不会受到水属性攻击的天气。", + }, + deltaStream: { + name: "德尔塔气流", + description: "变为令飞行属性的弱点消失的天气。", + }, + stamina: { + name: "持久力", + description: "受到攻击时，防御会提高。", + }, + wimpOut: { + name: "跃跃欲逃", + description: "ＨＰ变为一半时，会慌慌张张逃走，退回同行队伍中。", + }, + emergencyExit: { + name: "危险回避", + description: "ＨＰ变为一半时，为了回避危险，会退回到同行队伍中。", + }, + waterCompaction: { + name: "遇水凝固", + description: "受到水属性的招式攻击时，防御会大幅提高。", + }, + merciless: { + name: "不仁不义", + description: "攻击中毒状态的对手时，必定会击中要害。", + }, + shieldsDown: { + name: "界限盾壳", + description: "ＨＰ变为一半时，壳会坏掉，变得有攻击性。", + }, + stakeout: { + name: "蹲守", + description: "可以对替换出场的对手以２倍的伤害进行攻击。", + }, + waterBubble: { + name: "水泡", + description: "降低自己受到的火属性招式的威力，不会灼伤。", + }, + steelworker: { + name: "钢能力者", + description: "钢属性的招式威力会提高。", + }, + berserk: { + name: "怒火冲天", + description: "因对手的攻击ＨＰ变为一半时，特攻会提高。", + }, + slushRush: { + name: "拨雪", + description: "下雪天气时，速度会提高。", + }, + longReach: { + name: "远隔", + description: "可以不接触对手就使出所有的招式。", + }, + liquidVoice: { + name: "湿润之声", + description: "所有的声音招式都变为水属性。", + }, + triage: { + name: "先行治疗", + description: "可以率先使出回复招式。", + }, + galvanize: { + name: "电气皮肤", + description: "一般属性的招式会变为电属性。威力会少量提高。", + }, + surgeSurfer: { + name: "冲浪之尾", + description: "电气场地时，速度会变为２倍。", + }, + schooling: { + name: "鱼群", + description: "ＨＰ多的时候会聚起来变强。ＨＰ剩余量变少时，群体会分崩离析。", + }, + disguise: { + name: "画皮", + description: "通过画皮覆盖住身体，可以防住１次攻击。", + }, + battleBond: { + name: "牵绊变身", + description: "打倒对手时，与训练家的牵绊会增强，自己的攻击、特攻、速度会提高。", + }, + powerConstruct: { + name: "群聚变形", + description: "ＨＰ变为一半时，细胞们会赶来支援，变为完全体形态。", + }, + corrosion: { + name: "腐蚀", + description: "可以使钢属性和毒属性的宝可梦也陷入中毒状态。", + }, + comatose: { + name: "绝对睡眠", + description: "总是半梦半醒的状态，绝对不会醒来。可以就这么睡着进行攻击。", + }, + queenlyMajesty: { + name: "女王的威严", + description: "向对手施加威慑力，使其无法对我方使出先制招式。", + }, + innardsOut: { + name: "飞出的内在物", + description: "被对手打倒的时候，会给予对手相当于ＨＰ剩余量的伤害。", + }, + dancer: { + name: "舞者", + description: "有谁使出跳舞招式时，自己也能就这么接着使出跳舞招式。", + }, + battery: { + name: "蓄电池", + description: "会提高我方的特殊招式的威力。", + }, + fluffy: { + name: "毛茸茸", + description: "会将对手所给予的接触类招式的伤害减半，但火属性招式的伤害会变为２倍。", + }, + dazzling: { + name: "鲜艳之躯", + description: "让对手吓一跳，使其无法对我方使出先制招式。", + }, + soulHeart: { + name: "魂心", + description: "宝可梦每次变为濒死状态时，特攻会提高。", + }, + tanglingHair: { + name: "卷发", + description: "对于用攻击接触到自己的对手，会降低其速度。", + }, + receiver: { + name: "接球手", + description: "继承被打倒的同伴的特性，变为相同的特性。", + }, + powerOfAlchemy: { + name: "化学之力", + description: "继承被打倒的同伴的特性，变为相同的特性。", + }, + beastBoost: { + name: "异兽提升", + description: "打倒对手的时候，自己最高的那项能力会提高。", + }, + rksSystem: { + name: "ＡＲ系统", + description: "根据持有的存储碟，自己的属性会改变。", + }, + electricSurge: { + name: "电气制造者", + description: "出场时，会布下电气场地。", + }, + psychicSurge: { + name: "精神制造者", + description: "出场时，会布下精神场地。", + }, + mistySurge: { + name: "薄雾制造者", + description: "出场时，会布下薄雾场地。", + }, + grassySurge: { + name: "青草制造者", + description: "出场时，会布下青草场地。", + }, + fullMetalBody: { + name: "金属防护", + description: "不会因为对手的招式或特性而被降低能力。", + }, + shadowShield: { + name: "幻影防守", + description: "ＨＰ全满时，受到的伤害会变少。", + }, + prismArmor: { + name: "棱镜装甲", + description: "受到效果绝佳的攻击时，可以减弱其威力。", + }, + neuroforce: { + name: "脑核之力", + description: "效果绝佳的攻击，威力会变得更强。", + }, + intrepidSword: { + name: "不挠之剑", + description: "首次出场时，攻击会提高。", + }, + dauntlessShield: { + name: "不屈之盾", + description: "首次出场时，防御会提高。", + }, + libero: { + name: "自由者", + description: "变为与自己使出的招式相同的属性。每次出场战斗仅生效一次。", + }, + ballFetch: { + name: "捡球", + description: "没有携带道具时，会拾取第１个投出后捕捉失败的精灵球。", + }, + cottonDown: { + name: "棉絮", + description: "受到攻击后撒下棉絮，降低除自己以外的所有宝可梦的速度。", + }, + propellerTail: { + name: "螺旋尾鳍", + description: "能无视具有吸引对手招式效果的特性或招式的影响。", + }, + mirrorArmor: { + name: "镜甲", + description: "只反弹自己受到的能力降低效果。", + }, + gulpMissile: { + name: "一口导弹", + description: "冲浪或潜水时会叼来猎物。受到伤害时，会吐出猎物进行攻击。", + }, + stalwart: { + name: "坚毅", + description: "能无视具有吸引对手招式效果的特性或招式的影响。", + }, + steamEngine: { + name: "蒸汽机", + description: "受到水属性或火属性的招式攻击时，速度会巨幅提高。", + }, + punkRock: { + name: "庞克摇滚", + description: "声音招式的威力会提高。受到的声音招式伤害会减半。", + }, + sandSpit: { + name: "吐沙", + description: "受到攻击时，会刮起沙暴。", + }, + iceScales: { + name: "冰鳞粉", + description: "由于有冰鳞粉的守护，受到的特殊攻击伤害会减半。", + }, + ripen: { + name: "熟成", + description: "使树果成熟，效果变为２倍。", + }, + iceFace: { + name: "结冻头", + description: "头部的冰会代替自己承受物理攻击，但是样子会改变。下雪时，冰会恢复原状。", + }, + powerSpot: { + name: "能量点", + description: "只要处在相邻位置，招式的威力就会提高。", + }, + mimicry: { + name: "拟态", + description: "宝可梦的属性会根据场地的状态而变化。", + }, + screenCleaner: { + name: "除障", + description: "出场时，敌方和我方的光墙、反射壁和极光幕的效果会消失。", + }, + steelySpirit: { + name: "钢之意志", + description: "我方的钢属性攻击威力会提高。", + }, + perishBody: { + name: "灭亡之躯", + description: "受到接触类招式攻击时，双方都会在３回合后变为濒死状态。替换后效果消失。", + }, + wanderingSpirit: { + name: "游魂", + description: "与使用接触类招式攻击自己的宝可梦互换特性。", + }, + gorillaTactics: { + name: "一猩一意", + description: "虽然攻击会提高，但是只能使出一开始所选的招式。", + }, + neutralizingGas: { + name: "化学变化气体", + description: "特性为化学变化气体的宝可梦在场时，场上所有宝可梦的特性效果都会消失或者无法生效。", + }, + pastelVeil: { + name: "粉彩护幕", + description: "自己和同伴都不会陷入中毒的异常状态。", + }, + hungerSwitch: { + name: "饱了又饿", + description: "每回合结束时会在满腹花纹与空腹花纹之间交替改变样子。", + }, + quickDraw: { + name: "速击", + description: "有时能比对手先一步行动。", + }, + unseenFist: { + name: "无形拳", + description: "如果使出的是接触到对手的招式，就可以无视守护效果进行攻击。", + }, + curiousMedicine: { + name: "怪药", + description: "出场时会从贝壳撒药，将我方的能力变化复原。", + }, + transistor: { + name: "电晶体", + description: "电属性的招式威力会提高。", + }, + dragonsMaw: { + name: "龙颚", + description: "龙属性的招式威力会提高。", + }, + chillingNeigh: { + name: "苍白嘶鸣", + description: "打倒对手时会用冰冷的声音嘶鸣并提高攻击。", + }, + grimNeigh: { + name: "漆黑嘶鸣", + description: "打倒对手时会用恐怖的声音嘶鸣并提高特攻。", + }, + asOneGlastrier: { + name: "人马一体", + description: "兼备蕾冠王的紧张感和灵幽马的漆黑嘶鸣这两种特性。", + }, + asOneSpectrier: { + name: "人马一体", + description: "兼备蕾冠王的紧张感和灵幽马的漆黑嘶鸣这两种特性。", + }, + lingeringAroma: { + name: "甩不掉的气味", + description: "被对手接触到后，甩不掉的气味会沾上对手。", + }, + seedSower: { + name: "掉出种子", + description: "受到攻击时，会将脚下变成青草场地。", + }, + thermalExchange: { + name: "热交换", + description: "受到火属性的招式攻击时，攻击会提高，且不会陷入灼伤状态。", + }, + angerShell: { + name: "愤怒甲壳", + description: "因被对手攻击而ＨＰ变为一半时，会因愤怒降低防御和特防。但攻击、特攻、速度会提高。", + }, + purifyingSalt: { + name: "洁净之盐", + description: "因洁净的盐而不会陷入异常状态。会让幽灵属性的招式伤害减半。", + }, + wellBakedBody: { + name: "焦香之躯", + description: "受到火属性的招式攻击时，不会受到伤害，而是会大幅提高防御。", + }, + windRider: { + name: "乘风", + description: "吹起了顺风或受到风的招式攻击时，不会受到伤害，而是会提高攻击。", + }, + guardDog: { + name: "看门犬", + description: "受到威吓时，攻击会提高。让替换宝可梦的招式和道具无效。", + }, + rockyPayload: { + name: "搬岩", + description: "岩石属性的招式威力会提高。", + }, + windPower: { + name: "风力发电", + description: "受到风的招式攻击时，会变为充电状态。", + }, + zeroToHero: { + name: "全能变身", + description: "回到同行队伍后，会变为全能形态。", + }, + commander: { + name: "发号施令", + description: "出场时，若我方当中有吃吼霸，就会进入其口中，并从其口中发出指令。", + }, + electromorphosis: { + name: "电力转换", + description: "受到伤害时，会变为充电状态。", + }, + protosynthesis: { + name: "古代活性", + description: "携带着驱劲能量或天气为晴朗时，数值最高的能力会提高。", + }, + quarkDrive: { + name: "夸克充能", + description: "携带着驱劲能量或在电气场地上时，数值最高的能力会提高。", + }, + goodAsGold: { + name: "黄金之躯", + description: "不会氧化的坚固黄金身躯不会受到对手的变化招式的影响。", + }, + vesselOfRuin: { + name: "灾祸之鼎", + description: "以能呼唤灾厄的鼎的力量降低除自己以外的宝可梦的特攻。", + }, + swordOfRuin: { + name: "灾祸之剑", + description: "以能呼唤灾厄的剑的力量降低除自己以外的宝可梦的防御。", + }, + tabletsOfRuin: { + name: "灾祸之简", + description: "以能呼唤灾厄的简的力量降低除自己以外的宝可梦的攻击。", + }, + beadsOfRuin: { + name: "灾祸之玉", + description: "以能呼唤灾厄的勾玉的力量降低除自己以外的宝可梦的特防。", + }, + orichalcumPulse: { + name: "绯红脉动", + description: "出场时，会将天气变为晴朗。日照强烈时，会通过古代的脉动升高攻击。", + }, + hadronEngine: { + name: "强子引擎", + description: "出场时，会布下电气场地。处于电气场地时，会通过未来的机关升高特攻。", + }, + opportunist: { + name: "跟风", + description: "对手的能力提高时，自己也会趁机同样地提高能力。", + }, + cudChew: { + name: "反刍", + description: "吃了树果后，会在下一回合结束时从胃反刍出来再吃１次。", + }, + sharpness: { + name: "锋锐", + description: "提高切割对手的招式的威力。", + }, + supremeOverlord: { + name: "大将", + description: "出场时，攻击和特攻会按照目前被打倒的同伴数量逐渐提升，被打倒越多，提升越多。", + }, + costar: { + name: "同台共演", + description: "出场时，复制同伴的能力变化。", + }, + toxicDebris: { + name: "毒满地", + description: "受到物理招式的伤害时，会在对手脚下散布毒菱。", + }, + armorTail: { + name: "尾甲", + description: "包裹头部的神秘尾巴使对手无法对我方使出先制招式。", + }, + earthEater: { + name: "食土", + description: "受到地面属性的招式攻击时，不会受到伤害，而是会得到回复。", + }, + myceliumMight: { + name: "菌丝之力", + description: "使出变化招式时，虽然行动必定会变慢，但能不受对手的特性妨碍。", + }, + mindsEye: { + name: "心眼", + description: "一般属性和格斗属性的招式可以击中幽灵属性的宝可梦。无视对手的闪避率的变化，且命中率不会被降低。", + }, + supersweetSyrup: { + name: "甘露之蜜", + description: "首次出场时，会散发出甜腻的蜜的香味来降低对手的闪避率。", + }, + hospitality: { + name: "款待", + description: "出场时款待同伴，回复其少量ＨＰ。", + }, + toxicChain: { + name: "毒锁链", + description: "凭借含有毒素的锁链的力量，有时能让被招式击中的对手陷入剧毒状态。", + }, + embodyAspectTeal: { + name: "面影辉映", + description: "将回忆映于心中，让础石面具发出光辉，提高自己的防御。", + }, + embodyAspectWellspring: { + name: "面影辉映", + description: "将回忆映于心中，让础石面具发出光辉，提高自己的防御。", + }, + embodyAspectHearthflame: { + name: "面影辉映", + description: "将回忆映于心中，让础石面具发出光辉，提高自己的防御。", + }, + embodyAspectCornerstone: { + name: "面影辉映", + description: "将回忆映于心中，让础石面具发出光辉，提高自己的防御。", + }, + teraShift: { + name: "太晶变形", + description: "出场时，会吸收周围的能量，变为太晶形态。", + }, + teraShell: { + name: "太晶甲壳", + description: "甲壳蕴藏着全部属性的力量，会将自己ＨＰ全满时受到的伤害全都变为效果不好。", + }, + teraformZero: { + name: "归零化境", + description: "太乐巴戈斯变为星晶形态时，蕴藏在它身上的力量会将天气和场地的影响全部归零。", + }, + poisonPuppeteer: { + name: "毒傀儡", + description: "因桃歹郎的招式而陷入中毒状态的对手同时也会陷入混乱状态。", + }, +} as const; diff --git a/src/locales/zh_CN/battle.ts b/src/locales/zh_CN/battle.ts new file mode 100644 index 000000000..cfc7e104e --- /dev/null +++ b/src/locales/zh_CN/battle.ts @@ -0,0 +1,53 @@ +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +export const battle: SimpleTranslationEntries = { + "bossAppeared": "{{bossName}} 出现了。", + "trainerAppeared": "{{trainerName}}\n想要和你对战!", + "singleWildAppeared": "一只野生 {{pokemonName}} 出现了。!", + "multiWildAppeared": "野生的 {{pokemonName1}}\n和 {{pokemonName2}} 出现了。!", + "playerComeBack": "回来吧, {{pokemonName}}!", + "trainerComeBack": "{{trainerName}} 收回了 {{pokemonName}}!", + "playerGo": "去吧! {{pokemonName}}!", + "trainerGo": "{{trainerName}} 派出了 {{pokemonName}}!", + "switchQuestion": "要更换\n{{pokemonName}}吗?", + "trainerDefeated": `你击败了\n{{trainerName}}!`, + "pokemonCaught": "{{pokemonName}} 被抓住了!", + "pokemon": "宝可梦", + "sendOutPokemon": "上吧！ {{pokemonName}}!", + "hitResultCriticalHit": "击中了要害！", + "hitResultSuperEffective": "效果拔群！", + "hitResultNotVeryEffective": "收效甚微…", + "hitResultNoEffect": "对 {{pokemonName}} 没有效果！!", + "hitResultOneHitKO": "一击必杀！", + "attackFailed": "但是失败了！", + "attackHitsCount": `击中 {{count}} 次！`, + "expGain": "{{pokemonName}} 获得了 {{exp}} 经验值！", + "levelUp": "{{pokemonName}} 升级到 Lv. {{level}}！", + "learnMove": "{{pokemonName}} 学会了 {{moveName}}！", + "learnMovePrompt": "{{pokemonName}} 想要学习 {{moveName}}。", + "learnMoveLimitReached": "但是，{{pokemonName}} 已经学会了\n四个技能", + "learnMoveReplaceQuestion": "要忘记一个技能并学习 {{moveName}} 吗？", + "learnMoveStopTeaching": "不再尝试学习 {{moveName}}？", + "learnMoveNotLearned": "{{pokemonName}} 没有学会 {{moveName}}。", + "learnMoveForgetQuestion": "要忘记哪个技能？", + "learnMoveForgetSuccess": "{{pokemonName}} 忘记了\n如何使用 {{moveName}}。", + "levelCapUp": "等级上限提升到 {{levelCap}}！", + "moveNotImplemented": "{{moveName}} 尚未实装，无法选择。", + "moveNoPP": "这个技能的 PP 用完了", + "moveDisabled": "{{moveName}} 被禁用！", + "noPokeballForce": "一股无形的力量阻止了你使用精灵球。", + "noPokeballTrainer": "你不能捕捉其他训练家的宝可梦！", + "noPokeballMulti": "只能在剩下一只宝可梦时才能扔出精灵球！", + "noPokeballStrong": "目标宝可梦太强了，无法捕捉！你需要先削弱它！", + "noEscapeForce": "一股无形的力量阻止你逃跑。", + "noEscapeTrainer": "你不能从训练家战斗中逃跑！", + "noEscapePokemon": "{{pokemonName}} 的 {{moveName}} 阻止了你 {{escapeVerb}}！", + "runAwaySuccess": "你成功逃脱了！", + "runAwayCannotEscape": '你无法逃脱！', + "escapeVerbSwitch": "切换", + "escapeVerbFlee": "逃跑", + "notDisabled": "{{moveName}} 不再被禁用！", + "skipItemQuestion": "你确定要跳过拾取道具吗？", + "eggHatching": "咦？", + "ivScannerUseQuestion": "对 {{pokemonName}} 使用个体值扫描仪？" +} as const; \ No newline at end of file diff --git a/src/locales/zh_CN/command-ui-handler.ts b/src/locales/zh_CN/command-ui-handler.ts new file mode 100644 index 000000000..50f94864c --- /dev/null +++ b/src/locales/zh_CN/command-ui-handler.ts @@ -0,0 +1,9 @@ +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +export const commandUiHandler: SimpleTranslationEntries = { + "fight": "战斗", + "ball": "精灵球", + "pokemon": "宝可梦", + "run": "逃跑", + "actionMessage": "要让\n{{pokemonName}} 做什么?", +} as const; \ No newline at end of file diff --git a/src/locales/zh_CN/config.ts b/src/locales/zh_CN/config.ts new file mode 100644 index 000000000..0d0f1ea5a --- /dev/null +++ b/src/locales/zh_CN/config.ts @@ -0,0 +1,28 @@ +import { ability } from "./ability"; +import { battle } from "./battle"; +import { commandUiHandler } from "./command-ui-handler"; +import { fightUiHandler } from "./fight-ui-handler"; +import { menu } from "./menu"; +import { menuUiHandler } from "./menu-ui-handler"; +import { move } from "./move"; +import { pokeball } from "./pokeball"; +import { pokemon } from "./pokemon"; +import { pokemonStat } from "./pokemon-stat"; +import { starterSelectUiHandler } from "./starter-select-ui-handler"; +import { tutorial } from "./tutorial"; + + +export const zhCnConfig = { + ability: ability, + battle: battle, + commandUiHandler: commandUiHandler, + fightUiHandler: fightUiHandler, + menuUiHandler: menuUiHandler, + menu: menu, + move: move, + pokeball: pokeball, + pokemonStat: pokemonStat, + pokemon: pokemon, + starterSelectUiHandler: starterSelectUiHandler, + tutorial: tutorial +} \ No newline at end of file diff --git a/src/locales/zh_CN/fight-ui-handler.ts b/src/locales/zh_CN/fight-ui-handler.ts new file mode 100644 index 000000000..1ce9e0317 --- /dev/null +++ b/src/locales/zh_CN/fight-ui-handler.ts @@ -0,0 +1,6 @@ +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +export const fightUiHandler: SimpleTranslationEntries = { + "pp": "PP", + "power": "POWER", +} as const; \ No newline at end of file diff --git a/src/locales/zh_CN/menu-ui-handler.ts b/src/locales/zh_CN/menu-ui-handler.ts new file mode 100644 index 000000000..ec7ee48de --- /dev/null +++ b/src/locales/zh_CN/menu-ui-handler.ts @@ -0,0 +1,23 @@ +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +export const menuUiHandler: SimpleTranslationEntries = { + "GAME_SETTINGS": '游戏设置', + "ACHIEVEMENTS": "成就", + "STATS": "数据统计", + "VOUCHERS": "兑换券", + "EGG_LIST": "蛋列表", + "EGG_GACHA": "蛋扭蛋", + "MANAGE_DATA": "管理数据", + "COMMUNITY": "社区", + "RETURN_TO_TITLE": "返回标题画面", + "LOG_OUT": "登出", + "slot": "存档位 {{slotNumber}}", + "importSession": "导入存档", + "importSlotSelect": "选择要导入到的存档位。", + "exportSession": "导出存档", + "exportSlotSelect": "选择要导出的存档位。", + "importData": "导入数据", + "exportData": "导出数据", + "cancel": "取消", + "losingProgressionWarning": "你将失去自战斗开始以来的所有进度。是否继续？" +} as const; \ No newline at end of file diff --git a/src/locales/zh_CN/menu.ts b/src/locales/zh_CN/menu.ts new file mode 100644 index 000000000..28c556c91 --- /dev/null +++ b/src/locales/zh_CN/menu.ts @@ -0,0 +1,46 @@ +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +/** + * The menu namespace holds most miscellaneous text that isn't directly part of the game's + * contents or directly related to Pokemon data. This includes menu navigation, settings, + * account interactions, descriptive text, etc. + */ +export const menu: SimpleTranslationEntries = { + "cancel": "取消", + "continue": "继续", + "dailyRun": "每日挑战 (Beta)", + "loadGame": "加载游戏", + "newGame": "新游戏", + "selectGameMode": "选择一个游戏模式", + "logInOrCreateAccount": "登录或创建账户以开始游戏。无需邮箱！", + "username": "用户名", + "password": "密码", + "login": "登录", + "register": "注册", + "emptyUsername": "用户名不能为空", + "invalidLoginUsername": "提供的用户名无效", + "invalidRegisterUsername": "用户名只能包含字母、数字或下划线", + "invalidLoginPassword": "提供的密码无效", + "invalidRegisterPassword": "密码必须至少包含 6 个字符", + "usernameAlreadyUsed": "提供的用户名已被使用", + "accountNonExistent": "提供的用户不存在", + "unmatchingPassword": "提供的密码不匹配", + "passwordNotMatchingConfirmPassword": "密码必须与确认密码一致", + "confirmPassword": "确认密码", + "registrationAgeWarning": "注册即表示您确认您已年满 13 岁。", + "backToLogin": "返回登录", + "failedToLoadSaveData": "读取存档数据失败。请重新加载页面。如果问题仍然存在，请联系管理员。", + "sessionSuccess": "会话加载成功。", + "failedToLoadSession": "无法加载您的会话数据。它可能已损坏。", + "boyOrGirl": "你是男孩还是女孩？", + "boy": "男孩", + "girl": "女孩", + "dailyRankings": "每日排名", + "weeklyRankings": "每周排名", + "noRankings": "无排名", + "loading": "加载中…", + "playersOnline": "在线玩家", + "empty": "空", + "yes": "是", + "no": "否", +} as const; \ No newline at end of file diff --git a/src/locales/zh_CN/move.ts b/src/locales/zh_CN/move.ts new file mode 100644 index 000000000..6ef86aa8e --- /dev/null +++ b/src/locales/zh_CN/move.ts @@ -0,0 +1,3812 @@ +import { MoveTranslationEntries } from "#app/plugins/i18n"; + +export const move: MoveTranslationEntries = { + "pound": { + name: "拍击", + effect: "使用长长的尾巴或手等拍打对手进行攻击。" + }, + "karateChop": { + name: "空手劈", + effect: "用锋利的手刀劈向对手进行攻击。容易击中要害。" + }, + "doubleSlap": { + name: "连环巴掌", + effect: "用连环巴掌拍打对手进行攻击。连续攻击２～５次。" + }, + "cometPunch": { + name: "连续拳", + effect: "用拳头怒涛般的殴打对手进行攻击。连续攻击２～５次。" + }, + "megaPunch": { + name: "百万吨重拳", + effect: "用充满力量的拳头攻击对手。" + }, + "payDay": { + name: "聚宝功", + effect: "向对手的身体投掷小金币进行攻击。战斗后可以拿到钱。" + }, + "firePunch": { + name: "火焰拳", + effect: "用充满火焰的拳头攻击对手。有时会让对手陷入灼伤状态。" + }, + "icePunch": { + name: "冰冻拳", + effect: "用充满寒气的拳头攻击对手。有时会让对手陷入冰冻状态。" + }, + "thunderPunch": { + name: "雷电拳", + effect: "用充满电流的拳头攻击对手。有时会让对手陷入麻痹状态。" + }, + "scratch": { + name: "抓", + effect: "用坚硬且无比锋利的爪子抓对手进行攻击。" + }, + "viseGrip": { + name: "夹住", + effect: "将对手从两侧夹住，给予伤害。" + }, + "guillotine": { + name: "极落钳", + effect: "用大钳子或剪刀等夹断对手进行攻击。只要命中就会一击昏厥。" + }, + "razorWind": { + name: "旋风刀", + effect: "制造风之刃，于第２回合攻击对手。容易击中要害。" + }, + "swordsDance": { + name: "剑舞", + effect: "激烈地跳起战舞提高气势。大幅提高自己的攻击。" + }, + "cut": { + name: "居合劈", + effect: "用镰刀或爪子等切斩对手进行攻击。" + }, + "gust": { + name: "起风", + effect: "用翅膀将刮起的狂风袭向对手进行攻击。" + }, + "wingAttack": { + name: "翅膀攻击", + effect: "大大地展开美丽的翅膀，将其撞向对手进行攻击。" + }, + "whirlwind": { + name: "吹飞", + effect: "吹飞对手，强制拉后备宝可梦上场。如果对手为野生宝可梦，战斗将直接结束。" + }, + "fly": { + name: "飞翔", + effect: "第１回合飞上天空，第２回合攻击对手。" + }, + "bind": { + name: "绑紧", + effect: "使用长长的身体或藤蔓等，在４～５回合内绑紧对手进行攻击。" + }, + "slam": { + name: "摔打", + effect: "使用长长的尾巴或藤蔓等摔打对手进行攻击。" + }, + "vineWhip": { + name: "藤鞭", + effect: "用如同鞭子般弯曲而细长的藤蔓摔打对手进行攻击。" + }, + "stomp": { + name: "踩踏", + effect: "用大脚踩踏对手进行攻击。有时会使对手畏缩。" + }, + "doubleKick": { + name: "二连踢", + effect: "用２只脚踢飞对手进行攻击。连续２次给予伤害。" + }, + "megaKick": { + name: "百万吨重踢", + effect: "使出力大无穷的重踢踢飞对手进行攻击。" + }, + "jumpKick": { + name: "飞踢", + effect: "使出高高的腾空踢攻击对手。如果踢偏则自己会受到伤害。" + }, + "rollingKick": { + name: "回旋踢", + effect: "一边使身体快速旋转，一边踢飞对手进行攻击。有时会使对手畏缩。" + }, + "sandAttack": { + name: "泼沙", + effect: "向对手脸上泼沙子，从而降低命中率。" + }, + "headbutt": { + name: "头锤", + effect: "将头伸出，笔直地扑向对手进行攻击。有时会使对手畏缩。" + }, + "hornAttack": { + name: "角撞", + effect: "用尖锐的角攻击对手。" + }, + "furyAttack": { + name: "乱击", + effect: "用角或喙刺向对手进行攻击。连续攻击２～５次。" + }, + "hornDrill": { + name: "角钻", + effect: "用旋转的角刺入对手进行攻击。只要命中就会一击昏厥。" + }, + "tackle": { + name: "撞击", + effect: "用整个身体撞向对手进行攻击。" + }, + "bodySlam": { + name: "泰山压顶", + effect: "用整个身体压住对手进行攻击。有时会让对手陷入麻痹状态。" + }, + "wrap": { + name: "紧束", + effect: "使用长长的身体或藤蔓等，在４～５回合内紧束对手进行攻击。" + }, + "takeDown": { + name: "猛撞", + effect: "以惊人的气势撞向对手进行攻击。自己也会受到少许伤害。" + }, + "thrash": { + name: "大闹一番", + effect: "在２～３回合内，乱打一气地攻击对手。大闹一番后自己会陷入混乱。" + }, + "doubleEdge": { + name: "舍身冲撞", + effect: "拼命地猛撞向对手进行攻击。自己也会受到不小的伤害。" + }, + "tailWhip": { + name: "摇尾巴", + effect: "可爱地左右摇晃尾巴，诱使对手疏忽大意。会降低对手的防御。" + }, + "poisonSting": { + name: "毒针", + effect: "将有毒的针刺入对手进行攻击。有时会让对手陷入中毒状态。" + }, + "twineedle": { + name: "双针", + effect: "将２根针刺入对手，连续２次给予伤害。有时会让对手陷入中毒状态。" + }, + "pinMissile": { + name: "飞弹针", + effect: "向对手发射锐针进行攻击。连续攻击２～５次。" + }, + "leer": { + name: "瞪眼", + effect: "用犀利的眼神使其害怕，从而降低对手的防御。" + }, + "bite": { + name: "咬住", + effect: "用尖锐的牙咬住对手进行攻击。有时会使对手畏缩。" + }, + "growl": { + name: "叫声", + effect: "让对手听可爱的叫声，引开注意力使其疏忽，从而降低对手的攻击。" + }, + "roar": { + name: "吼叫", + effect: "放走对手，强制拉后备宝可梦上场。如果对手为野生宝可梦，战斗将直接结束。" + }, + "sing": { + name: "唱歌", + effect: "让对手听舒适、美妙的歌声，从而陷入睡眠状态。" + }, + "supersonic": { + name: "超音波", + effect: "从身体发出特殊的音波，从而使对手混乱。" + }, + "sonicBoom": { + name: "音爆", + effect: "将冲击波撞向对手进行攻击。必定会给予20的伤害。" + }, + "disable": { + name: "定身法", + effect: "阻碍对手行动，之前使出的招式将在４回合内无法使用。" + }, + "acid": { + name: "溶解液", + effect: "将强酸泼向对手进行攻击。有时会降低对手的特防。" + }, + "ember": { + name: "火花", + effect: "向对手发射小型火焰进行攻击。有时会让对手陷入灼伤状态。" + }, + "flamethrower": { + name: "喷射火焰", + effect: "向对手发射烈焰进行攻击。有时会让对手陷入灼伤状态。" + }, + "mist": { + name: "白雾", + effect: "用白雾覆盖身体。在５回合内不会让对手降低自己的能力。" + }, + "waterGun": { + name: "水枪", + effect: "向对手猛烈地喷射水流进行攻击。" + }, + "hydroPump": { + name: "水炮", + effect: "向对手猛烈地喷射大量水流进行攻击。" + }, + "surf": { + name: "冲浪", + effect: "利用大浪攻击自己周围所有的宝可梦。" + }, + "iceBeam": { + name: "冰冻光束", + effect: "向对手发射冰冻光束进行攻击。有时会让对手陷入冰冻状态。" + }, + "blizzard": { + name: "暴风雪", + effect: "将猛烈的暴风雪刮向对手进行攻击。有时会让对手陷入冰冻状态。" + }, + "psybeam": { + name: "幻象光线", + effect: "向对手发射神奇的光线进行攻击。有时会使对手混乱。" + }, + "bubbleBeam": { + name: "泡沫光线", + effect: "向对手猛烈地喷射泡沫进行攻击。有时会降低对手的速度。" + }, + "auroraBeam": { + name: "极光束", + effect: "向对手发射虹色光束进行攻击。有时会降低对手的攻击。" + }, + "hyperBeam": { + name: "破坏光线", + effect: "向对手发射强烈的光线进行攻击。下一回合自己将无法动弹。" + }, + "peck": { + name: "啄", + effect: "用尖锐的喙或角刺向对手进行攻击。" + }, + "drillPeck": { + name: "啄钻", + effect: "一边旋转，一边将尖喙刺入对手进行攻击。" + }, + "submission": { + name: "深渊翻滚", + effect: "将对手连同自己一起摔向地面进行攻击。自己也会受到少许伤害。" + }, + "lowKick": { + name: "踢倒", + effect: "用力踢对手的脚，使其摔倒进行攻击。对手越重，威力越大。" + }, + "counter": { + name: "双倍奉还", + effect: "从对手那里受到物理攻击的伤害将以２倍返还给同一个对手。" + }, + "seismicToss": { + name: "地球上投", + effect: "利用引力将对手甩飞出去。给予对手和自己等级相同的伤害。" + }, + "strength": { + name: "怪力", + effect: "使出浑身力气殴打对手进行攻击。" + }, + "absorb": { + name: "吸取", + effect: "吸取对手的养分进行攻击。可以回复给予对手伤害的一半ＨＰ。" + }, + "megaDrain": { + name: "超级吸取", + effect: "吸取对手的养分进行攻击。可以回复给予对手伤害的一半ＨＰ。" + }, + "leechSeed": { + name: "寄生种子", + effect: "植入寄生种子后，将在每回合一点一点吸取对手的ＨＰ，从而用来回复自己的ＨＰ。" + }, + "growth": { + name: "生长", + effect: "让身体一下子长大，从而提高攻击和特攻。" + }, + "razorLeaf": { + name: "飞叶快刀", + effect: "飞出叶片，切斩对手进行攻击。容易击中要害。" + }, + "solarBeam": { + name: "日光束", + effect: "第１回合收集满满的日光，第２回合发射光束进行攻击。" + }, + "poisonPowder": { + name: "毒粉", + effect: "撒出毒粉，从而让对手陷入中毒状态。" + }, + "stunSpore": { + name: "麻痹粉", + effect: "撒出麻痹粉，从而让对手陷入麻痹状态。" + }, + "sleepPowder": { + name: "催眠粉", + effect: "撒出催眠粉，从而让对手陷入睡眠状态。" + }, + "petalDance": { + name: "花瓣舞", + effect: "在２～３回合内，散落花瓣攻击对手。之后自己会陷入混乱。" + }, + "stringShot": { + name: "吐丝", + effect: "用口中吐出的丝缠绕对手，从而大幅降低对手的速度。" + }, + "dragonRage": { + name: "龙之怒", + effect: "将愤怒的冲击波撞向对手进行攻击。必定会给予40的伤害。" + }, + "fireSpin": { + name: "火焰旋涡", + effect: "将对手困在激烈的火焰旋涡中，在４～５回合内进行攻击。" + }, + "thunderShock": { + name: "电击", + effect: "发出电流刺激对手进行攻击。有时会让对手陷入麻痹状态。" + }, + "thunderbolt": { + name: "十万伏特", + effect: "向对手发出强力电击进行攻击。有时会让对手陷入麻痹状态。" + }, + "thunderWave": { + name: "电磁波", + effect: "向对手发出微弱的电击，从而让对手陷入麻痹状态。" + }, + "thunder": { + name: "打雷", + effect: "向对手劈下暴雷进行攻击。有时会让对手陷入麻痹状态。" + }, + "rockThrow": { + name: "落石", + effect: "拿起小岩石，投掷对手进行攻击。" + }, + "earthquake": { + name: "地震", + effect: "利用地震的冲击，攻击自己周围所有的宝可梦。" + }, + "fissure": { + name: "地裂", + effect: "让对手掉落于地裂的裂缝中进行攻击。只要命中就会一击昏厥。" + }, + "dig": { + name: "挖洞", + effect: "第１回合钻入地底，第２回合攻击对手。" + }, + "toxic": { + name: "剧毒", + effect: "让对手陷入剧毒状态。随着回合的推进，中毒伤害会增加。" + }, + "confusion": { + name: "念力", + effect: "向对手发送微弱的念力进行攻击。有时会使对手混乱。" + }, + "psychic": { + name: "精神强念", + effect: "向对手发送强大的念力进行攻击。有时会降低对手的特防。" + }, + "hypnosis": { + name: "催眠术", + effect: "施以诱导睡意的暗示，让对手陷入睡眠状态。" + }, + "meditate": { + name: "瑜伽姿势", + effect: "唤醒身体深处沉睡的力量，从而提高自己的攻击。" + }, + "agility": { + name: "高速移动", + effect: "让身体放松变得轻盈，以便高速移动。大幅提高自己的速度。" + }, + "quickAttack": { + name: "电光一闪", + effect: "以迅雷不及掩耳之势扑向对手。必定能够先制攻击。" + }, + "rage": { + name: "愤怒", + effect: "如果在使出招式后受到攻击的话，会因愤怒的力量而提高攻击。" + }, + "teleport": { + name: "瞬间移动", + effect: "当有后备宝可梦时使用，就可以进行替换。野生的宝可梦使用则会逃走。" + }, + "nightShade": { + name: "黑夜魔影", + effect: "显示恐怖幻影，只给予对手和自己等级相同的伤害。" + }, + "mimic": { + name: "模仿", + effect: "可以将对手最后使用的招式，在战斗内变成自己的招式。" + }, + "screech": { + name: "刺耳声", + effect: "发出不由自主想要捂起耳朵的刺耳声，从而大幅降低对手的防御。" + }, + "doubleTeam": { + name: "影子分身", + effect: "通过快速移动来制造分身，扰乱对手，从而提高闪避率。" + }, + "recover": { + name: "自我再生", + effect: "让细胞再生，从而回复自己最大ＨＰ的一半。" + }, + "harden": { + name: "变硬", + effect: "全身使劲，让身体变硬，从而提高自己的防御。" + }, + "minimize": { + name: "变小", + effect: "蜷缩身体显得很小，从而大幅提高自己的闪避率。" + }, + "smokescreen": { + name: "烟幕", + effect: "向对手喷出烟或墨汁等，从而降低对手的命中率。" + }, + "confuseRay": { + name: "奇异之光", + effect: "显示奇怪的光，扰乱对手。使对手混乱。" + }, + "withdraw": { + name: "缩入壳中", + effect: "缩入壳里保护身体，从而提高自己的防御。" + }, + "defenseCurl": { + name: "变圆", + effect: "将身体蜷曲变圆，从而提高自己的防御。" + }, + "barrier": { + name: "屏障", + effect: "制造坚固的壁障，从而大幅提高自己的防御。" + }, + "lightScreen": { + name: "光墙", + effect: "利用神奇的墙壁，在５回合内减弱从对手那里受到的特殊攻击的伤害。" + }, + "haze": { + name: "黑雾", + effect: "升起黑雾，将正在场上战斗的全体宝可梦的能力变回原点。" + }, + "reflect": { + name: "反射壁", + effect: "利用神奇的墙壁，在５回合内减弱从对手那里受到的物理攻击的伤害。" + }, + "focusEnergy": { + name: "聚气", + effect: "深深地吸口气，集中精神。自己的攻击会变得容易击中要害。" + }, + "bide": { + name: "忍耐", + effect: "在２回合内忍受攻击，受到的伤害会２倍返还给对手。" + }, + "metronome": { + name: "挥指", + effect: "挥动手指刺激自己的大脑，从许多的招式中随机使出１个。" + }, + "mirrorMove": { + name: "鹦鹉学舌", + effect: "模仿对手使用的招式，自己也使用相同招式。" + }, + "selfDestruct": { + name: "玉石俱碎", + effect: "引发爆炸，攻击自己周围所有的宝可梦。使用后陷入昏厥。" + }, + "eggBomb": { + name: "炸蛋", + effect: "向对手用力投掷大大的蛋进行攻击。" + }, + "lick": { + name: "舌舔", + effect: "用长长的舌头，舔遍对手进行攻击。有时会让对手陷入麻痹状态。" + }, + "smog": { + name: "浊雾", + effect: "将肮脏的浓雾吹向对手进行攻击。有时会让对手陷入中毒状态。" + }, + "sludge": { + name: "污泥攻击", + effect: "用污泥投掷对手进行攻击。有时会让对手陷入中毒状态。" + }, + "boneClub": { + name: "骨棒", + effect: "用手中的骨头殴打对手进行攻击。有时会使对手畏缩。" + }, + "fireBlast": { + name: "大字爆炎", + effect: "用大字形状的火焰烧尽对手。有时会让对手陷入灼伤状态。" + }, + "waterfall": { + name: "攀瀑", + effect: "以惊人的气势扑向对手。有时会使对手畏缩。" + }, + "clamp": { + name: "贝壳夹击", + effect: "用非常坚固且厚实的贝壳，在４～５回合内夹住对手进行攻击。" + }, + "swift": { + name: "高速星星", + effect: "发射星形的光攻击对手。攻击必定会命中。" + }, + "skullBash": { + name: "火箭头锤", + effect: "第１回合把头缩进去，从而提高防御。第２回合攻击对手。" + }, + "spikeCannon": { + name: "尖刺加农炮", + effect: "向对手发射锐针进行攻击。连续攻击２～５次。" + }, + "constrict": { + name: "缠绕", + effect: "用触手或青藤等缠绕进行攻击。有时会降低对手的速度。" + }, + "amnesia": { + name: "瞬间失忆", + effect: "将头脑清空，瞬间忘记某事，从而大幅提高自己的特防。" + }, + "kinesis": { + name: "折弯汤匙", + effect: "折弯汤匙引开注意，从而降低对手的命中率。" + }, + "softBoiled": { + name: "生蛋", + effect: "回复自己最大ＨＰ的一半。" + }, + "highJumpKick": { + name: "飞膝踢", + effect: "跳起后用膝盖撞对手进行攻击。如果撞偏则自己会受到伤害。" + }, + "glare": { + name: "大蛇瞪眼", + effect: "用腹部的花纹使对手害怕，从而让其陷入麻痹状态。" + }, + "dreamEater": { + name: "食梦", + effect: "吃掉正在睡觉的对手的梦进行攻击。回复对手所受到伤害的一半ＨＰ。" + }, + "poisonGas": { + name: "毒瓦斯", + effect: "将毒瓦斯吹到对手的脸上，从而让对手陷入中毒状态。" + }, + "barrage": { + name: "投球", + effect: "向对手投掷圆形物体进行攻击。连续攻击２～５次。" + }, + "leechLife": { + name: "吸血", + effect: "吸取血液攻击对手。可以回复给予对手伤害的一半ＨＰ。" + }, + "lovelyKiss": { + name: "恶魔之吻", + effect: "用恐怖的脸强吻对手。让对手陷入睡眠状态。" + }, + "skyAttack": { + name: "神鸟猛击", + effect: "第２回合攻击对手。偶尔使对手畏缩。也容易击中要害。" + }, + "transform": { + name: "变身", + effect: "变身成对手宝可梦的样子，能够使用和对手完全相同的招式。" + }, + "bubble": { + name: "泡沫", + effect: "向对手用力吹起无数泡泡进行攻击。有时会降低对手的速度。" + }, + "dizzyPunch": { + name: "迷昏拳", + effect: "有节奏地出拳攻击对手。有时会使对手混乱。" + }, + "spore": { + name: "蘑菇孢子", + effect: "沙沙沙地撒满具有催眠效果的孢子，从而让对手陷入睡眠状态。" + }, + "flash": { + name: "闪光", + effect: "使出光芒，从而降低对手的命中率。也可在阴暗的洞窟里照亮四周。" + }, + "psywave": { + name: "精神波", + effect: "向对手发射神奇的念波进行攻击。每次使用，伤害都会改变。" + }, + "splash": { + name: "跃起", + effect: "也不攻击只是一蹦一蹦地跳，什么都不会发生……" + }, + "acidArmor": { + name: "溶化", + effect: "通过细胞的变化进行液化，从而大幅提高自己的防御。" + }, + "crabhammer": { + name: "蟹钳锤", + effect: "用大钳子敲打对手进行攻击。容易击中要害。" + }, + "explosion": { + name: "大爆炸", + effect: "引发大爆炸，攻击自己周围所有的宝可梦。使用后自己会陷入昏厥。" + }, + "furySwipes": { + name: "乱抓", + effect: "用爪子或镰刀等抓对手进行攻击。连续攻击２～５次。" + }, + "bonemerang": { + name: "骨头回力镖", + effect: "用手中的骨头投掷对手，来回连续２次给予伤害。" + }, + "rest": { + name: "睡觉", + effect: "连续睡上２回合。回复自己的全部ＨＰ以及治愈所有异常状态。" + }, + "rockSlide": { + name: "岩崩", + effect: "将大岩石猛烈地撞向对手进行攻击。有时会使对手畏缩。" + }, + "hyperFang": { + name: "终结门牙", + effect: "用锋利的门牙牢牢地咬住对手进行攻击。有时会使对手畏缩。" + }, + "sharpen": { + name: "棱角化", + effect: "增加身体的角，变得棱棱角角，从而提高自己的攻击。" + }, + "conversion": { + name: "纹理", + effect: "将自己的属性转换成和已学会的招式中第一个招式相同的属性。" + }, + "triAttack": { + name: "三重攻击", + effect: "用３种光线进行攻击。有时会让对手陷入麻痹、灼伤或冰冻的状态。" + }, + "superFang": { + name: "愤怒门牙", + effect: "用锋利的门牙猛烈地咬住对手进行攻击。对手的ＨＰ减半。" + }, + "slash": { + name: "劈开", + effect: "用爪子或镰刀等劈开对手进行攻击。容易击中要害。" + }, + "substitute": { + name: "替身", + effect: "削减少许自己的ＨＰ，制造分身。分身将成为自己的替身。" + }, + "struggle": { + name: "挣扎", + effect: "当自己的ＰＰ耗尽时，努力挣扎攻击对手。自己也会受到少许伤害。" + }, + "sketch": { + name: "写生", + effect: "将对手使用的招式变成自己的招式。使用１次后写生消失。" + }, + "tripleKick": { + name: "三连踢", + effect: "连续３次踢对手进行攻击。每踢中一次，威力就会提高。" + }, + "thief": { + name: "小偷", + effect: "攻击的同时盗取道具。当自己携带道具时，不会去盗取。" + }, + "spiderWeb": { + name: "蛛网", + effect: "将黏糊糊的细丝一层一层缠住对手，使其不能从战斗中逃走。" + }, + "mindReader": { + name: "心之眼", + effect: "用心感受对手的行动，下次攻击必定会击中对手。" + }, + "nightmare": { + name: "恶梦", + effect: "让在睡眠状态下的对手做恶梦，每回合会缓缓减少HP。" + }, + "flameWheel": { + name: "火焰轮", + effect: "让火焰覆盖全身，猛撞向对手进行攻击。有时会让对手陷入灼伤状态。" + }, + "snore": { + name: "打鼾", + effect: "在自己睡觉时，发出噪音进行攻击。有时会使对手畏缩。" + }, + "curse": { + name: "诅咒", + effect: "使用该招式的宝可梦，其属性是幽灵属性或其他属性时，效果会不一样。" + }, + "flail": { + name: "抓狂", + effect: "抓狂般乱打进行攻击。自己的ＨＰ越少，招式的威力越大。" + }, + "conversion2": { + name: "纹理２", + effect: "为了可以抵抗对手最后使用的招式，从而使自己的属性发生变化。" + }, + "aeroblast": { + name: "气旋攻击", + effect: "发射空气旋涡进行攻击。容易击中要害。" + }, + "cottonSpore": { + name: "棉孢子", + effect: "将棉花般柔软的孢子紧贴对手，从而大幅降低对手的速度。" + }, + "reversal": { + name: "绝处逢生", + effect: "竭尽全力进行攻击。自己的ＨＰ越少，招式的威力越大。" + }, + "spite": { + name: "怨恨", + effect: "对对手最后使用的招式怀有怨恨，减少４ＰＰ该招式。" + }, + "powderSnow": { + name: "细雪", + effect: "将冰冷的细雪吹向对手进行攻击。有时会让对手陷入冰冻状态。" + }, + "protect": { + name: "守住", + effect: "完全抵挡对手的攻击。连续使出则容易失败。" + }, + "machPunch": { + name: "音速拳", + effect: "以迅雷不及掩耳之势出拳。必定能够先制攻击。" + }, + "scaryFace": { + name: "可怕面孔", + effect: "用恐怖的表情瞪着对手，使其害怕，从而大幅降低对手的速度。" + }, + "feintAttack": { + name: "出奇一击", + effect: "悄悄地靠近对手，趁其不备进行殴打。攻击必定会命中。" + }, + "sweetKiss": { + name: "天使之吻", + effect: "像天使般可爱地亲吻对手，从而使对手混乱。" + }, + "bellyDrum": { + name: "腹鼓", + effect: "将自己的ＨＰ减少到最大ＨＰ的一半，从而最大限度提高自己的攻击。" + }, + "sludgeBomb": { + name: "污泥炸弹", + effect: "用污泥投掷对手进行攻击。有时会让对手陷入中毒状态。" + }, + "mudSlap": { + name: "掷泥", + effect: "向对手的脸等投掷泥块进行攻击。会降低对手的命中率。" + }, + "octazooka": { + name: "章鱼桶炮", + effect: "向对手的脸等喷出墨汁进行攻击。有时会降低对手的命中率。" + }, + "spikes": { + name: "撒菱", + effect: "在对手的脚下扔撒菱。对替换出场的对手的宝可梦给予伤害。" + }, + "zapCannon": { + name: "电磁炮", + effect: "发射大炮一样的电流进行攻击。让对手陷入麻痹状态。" + }, + "foresight": { + name: "识破", + effect: "使出后对幽灵属性宝可梦没有效果的招式以及闪避率高的对手，变得能够打中。" + }, + "destinyBond": { + name: "同命", + effect: "使出招式后，当受到对手攻击陷入昏厥时，对手也会一同昏厥。连续使出则会失败。" + }, + "perishSong": { + name: "终焉之歌", + effect: "倾听歌声的宝可梦经过３回合陷入昏厥。替换后效果消失。" + }, + "icyWind": { + name: "冰冻之风", + effect: "将结冰的冷气吹向对手进行攻击。会降低对手的速度。" + }, + "detect": { + name: "看穿", + effect: "完全抵挡对手的攻击。连续使出则容易失败。" + }, + "boneRush": { + name: "骨棒乱打", + effect: "用坚硬的骨头殴打对手进行攻击。连续攻击２～５次。" + }, + "lockOn": { + name: "锁定", + effect: "紧紧瞄准对手，下次攻击必定会打中。" + }, + "outrage": { + name: "逆鳞", + effect: "在２～３回合内，乱打一气地进行攻击。大闹一番后自己会陷入混乱。" + }, + "sandstorm": { + name: "沙暴", + effect: "在５回合内扬起沙暴，除岩石、地面和钢属性以外的宝可梦，都会受到伤害。岩石属性的特防还会提高。" + }, + "gigaDrain": { + name: "终极吸取", + effect: "吸取对手的养分进行攻击。可以回复给予对手伤害的一半ＨＰ。" + }, + "endure": { + name: "挺住", + effect: "即使受到攻击，也至少会留下１ＨＰ。连续使出则容易失败。" + }, + "charm": { + name: "撒娇", + effect: "可爱地凝视，诱使对手疏忽大意，从而大幅降低对手的攻击。" + }, + "rollout": { + name: "滚动", + effect: "在５回合内连续滚动攻击对手。招式每次击中，威力就会提高。" + }, + "falseSwipe": { + name: "点到为止", + effect: "对手的ＨＰ至少会留下１ＨＰ，如此般手下留情地攻击。" + }, + "swagger": { + name: "虚张声势", + effect: "激怒对手，使其混乱。因为愤怒，对手的攻击会大幅提高。" + }, + "milkDrink": { + name: "喝牛奶", + effect: "回复自己最大ＨＰ的一半。" + }, + "spark": { + name: "电光", + effect: "让电流覆盖全身，猛撞向对手进行攻击。有时会让对手陷入麻痹状态。" + }, + "furyCutter": { + name: "连斩", + effect: "用镰刀或爪子等切斩对手进行攻击。连续击中，威力就会提高。" + }, + "steelWing": { + name: "钢翼", + effect: "用坚硬的翅膀敲打对手进行攻击。有时会提高自己的防御。" + }, + "meanLook": { + name: "黑色目光", + effect: "用好似要勾人心魂的黑色目光一动不动地凝视对手，使其不能从战斗中逃走。" + }, + "attract": { + name: "迷人", + effect: "♂诱惑♀或♀诱惑♂，让对手着迷。对手将很难使出招式。" + }, + "sleepTalk": { + name: "梦话", + effect: "从自己已学会的招式中任意使出１个。只能在自己睡觉时使用。" + }, + "healBell": { + name: "治愈铃声", + effect: "让同伴听舒适的铃音，从而治愈我方全员的异常状态。" + }, + "return": { + name: "报恩", + effect: "为了训练家而全力攻击对手。亲密度越高，威力越大。" + }, + "present": { + name: "礼物", + effect: "递给对手设有圈套的盒子进行攻击。也有可能回复对手ＨＰ。" + }, + "frustration": { + name: "迁怒", + effect: "为了发泄不满而全力攻击对手。亲密度越低，威力越大。" + }, + "safeguard": { + name: "神秘守护", + effect: "在５回合内被神奇的力量守护，从而不会陷入异常状态。" + }, + "painSplit": { + name: "分担痛楚", + effect: "将自己的ＨＰ和对手的ＨＰ相加，然后自己和对手友好地平分。" + }, + "sacredFire": { + name: "神圣之火", + effect: "用神秘的火焰烧尽对手进行攻击。有时会让对手陷入灼伤状态。" + }, + "magnitude": { + name: "震级", + effect: "晃动地面，攻击自己周围所有的宝可梦。招式的威力会有各种变化。" + }, + "dynamicPunch": { + name: "爆裂拳", + effect: "使出浑身力气出拳进行攻击。必定会使对手混乱。" + }, + "megahorn": { + name: "超级角击", + effect: "用坚硬且华丽的角狠狠地刺入对手进行攻击。" + }, + "dragonBreath": { + name: "龙息", + effect: "将强烈的气息吹向对手进行攻击。有时会让对手陷入麻痹状态。" + }, + "batonPass": { + name: "接棒", + effect: "和后备宝可梦进行替换。换上的宝可梦能直接继承其能力的变化。" + }, + "encore": { + name: "再来一次", + effect: "让对手接受再来一次，连续３次使出最后使用的招式。" + }, + "pursuit": { + name: "追打", + effect: "当对手替换宝可梦上场时使出此招式的话，能够以２倍的威力进行攻击。" + }, + "rapidSpin": { + name: "高速旋转", + effect: "通过旋转来攻击对手。可以摆脱绑紧、紧束、寄生种子等招式。还能提高自己的速度。" + }, + "sweetScent": { + name: "甜甜香气", + effect: "用香气大幅降低对手的闪避率。" + }, + "ironTail": { + name: "铁尾", + effect: "使用坚硬的尾巴摔打对手进行攻击。有时会降低对手的防御。" + }, + "metalClaw": { + name: "金属爪", + effect: "用钢铁之爪劈开对手进行攻击。有时会提高自己的攻击。" + }, + "vitalThrow": { + name: "借力摔", + effect: "会在对手之后进行攻击。但是自己的攻击必定会命中。" + }, + "morningSun": { + name: "晨光", + effect: "回复自己的ＨＰ。根据天气的不同，回复量也会有所变化。" + }, + "synthesis": { + name: "光合作用", + effect: "回复自己的ＨＰ。根据天气的不同，回复量也会有所变化。" + }, + "moonlight": { + name: "月光", + effect: "回复自己的ＨＰ。根据天气的不同，回复量也会有所变化。" + }, + "hiddenPower": { + name: "觉醒力量", + effect: "招式的属性会随着使用此招式的宝可梦而改变。" + }, + "crossChop": { + name: "十字劈", + effect: "用两手呈十字劈打对手进行攻击。容易击中要害。" + }, + "twister": { + name: "龙卷风", + effect: "兴起龙卷风，将对手卷入进行攻击。有时会使对手畏缩。" + }, + "rainDance": { + name: "求雨", + effect: "在５回合内一直降雨，从而提高水属性的招式威力。火属性的招式威力则降低。" + }, + "sunnyDay": { + name: "大晴天", + effect: "在５回合内让日照变得强烈，从而提高火属性的招式威力。水属性的招式威力则降低。" + }, + "crunch": { + name: "咬碎", + effect: "用利牙咬碎对手进行攻击。有时会降低对手的防御。" + }, + "mirrorCoat": { + name: "镜面反射", + effect: "从对手那里受到特殊攻击的伤害将以２倍返还给同一个对手。" + }, + "psychUp": { + name: "自我暗示", + effect: "向自己施以自我暗示，将能力变化的状态变得和对手一样。" + }, + "extremeSpeed": { + name: "神速", + effect: "以迅雷不及掩耳之势猛撞向对手进行攻击。必定能够先制攻击。" + }, + "ancientPower": { + name: "原始之力", + effect: "用原始之力进行攻击。有时会提高自己所有的能力。" + }, + "shadowBall": { + name: "暗影球", + effect: "投掷一团黑影进行攻击。有时会降低对手的特防。" + }, + "futureSight": { + name: "预知未来", + effect: "在使用招式２回合后，向对手发送一团念力进行攻击。" + }, + "rockSmash": { + name: "碎岩", + effect: "用拳头进行攻击。有时会降低对手的防御。" + }, + "whirlpool": { + name: "潮旋", + effect: "将对手困在激烈的水流旋涡中，在４～５回合内进行攻击。" + }, + "beatUp": { + name: "围攻", + effect: "我方全员进行攻击。同行的宝可梦越多，招式的攻击次数越多。" + }, + "fakeOut": { + name: "击掌奇袭", + effect: "进行先制攻击，使对手畏缩。要在出场后立刻使出才能成功。" + }, + "uproar": { + name: "吵闹", + effect: "在３回合内大吵大闹攻击对手。在此期间谁都不能入眠。" + }, + "stockpile": { + name: "蓄力", + effect: "积蓄力量，提高自己的防御和特防。最多积蓄３次。" + }, + "spitUp": { + name: "喷出", + effect: "将积蓄的力量撞向对手进行攻击。积蓄得越多，威力越大。" + }, + "swallow": { + name: "吞下", + effect: "将积蓄的力量吞下，从而回复自己的ＨＰ。积蓄得越多，回复越大。" + }, + "heatWave": { + name: "热风", + effect: "将炎热的气息吹向对手进行攻击。有时会让对手陷入灼伤状态。" + }, + "hail": { + name: "冰雹", + effect: "在５回合内一直降冰雹，除冰属性的宝可梦以外，给予全体宝可梦伤害。" + }, + "torment": { + name: "无理取闹", + effect: "向对手无理取闹，令其不能连续２次使出相同招式。" + }, + "flatter": { + name: "吹捧", + effect: "吹捧对手，使其混乱。同时还会提高对手的特攻。" + }, + "willOWisp": { + name: "磷火", + effect: "放出怪异的火焰，从而让对手陷入灼伤状态。" + }, + "memento": { + name: "临别礼物", + effect: "虽然会使自己陷入昏厥，但是能够大幅降低对手的攻击和特攻。" + }, + "facade": { + name: "硬撑", + effect: "当自己处于中毒、麻痹、灼伤状态时，向对手使出此招式的话，威力会变成２倍。" + }, + "focusPunch": { + name: "真气拳", + effect: "集中精神出拳。在招式使出前若受到攻击则会失败。" + }, + "smellingSalts": { + name: "清醒", + effect: "对于麻痹状态下的对手，威力会变成２倍。但相反对手的麻痹也会被治愈。" + }, + "followMe": { + name: "看我嘛", + effect: "引起对手的注意，将对手的攻击全部转移到自己身上。" + }, + "naturePower": { + name: "自然之力", + effect: "用自然之力进行攻击。根据所使用场所的不同，使出的招式也会有所变化。" + }, + "charge": { + name: "充电", + effect: "变为充电状态，提高下次使出的电属性的招式威力。自己的特防也会提高。" + }, + "taunt": { + name: "挑衅", + effect: "使对手愤怒。在３回合内让对手只能使出给予伤害的招式。" + }, + "helpingHand": { + name: "帮助", + effect: "帮助伙伴。被帮助的宝可梦，其招式威力变得比平时大。" + }, + "trick": { + name: "戏法", + effect: "抓住对手的空隙，交换自己和对手的持有物。" + }, + "rolePlay": { + name: "扮演", + effect: "扮演对手，让自己的特性变得和对手相同。" + }, + "wish": { + name: "祈愿", + effect: "在下一回合回复自己或是替换出场的宝可梦最大ＨＰ的一半。" + }, + "assist": { + name: "借助", + effect: "向同伴紧急求助，从我方宝可梦已学会的招式中随机使用１个。" + }, + "ingrain": { + name: "扎根", + effect: "在大地上扎根，每回合回复自己的ＨＰ。因为扎根了，所以不能替换宝可梦。" + }, + "superpower": { + name: "蛮力", + effect: "发挥惊人的力量攻击对手。自己的攻击和防御会降低。" + }, + "magicCoat": { + name: "魔法反射", + effect: "当对手使出会变成异常状态的招式或寄生种子等时，会将对手的招式反射回去。" + }, + "recycle": { + name: "回收利用", + effect: "使战斗中已经消耗掉的自己的持有物再生，并可以再次使用。" + }, + "revenge": { + name: "报复", + effect: "如果受到对手的招式攻击，就能给予对手２倍的伤害。" + }, + "brickBreak": { + name: "劈瓦", + effect: "将手刀猛烈地挥下攻击对手。还可以破坏光墙和反射壁等。" + }, + "yawn": { + name: "哈欠", + effect: "打个大哈欠引起睡意。在下一回合让对手陷入睡眠状态。" + }, + "knockOff": { + name: "拍落", + effect: "拍落对手的持有物，直到战斗结束都不能使用。对手携带道具时会增加伤害。" + }, + "endeavor": { + name: "蛮干", + effect: "给予伤害，使对手的ＨＰ变得和自己的ＨＰ一样。" + }, + "eruption": { + name: "喷火", + effect: "爆发怒火攻击对手。自己的ＨＰ越少，招式的威力越小。" + }, + "skillSwap": { + name: "特性互换", + effect: "利用超能力互换自己和对手的特性。" + }, + "imprison": { + name: "封印", + effect: "如果对手有和自己相同的招式，那么只有对手无法使用该招式。" + }, + "refresh": { + name: "焕然一新", + effect: "让身体休息，治愈自己身上所中的毒、麻痹、灼伤的异常状态。" + }, + "grudge": { + name: "怨念", + effect: "因对手的招式而陷入昏厥时给对手施加怨念，让该招式的ＰＰ变成０。" + }, + "snatch": { + name: "抢夺", + effect: "将对手打算使用的回复招式或能力变化招式夺为己用。" + }, + "secretPower": { + name: "秘密之力", + effect: "根据使用场所不同，该招式的追加效果也会有所变化。" + }, + "dive": { + name: "潜水", + effect: "第１回合潜入水中，第２回合浮上来进行攻击。" + }, + "armThrust": { + name: "猛推", + effect: "用张开着的双手猛推对手进行攻击。连续攻击２～５次。" + }, + "camouflage": { + name: "保护色", + effect: "根据所在场所不同，如水边、草丛和洞窟等，可以改变自己的属性。" + }, + "tailGlow": { + name: "萤火", + effect: "凝视闪烁的光芒，集中自己的精神，从而巨幅提高特攻。" + }, + "lusterPurge": { + name: "洁净光芒", + effect: "释放耀眼的光芒进行攻击。有时会降低对手的特防。" + }, + "mistBall": { + name: "薄雾球", + effect: "用围绕着雾状羽毛的球进行攻击。有时会降低对手的特攻。" + }, + "featherDance": { + name: "羽毛舞", + effect: "撒出羽毛，笼罩在对手的周围。大幅降低对手的攻击。" + }, + "teeterDance": { + name: "摇晃舞", + effect: "摇摇晃晃地跳起舞蹈，让自己周围的宝可梦陷入混乱状态。" + }, + "blazeKick": { + name: "火焰踢", + effect: "攻击对手后，有时会使其陷入灼伤状态。也容易击中要害。" + }, + "mudSport": { + name: "玩泥巴", + effect: "一旦使用此招式，周围就会弄得到处是泥。在５回合内减弱电属性的招式。" + }, + "iceBall": { + name: "冰球", + effect: "在５回合内攻击对手。招式每次击中，威力就会提高。" + }, + "needleArm": { + name: "尖刺臂", + effect: "用带刺的手臂猛烈地挥舞进行攻击。有时会使对手畏缩。" + }, + "slackOff": { + name: "偷懒", + effect: "偷懒休息。回复自己最大ＨＰ的一半。" + }, + "hyperVoice": { + name: "巨声", + effect: "给予对手又吵又响的巨大震动进行攻击。" + }, + "poisonFang": { + name: "剧毒牙", + effect: "用有毒的牙齿咬住对手进行攻击。有时会使对手中剧毒。" + }, + "crushClaw": { + name: "撕裂爪", + effect: "用坚硬的锐爪劈开对手进行攻击。有时会降低对手的防御。" + }, + "blastBurn": { + name: "爆炸烈焰", + effect: "用爆炸的火焰烧尽对手进行攻击。下一回合自己将无法动弹。" + }, + "hydroCannon": { + name: "加农水炮", + effect: "向对手喷射水炮进行攻击。下一回合自己将无法动弹。" + }, + "meteorMash": { + name: "彗星拳", + effect: "使出彗星般的拳头攻击对手。有时会提高自己的攻击。" + }, + "astonish": { + name: "惊吓", + effect: "用尖叫声等突然惊吓对手进行攻击。有时会使对手畏缩。" + }, + "weatherBall": { + name: "气象球", + effect: "根据使用时的天气，招式属性和威力会改变。" + }, + "aromatherapy": { + name: "芳香治疗", + effect: "让同伴闻沁人心脾的香气，从而治愈我方全员的异常状态。" + }, + "fakeTears": { + name: "假哭", + effect: "装哭流泪。使对手不知所措，从而大幅降低对手的特防。" + }, + "airCutter": { + name: "空气利刃", + effect: "用锐利的风切斩对手进行攻击。容易击中要害。" + }, + "overheat": { + name: "过热", + effect: "使出全部力量攻击对手。使用之后会因为反作用力，自己的特攻大幅降低。" + }, + "odorSleuth": { + name: "气味侦测", + effect: "使出后对幽灵属性宝可梦没有效果的招式以及闪避率高的对手，变得能够打中。" + }, + "rockTomb": { + name: "岩石封锁", + effect: "投掷岩石进行攻击。封住对手的行动，从而降低速度。" + }, + "silverWind": { + name: "银色旋风", + effect: "在风中掺入鳞粉攻击对手。有时会提高自己的全部能力。" + }, + "metalSound": { + name: "金属音", + effect: "让对手听摩擦金属般讨厌的声音。大幅降低对手的特防。" + }, + "grassWhistle": { + name: "草笛", + effect: "让对手听舒适的笛声，从而陷入睡眠状态。" + }, + "tickle": { + name: "挠痒", + effect: "给对手挠痒，使其发笑，从而降低对手的攻击和防御。" + }, + "cosmicPower": { + name: "宇宙力量", + effect: "汲取宇宙中神秘的力量，从而提高自己的防御和特防。" + }, + "waterSpout": { + name: "喷水", + effect: "掀起潮水进行攻击。自己的ＨＰ越少，招式的威力越小。" + }, + "signalBeam": { + name: "信号光束", + effect: "发射神奇的光线进行攻击。有时会使对手混乱。" + }, + "shadowPunch": { + name: "暗影拳", + effect: "使出混影之拳。攻击必定会命中。" + }, + "extrasensory": { + name: "神通力", + effect: "发出看不见的神奇力量进行攻击。有时会使对手畏缩。" + }, + "skyUppercut": { + name: "冲天拳", + effect: "用冲向天空般高高的上勾拳顶起对手进行攻击。" + }, + "sandTomb": { + name: "流沙深渊", + effect: "将对手困在铺天盖地的沙暴中，在４～５回合内进行攻击。" + }, + "sheerCold": { + name: "绝对零度", + effect: "给对手一击昏厥。如果是冰属性以外的宝可梦使用，就会难以打中。" + }, + "muddyWater": { + name: "浊流", + effect: "向对手喷射浑浊的水进行攻击。有时会降低对手的命中率。" + }, + "bulletSeed": { + name: "种子机关枪", + effect: "向对手猛烈地发射种子进行攻击。连续攻击２～５次。" + }, + "aerialAce": { + name: "燕返", + effect: "以敏捷的动作戏弄对手后进行切斩。攻击必定会命中。" + }, + "icicleSpear": { + name: "冰锥", + effect: "向对手发射锋利的冰柱进行攻击。连续攻击２～５次。" + }, + "ironDefense": { + name: "铁壁", + effect: "将皮肤变得坚硬如铁，从而大幅提高自己的防御。" + }, + "block": { + name: "挡路", + effect: "张开双手进行阻挡，封住对手的退路，使其不能逃走。" + }, + "howl": { + name: "长嚎", + effect: "大声吼叫提高气势，从而提高自己和同伴的攻击。" + }, + "dragonClaw": { + name: "龙爪", + effect: "用尖锐的巨爪劈开对手进行攻击。" + }, + "frenzyPlant": { + name: "疯狂植物", + effect: "用大树摔打对手进行攻击。下一回合自己将无法动弹。" + }, + "bulkUp": { + name: "健美", + effect: "使出全身力气绷紧肌肉，从而提高自己的攻击和防御。" + }, + "bounce": { + name: "弹跳", + effect: "弹跳到高高的空中，第２回合攻击对手。有时会让对手陷入麻痹状态。" + }, + "mudShot": { + name: "泥巴射击", + effect: "向对手投掷泥块进行攻击。同时降低对手的速度。" + }, + "poisonTail": { + name: "毒尾", + effect: "用尾巴拍打。有时会让对手陷入中毒状态，也容易击中要害。" + }, + "covet": { + name: "渴望", + effect: "一边可爱地撒娇，一边靠近对手进行攻击，还能夺取对手携带的道具。" + }, + "voltTackle": { + name: "伏特攻击", + effect: "让电流覆盖全身猛撞向对手。自己也会受到不小的伤害。有时会让对手陷入麻痹状态。" + }, + "magicalLeaf": { + name: "魔法叶", + effect: "散落可以追踪对手的神奇叶片。攻击必定会命中。" + }, + "waterSport": { + name: "玩水", + effect: "用水湿透周围。在５回合内减弱火属性的招式。" + }, + "calmMind": { + name: "冥想", + effect: "静心凝神，从而提高自己的特攻和特防。" + }, + "leafBlade": { + name: "叶刃", + effect: "像用剑一般操纵叶片切斩对手进行攻击。容易击中要害。" + }, + "dragonDance": { + name: "龙之舞", + effect: "激烈地跳起神秘且强有力的舞蹈。从而提高自己的攻击和速度。" + }, + "rockBlast": { + name: "岩石爆击", + effect: "向对手发射坚硬的岩石进行攻击。连续攻击２～５次。" + }, + "shockWave": { + name: "电击波", + effect: "向对手快速发出电击。攻击必定会命中。" + }, + "waterPulse": { + name: "水之波动", + effect: "用水的震动攻击对手。有时会使对手混乱。" + }, + "doomDesire": { + name: "破灭之愿", + effect: "使用招式２回合后，会用无数道光束攻击对手。" + }, + "psychoBoost": { + name: "精神突进", + effect: "使出全部力量攻击对手。使用之后会因为反作用力，自己的特攻大幅降低。" + }, + "roost": { + name: "羽栖", + effect: "降到地面，使身体休息。回复自己最大ＨＰ的一半。" + }, + "gravity": { + name: "重力", + effect: "在５回合内，飘浮特性和飞行属性的宝可梦会被地面属性的招式击中。飞向空中的招式也将无法使用。" + }, + "miracleEye": { + name: "奇迹之眼", + effect: "使出后对恶属性宝可梦没有效果的招式以及闪避率高的对手，变得能够打中。" + }, + "wakeUpSlap": { + name: "唤醒巴掌", + effect: "给予睡眠状态下的对手较大的伤害。但相反对手会从睡眠中醒过来。" + }, + "hammerArm": { + name: "臂锤", + effect: "挥舞强力而沉重的拳头，给予对手伤害。自己的速度会降低。" + }, + "gyroBall": { + name: "陀螺球", + effect: "让身体高速旋转并撞击对手。速度比对手越慢，威力越大。" + }, + "healingWish": { + name: "治愈之愿", + effect: "虽然自己陷入昏厥，但可以治愈后备上场的宝可梦的异常状态以及回复ＨＰ。" + }, + "brine": { + name: "盐水", + effect: "当对手的ＨＰ负伤到一半左右时，招式威力会变成２倍。" + }, + "naturalGift": { + name: "自然之恩", + effect: "从树果上获得力量进行攻击。根据携带的树果，招式属性和威力会改变。" + }, + "feint": { + name: "佯攻", + effect: "能够攻击正在使用守住或看穿等招式的对手。解除其守护效果。" + }, + "pluck": { + name: "啄食", + effect: "用喙进行攻击。当对手携带树果时，可以食用并获得其效果。" + }, + "tailwind": { + name: "顺风", + effect: "刮起猛烈的旋风，在４回合内提高我方全员的速度。" + }, + "acupressure": { + name: "点穴", + effect: "通过点穴让身体舒筋活络。大幅提高某１项能力。" + }, + "metalBurst": { + name: "金属爆炸", + effect: "使出招式前，将最后受到的招式的伤害大力返还给对手。" + }, + "uTurn": { + name: "急速折返", + effect: "在攻击之后急速返回，和后备宝可梦进行替换。" + }, + "closeCombat": { + name: "近身战", + effect: "放弃守护，向对手的怀里突击。自己的防御和特防会降低。" + }, + "payback": { + name: "以牙还牙", + effect: "蓄力攻击。如果能在对手之后攻击，招式的威力会变成２倍。" + }, + "assurance": { + name: "恶意追击", + effect: "如果此回合内对手已经受到伤害的话，招式威力会变成２倍。" + }, + "embargo": { + name: "查封", + effect: "让对手在５回合内不能使用宝可梦携带的道具。训练家也不能给那只宝可梦使用道具。" + }, + "fling": { + name: "投掷", + effect: "快速投掷携带的道具进行攻击。根据道具不同，威力和效果会改变。" + }, + "psychoShift": { + name: "精神转移", + effect: "利用超能力施以暗示，从而将自己受到的异常状态转移给对手。" + }, + "trumpCard": { + name: "王牌", + effect: "王牌招式的剩余PP越少，招式的威力越大。" + }, + "healBlock": { + name: "回复封锁", + effect: "在５回合内无法通过招式、特性或携带的道具来回复HP。" + }, + "wringOut": { + name: "绞紧", + effect: "用力勒紧对手进行攻击。对手的HP越多，威力越大。" + }, + "powerTrick": { + name: "力量戏法", + effect: "利用超能力交换自己的攻击和防御的力量。" + }, + "gastroAcid": { + name: "胃液", + effect: "将胃液吐向对手的身体。沾上的胃液会消除对手的特性效果。" + }, + "luckyChant": { + name: "幸运咒语", + effect: "向天许愿，从而在５回合内不会被对手的攻击打中要害。" + }, + "meFirst": { + name: "抢先一步", + effect: "提高威力，抢先使出对手想要使出的招式。如果不先使出则会失败。" + }, + "copycat": { + name: "仿效", + effect: "模仿对手刚才使出的招式，并使出相同招式。如果对手还没出招则会失败。" + }, + "powerSwap": { + name: "力量互换", + effect: "利用超能力互换自己和对手的攻击以及特攻的能力变化。" + }, + "guardSwap": { + name: "防守互换", + effect: "利用超能力互换自己和对手的防御以及特防的能力变化。" + }, + "punishment": { + name: "惩罚", + effect: "根据能力变化，对手提高的力量越大，招式的威力越大。" + }, + "lastResort": { + name: "珍藏", + effect: "当战斗中已学会的招式全部使用过后，才能开始使出珍藏的招式。" + }, + "worrySeed": { + name: "烦恼种子", + effect: "种植心神不宁的种子。使对手不能入眠，并将特性变成不眠。" + }, + "suckerPunch": { + name: "突袭", + effect: "可以比对手先攻击。对手使出的招式如果不是攻击招式则会失败。" + }, + "toxicSpikes": { + name: "毒菱", + effect: "在对手的脚下撒毒菱。使对手替换出场的宝可梦中毒。" + }, + "heartSwap": { + name: "心灵互换", + effect: "利用超能力互换自己和对手之间的能力变化。" + }, + "aquaRing": { + name: "水流环", + effect: "在自己身体的周围覆盖用水制造的幕。每回合回复ＨＰ。" + }, + "magnetRise": { + name: "电磁飘浮", + effect: "利用电气产生的磁力浮在空中。在５回合内可以飘浮。" + }, + "flareBlitz": { + name: "闪焰冲锋", + effect: "让火焰覆盖全身猛撞向对手。自己也会受到不小的伤害。有时会让对手陷入灼伤状态。" + }, + "forcePalm": { + name: "发劲", + effect: "向对手的身体发出冲击波进行攻击。有时会让对手陷入麻痹状态。" + }, + "auraSphere": { + name: "波导弹", + effect: "从体内产生出波导之力，然后向对手发出。攻击必定会命中。" + }, + "rockPolish": { + name: "岩石打磨", + effect: "打磨自己的身体，减少空气阻力。可以大幅提高自己的速度。" + }, + "poisonJab": { + name: "毒击", + effect: "用带毒的触手或手臂刺入对手。有时会让对手陷入中毒状态。" + }, + "darkPulse": { + name: "恶之波动", + effect: "从体内发出充满恶意的恐怖气场。有时会使对手畏缩。" + }, + "nightSlash": { + name: "暗袭要害", + effect: "抓住瞬间的空隙切斩对手。容易击中要害。" + }, + "aquaTail": { + name: "水流尾", + effect: "如惊涛骇浪般挥动大尾巴攻击对手。" + }, + "seedBomb": { + name: "种子炸弹", + effect: "将外壳坚硬的大种子，从上方砸下攻击对手。" + }, + "airSlash": { + name: "空气之刃", + effect: "用连天空也能劈开的空气之刃进行攻击。有时会使对手畏缩。" + }, + "xScissor": { + name: "十字剪", + effect: "将镰刀或爪子像剪刀般地交叉，顺势劈开对手。" + }, + "bugBuzz": { + name: "虫鸣", + effect: "利用振动发出音波进行攻击。有时会降低对手的特防。" + }, + "dragonPulse": { + name: "龙之波动", + effect: "从大大的口中掀起冲击波攻击对手。" + }, + "dragonRush": { + name: "龙之俯冲", + effect: "释放出骇人的杀气，一边威慑一边撞击对手。有时会使对手畏缩。" + }, + "powerGem": { + name: "力量宝石", + effect: "发射如宝石般闪耀的光芒攻击对手。" + }, + "drainPunch": { + name: "吸取拳", + effect: "用拳头吸取对手的力量。可以回复给予对手伤害的一半ＨＰ。" + }, + "vacuumWave": { + name: "真空波", + effect: "挥动拳头，掀起真空波。必定能够先制攻击。" + }, + "focusBlast": { + name: "真气弹", + effect: "提高气势，释放出全部力量。有时会降低对手的特防。" + }, + "energyBall": { + name: "能量球", + effect: "发射从自然收集的生命力量。有时会降低对手的特防。" + }, + "braveBird": { + name: "勇鸟猛攻", + effect: "收拢翅膀，通过低空飞行突击对手。自己也会受到不小的伤害。" + }, + "earthPower": { + name: "大地之力", + effect: "向对手脚下释放出大地之力。有时会降低对手的特防。" + }, + "switcheroo": { + name: "掉包", + effect: "用一闪而过的速度交换自己和对手的持有物。" + }, + "gigaImpact": { + name: "终极冲击", + effect: "使出自己浑身力量突击对手。下一回合自己将无法动弹。" + }, + "nastyPlot": { + name: "诡计", + effect: "谋划诡计，激活头脑。大幅提高自己的特攻。" + }, + "bulletPunch": { + name: "子弹拳", + effect: "向对手使出如子弹般快速而坚硬的拳头。必定能够先制攻击。" + }, + "avalanche": { + name: "雪崩", + effect: "如果受到对手的招式攻击，就能给予该对手２倍威力的攻击。" + }, + "iceShard": { + name: "冰砾", + effect: "瞬间制作冰块，快速地扔向对手。必定能够先制攻击。" + }, + "shadowClaw": { + name: "暗影爪", + effect: "以影子做成的锐爪，劈开对手。容易击中要害。" + }, + "thunderFang": { + name: "雷电牙", + effect: "用蓄满电流的牙齿咬住对手。有时会使对手畏缩或陷入麻痹状态。" + }, + "iceFang": { + name: "冰冻牙", + effect: "用藏有冷气的牙齿咬住对手。有时会使对手畏缩或陷入冰冻状态。" + }, + "fireFang": { + name: "火焰牙", + effect: "用覆盖着火焰的牙齿咬住对手。有时会使对手畏缩或陷入灼伤状态。" + }, + "shadowSneak": { + name: "影子偷袭", + effect: "伸长影子，从对手的背后进行攻击。必定能够先制攻击。" + }, + "mudBomb": { + name: "泥巴炸弹", + effect: "向对手发射坚硬的泥弹进行攻击。有时会降低对手的命中率。" + }, + "psychoCut": { + name: "精神利刃", + effect: "用实体化的心之利刃劈开对手。容易击中要害。" + }, + "zenHeadbutt": { + name: "意念头锤", + effect: "将思念的力量集中在前额进行攻击。有时会使对手畏缩。" + }, + "mirrorShot": { + name: "镜光射击", + effect: "抛光自己的身体，向对手释放出闪光之力。有时会降低对手的命中率。" + }, + "flashCannon": { + name: "加农光炮", + effect: "将身体的光芒聚集在一点释放出去。有时会降低对手的特防。" + }, + "rockClimb": { + name: "攀岩", + effect: "发动猛撞攻击，有时会使对手混乱。是宝可表的秘传招式之一。" + }, + "defog": { + name: "清除浓雾", + effect: "用强风吹开对手的反射壁或光墙等。也会降低对手的闪避率。" + }, + "trickRoom": { + name: "戏法空间", + effect: "制造出离奇的空间。在５回合内速度慢的宝可梦可以先行动。" + }, + "dracoMeteor": { + name: "流星群", + effect: "从天空中向对手落下陨石。使用之后因为反作用力，自己的特攻会大幅降低。" + }, + "discharge": { + name: "放电", + effect: "用耀眼的电击攻击自己周围所有的宝可梦。有时会陷入麻痹状态。" + }, + "lavaPlume": { + name: "喷烟", + effect: "用熊熊烈火攻击自己周围所有的宝可梦。有时会陷入灼伤状态。" + }, + "leafStorm": { + name: "飞叶风暴", + effect: "用尖尖的叶片向对手卷起风暴。使用之后因为反作用力自己的特攻会大幅降低。" + }, + "powerWhip": { + name: "强力鞭打", + effect: "激烈地挥舞青藤或触手摔打对手进行攻击。" + }, + "rockWrecker": { + name: "岩石炮", + effect: "向对手发射巨大的岩石进行攻击。下一回合自己将无法动弹。" + }, + "crossPoison": { + name: "十字毒刃", + effect: "用毒刃劈开对手。有时会让对手陷入中毒状态，也容易击中要害。" + }, + "gunkShot": { + name: "垃圾射击", + effect: "用肮脏的垃圾撞向对手进行攻击。有时会让对手陷入中毒状态。" + }, + "ironHead": { + name: "铁头", + effect: "用钢铁般坚硬的头部进行攻击。有时会使对手畏缩。" + }, + "magnetBomb": { + name: "磁铁炸弹", + effect: "发射吸住对手的钢铁炸弹。攻击必定会命中。" + }, + "stoneEdge": { + name: "尖石攻击", + effect: "用尖尖的岩石刺入对手进行攻击。容易击中要害。" + }, + "captivate": { + name: "诱惑", + effect: "♂诱惑♀或♀诱惑♂，从而大幅降低对手的特攻。" + }, + "stealthRock": { + name: "隐形岩", + effect: "将无数岩石悬浮在对手的周围，从而对替换出场的对手的宝可梦给予伤害。" + }, + "grassKnot": { + name: "打草结", + effect: "用草缠住并绊倒对手。对手越重，威力越大。" + }, + "chatter": { + name: "喋喋不休", + effect: "用非常烦人的，喋喋不休的音波攻击对手。使对手混乱。" + }, + "judgment": { + name: "制裁光砾", + effect: "向对手放出无数的光弹。属性会根据自己携带的石板不同而改变。" + }, + "bugBite": { + name: "虫咬", + effect: "咬住进行攻击。当对手携带树果时，可以食用并获得其效果。" + }, + "chargeBeam": { + name: "充电光束", + effect: "向对手发射电击光束。由于蓄满电流，有时会提高自己的特攻。" + }, + "woodHammer": { + name: "木槌", + effect: "用坚硬的躯体撞击对手进行攻击。自己也会受到不小的伤害。" + }, + "aquaJet": { + name: "水流喷射", + effect: "以迅雷不及掩耳之势扑向对手。必定能够先制攻击。" + }, + "attackOrder": { + name: "攻击指令", + effect: "召唤手下，让其朝对手发起攻击。容易击中要害。" + }, + "defendOrder": { + name: "防御指令", + effect: "召唤手下，让其附在自己的身体上。可以提高自己的防御和特防。" + }, + "healOrder": { + name: "回复指令", + effect: "召唤手下疗伤。回复自己最大HP的一半。" + }, + "headSmash": { + name: "双刃头锤", + effect: "拼命使出浑身力气，向对手进行头锤攻击。自己也会受到非常大的伤害。" + }, + "doubleHit": { + name: "二连击", + effect: "使用尾巴等拍打对手进行攻击。连续２次给予伤害。" + }, + "roarOfTime": { + name: "时光咆哮", + effect: "释放出扭曲时间般的强大力量攻击对手。下一回合自己将无法动弹。" + }, + "spacialRend": { + name: "亚空裂斩", + effect: "将对手连同周围的空间一起撕裂并给予伤害。容易击中要害。" + }, + "lunarDance": { + name: "新月舞", + effect: "虽然自己陷入昏厥，但可以治愈后备上场的宝可梦的全部状态。" + }, + "crushGrip": { + name: "捏碎", + effect: "用骇人的力量捏碎对手。对手剩余的ＨＰ越多，威力越大。" + }, + "magmaStorm": { + name: "熔岩风暴", + effect: "将对手困在熊熊燃烧的火焰中，在４～５回合内进行攻击。" + }, + "darkVoid": { + name: "暗黑洞", + effect: "将对手强制拖入黑暗的世界，从而让对手陷入睡眠状态。" + }, + "seedFlare": { + name: "种子闪光", + effect: "从身体里产生冲击波。有时会大幅降低对手的特防。" + }, + "ominousWind": { + name: "奇异之风", + effect: "突然刮起毛骨悚然的暴风攻击对手。有时会提高自己的全部能力。" + }, + "shadowForce": { + name: "暗影潜袭", + effect: "第１回合消失踪影，第２回合攻击对手。即使对手正受保护，也能击中。" + }, + "honeClaws": { + name: "磨爪", + effect: "将爪子磨得更加锋利。提高自己的攻击和命中率。" + }, + "wideGuard": { + name: "广域防守", + effect: "在１回合内防住击打我方全员的攻击。" + }, + "guardSplit": { + name: "防守平分", + effect: "利用超能力将自己和对手的防御和特防相加，再进行平分。" + }, + "powerSplit": { + name: "力量平分", + effect: "利用超能力将自己和对手的攻击和特攻相加，再进行平分。" + }, + "wonderRoom": { + name: "奇妙空间", + effect: "制造出离奇的空间。在５回合内互换所有宝可梦的防御和特防。" + }, + "psyshock": { + name: "精神冲击", + effect: "将神奇的念波实体化攻击对手。给予物理伤害。" + }, + "venoshock": { + name: "毒液冲击", + effect: "将特殊的毒液泼向对手。对处于中毒状态的对手，威力会变成２倍。" + }, + "autotomize": { + name: "身体轻量化", + effect: "削掉身体上没用的部分。大幅提高自己的速度，同时体重也会变轻。" + }, + "ragePowder": { + name: "愤怒粉", + effect: "将令人烦躁的粉末撒在自己身上，用以吸引对手的注意。使对手的攻击全部指向自己。" + }, + "telekinesis": { + name: "意念移物", + effect: "利用超能力使对手浮起来。在３回合内攻击会变得容易打中对手。" + }, + "magicRoom": { + name: "魔法空间", + effect: "制造出离奇的空间。在５回合内所有宝可梦携带道具的效果都会消失。" + }, + "smackDown": { + name: "击落", + effect: "扔石头或炮弹，攻击飞行的对手。对手会被击落，掉到地面。" + }, + "stormThrow": { + name: "山岚摔", + effect: "向对手使出强烈的一击。攻击必定会击中要害。" + }, + "flameBurst": { + name: "烈焰溅射", + effect: "如果击中，爆裂的火焰会攻击到对手。爆裂出的火焰还会飞溅到旁边的对手。" + }, + "sludgeWave": { + name: "污泥波", + effect: "用污泥波攻击自己周围所有的宝可梦。有时会陷入中毒状态。" + }, + "quiverDance": { + name: "蝶舞", + effect: "轻巧地跳起神秘而又美丽的舞蹈。提高自己的特攻、特防和速度。" + }, + "heavySlam": { + name: "重磅冲撞", + effect: "用沉重的身体撞向对手进行攻击。自己比对手越重，威力越大。" + }, + "synchronoise": { + name: "同步干扰", + effect: "用神奇电波对周围所有和自己属性相同的宝可梦给予伤害。" + }, + "electroBall": { + name: "电球", + effect: "用电气团撞向对手。自己比对手速度越快，威力越大。" + }, + "soak": { + name: "浸水", + effect: "将大量的水泼向对手，从而使其变成水属性。" + }, + "flameCharge": { + name: "蓄能焰袭", + effect: "让火焰覆盖全身，攻击对手。积蓄力量来提高自己的速度。" + }, + "coil": { + name: "盘蜷", + effect: "盘蜷着集中精神。提高自己的攻击、防御和命中率。" + }, + "lowSweep": { + name: "下盘踢", + effect: "以敏捷的动作瞄准对手的脚进行攻击。会降低对手的速度。" + }, + "acidSpray": { + name: "酸液炸弹", + effect: "喷出能溶化对手的液体进行攻击。会大幅降低对手的特防。" + }, + "foulPlay": { + name: "欺诈", + effect: "利用对手的力量进行攻击。正和自己战斗的对手，其攻击越高，伤害越大。" + }, + "simpleBeam": { + name: "单纯光束", + effect: "向对手发送谜之念波。接收到念波的对手，其特性会变为单纯。" + }, + "entrainment": { + name: "找伙伴", + effect: "用神奇的节奏跳舞。使对手模仿自己的动作，从而将特性变成一样。" + }, + "afterYou": { + name: "您先请", + effect: "支援我方或对手的行动，使其紧接着此招式之后行动。" + }, + "round": { + name: "轮唱", + effect: "用歌声攻击对手。大家一起轮唱便可以接连使出，威力也会提高。" + }, + "echoedVoice": { + name: "回声", + effect: "用回声攻击对手。如果每回合都有宝可梦接着使用该招式，威力就会提高。" + }, + "chipAway": { + name: "逐步击破", + effect: "看准机会稳步攻击。无视对手的能力变化，直接给予伤害。" + }, + "clearSmog": { + name: "清除之烟", + effect: "向对手投掷特殊的泥块进行攻击。使其能力变回原点。" + }, + "storedPower": { + name: "辅助力量", + effect: "用蓄积起来的力量攻击对手。自己的能力提高得越多，威力就越大。" + }, + "quickGuard": { + name: "快速防守", + effect: "守护自己和同伴，以防对手的先制攻击。" + }, + "allySwitch": { + name: "交换场地", + effect: "用神奇的力量瞬间移动，互换自己和同伴所在的位置。连续使出则容易失败。" + }, + "scald": { + name: "热水", + effect: "向对手喷射煮得翻滚的开水进行攻击。有时会让对手陷入灼伤状态。" + }, + "shellSmash": { + name: "破壳", + effect: "打破外壳，降低自己的防御和特防，但大幅提高攻击、特攻和速度。" + }, + "healPulse": { + name: "治愈波动", + effect: "放出治愈波动，从而回复对手最大ＨＰ的一半。" + }, + "hex": { + name: "祸不单行", + effect: "接二连三地进行攻击。对处于异常状态的对手给予较大的伤害。" + }, + "skyDrop": { + name: "自由落体", + effect: "第１回合将对手带到空中，第２回合将其摔下进行攻击。被带到空中的对手不能动弹。" + }, + "shiftGear": { + name: "换档", + effect: "转动齿轮，不仅提高自己的攻击，还会大幅提高速度。" + }, + "circleThrow": { + name: "巴投", + effect: "扔飞对手，强制拉后备宝可梦上场。如果对手为野生宝可梦，战斗将直接结束。" + }, + "incinerate": { + name: "烧净", + effect: "用火焰攻击对手。对手携带树果等时，会烧掉，使其不能使用。" + }, + "quash": { + name: "延后", + effect: "压制对手，从而将其行动顺序放到最后。" + }, + "acrobatics": { + name: "杂技", + effect: "轻巧地攻击对手。自己没有携带道具时，会给予较大的伤害。" + }, + "reflectType": { + name: "镜面属性", + effect: "反射对手的属性，让自己也变成一样的属性。" + }, + "retaliate": { + name: "报仇", + effect: "为倒下的同伴报仇。如果上一回合有同伴倒下，威力就会提高。" + }, + "finalGambit": { + name: "搏命", + effect: "拼命攻击对手。虽然自己陷入昏厥，但会给予对手和自己目前ＨＰ等量的伤害。" + }, + "bestow": { + name: "传递礼物", + effect: "当对手未携带道具时，能够将自己携带的道具交给对手。" + }, + "inferno": { + name: "烈火深渊", + effect: "用烈焰包裹住对手进行攻击。让对手陷入灼伤状态。" + }, + "waterPledge": { + name: "水之誓约", + effect: "用水柱进行攻击。如果和火组合，威力就会提高，天空中会挂上彩虹。" + }, + "firePledge": { + name: "火之誓约", + effect: "用火柱进行攻击。如果和草组合，威力就会提高，周围会变成火海。" + }, + "grassPledge": { + name: "草之誓约", + effect: "用草柱进行攻击。如果和水组合，威力就会提高，周围会变成湿地。" + }, + "voltSwitch": { + name: "伏特替换", + effect: "在攻击之后急速返回，和后备宝可梦进行替换。" + }, + "struggleBug": { + name: "虫之抵抗", + effect: "抵抗并攻击对手。会降低对手的特攻。" + }, + "bulldoze": { + name: "重踏", + effect: "用力踩踏地面并攻击自己周围所有的宝可梦。会降低对方的速度。" + }, + "frostBreath": { + name: "冰息", + effect: "将冰冷的气息吹向对手进行攻击。必定会击中要害。" + }, + "dragonTail": { + name: "龙尾", + effect: "弹飞对手，强制拉后备宝可梦上场。如果对手为野生宝可梦，战斗将直接结束。" + }, + "workUp": { + name: "自我激励", + effect: "激励自己，从而提高攻击和特攻。" + }, + "electroweb": { + name: "电网", + effect: "用电网捉住对手进行攻击。会降低对手的速度。" + }, + "wildCharge": { + name: "疯狂伏特", + effect: "让电流覆盖全身，撞向对手进行攻击。自己也会受到少许伤害。" + }, + "drillRun": { + name: "直冲钻", + effect: "像钢钻一样，一边旋转身体一边撞击对手。容易击中要害。" + }, + "dualChop": { + name: "二连劈", + effect: "用身体坚硬的部分拍打对手进行攻击。连续２次给予伤害。" + }, + "heartStamp": { + name: "爱心印章", + effect: "以可爱的动作使对手疏忽，乘机给出强烈的一击。有时会使对手畏缩。" + }, + "hornLeech": { + name: "木角", + effect: "将角刺入，吸取对手的养分。可以回复给予对手伤害的一半ＨＰ。" + }, + "sacredSword": { + name: "圣剑", + effect: "用剑切斩对手进行攻击。无视对手的能力变化，直接给予伤害。" + }, + "razorShell": { + name: "贝壳刃", + effect: "用锋利的贝壳切斩对手进行攻击。有时会降低对手的防御。" + }, + "heatCrash": { + name: "高温重压", + effect: "用燃烧的身体撞向对手进行攻击。自己比对手越重，威力越大。" + }, + "leafTornado": { + name: "青草搅拌器", + effect: "用锋利的叶片包裹住对手进行攻击。有时会降低对手的命中率。" + }, + "steamroller": { + name: "疯狂滚压", + effect: "旋转揉成团的身体压扁对手。有时会使对手畏缩。" + }, + "cottonGuard": { + name: "棉花防守", + effect: "用软绵绵的绒毛包裹住自己的身体进行守护。巨幅提高自己的防御。" + }, + "nightDaze": { + name: "暗黑爆破", + effect: "放出黑暗的冲击波攻击对手。有时会降低对手的命中率。" + }, + "psystrike": { + name: "精神击破", + effect: "将神奇的念波实体化攻击对手。给予物理伤害。" + }, + "tailSlap": { + name: "扫尾拍打", + effect: "用坚硬的尾巴拍打对手进行攻击。连续攻击２～５次。" + }, + "hurricane": { + name: "暴风", + effect: "用强烈的风席卷对手进行攻击。有时会使对手混乱。" + }, + "headCharge": { + name: "爆炸头突击", + effect: "用厉害的爆炸头猛撞向对手进行攻击。自己也会受到少许伤害。" + }, + "gearGrind": { + name: "齿轮飞盘", + effect: "向对手投掷钢铁齿轮进行攻击。连续２次给予伤害。" + }, + "searingShot": { + name: "火焰弹", + effect: "用熊熊烈火攻击自己周围所有的宝可梦。有时会陷入灼伤状态。" + }, + "technoBlast": { + name: "高科技光炮", + effect: "向对手放出光弹。属性会根据自己携带的卡带不同而改变。" + }, + "relicSong": { + name: "古老之歌", + effect: "让对手听古老之歌，打动对手的内心进行攻击。有时会让对手陷入睡眠状态。" + }, + "secretSword": { + name: "神秘之剑", + effect: "用长角切斩对手进行攻击。角上拥有的神奇力量将给予物理伤害。" + }, + "glaciate": { + name: "冰封世界", + effect: "将冰冻的冷气吹向对手进行攻击。会降低对手的速度。" + }, + "boltStrike": { + name: "雷击", + effect: "让强大的电流覆盖全身，猛撞向对手进行攻击。有时会让对手陷入麻痹状态。" + }, + "blueFlare": { + name: "青焰", + effect: "用美丽而激烈的青焰包裹住对手进行攻击。有时会让对手陷入灼伤状态。" + }, + "fieryDance": { + name: "火之舞", + effect: "让火焰覆盖全身，振翅攻击对手。有时会提高自己的特攻。" + }, + "freezeShock": { + name: "冰冻伏特", + effect: "用覆盖着电流的冰块，在第２回合撞向对手。有时会让对手陷入麻痹状态。" + }, + "iceBurn": { + name: "极寒冷焰", + effect: "用能够冻结一切的强烈冷气，在第２回合包裹住对手。有时会让对手陷入灼伤状态。" + }, + "snarl": { + name: "大声咆哮", + effect: "没完没了地大声斥责，从而降低对手的特攻。" + }, + "icicleCrash": { + name: "冰柱坠击", + effect: "用大冰柱激烈地撞向对手进行攻击。有时会使对手畏缩。" + }, + "vCreate": { + name: "Ｖ热焰", + effect: "从前额产生灼热的火焰，舍身撞击对手。防御、特防和速度会降低。" + }, + "fusionFlare": { + name: "交错火焰", + effect: "释放出巨大的火焰。受到巨大的闪电影响时，招式威力会提高。" + }, + "fusionBolt": { + name: "交错闪电", + effect: "释放出巨大的闪电。受到巨大的火焰影响时，招式威力会提高。" + }, + "flyingPress": { + name: "飞身重压", + effect: "从空中俯冲向对手。此招式同时带有格斗属性和飞行属性。" + }, + "matBlock": { + name: "掀榻榻米", + effect: "将掀起来的榻榻米当作盾牌，防住自己和同伴免受招式伤害。变化招式无法防住。" + }, + "belch": { + name: "打嗝", + effect: "朝着对手打嗝，并给予伤害。如果不吃树果则无法使出。" + }, + "rototiller": { + name: "耕地", + effect: "翻耕土地，使草木更容易成长。会提高草属性宝可梦的攻击和特攻。" + }, + "stickyWeb": { + name: "黏黏网", + effect: "在对手周围围上黏黏的网，降低替换出场的对手的速度。" + }, + "fellStinger": { + name: "致命针刺", + effect: "如果使用此招式打倒对手，攻击会巨幅提高。" + }, + "phantomForce": { + name: "潜灵奇袭", + effect: "第１回合消失在某处，第２回合攻击对手。可以无视守护进行攻击。" + }, + "trickOrTreat": { + name: "万圣夜", + effect: "邀请对手参加万圣夜。使对手被追加幽灵属性。" + }, + "nobleRoar": { + name: "战吼", + effect: "发出战吼威吓对手，从而降低对手的攻击和特攻。" + }, + "ionDeluge": { + name: "等离子浴", + effect: "将带电粒子扩散开来，使一般属性的招式变成电属性。" + }, + "parabolicCharge": { + name: "抛物面充电", + effect: "给周围全体宝可梦造成伤害。可以回复给予伤害的一半HP。" + }, + "forestsCurse": { + name: "森林咒术", + effect: "向对手施加森林咒术。中了咒术的对手会被追加草属性。" + }, + "petalBlizzard": { + name: "落英缤纷", + effect: "猛烈地刮起飞雪般的落花，攻击周围所有的宝可梦，并给予伤害。" + }, + "freezeDry": { + name: "冷冻干燥", + effect: "急剧冷冻对手，有时会让对手陷入冰冻状态。对于水属性宝可梦也是效果绝佳。" + }, + "disarmingVoice": { + name: "魅惑之声", + effect: "发出魅惑的叫声，给予对手精神上的伤害。攻击必定会命中。" + }, + "partingShot": { + name: "抛下狠话", + effect: "抛下狠话威吓对手，降低攻击和特攻后，和后备宝可梦进行替换。" + }, + "topsyTurvy": { + name: "颠倒", + effect: "颠倒对手身上的所有能力变化，变成和原来相反的状态。" + }, + "drainingKiss": { + name: "吸取之吻", + effect: "用一个吻吸取对手的ＨＰ。回复给予对手伤害的一半以上的ＨＰ。" + }, + "craftyShield": { + name: "戏法防守", + effect: "使用神奇的力量防住攻击我方的变化招式。但无法防住伤害招式的攻击。" + }, + "flowerShield": { + name: "鲜花防守", + effect: "使用神奇的力量提高在场的所有草属性宝可梦的防御。" + }, + "grassyTerrain": { + name: "青草场地", + effect: "在５回合内变成青草场地。地面上的宝可梦每回合都能回复。草属性的招式威力还会提高。" + }, + "mistyTerrain": { + name: "薄雾场地", + effect: "在５回合内，地面上的宝可梦不会陷入异常状态。龙属性招式的伤害也会减半。" + }, + "electrify": { + name: "输电", + effect: "对手使出招式前，如果输电，则该回合对手的招式变成电属性。" + }, + "playRough": { + name: "嬉闹", + effect: "与对手嬉闹并攻击。有时会降低对手的攻击。" + }, + "fairyWind": { + name: "妖精之风", + effect: "刮起妖精之风，吹向对手进行攻击。" + }, + "moonblast": { + name: "月亮之力", + effect: "借用月亮的力量攻击对手。有时会降低对手的特攻。" + }, + "boomburst": { + name: "爆音波", + effect: "通过震耳欲聋的爆炸声产生的破坏力，攻击自己周围所有的宝可梦。" + }, + "fairyLock": { + name: "妖精之锁", + effect: "通过封锁，下一回合所有的宝可梦都无法逃走。" + }, + "kingsShield": { + name: "王者盾牌", + effect: "防住对手攻击的同时，自己变为防御姿态。能够降低所接触到的对手的攻击。" + }, + "playNice": { + name: "和睦相处", + effect: "和对手和睦相处，使其失去战斗的气力，从而降低对手的攻击。" + }, + "confide": { + name: "密语", + effect: "和对手进行密语，使其失去集中力，从而降低对手的特攻。" + }, + "diamondStorm": { + name: "钻石风暴", + effect: "掀起钻石风暴给予伤害。有时会大幅提高自己的防御。" + }, + "steamEruption": { + name: "蒸汽爆炸", + effect: "将滚烫的蒸汽喷向对手。有时会让对手灼伤。" + }, + "hyperspaceHole": { + name: "异次元洞", + effect: "通过异次元洞，突然出现在对手的侧面进行攻击。还可以无视守住和看穿等招式。" + }, + "waterShuriken": { + name: "飞水手里剑", + effect: "用粘液制成的手里剑，连续攻击２～５次。必定能够先制攻击。" + }, + "mysticalFire": { + name: "魔法火焰", + effect: "从口中喷出特别灼热的火焰进行攻击。降低对手的特攻。" + }, + "spikyShield": { + name: "尖刺防守", + effect: "防住对手攻击的同时，削减接触到自己的对手的体力。" + }, + "aromaticMist": { + name: "芳香薄雾", + effect: "通过神奇的芳香，提高我方宝可梦的特防。" + }, + "eerieImpulse": { + name: "怪异电波", + effect: "从身体放射出怪异电波，让对手沐浴其中，从而大幅降低其特攻。" + }, + "venomDrench": { + name: "毒液陷阱", + effect: "将特殊的毒液泼向对手。对处于中毒状态的对手，其攻击、特攻和速度都会降低。" + }, + "powder": { + name: "粉尘", + effect: "如果被撒到粉尘的对手使用火招式，则会爆炸并给予伤害。" + }, + "geomancy": { + name: "大地掌控", + effect: "第１回合吸收能量，第２回合大幅提高特攻、特防和速度。" + }, + "magneticFlux": { + name: "磁场操控", + effect: "通过操控磁场，会提高特性为正电和负电的宝可梦的防御和特防。" + }, + "happyHour": { + name: "欢乐时光", + effect: "如果使用欢乐时光，战斗后得到的钱会翻倍。" + }, + "electricTerrain": { + name: "电气场地", + effect: "在５回合内变成电气场地。地面上的宝可梦将无法入眠。电属性的招式威力还会提高。" + }, + "dazzlingGleam": { + name: "魔法闪耀", + effect: "向对手发射强光，并给予伤害。" + }, + "celebrate": { + name: "庆祝", + effect: "宝可梦为十分开心的你庆祝。" + }, + "holdHands": { + name: "牵手", + effect: "我方宝可梦之间牵手。能带来非常幸福的心情。" + }, + "babyDollEyes": { + name: "圆瞳", + effect: "用圆瞳凝视对手，从而降低其攻击。必定能够先制攻击。" + }, + "nuzzle": { + name: "蹭蹭脸颊", + effect: "将带电的脸颊蹭蹭对手进行攻击。让对手陷入麻痹状态。" + }, + "holdBack": { + name: "手下留情", + effect: "在攻击的时候手下留情，从而使对手的ＨＰ至少会留下１ＨＰ。" + }, + "infestation": { + name: "纠缠不休", + effect: "在４～５回合内死缠烂打地进行攻击。在此期间对手将无法逃走。" + }, + "powerUpPunch": { + name: "增强拳", + effect: "通过反复击打对手，使自己的拳头慢慢变硬。打中对手攻击就会提高。" + }, + "oblivionWing": { + name: "归天之翼", + effect: "从锁定的对手身上吸取ＨＰ。回复给予对手伤害的一半以上的ＨＰ。" + }, + "thousandArrows": { + name: "千箭齐发", + effect: "可以击中浮在空中的宝可梦。空中的对手被击落后，会掉到地面。" + }, + "thousandWaves": { + name: "千波激荡", + effect: "从地面掀起波浪进行攻击。被掀入波浪中的对手，将无法从战斗中逃走。" + }, + "landsWrath": { + name: "大地神力", + effect: "聚集大地的力量，将此力量集中攻击对手，并给予伤害。" + }, + "lightOfRuin": { + name: "破灭之光", + effect: "借用永恒之花的力量，发射出强力光线。自己也会受到非常大的伤害。" + }, + "originPulse": { + name: "根源波动", + effect: "用无数青白色且闪耀的光线攻击对手。" + }, + "precipiceBlades": { + name: "断崖之剑", + effect: "将大地的力量变化为利刃攻击对手。" + }, + "dragonAscent": { + name: "画龙点睛", + effect: "从天空中急速下降攻击对手。自己的防御和特防会降低。" + }, + "hyperspaceFury": { + name: "异次元猛攻", + effect: "用许多手臂，无视对手的守住或看穿等招式进行连续攻击，自己的防御会降低。" + }, + "breakneckBlitzPhysical": { + name: "一般Ｚ究极无敌大冲撞", + effect: "通过Ｚ力量气势猛烈地全力撞上对手。威力会根据原来的招式而改变。" + }, + "breakneckBlitzSpecial": { + name: "一般Ｚ究极无敌大冲撞", + effect: "通过Ｚ力量气势猛烈地全力撞上对手。威力会根据原来的招式而改变。" + }, + "allOutPummelingPhysical": { + name: "格斗Ｚ全力无双激烈拳", + effect: "通过Ｚ力量制造出能量弹，全力撞向对手。威力会根据原来的招式而改变。" + }, + "allOutPummelingSpecial": { + name: "格斗Ｚ全力无双激烈拳", + effect: "通过Ｚ力量制造出能量弹，全力撞向对手。威力会根据原来的招式而改变。" + }, + "supersonicSkystrikePhysical": { + name: "飞行Ｚ极速俯冲轰烈撞", + effect: "通过Ｚ力量猛烈地飞向天空，朝对手全力落下。威力会根据原来的招式而改变。" + }, + "supersonicSkystrikeSpecial": { + name: "飞行Ｚ极速俯冲轰烈撞", + effect: "通过Ｚ力量猛烈地飞向天空，朝对手全力落下。威力会根据原来的招式而改变。" + }, + "acidDownpourPhysical": { + name: "毒Ｚ强酸剧毒灭绝雨", + effect: "通过Ｚ力量使毒沼涌起，全力让对手沉下去。威力会根据原来的招式而改变。" + }, + "acidDownpourSpecial": { + name: "毒Ｚ强酸剧毒灭绝雨", + effect: "通过Ｚ力量使毒沼涌起，全力让对手沉下去。威力会根据原来的招式而改变。" + }, + "tectonicRagePhysical": { + name: "地面Ｚ地隆啸天大终结", + effect: "通过Ｚ力量潜入地里最深处，全力撞上对手。威力会根据原来的招式而改变。" + }, + "tectonicRageSpecial": { + name: "地面Ｚ地隆啸天大终结", + effect: "通过Ｚ力量潜入地里最深处，全力撞上对手。威力会根据原来的招式而改变。" + }, + "continentalCrushPhysical": { + name: "岩石Ｚ毁天灭地巨岩坠", + effect: "通过Ｚ力量召唤大大的岩山，全力撞向对手。威力会根据原来的招式而改变。" + }, + "continentalCrushSpecial": { + name: "岩石Ｚ毁天灭地巨岩坠", + effect: "通过Ｚ力量召唤大大的岩山，全力撞向对手。威力会根据原来的招式而改变。" + }, + "savageSpinOutPhysical": { + name: "虫Ｚ绝对捕食回旋斩", + effect: "通过Ｚ力量将吐出的丝线全力束缚对手。威力会根据原来的招式而改变。" + }, + "savageSpinOutSpecial": { + name: "虫Ｚ绝对捕食回旋斩", + effect: "通过Ｚ力量将吐出的丝线全力束缚对手。威力会根据原来的招式而改变。" + }, + "neverEndingNightmarePhysical": { + name: "幽灵Ｚ无尽暗夜之诱惑", + effect: "通过Ｚ力量召唤强烈的怨念，全力降临到对手身上。威力会根据原来的招式而改变。" + }, + "neverEndingNightmareSpecial": { + name: "幽灵Ｚ无尽暗夜之诱惑", + effect: "通过Ｚ力量召唤强烈的怨念，全力降临到对手身上。威力会根据原来的招式而改变。" + }, + "corkscrewCrashPhysical": { + name: "钢Ｚ超绝螺旋连击", + effect: "通过Ｚ力量进行高速旋转，全力撞上对手。威力会根据原来的招式而改变。" + }, + "corkscrewCrashSpecial": { + name: "钢Ｚ超绝螺旋连击", + effect: "通过Ｚ力量进行高速旋转，全力撞上对手。威力会根据原来的招式而改变。" + }, + "infernoOverdrivePhysical": { + name: "火Ｚ超强极限爆焰弹", + effect: "通过Ｚ力量喷出熊熊烈火，全力撞向对手。威力会根据原来的招式而改变。" + }, + "infernoOverdriveSpecial": { + name: "火Ｚ超强极限爆焰弹", + effect: "通过Ｚ力量喷出熊熊烈火，全力撞向对手。威力会根据原来的招式而改变。" + }, + "hydroVortexPhysical": { + name: "水Ｚ超级水流大漩涡", + effect: "通过Ｚ力量制造大大的潮旋，全力吞没对手。威力会根据原来的招式而改变。" + }, + "hydroVortexSpecial": { + name: "水Ｚ超级水流大漩涡", + effect: "通过Ｚ力量制造大大的潮旋，全力吞没对手。威力会根据原来的招式而改变。" + }, + "bloomDoomPhysical": { + name: "草Ｚ绚烂缤纷花怒放", + effect: "通过Ｚ力量借助花草的能量，全力攻击对手。威力会根据原来的招式而改变。" + }, + "bloomDoomSpecial": { + name: "草Ｚ绚烂缤纷花怒放", + effect: "通过Ｚ力量借助花草的能量，全力攻击对手。威力会根据原来的招式而改变。" + }, + "gigavoltHavocPhysical": { + name: "电Ｚ终极伏特狂雷闪", + effect: "通过Ｚ力量将蓄积的强大电流全力撞向对手。威力会根据原来的招式而改变。" + }, + "gigavoltHavocSpecial": { + name: "电Ｚ终极伏特狂雷闪", + effect: "通过Ｚ力量将蓄积的强大电流全力撞向对手。威力会根据原来的招式而改变。" + }, + "shatteredPsychePhysical": { + name: "超能力Ｚ至高精神破坏波", + effect: "通过Ｚ力量操纵对手，全力使其感受到痛苦。威力会根据原来的招式而改变。" + }, + "shatteredPsycheSpecial": { + name: "超能力Ｚ至高精神破坏波", + effect: "通过Ｚ力量操纵对手，全力使其感受到痛苦。威力会根据原来的招式而改变。" + }, + "subzeroSlammerPhysical": { + name: "冰Ｚ激狂大地万里冰", + effect: "通过Ｚ力量急剧降低气温，全力冰冻对手。威力会根据原来的招式而改变。" + }, + "subzeroSlammerSpecial": { + name: "冰Ｚ激狂大地万里冰", + effect: "通过Ｚ力量急剧降低气温，全力冰冻对手。威力会根据原来的招式而改变。" + }, + "devastatingDrakePhysical": { + name: "龙Ｚ究极巨龙震天地", + effect: "通过Ｚ力量将气场实体化，向对手全力发动袭击。威力会根据原来的招式而改变。" + }, + "devastatingDrakeSpecial": { + name: "龙Ｚ究极巨龙震天地", + effect: "通过Ｚ力量将气场实体化，向对手全力发动袭击。威力会根据原来的招式而改变。" + }, + "blackHoleEclipsePhysical": { + name: "恶Ｚ黑洞吞噬万物灭", + effect: "通过Ｚ力量收集恶能量，全力将对手吸入。威力会根据原来的招式而改变。" + }, + "blackHoleEclipseSpecial": { + name: "恶Ｚ黑洞吞噬万物灭", + effect: "通过Ｚ力量收集恶能量，全力将对手吸入。威力会根据原来的招式而改变。" + }, + "twinkleTacklePhysical": { + name: "妖精Ｚ可爱星星飞天撞", + effect: "通过Ｚ力量制造魅惑空间，全力捉弄对手。威力会根据原来的招式而改变。" + }, + "twinkleTackleSpecial": { + name: "妖精Ｚ可爱星星飞天撞", + effect: "通过Ｚ力量制造魅惑空间，全力捉弄对手。威力会根据原来的招式而改变。" + }, + "catastropika": { + name: "皮卡丘Ｚ皮卡皮卡必杀击", + effect: "通过Ｚ力量，皮卡丘全身覆盖最强电力，全力猛扑对手。" + }, + "shoreUp": { + name: "集沙", + effect: "回复自己最大ＨＰ的一半。在沙暴中回复得更多。" + }, + "firstImpression": { + name: "迎头一击", + effect: "威力很高的招式，但只有在出场战斗时，立刻使出才能成功。" + }, + "banefulBunker": { + name: "碉堡", + effect: "防住对手攻击的同时，让接触到自己的对手中毒。" + }, + "spiritShackle": { + name: "缝影", + effect: "攻击的同时，缝住对手的影子，使其无法逃走。" + }, + "darkestLariat": { + name: "ＤＤ金勾臂", + effect: "旋转双臂打向对手。无视对手的能力变化，直接给予伤害。" + }, + "sparklingAria": { + name: "泡影的咏叹调", + effect: "随着唱歌会放出很多气球。受到此招式攻击时，灼伤会被治愈。" + }, + "iceHammer": { + name: "冰锤", + effect: "挥舞强力而沉重的拳头，给予对手伤害。自己的速度会降低。" + }, + "floralHealing": { + name: "花疗", + effect: "回复对手最大ＨＰ的一半。在青草场地时，效果会提高。" + }, + "highHorsepower": { + name: "十万马力", + effect: "使出全身力量，猛攻对手。" + }, + "strengthSap": { + name: "吸取力量", + effect: "给自己回复和对手攻击力相同数值的ＨＰ，然后降低对手的攻击。" + }, + "solarBlade": { + name: "日光刃", + effect: "第１回合收集满满的日光，第２回合将此力量集中在剑上进行攻击。" + }, + "leafage": { + name: "树叶", + effect: "将叶片打向对手，进行攻击。" + }, + "spotlight": { + name: "聚光灯", + effect: "给宝可梦打上聚光灯，该回合只能瞄准该宝可梦。" + }, + "toxicThread": { + name: "毒丝", + effect: "将混有毒的丝吐向对手。使其中毒，从而降低对手的速度。" + }, + "laserFocus": { + name: "磨砺", + effect: "集中精神，下次攻击必定会击中要害。" + }, + "gearUp": { + name: "辅助齿轮", + effect: "启动齿轮，提高特性为正电和负电的宝可梦的攻击和特攻。" + }, + "throatChop": { + name: "深渊突刺", + effect: "受到此招式攻击的对手，会因为地狱般的痛苦，在２回合内，变得无法使出声音类招式。" + }, + "pollenPuff": { + name: "花粉团", + effect: "对敌人使用是会爆炸的团子。对我方使用则是给予回复的团子。" + }, + "anchorShot": { + name: "掷锚", + effect: "将锚缠住对手进行攻击。使对手无法逃走。" + }, + "psychicTerrain": { + name: "精神场地", + effect: "在５回合内，地面上的宝可梦不会受到先制招式的攻击。超能力属性的招式威力会提高。" + }, + "lunge": { + name: "猛扑", + effect: "全力猛扑对手进行攻击。从而降低对手的攻击。" + }, + "fireLash": { + name: "火焰鞭", + effect: "用燃烧的鞭子抽打对手。受到攻击的对手防御会降低。" + }, + "powerTrip": { + name: "嚣张", + effect: "耀武扬威地攻击对手，自己的能力提高得越多，威力就越大。" + }, + "burnUp": { + name: "燃尽", + effect: "将自己全身燃烧起火焰来，给予对手大大的伤害。自己的火属性将会消失。" + }, + "speedSwap": { + name: "速度互换", + effect: "将对手和自己的速度进行互换。" + }, + "smartStrike": { + name: "修长之角", + effect: "用尖尖的角刺入对手进行攻击。攻击必定会命中。" + }, + "purify": { + name: "净化", + effect: "治愈对手的异常状态。治愈后可以回复自己的ＨＰ。" + }, + "revelationDance": { + name: "觉醒之舞", + effect: "全力跳舞进行攻击。此招式的属性将变得和自己的属性相同。" + }, + "coreEnforcer": { + name: "核心惩罚者", + effect: "如果给予过伤害的对手已经结束行动，其特性就会被消除。" + }, + "tropKick": { + name: "热带踢", + effect: "向对手使出来自南国的火热脚踢。从而降低对手的攻击。" + }, + "instruct": { + name: "号令", + effect: "向对手下达指示，让其再次使出刚才的招式。" + }, + "beakBlast": { + name: "鸟嘴加农炮", + effect: "先加热鸟嘴后再进行攻击。鸟嘴在加热时对手触碰的话，就会使其灼伤。" + }, + "clangingScales": { + name: "鳞片噪音", + effect: "摩擦全身鳞片，发出响亮的声音进行攻击。攻击后自己的防御会降低。" + }, + "dragonHammer": { + name: "龙锤", + effect: "将身体当作锤子，向对手发动袭击，给予伤害。" + }, + "brutalSwing": { + name: "狂舞挥打", + effect: "用自己的身体狂舞挥打，给予对手伤害。" + }, + "auroraVeil": { + name: "极光幕", + effect: "在５回合内减弱物理和特殊的伤害。只有下雪时才能使出。" + }, + "sinisterArrowRaid": { + name: "狙射树枭Ｚ遮天蔽日暗影箭", + effect: "通过Ｚ力量制造出无数箭的狙射树枭将全力射穿对手进行攻击。" + }, + "maliciousMoonsault": { + name: "炽焰咆哮虎Ｚ极恶飞跃粉碎击", + effect: "通过Ｚ力量得到强壮肉体的炽焰咆哮虎将全力撞向对手进行攻击。" + }, + "oceanicOperetta": { + name: "西狮海壬Ｚ海神庄严交响乐", + effect: "通过Ｚ力量召唤大量水的西狮海壬将全力攻击对手。" + }, + "guardianOfAlola": { + name: "卡璞Ｚ巨人卫士・阿罗拉", + effect: "通过Ｚ力量得到阿罗拉之力的土地神宝可梦将全力进行攻击。对手的剩余HP会减少很多。" + }, + "soulStealing7StarStrike": { + name: "玛夏多Ｚ七星夺魂腿", + effect: "得到Ｚ力量的玛夏多将全力使出拳头和脚踢的连续招式叩打对手。" + }, + "stokedSparksurfer": { + name: "阿罗雷Ｚ驾雷驭电戏冲浪", + effect: "得到Ｚ力量的阿罗拉地区的雷丘将全力进行攻击。从而让对手陷入麻痹状态。" + }, + "pulverizingPancake": { + name: "卡比兽Ｚ认真起来大爆击", + effect: "通过Ｚ力量使得认真起来的卡比兽跃动巨大身躯，全力向对手发动袭击。" + }, + "extremeEvoboost": { + name: "伊布Ｚ九彩昇华齐聚顶", + effect: "得到Ｚ力量的伊布将借助进化后伙伴们的力量，大幅提高能力。" + }, + "genesisSupernova": { + name: "梦幻Ｚ起源超新星大爆炸", + effect: "得到Ｚ力量的梦幻将全力攻击对手。脚下会变成精神场地。" + }, + "shellTrap": { + name: "陷阱甲壳", + effect: "设下甲壳陷阱。如果对手使出物理招式，陷阱就会爆炸并给予对手伤害。" + }, + "fleurCannon": { + name: "花朵加农炮", + effect: "放出强力光束后，自己的特攻会大幅降低。" + }, + "psychicFangs": { + name: "精神之牙", + effect: "利用精神力量咬住对手进行攻击。还可以破坏光墙和反射壁等。" + }, + "stompingTantrum": { + name: "跺脚", + effect: "化悔恨为力量进行攻击。如果上一回合招式没有打中，威力就会翻倍。" + }, + "shadowBone": { + name: "暗影之骨", + effect: "用附有灵魂的骨头殴打对手进行攻击。有时会降低对手的防御。" + }, + "accelerock": { + name: "冲岩", + effect: "迅速撞向对手进行攻击。必定能够先制攻击。" + }, + "liquidation": { + name: "水流裂破", + effect: "用水之力量撞向对手进行攻击。有时会降低对手的防御。" + }, + "prismaticLaser": { + name: "棱镜镭射", + effect: "用棱镜的力量发射强烈光线。下一回合自己将无法动弹。" + }, + "spectralThief": { + name: "暗影偷盗", + effect: "潜入对手的影子进行攻击。会夺取对手的能力提升。" + }, + "sunsteelStrike": { + name: "流星闪冲", + effect: "以流星般的气势猛撞对手。可以无视对手的特性进行攻击。" + }, + "moongeistBeam": { + name: "暗影之光", + effect: "放出奇怪的光线攻击对手。可以无视对手的特性进行攻击。" + }, + "tearfulLook": { + name: "泪眼汪汪", + effect: "变得泪眼汪汪，让对手丧失斗志。从而降低对手的攻击和特攻。" + }, + "zingZap": { + name: "麻麻刺刺", + effect: "撞向对手，并发出强电，使其感到麻麻刺刺的。有时会使对手畏缩。" + }, + "naturesMadness": { + name: "自然之怒", + effect: "向对手释放自然之怒。对手的ＨＰ会减半。" + }, + "multiAttack": { + name: "多属性攻击", + effect: "一边覆盖高能量，一边撞向对手进行攻击。根据存储碟不同，属性会改变。" + }, + "tenMillionVoltThunderbolt": { + name: "智皮卡Ｚ千万伏特", + effect: "戴着帽子的皮卡丘将通过Ｚ力量增强的电击全力释放给对手。容易击中要害。" + }, + "mindBlown": { + name: "惊爆大头", + effect: "让自己的头爆炸，来攻击周围的一切。自己也会受到伤害。" + }, + "plasmaFists": { + name: "等离子闪电拳", + effect: "用覆盖着电流的拳头进行攻击。使一般属性的招式变成电属性。" + }, + "photonGeyser": { + name: "光子喷涌", + effect: "用光柱来进行攻击。比较自己的攻击和特攻，用数值相对较高的一项给予对方伤害。" + }, + "lightThatBurnsTheSky": { + name: "究极奈克洛Ｚ焚天灭世炽光爆", + effect: "奈克洛兹玛会无视对手的特性效果，在攻击和特攻之间，用数值相对较高的一项给予对方伤害。" + }, + "searingSunrazeSmash": { + name: "索尔迦雷欧Ｚ日光回旋下苍穹", + effect: "得到Ｚ力量的索尔迦雷欧将全力进行攻击。可以无视对手的特性效果。" + }, + "menacingMoonrazeMaelstrom": { + name: "露奈雅拉Ｚ月华飞溅落灵霄", + effect: "得到Ｚ力量的露奈雅拉将全力进行攻击。可以无视对手的特性效果。" + }, + "letsSnuggleForever": { + name: "谜拟丘Ｚ亲密无间大乱揍", + effect: "得到Ｚ力量的谜拟Ｑ将全力进行乱揍攻击。" + }, + "splinteredStormshards": { + name: "鬃岩狼人Ｚ狼啸石牙飓风暴", + effect: "得到Ｚ力量的鬃岩狼人将全力进行攻击。而且会消除场地状态。" + }, + "clangorousSoulblaze": { + name: "杖尾鳞甲龙Ｚ炽魂热舞烈音爆", + effect: "得到Ｚ力量的杖尾鳞甲龙将全力攻击对手。并且自己的能力会提高。" + }, + "zippyZap": { + name: "电电加速", + effect: "迅猛无比的电击。必定能够先制攻击，击中对方的要害。" + }, + "splishySplash": { + name: "滔滔冲浪", + effect: "往巨浪中注入电能后冲撞对手进行攻击。有时会让对手陷入麻痹状态。" + }, + "floatyFall": { + name: "飘飘坠落", + effect: "轻飘飘地浮起来后，再猛地俯冲下去进行攻击。有时会使对手畏缩。" + }, + "pikaPapow": { + name: "闪闪雷光", + effect: "皮卡丘越喜欢训练家，电击的威力就越强。攻击必定会命中。" + }, + "bouncyBubble": { + name: "活活气泡", + effect: "投掷水球进行攻击。吸水后能回复等同于造成的伤害一半的HP。" + }, + "buzzyBuzz": { + name: "麻麻电击", + effect: "放出电击攻击对手。让对手陷入麻痹状态。" + }, + "sizzlySlide": { + name: "熊熊火爆", + effect: "用燃起大火的身体猛烈地冲撞对手。让对手陷入灼伤状态。" + }, + "glitzyGlow": { + name: "哗哗气场", + effect: "利用念力强攻，粉碎对方信心。制造一道能减弱对手特殊攻击的神奇墙壁。" + }, + "baddyBad": { + name: "坏坏领域", + effect: "恶行恶相地进行攻击。制造一道能减弱对手物理攻击的神奇墙壁。" + }, + "sappySeed": { + name: "茁茁炸弹", + effect: "长出巨大的藤蔓，播撒种子进行攻击。种子每回合都会吸取对手的HP。" + }, + "freezyFrost": { + name: "冰冰霜冻", + effect: "利用冰冷的黑雾结晶进行攻击。使全体宝可梦的能力变回原点。" + }, + "sparklySwirl": { + name: "亮亮风暴", + effect: "利用芬芳刺鼻的龙卷风吞噬对方。能治愈我方宝可梦的异常状态。" + }, + "veeveeVolley": { + name: "砰砰击破", + effect: "伊布越喜欢训练家，冲撞的威力就越强。攻击必定会命中。" + }, + "doubleIronBash": { + name: "钢拳双击", + effect: "以胸口的螺帽为中心旋转，并连续２次挥动手臂打击对手。有时会使对手畏缩。" + }, + "maxGuard": { + name: "极巨防壁", + effect: "完全抵挡对手的攻击。连续使出则容易失败。" + }, + "dynamaxCannon": { + name: "极巨炮", + effect: "将凝缩在体内的能量从核心放出进行攻击。" + }, + "snipeShot": { + name: "狙击", + effect: "能无视具有吸引对手招式效果的特性或招式的影响。可以向选定的对手进行攻击。" + }, + "jawLock": { + name: "紧咬不放", + effect: "使双方直到一方昏厥为止无法替换宝可梦。其中一方退场则可以解除效果。" + }, + "stuffCheeks": { + name: "大快朵颐", + effect: "吃掉携带的树果，大幅提高防御。" + }, + "noRetreat": { + name: "背水一战", + effect: "提高自己的所有能力，但无法替换或逃走。" + }, + "tarShot": { + name: "沥青射击", + effect: "泼洒黏糊糊的沥青，降低对手的速度。火属性会变成对手的弱点。" + }, + "magicPowder": { + name: "魔法粉", + effect: "向对手喷洒魔法粉，使对手变为超能力属性。" + }, + "dragonDarts": { + name: "龙箭", + effect: "让多龙梅西亚进行２次攻击。如果对手有２只宝可梦，则对它们各进行１次攻击。" + }, + "teatime": { + name: "茶会", + effect: "举办一场茶会，场上的所有宝可梦都会吃掉自己携带的树果。" + }, + "octolock": { + name: "蛸固", + effect: "让对手无法逃走。对手被固定后，每回合都会降低防御和特防。" + }, + "boltBeak": { + name: "电喙", + effect: "用带电的喙啄刺对手。如果比对手先出手攻击，招式的威力会变成２倍。" + }, + "fishiousRend": { + name: "鳃咬", + effect: "用坚硬的腮咬住对手。如果比对手先出手攻击，招式的威力会变成２倍。" + }, + "courtChange": { + name: "换场", + effect: "用神奇的力量交换双方的场地效果。" + }, + "maxFlare": { + name: "极巨火爆", + effect: "极巨化宝可梦使出的火属性攻击。可在５回合内让日照变得强烈。" + }, + "maxFlutterby": { + name: "极巨虫蛊", + effect: "极巨化宝可梦使出的虫属性攻击。会降低对手的特攻。" + }, + "maxLightning": { + name: "极巨闪电", + effect: "极巨化宝可梦使出的电属性攻击。可在５回合内将脚下变成电气场地。" + }, + "maxStrike": { + name: "极巨攻击", + effect: "极巨化宝可梦使出的一般属性攻击。会降低对手的速度。" + }, + "maxKnuckle": { + name: "极巨拳斗", + effect: "极巨化宝可梦使出的格斗属性攻击。会提高我方的攻击。" + }, + "maxPhantasm": { + name: "极巨幽魂", + effect: "极巨化宝可梦使出的幽灵属性攻击。会降低对手的防御。" + }, + "maxHailstorm": { + name: "极巨寒冰", + effect: "极巨化宝可梦使出的冰属性攻击。在５回合内会下雪。" + }, + "maxOoze": { + name: "极巨酸毒", + effect: "极巨化宝可梦使出的毒属性攻击。会提高我方的特攻。" + }, + "maxGeyser": { + name: "极巨水流", + effect: "极巨化宝可梦使出的水属性攻击。可在５回合内降下大雨。" + }, + "maxAirstream": { + name: "极巨飞冲", + effect: "极巨化宝可梦使出的飞行属性攻击。会提高我方的速度。" + }, + "maxStarfall": { + name: "极巨妖精", + effect: "极巨化宝可梦使出的妖精属性攻击。可在５回合内将脚下变成薄雾场地。" + }, + "maxWyrmwind": { + name: "极巨龙骑", + effect: "极巨化宝可梦使出的龙属性攻击。会降低对手的攻击。" + }, + "maxMindstorm": { + name: "极巨超能", + effect: "极巨化宝可梦使出的超能力属性攻击。可在５回合内将脚下变成精神场地。" + }, + "maxRockfall": { + name: "极巨岩石", + effect: "极巨化宝可梦使出的岩石属性攻击。可在５回合内卷起沙暴。" + }, + "maxQuake": { + name: "极巨大地", + effect: "极巨化宝可梦使出的地面属性攻击。会提高我方的特防。" + }, + "maxDarkness": { + name: "极巨恶霸", + effect: "极巨化宝可梦使出的恶属性攻击。会降低对手的特防。" + }, + "maxOvergrowth": { + name: "极巨草原", + effect: "极巨化宝可梦使出的草属性攻击。可在５回合内将脚下变成青草场地。" + }, + "maxSteelspike": { + name: "极巨钢铁", + effect: "极巨化宝可梦使出的钢属性攻击。会提高我方的防御。" + }, + "clangorousSoul": { + name: "魂舞烈音爆", + effect: "削减少许自己的ＨＰ，使所有能力都提高。" + }, + "bodyPress": { + name: "扑击", + effect: "用身体撞向对手进行攻击。防御越高，给予的伤害就越高。" + }, + "decorate": { + name: "装饰", + effect: "通过装饰，大幅提高对方的攻击和特攻。" + }, + "drumBeating": { + name: "鼓击", + effect: "用鼓点来控制鼓的根部进行攻击，从而降低对手的速度。" + }, + "snapTrap": { + name: "捕兽夹", + effect: "使用捕兽夹，在４～５回合内，夹住对手进行攻击。" + }, + "pyroBall": { + name: "火焰球", + effect: "点燃小石子，形成火球攻击对手。有时会使对手陷入灼伤状态。" + }, + "behemothBlade": { + name: "巨兽斩", + effect: "以全身力气举起强大的剑，猛烈地劈向对手进行攻击。" + }, + "behemothBash": { + name: "巨兽弹", + effect: "将全身变化为坚固的盾，猛烈地撞向对手进行攻击。" + }, + "auraWheel": { + name: "气场轮", + effect: "用储存在颊囊里的能量进行攻击，并提高自己的速度。其属性会随着莫鲁贝可的样子而改变。" + }, + "breakingSwipe": { + name: "广域破坏", + effect: "用坚韧的尾巴猛扫对手进行攻击，从而降低对手的攻击。" + }, + "branchPoke": { + name: "木枝突刺", + effect: "使用尖锐的树枝刺向对手进行攻击。" + }, + "overdrive": { + name: "破音", + effect: "奏响吉他和贝斯，释放出发出巨响的剧烈震动攻击对手。" + }, + "appleAcid": { + name: "苹果酸", + effect: "使用从酸苹果中提取出来的酸性液体进行攻击。降低对手的特防。" + }, + "gravApple": { + name: "万有引力", + effect: "从高处落下苹果，给予对手伤害。可降低对手的防御。" + }, + "spiritBreak": { + name: "灵魂冲击", + effect: "用足以让对手一蹶不振的气势进行攻击。会降低对手的特攻。" + }, + "strangeSteam": { + name: "神奇蒸汽", + effect: "喷出烟雾攻击对手。有时会使对手混乱。" + }, + "lifeDew": { + name: "生命水滴", + effect: "喷洒出神奇的水，回复自己和场上同伴的ＨＰ。" + }, + "obstruct": { + name: "拦堵", + effect: "完全抵挡对手的攻击。连续使出则容易失败。一旦触碰，防御就会大幅降低。" + }, + "falseSurrender": { + name: "假跪真撞", + effect: "装作低头认错的样子，用凌乱的头发进行突刺。攻击必定会命中。" + }, + "meteorAssault": { + name: "流星突击", + effect: "大力挥舞粗壮的茎进行攻击。但同时自己也会被晃晕，下一回合自己将无法动弹。" + }, + "eternabeam": { + name: "无极光束", + effect: "无极汰那变回原来的样子后，发动的最强攻击。下一回合自己将无法动弹。" + }, + "steelBeam": { + name: "铁蹄光线", + effect: "将从全身聚集的钢铁化为光束，激烈地发射出去。自己也会受到伤害。" + }, + "expandingForce": { + name: "广域战力", + effect: "利用精神力量攻击对手。在精神场地上威力会有所提高，能对所有对手造成伤害。" + }, + "steelRoller": { + name: "铁滚轮", + effect: "在破坏场地的同时攻击对手。如果脚下没有任何场地状态存在，使出此招式时便会失败。" + }, + "scaleShot": { + name: "鳞射", + effect: "发射鳞片进行攻击。连续攻击２～５次。速度会提高但防御会降低。" + }, + "meteorBeam": { + name: "流星光束", + effect: "第１回合聚集宇宙之力提高特攻，第２回合攻击对手。" + }, + "shellSideArm": { + name: "臂贝武器", + effect: "从物理攻击和特殊攻击中选择可造成较多伤害的方式进行攻击。有时会让对手陷入中毒状态。" + }, + "mistyExplosion": { + name: "薄雾炸裂", + effect: "对自己周围的所有宝可梦进行攻击，但使出后，自己会陷入昏厥。在薄雾场地上，招式威力会提高。" + }, + "grassyGlide": { + name: "青草滑梯", + effect: "仿佛在地面上滑行般地攻击对手。在青草场地上，必定能够先制攻击。" + }, + "risingVoltage": { + name: "电力上升", + effect: "用从地面升腾而起的电击进行攻击。当对手处于电气场地上时，招式威力会变成２倍。" + }, + "terrainPulse": { + name: "大地波动", + effect: "借助场地的力量进行攻击。视使出招式时场地状态不同，招式的属性和威力会有所变化。" + }, + "skitterSmack": { + name: "爬击", + effect: "从对手背后爬近后进行攻击。会降低对手的特攻。" + }, + "burningJealousy": { + name: "妒火", + effect: "用嫉妒的能量攻击对手。会让在该回合内能力有所提高的宝可梦陷入灼伤状态。" + }, + "lashOut": { + name: "泄愤", + effect: "攻击对手以发泄对其感到的恼怒情绪。如果在该回合内自身能力遭到降低，招式的威力会变成２倍。" + }, + "poltergeist": { + name: "灵骚", + effect: "操纵对手的持有物进行攻击。当对手没有携带道具时，使出此招式时便会失败。" + }, + "corrosiveGas": { + name: "腐蚀气体", + effect: "用具有强酸性的气体包裹住自己周围所有的宝可梦，并融化其所携带的道具。" + }, + "coaching": { + name: "指导", + effect: "通过进行正确合理的指导，提高我方全员的攻击和防御。" + }, + "flipTurn": { + name: "快速折返", + effect: "在攻击之后急速返回，和后备宝可梦进行替换。" + }, + "tripleAxel": { + name: "三旋击", + effect: "连续３次踢对手进行攻击。每踢中一次，威力就会提高。" + }, + "dualWingbeat": { + name: "双翼", + effect: "将翅膀撞向对手进行攻击。连续２次给予伤害。" + }, + "scorchingSands": { + name: "热沙大地", + effect: "将滚烫的沙子砸向对手进行攻击。有时会让对手陷入灼伤状态。" + }, + "jungleHealing": { + name: "丛林治疗", + effect: "与丛林融为一体，回复自己和场上同伴的ＨＰ和状态。" + }, + "wickedBlow": { + name: "暗冥强击", + effect: "将恶之流派修炼至大成的猛烈一击。必定会击中要害。" + }, + "surgingStrikes": { + name: "水流连打", + effect: "将水之流派修炼至大成的仿若行云流水般的３次连击。必定会击中要害。" + }, + "thunderCage": { + name: "雷电囚笼", + effect: "将对手困在电流四溅的囚笼中，在４～５回合内进行攻击。" + }, + "dragonEnergy": { + name: "巨龙威能", + effect: "把生命力转换为力量攻击对手。自己的ＨＰ越少，招式的威力越小。" + }, + "freezingGlare": { + name: "冰冷视线", + effect: "从双眼发射精神力量进行攻击。有时会让对手陷入冰冻状态。" + }, + "fieryWrath": { + name: "怒火中烧", + effect: "将愤怒转化为火焰般的气场进行攻击。有时会使对手畏缩。" + }, + "thunderousKick": { + name: "雷鸣蹴击", + effect: "以雷电般的动作戏耍对手的同时使出脚踢。可降低对手的防御。" + }, + "glacialLance": { + name: "雪矛", + effect: "向对手投掷掀起暴风雪的冰矛进行攻击。" + }, + "astralBarrage": { + name: "星碎", + effect: "用大量的小灵体向对手发起攻击。" + }, + "eerieSpell": { + name: "诡异咒语", + effect: "用强大的精神力量攻击。让对手最后使用的招式减少３ＰＰ。" + }, + "direClaw": { + name: "克命爪", + effect: "以破灭之爪进行攻击。有时还会让对手陷入中毒、麻痹、睡眠之中的一种状态。" + }, + "psyshieldBash": { + name: "屏障猛攻", + effect: "让意念的能量覆盖全身，撞向对手进行攻击。会提高自己的防御。" + }, + "powerShift": { + name: "力量转换", + effect: "将自己的攻击与防御互相交换。" + }, + "stoneAxe": { + name: "岩斧", + effect: "用岩石之斧进行攻击。散落的岩石碎片会飘浮在对手周围。" + }, + "springtideStorm": { + name: "阳春风暴", + effect: "用交织着爱与恨的烈风席卷对手进行攻击。有时会降低对手的攻击。" + }, + "mysticalPower": { + name: "神秘之力", + effect: "放出不可思议的力量攻击。会提高自己的特攻。" + }, + "ragingFury": { + name: "大愤慨", + effect: "在２～３回合内，一边放出火焰，一边疯狂乱打。大闹一番后自己会陷入混乱。" + }, + "waveCrash": { + name: "波动冲", + effect: "让水覆盖全身后撞向对手。自己也会受到不少伤害。" + }, + "chloroblast": { + name: "叶绿爆震", + effect: "将自己的叶绿素凝聚起来后放出去进行攻击。自己也会受到伤害，" + }, + "mountainGale": { + name: "冰山风", + effect: "将冰山般巨大的冰块砸向对手进行攻击。有时会使对手畏缩。" + }, + "victoryDance": { + name: "胜利之舞", + effect: "激烈地跳起唤来胜利的舞蹈，提高自己的攻击、防御和速度。" + }, + "headlongRush": { + name: "突飞猛扑", + effect: "向对手使出灌注了全心全力的撞击。自己的防御和特防会降低。" + }, + "barbBarrage": { + name: "毒千针", + effect: "用无数的毒针进行攻击。有时还会让对手陷入中毒状态。攻击处于中毒状态的对手时，威力会变成２倍。" + }, + "esperWing": { + name: "气场之翼", + effect: "用经过气场强化的翅膀撕裂对手。容易击中要害。会提高自己的速度。" + }, + "bitterMalice": { + name: "冤冤相报", + effect: "用令人毛骨悚然的怨念进行攻击。会降低对手的攻击。" + }, + "shelter": { + name: "闭关", + effect: "将皮肤变得坚硬如铁盾，从而大幅提高自己的防御。" + }, + "tripleArrows": { + name: "三连箭", + effect: "使出一记腿技后同时发射３箭。有时会降低对手的防御或使对手畏缩。容易击中要害。" + }, + "infernalParade": { + name: "群魔乱舞", + effect: "用无数的火球进行攻击。有时会让对手陷入灼伤状态。攻击处于异常状态的对手时，威力会变成２倍。" + }, + "ceaselessEdge": { + name: "秘剑・千重涛", + effect: "用贝壳之剑进行攻击。散落的贝壳碎片会散落在对手脚下成为撒菱。" + }, + "bleakwindStorm": { + name: "枯叶风暴", + effect: "用足以让身心都止不住颤抖的冰冷狂风进行攻击。有时会降低对手的速度。" + }, + "wildboltStorm": { + name: "鸣雷风暴", + effect: "呼唤雷云引起风暴，用雷与风进行激烈的攻击。有时会让对手陷入麻痹状态。" + }, + "sandsearStorm": { + name: "热沙风暴", + effect: "用灼热的沙子和强烈的风席卷对手进行攻击。有时会让对手陷入灼伤状态。" + }, + "lunarBlessing": { + name: "新月祈祷", + effect: "向新月献上祈祷，回复自己和场上同伴的ＨＰ和状态。" + }, + "takeHeart": { + name: "勇气填充", + effect: "鼓起冲劲，治愈自己的异常状态，同时提高自己的特攻和特防。" + }, + "gMaxWildfire": { + name: "超极巨深渊灭焰", + effect: "超极巨化的喷火龙使出的火属性攻击。可在４回合内给予对手伤害。" + }, + "gMaxBefuddle": { + name: "超极巨蝶影蛊惑", + effect: "超极巨化的巴大蝶使出的虫属性攻击。会让对手陷入中毒、麻痹或睡眠状态。" + }, + "gMaxVoltCrash": { + name: "超极巨万雷轰顶", + effect: "超极巨化的皮卡丘使出的电属性攻击。会让对手陷入麻痹状态。" + }, + "gMaxGoldRush": { + name: "超极巨特大金币", + effect: "超极巨化的喵喵使出的一般属性攻击。会让对手陷入混乱状态，并可获得金钱。" + }, + "gMaxChiStrike": { + name: "超极巨会心一击", + effect: "超极巨化的怪力使出的格斗属性攻击。会变得容易击中要害。" + }, + "gMaxTerror": { + name: "超极巨幻影幽魂", + effect: "超极巨化的耿鬼使出的幽灵属性攻击。会踩住对手的影子，让其无法被替换。" + }, + "gMaxResonance": { + name: "超极巨极光旋律", + effect: "超极巨化的拉普拉斯使出的冰属性攻击。可在５回合内减弱受到的伤害。" + }, + "gMaxCuddle": { + name: "超极巨热情拥抱", + effect: "超极巨化的伊布使出的一般属性攻击。会让对手陷入着迷状态。" + }, + "gMaxReplenish": { + name: "超极巨资源再生", + effect: "超极巨化的卡比兽使出的一般属性攻击。会让吃掉的树果再生。" + }, + "gMaxMalodor": { + name: "超极巨臭气冲天", + effect: "超极巨化的灰尘山使出的毒属性攻击。会让对手陷入中毒状态。" + }, + "gMaxStonesurge": { + name: "超极巨岩阵以待", + effect: "超极巨化的暴噬龟使出的水属性攻击。会发射无数锐利的岩石。" + }, + "gMaxWindRage": { + name: "超极巨旋风袭卷", + effect: "超极巨化的钢铠鸦使出的飞行属性攻击。可消除反射壁和光墙。" + }, + "gMaxStunShock": { + name: "超极巨异毒电场", + effect: "超极巨化的颤弦蝾螈使出的电属性攻击。会让对手陷入中毒或麻痹状态。" + }, + "gMaxFinale": { + name: "超极巨幸福圆满", + effect: "超极巨化的霜奶仙使出的妖精属性攻击。可回复我方的ＨＰ。" + }, + "gMaxDepletion": { + name: "超极巨劣化衰变", + effect: "超极巨化的铝钢龙使出的龙属性攻击。可减少对手最后使用的招式的ＰＰ。" + }, + "gMaxGravitas": { + name: "超极巨天道七星", + effect: "超极巨化的以欧路普使出的超能力属性攻击。在５回合内重力会产生变化。" + }, + "gMaxVolcalith": { + name: "超极巨炎石喷发", + effect: "超极巨化的巨炭山使出的岩石属性攻击。可在４回合内给予对手伤害。" + }, + "gMaxSandblast": { + name: "超极巨沙尘漫天", + effect: "超极巨化的沙螺蟒使出的地面属性攻击。在４～５回合内会狂刮沙暴。" + }, + "gMaxSnooze": { + name: "超极巨睡魔降临", + effect: "超极巨化的长毛巨魔使出的恶属性攻击。会通过打大哈欠让对手产生睡意。" + }, + "gMaxTartness": { + name: "超极巨酸不溜丢", + effect: "超极巨化的苹裹龙使出的草属性攻击。会降低对手的闪避率。" + }, + "gMaxSweetness": { + name: "超极巨琼浆玉液", + effect: "超极巨化的丰蜜龙使出的草属性攻击。会治愈我方的异常状态。" + }, + "gMaxSmite": { + name: "超极巨天谴雷诛", + effect: "超极巨化的布莉姆温使出的妖精属性攻击。会让对手陷入混乱状态。" + }, + "gMaxSteelsurge": { + name: "超极巨钢铁阵法", + effect: "超极巨化的大王铜象使出的钢属性攻击。会发射无数锐利的刺。" + }, + "gMaxMeltdown": { + name: "超极巨液金熔击", + effect: "超极巨化的美录梅塔使出的钢属性攻击。会让对手无法连续使出相同的招式。" + }, + "gMaxFoamBurst": { + name: "超极巨激漩泡涡", + effect: "超极巨化的巨钳蟹使出的水属性攻击。会大幅降低对手的速度。" + }, + "gMaxCentiferno": { + name: "超极巨百火焚野", + effect: "超极巨化的焚焰蚣使出的火属性攻击。可在４～５回合内将对手困在火焰中。" + }, + "gMaxVineLash": { + name: "超极巨灰飞鞭灭", + effect: "超极巨化的妙蛙花使出的草属性攻击。可在４回合内给予对手伤害。" + }, + "gMaxCannonade": { + name: "超极巨水炮轰灭", + effect: "超极巨化的水箭龟使出的水属性攻击。可在４回合内给予对手伤害。" + }, + "gMaxDrumSolo": { + name: "超极巨狂擂乱打", + effect: "超极巨化的轰擂金刚猩使出的草属性攻击。不会受到对手特性的干扰。" + }, + "gMaxFireball": { + name: "超极巨破阵火球", + effect: "超极巨化的闪焰王牌使出的火属性攻击。不会受到对手特性的干扰。" + }, + "gMaxHydrosnipe": { + name: "超极巨狙击神射", + effect: "超极巨化的千面避役使出的水属性攻击。不会受到对手特性的干扰。" + }, + "gMaxOneBlow": { + name: "超极巨夺命一击", + effect: "超极巨化的武道熊师使出的恶属性攻击。是可以无视极巨防壁的一击。" + }, + "gMaxRapidFlow": { + name: "超极巨流水连击", + effect: "超极巨化的武道熊师使出的水属性攻击。是可以无视极巨防壁的连击。" + }, + "teraBlast": { + name: "太晶爆发", + effect: "太晶化时，会放出太晶属性的能量攻击。比较自己的攻击和特攻，用数值相对较高的一项给予对方伤害。（其他属性）／用攻击和特攻数值较高的一项给予伤害。对正处于太晶化的对手效果绝佳。自己的攻击和特攻会降低。（星晶）" + }, + "silkTrap": { + name: "线阱", + effect: "用丝设置陷阱。防住对方攻击的同时，能够降低所接触到的对手的速度。" + }, + "axeKick": { + name: "下压踢", + effect: "将踢起的脚跟往下劈向对手进行攻击。有时会使对手混乱。如果劈偏则自己会受到伤害。" + }, + "lastRespects": { + name: "扫墓", + effect: "为了化解伙伴的悔恨而进行攻击。被打倒的我方宝可梦越多，招式的威力越高。" + }, + "luminaCrash": { + name: "琉光冲激", + effect: "放出连精神都能影响到的奇妙怪光进行攻击。会大幅降低对方的特防。" + }, + "orderUp": { + name: "上菜", + effect: "以潇洒的身手进行攻击。若口中有米立龙，会按其样子提高能力。" + }, + "jetPunch": { + name: "喷射拳", + effect: "将激流覆盖于拳头，以肉眼无法辨识的速度打出拳击。必定能够先制攻击。" + }, + "spicyExtract": { + name: "辣椒精华", + effect: "放出极为辛辣的精华。对手的攻击会大幅提高，防御会大幅降低。" + }, + "spinOut": { + name: "疾速转轮", + effect: "通过往腿上增加负荷，以激烈的旋转给予对手伤害。自己的速度会大幅降低。" + }, + "populationBomb": { + name: "鼠数儿", + effect: "伙伴们会纷纷赶来集合，以群体行动给予对手攻击。连续命中１～１０次。" + }, + "iceSpinner": { + name: "冰旋", + effect: "脚上覆盖薄冰，旋转着撞击对手。通过旋转的动作破坏场地。" + }, + "glaiveRush": { + name: "巨剑突击", + effect: "有勇无谋的舍身突击。使出招式后，对手的攻击必定会命中，且伤害会变成２倍。" + }, + "revivalBlessing": { + name: "复生祈祷", + effect: "通过以慈爱之心祈祷，让陷入昏厥的后备宝可梦以回复一半ＨＰ的状态复活。" + }, + "saltCure": { + name: "盐腌", + effect: "使对手陷入盐腌状态，每回合给予对手伤害。对手为钢或水属性时会更痛苦。" + }, + "tripleDive": { + name: "三连钻", + effect: "以默契的跳跃溅起水花击向对手。连续３次给予伤害。" + }, + "mortalSpin": { + name: "晶光转转", + effect: "通过旋转来攻击对手。可以摆脱绑紧、紧束、寄生种子等招式。还能让对手陷入中毒状态。" + }, + "doodle": { + name: "描绘", + effect: "把握并映射出对手的本质，让自己和同伴宝可梦的特性变得和对手相同。" + }, + "filletAway": { + name: "甩肉", + effect: "削减自己的ＨＰ，大幅提高攻击和特攻以及速度。" + }, + "kowtowCleave": { + name: "仆刀", + effect: "下跪让对手大意后发起袭击劈向对手。攻击必定会命中。" + }, + "flowerTrick": { + name: "千变万花", + effect: "将做了手脚的花束扔向对手进行攻击。必定会命中，且会击中要害。" + }, + "torchSong": { + name: "闪焰高歌", + effect: "如唱歌一样喷出熊熊燃烧的火焰烧焦对手。会提高自己的特攻。" + }, + "aquaStep": { + name: "流水旋舞", + effect: "以盈盈欲滴的轻快步伐戏耍对手并给予其伤害。会提高自己的速度。" + }, + "ragingBull": { + name: "怒牛", + effect: "狂怒暴牛的猛烈冲撞。招式的属性随形态改变，光墙和反射壁等招式也能破坏。" + }, + "makeItRain": { + name: "淘金潮", + effect: "扔出大量硬币攻击。自己的特攻会降低，战斗后还可以拿到钱。" + }, + "psyblade": { + name: "精神剑", + effect: "用无形的利刃劈开对手。处于电气场地时，招式威力会变成１．５倍。" + }, + "hydroSteam": { + name: "水蒸气", + effect: "将煮得翻滚的开水猛烈地喷向对手。日照强烈时，招式威力不但不会降低，还会变成１．５倍。" + }, + "ruination": { + name: "大灾难", + effect: "引发毁灭性的灾厄，使对手的ＨＰ减半。" + }, + "collisionCourse": { + name: "全开猛撞", + effect: "边变形边凶暴地落下，并引发起古老的大爆炸。若针对到弱点，威力会进一步。" + }, + "electroDrift": { + name: "闪电猛冲", + effect: "边变形边高速奔走，并以未知的电击贯穿对手。若针对到弱点，威力会进一步。" + }, + "shedTail": { + name: "断尾", + effect: "削减自己的ＨＰ，制造分身后会返回，并和后备宝可梦进行替换。" + }, + "chillyReception": { + name: "冷笑话", + effect: "留下冷场的冷笑话后，和后备宝可梦进行替换。在５回合内会下雪。" + }, + "tidyUp": { + name: "大扫除", + effect: "将撒菱、隐形岩、黏黏网、毒菱、替身全部扫除掉。自己的攻击和速度会提高。" + }, + "snowscape": { + name: "雪景", + effect: "在５回合内会下雪。冰属性的防御会提高。" + }, + "pounce": { + name: "虫扑", + effect: "飞扑向对手攻击。会降低对手的速度。" + }, + "trailblaze": { + name: "起草", + effect: "跳出草丛进行攻击。通过轻快的步伐会提高自己的速度。" + }, + "chillingWater": { + name: "泼冷水", + effect: "泼洒冰冷得足以让对手失去活力的水进行攻击。会降低对手的攻击。" + }, + "hyperDrill": { + name: "强力钻", + effect: "急速旋转尖锐的身体部位贯穿对手。可以无视守住和看穿等招式。" + }, + "twinBeam": { + name: "双光束", + effect: "从两眼发射出神奇的光线攻击。连续２次给予伤害。" + }, + "rageFist": { + name: "愤怒之拳", + effect: "将愤怒化为力量攻击。受到攻击的次数越多，招式的威力越高。" + }, + "armorCannon": { + name: "铠农炮", + effect: "熊熊燃烧自己的铠甲，将其做成炮弹射出攻击。自己的防御和特防会降低。" + }, + "bitterBlade": { + name: "悔念剑", + effect: "将对世间的留恋聚集于剑尖，并斩击对手。可以回复给予对手伤害的一半ＨＰ。" + }, + "doubleShock": { + name: "电光双击", + effect: "将全身所有的电力放出，给予对手大大的伤害。自己的电属性将会消失。" + }, + "gigatonHammer": { + name: "巨力锤", + effect: "连同身体转起巨大的锤子进行攻击。这个招式无法连续使出２次。" + }, + "comeuppance": { + name: "复仇", + effect: "使出招式前，将最后受到的招式的伤害大力返还给对手。" + }, + "aquaCutter": { + name: "水波刀", + effect: "如刀刃般喷射出加压的水切开对手。容易击中要害。" + }, + "blazingTorque": { + name: "灼热暴冲", + effect: "―――" + }, + "wickedTorque": { + name: "黑暗暴冲", + effect: "―――" + }, + "noxiousTorque": { + name: "剧毒暴冲", + effect: "―――" + }, + "combatTorque": { + name: "格斗暴冲", + effect: "―――" + }, + "magicalTorque": { + name: "魔法暴冲", + effect: "―――" + }, + "bloodMoon": { + name: "血月", + effect: "从赤红如血的满月发射出全部的气势。这个招式无法连续使出２次。" + }, + "matchaGotcha": { + name: "刷刷茶炮", + effect: "发射经搅拌的茶的大炮，可以回复给予对手伤害的一半ＨＰ，有时会让对手陷入灼伤状态。" + }, + "syrupBomb": { + name: "糖浆炸弹", + effect: "使粘稠的麦芽糖浆爆炸，让对手陷入满身糖状态，在３回合内持续降低其速度。" + }, + "ivyCudgel": { + name: "棘藤棒", + effect: "用缠有藤蔓的棍棒殴打。属性会随所戴的面具而改变。容易击中要害。" + }, + "electroShot": { + name: "电光束", + effect: "第１回合收集电力提高特攻，第２回合将高压的电力发射出去。下雨天气时能立刻发射。" + }, + "teraStarstorm": { + name: "晶光星群", + effect: "照射出结晶的力量来驱逐敌人。太乐巴戈斯在星晶形态下使出时，能对所有对手造成伤害。" + }, + "fickleBeam": { + name: "随机光", + effect: "发射光线进行攻击。有时其他的头也会合力发射镭射，让招式威力变成２倍。" + }, + "burningBulwark": { + name: "火焰守护", + effect: "用超高温的体毛防住对手攻击的同时，让接触到自己的对手灼伤。" + }, + "thunderclap": { + name: "迅雷", + effect: "可以比对手先使出电击进行攻击。对手使出的招式如果不是攻击招式则会失败。" + }, + "mightyCleave": { + name: "强刃攻击", + effect: "用积蓄在头部的光来斩切对手。可以无视守护进行攻击。" + }, + "tachyonCutter": { + name: "迅子利刃", + effect: "接连发射出粒子的利刃，连续２次给予伤害。攻击必定会命中。" + }, + "hardPress": { + name: "硬压", + effect: "用手臂或钳子压迫对手。对手剩余的ＨＰ越多，威力越大。" + }, + "dragonCheer": { + name: "龙声鼓舞", + effect: "以龙之鼓舞提高士气，让我方的招式变得容易击中要害。对龙属性的鼓舞效果会更强。" + }, + "alluringVoice": { + name: "魅诱之声", + effect: "用天使般的歌声攻击对手。会让此回合内能力有提高的宝可梦陷入混乱状态。" + }, + "temperFlare": { + name: "豁出去", + effect: "以自暴自弃的气势进行攻击。如果上一回合招式没有命中，威力就会翻倍。" + }, + "supercellSlam": { + name: "闪电强袭", + effect: "让身体带电后压向对手。如果没有命中则自己会受到伤害。" + }, + "psychicNoise": { + name: "精神噪音", + effect: "用令对手不舒服的音波进行攻击。让对手在２回合内无法通过招式、特性或携带的道具回复ＨＰ。" + }, + "upperHand": { + name: "快手还击", + effect: "察觉到对手的动作后用掌根攻击，让对手畏缩。如果对手使出的招式不是先制攻击，则会失败。" + }, + "malignantChain": { + name: "邪毒锁链", + effect: "用由毒形成的锁链缠住对手注入毒素加以侵蚀。有时会让对手陷入剧毒状态。" + } +} as const; \ No newline at end of file diff --git a/src/locales/zh_CN/pokeball.ts b/src/locales/zh_CN/pokeball.ts new file mode 100644 index 000000000..a3260946a --- /dev/null +++ b/src/locales/zh_CN/pokeball.ts @@ -0,0 +1,10 @@ +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +export const pokeball: SimpleTranslationEntries = { + "pokeBall": "精灵球", + "greatBall": "超级球", + "ultraBall": "高级球", + "rogueBall": "肉鸽球", + "masterBall": "大师球", + "luxuryBall": "豪华球", +} as const; \ No newline at end of file diff --git a/src/locales/zh_CN/pokemon-stat.ts b/src/locales/zh_CN/pokemon-stat.ts new file mode 100644 index 000000000..d30922c46 --- /dev/null +++ b/src/locales/zh_CN/pokemon-stat.ts @@ -0,0 +1,16 @@ +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +export const pokemonStat: SimpleTranslationEntries = { + "HP": "最大HP", + "HPshortened": "最大HP", + "ATK": "攻击", + "ATKshortened": "攻击", + "DEF": "防御", + "DEFshortened": "防御", + "SPATK": "特攻", + "SPATKshortened": "特攻", + "SPDEF": "特防", + "SPDEFshortened": "特防", + "SPD": "速度", + "SPDshortened": "速度" +} as const; \ No newline at end of file diff --git a/src/locales/zh_CN/pokemon.ts b/src/locales/zh_CN/pokemon.ts new file mode 100644 index 000000000..b1848b185 --- /dev/null +++ b/src/locales/zh_CN/pokemon.ts @@ -0,0 +1,1086 @@ +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +export const pokemon: SimpleTranslationEntries = { + "bulbasaur": "妙蛙种子", + "ivysaur": "妙蛙草", + "venusaur": "妙蛙花", + "charmander": "小火龙", + "charmeleon": "火恐龙", + "charizard": "喷火龙", + "squirtle": "杰尼龟", + "wartortle": "卡咪龟", + "blastoise": "水箭龟", + "caterpie": "绿毛虫", + "metapod": "铁甲蛹", + "butterfree": "巴大蝶", + "weedle": "独角虫", + "kakuna": "铁壳蛹", + "beedrill": "大针蜂", + "pidgey": "波波", + "pidgeotto": "比比鸟", + "pidgeot": "大比鸟", + "rattata": "小拉达", + "raticate": "拉达", + "spearow": "烈雀", + "fearow": "大嘴雀", + "ekans": "阿柏蛇", + "arbok": "阿柏怪", + "pikachu": "皮卡丘", + "raichu": "雷丘", + "sandshrew": "穿山鼠", + "sandslash": "穿山王", + "nidoran_f": "尼多兰", + "nidorina": "尼多娜", + "nidoqueen": "尼多后", + "nidoran_m": "尼多朗", + "nidorino": "尼多力诺", + "nidoking": "尼多王", + "clefairy": "皮皮", + "clefable": "皮可西", + "vulpix": "六尾", + "ninetales": "九尾", + "jigglypuff": "胖丁", + "wigglytuff": "胖可丁", + "zubat": "超音蝠", + "golbat": "大嘴蝠", + "oddish": "走路草", + "gloom": "臭臭花", + "vileplume": "霸王花", + "paras": "派拉斯", + "parasect": "派拉斯特", + "venonat": "毛球", + "venomoth": "摩鲁蛾", + "diglett": "地鼠", + "dugtrio": "三地鼠", + "meowth": "喵喵", + "persian": "猫老大", + "psyduck": "可达鸭", + "golduck": "哥达鸭", + "mankey": "猴怪", + "primeape": "火爆猴", + "growlithe": "卡蒂狗", + "arcanine": "风速狗", + "poliwag": "蚊香蝌蚪", + "poliwhirl": "蚊香君", + "poliwrath": "蚊香泳士", + "abra": "凯西", + "kadabra": "勇基拉", + "alakazam": "胡地", + "machop": "腕力", + "machoke": "豪力", + "machamp": "怪力", + "bellsprout": "喇叭芽", + "weepinbell": "口呆花", + "victreebel": "大食花", + "tentacool": "玛瑙水母", + "tentacruel": "毒刺水母", + "geodude": "小拳石", + "graveler": "隆隆石", + "golem": "隆隆岩", + "ponyta": "小火马", + "rapidash": "烈焰马", + "slowpoke": "呆呆兽", + "slowbro": "呆壳兽", + "magnemite": "小磁怪", + "magneton": "三合一磁怪", + "farfetchd": "大葱鸭", + "doduo": "嘟嘟", + "dodrio": "嘟嘟利", + "seel": "小海狮", + "dewgong": "白海狮", + "grimer": "臭泥", + "muk": "臭臭泥", + "shellder": "大舌贝", + "cloyster": "刺甲贝", + "gastly": "鬼斯", + "haunter": "鬼斯通", + "gengar": "耿鬼", + "onix": "大岩蛇", + "drowzee": "催眠貘", + "hypno": "引梦貘人", + "krabby": "大钳蟹", + "kingler": "巨钳蟹", + "voltorb": "霹雳电球", + "electrode": "顽皮雷弹", + "exeggcute": "蛋蛋", + "exeggutor": "椰蛋树", + "cubone": "卡拉卡拉", + "marowak": "嘎啦嘎啦", + "hitmonlee": "飞腿郎", + "hitmonchan": "快拳郎", + "lickitung": "大舌头", + "koffing": "瓦斯弹", + "weezing": "双弹瓦斯", + "rhyhorn": "独角犀牛", + "rhydon": "钻角犀兽", + "chansey": "吉利蛋", + "tangela": "蔓藤怪", + "kangaskhan": "袋兽", + "horsea": "墨海马", + "seadra": "海刺龙", + "goldeen": "角金鱼", + "seaking": "金鱼王", + "staryu": "海星星", + "starmie": "宝石海星", + "mr_mime": "魔墙人偶", + "scyther": "飞天螳螂", + "jynx": "迷唇姐", + "electabuzz": "电击兽", + "magmar": "鸭嘴火兽", + "pinsir": "凯罗斯", + "tauros": "肯泰罗", + "magikarp": "鲤鱼王", + "gyarados": "暴鲤龙", + "lapras": "拉普拉斯", + "ditto": "百变怪", + "eevee": "伊布", + "vaporeon": "水伊布", + "jolteon": "雷伊布", + "flareon": "火伊布", + "porygon": "多边兽", + "omanyte": "菊石兽", + "omastar": "多刺菊石兽", + "kabuto": "化石盔", + "kabutops": "镰刀盔", + "aerodactyl": "化石翼龙", + "snorlax": "卡比兽", + "articuno": "急冻鸟", + "zapdos": "闪电鸟", + "moltres": "火焰鸟", + "dratini": "迷你龙", + "dragonair": "哈克龙", + "dragonite": "快龙", + "mewtwo": "超梦", + "mew": "梦幻", + "chikorita": "菊草叶", + "bayleef": "月桂叶", + "meganium": "大竺葵", + "cyndaquil": "火球鼠", + "quilava": "火岩鼠", + "typhlosion": "火暴兽", + "totodile": "小锯鳄", + "croconaw": "蓝鳄", + "feraligatr": "大力鳄", + "sentret": "尾立", + "furret": "大尾立", + "hoothoot": "咕咕", + "noctowl": "猫头夜鹰", + "ledyba": "芭瓢虫", + "ledian": "安瓢虫", + "spinarak": "圆丝蛛", + "ariados": "阿利多斯", + "crobat": "叉字蝠", + "chinchou": "灯笼鱼", + "lanturn": "电灯怪", + "pichu": "皮丘", + "cleffa": "皮宝宝", + "igglybuff": "宝宝丁", + "togepi": "波克比", + "togetic": "波克基古", + "natu": "天然雀", + "xatu": "天然鸟", + "mareep": "咩利羊", + "flaaffy": "茸茸羊", + "ampharos": "电龙", + "bellossom": "美丽花", + "marill": "玛力露", + "azumarill": "玛力露丽", + "sudowoodo": "树才怪", + "politoed": "蚊香蛙皇", + "hoppip": "毽子草", + "skiploom": "毽子花", + "jumpluff": "毽子棉", + "aipom": "长尾怪手", + "sunkern": "向日种子", + "sunflora": "向日花怪", + "yanma": "蜻蜻蜓", + "wooper": "乌波", + "quagsire": "沼王", + "espeon": "太阳伊布", + "umbreon": "月亮伊布", + "murkrow": "黑暗鸦", + "slowking": "呆呆王", + "misdreavus": "梦妖", + "unown": "未知图腾", + "wobbuffet": "果然翁", + "girafarig": "麒麟奇", + "pineco": "榛果球", + "forretress": "佛烈托斯", + "dunsparce": "土龙弟弟", + "gligar": "天蝎", + "steelix": "大钢蛇", + "snubbull": "布鲁", + "granbull": "布鲁皇", + "qwilfish": "千针鱼", + "scizor": "巨钳螳螂", + "shuckle": "壶壶", + "heracross": "赫拉克罗斯", + "sneasel": "狃拉", + "teddiursa": "熊宝宝", + "ursaring": "圈圈熊", + "slugma": "熔岩虫", + "magcargo": "熔岩蜗牛", + "swinub": "小山猪", + "piloswine": "长毛猪", + "corsola": "太阳珊瑚", + "remoraid": "铁炮鱼", + "octillery": "章鱼桶", + "delibird": "信使鸟", + "mantine": "巨翅飞鱼", + "skarmory": "盔甲鸟", + "houndour": "戴鲁比", + "houndoom": "黑鲁加", + "kingdra": "刺龙王", + "phanpy": "小小象", + "donphan": "顿甲", + "porygon2": "多边兽Ⅱ", + "stantler": "惊角鹿", + "smeargle": "图图犬", + "tyrogue": "无畏小子", + "hitmontop": "战舞郎", + "smoochum": "迷唇娃", + "elekid": "电击怪", + "magby": "鸭嘴宝宝", + "miltank": "大奶罐", + "blissey": "幸福蛋", + "raikou": "雷公", + "entei": "炎帝", + "suicune": "水君", + "larvitar": "幼基拉斯", + "pupitar": "沙基拉斯", + "tyranitar": "班基拉斯", + "lugia": "洛奇亚", + "ho_oh": "凤王", + "celebi": "时拉比", + "treecko": "木守宫", + "grovyle": "森林蜥蜴", + "sceptile": "蜥蜴王", + "torchic": "火稚鸡", + "combusken": "力壮鸡", + "blaziken": "火焰鸡", + "mudkip": "水跃鱼", + "marshtomp": "沼跃鱼", + "swampert": "巨沼怪", + "poochyena": "土狼犬", + "mightyena": "大狼犬", + "zigzagoon": "蛇纹熊", + "linoone": "直冲熊", + "wurmple": "刺尾虫", + "silcoon": "甲壳茧", + "beautifly": "狩猎凤蝶", + "cascoon": "盾甲茧", + "dustox": "毒粉蛾", + "lotad": "莲叶童子", + "lombre": "莲帽小童", + "ludicolo": "乐天河童", + "seedot": "橡实果", + "nuzleaf": "长鼻叶", + "shiftry": "狡猾天狗", + "taillow": "傲骨燕", + "swellow": "大王燕", + "wingull": "长翅鸥", + "pelipper": "大嘴鸥", + "ralts": "拉鲁拉丝", + "kirlia": "奇鲁莉安", + "gardevoir": "沙奈朵", + "surskit": "溜溜糖球", + "masquerain": "雨翅蛾", + "shroomish": "蘑蘑菇", + "breloom": "斗笠菇", + "slakoth": "懒人獭", + "vigoroth": "过动猿", + "slaking": "请假王", + "nincada": "土居忍士", + "ninjask": "铁面忍者", + "shedinja": "脱壳忍者", + "whismur": "咕妞妞", + "loudred": "吼爆弹", + "exploud": "爆音怪", + "makuhita": "幕下力士", + "hariyama": "铁掌力士", + "azurill": "露力丽", + "nosepass": "朝北鼻", + "skitty": "向尾喵", + "delcatty": "优雅猫", + "sableye": "勾魂眼", + "mawile": "大嘴娃", + "aron": "可可多拉", + "lairon": "可多拉", + "aggron": "波士可多拉", + "meditite": "玛沙那", + "medicham": "恰雷姆", + "electrike": "落雷兽", + "manectric": "雷电兽", + "plusle": "正电拍拍", + "minun": "负电拍拍", + "volbeat": "电萤虫", + "illumise": "甜甜萤", + "roselia": "毒蔷薇", + "gulpin": "溶食兽", + "swalot": "吞食兽", + "carvanha": "利牙鱼", + "sharpedo": "巨牙鲨", + "wailmer": "吼吼鲸", + "wailord": "吼鲸王", + "numel": "呆火驼", + "camerupt": "喷火驼", + "torkoal": "煤炭龟", + "spoink": "跳跳猪", + "grumpig": "噗噗猪", + "spinda": "晃晃斑", + "trapinch": "大颚蚁", + "vibrava": "超音波幼虫", + "flygon": "沙漠蜻蜓", + "cacnea": "刺球仙人掌", + "cacturne": "梦歌仙人掌", + "swablu": "青绵鸟", + "altaria": "七夕青鸟", + "zangoose": "猫鼬斩", + "seviper": "饭匙蛇", + "lunatone": "月石", + "solrock": "太阳岩", + "barboach": "泥泥鳅", + "whiscash": "鲶鱼王", + "corphish": "龙虾小兵", + "crawdaunt": "铁螯龙虾", + "baltoy": "天秤偶", + "claydol": "念力土偶", + "lileep": "触手百合", + "cradily": "摇篮百合", + "anorith": "太古羽虫", + "armaldo": "太古盔甲", + "feebas": "丑丑鱼", + "milotic": "美纳斯", + "castform": "飘浮泡泡", + "kecleon": "变隐龙", + "shuppet": "怨影娃娃", + "banette": "诅咒娃娃", + "duskull": "夜巡灵", + "dusclops": "彷徨夜灵", + "tropius": "热带龙", + "chimecho": "风铃铃", + "absol": "阿勃梭鲁", + "wynaut": "小果然", + "snorunt": "雪童子", + "glalie": "冰鬼护", + "spheal": "海豹球", + "sealeo": "海魔狮", + "walrein": "帝牙海狮", + "clamperl": "珍珠贝", + "huntail": "猎斑鱼", + "gorebyss": "樱花鱼", + "relicanth": "古空棘鱼", + "luvdisc": "爱心鱼", + "bagon": "宝贝龙", + "shelgon": "甲壳龙", + "salamence": "暴飞龙", + "beldum": "铁哑铃", + "metang": "金属怪", + "metagross": "巨金怪", + "regirock": "雷吉洛克", + "regice": "雷吉艾斯", + "registeel": "雷吉斯奇鲁", + "latias": "拉帝亚斯", + "latios": "拉帝欧斯", + "kyogre": "盖欧卡", + "groudon": "固拉多", + "rayquaza": "烈空坐", + "jirachi": "基拉祈", + "deoxys": "代欧奇希斯", + "turtwig": "草苗龟", + "grotle": "树林龟", + "torterra": "土台龟", + "chimchar": "小火焰猴", + "monferno": "猛火猴", + "infernape": "烈焰猴", + "piplup": "波加曼", + "prinplup": "波皇子", + "empoleon": "帝王拿波", + "starly": "姆克儿", + "staravia": "姆克鸟", + "staraptor": "姆克鹰", + "bidoof": "大牙狸", + "bibarel": "大尾狸", + "kricketot": "圆法师", + "kricketune": "音箱蟀", + "shinx": "小猫怪", + "luxio": "勒克猫", + "luxray": "伦琴猫", + "budew": "含羞苞", + "roserade": "罗丝雷朵", + "cranidos": "头盖龙", + "rampardos": "战槌龙", + "shieldon": "盾甲龙", + "bastiodon": "护城龙", + "burmy": "结草儿", + "wormadam": "结草贵妇", + "mothim": "绅士蛾", + "combee": "三蜜蜂", + "vespiquen": "蜂女王", + "pachirisu": "帕奇利兹", + "buizel": "泳圈鼬", + "floatzel": "浮潜鼬", + "cherubi": "樱花宝", + "cherrim": "樱花儿", + "shellos": "无壳海兔", + "gastrodon": "海兔兽", + "ambipom": "双尾怪手", + "drifloon": "飘飘球", + "drifblim": "随风球", + "buneary": "卷卷耳", + "lopunny": "长耳兔", + "mismagius": "梦妖魔", + "honchkrow": "乌鸦头头", + "glameow": "魅力喵", + "purugly": "东施喵", + "chingling": "铃铛响", + "stunky": "臭鼬噗", + "skuntank": "坦克臭鼬", + "bronzor": "铜镜怪", + "bronzong": "青铜钟", + "bonsly": "盆才怪", + "mime_jr": "魔尼尼", + "happiny": "小福蛋", + "chatot": "聒噪鸟", + "spiritomb": "花岩怪", + "gible": "圆陆鲨", + "gabite": "尖牙陆鲨", + "garchomp": "烈咬陆鲨", + "munchlax": "小卡比兽", + "riolu": "利欧路", + "lucario": "路卡利欧", + "hippopotas": "沙河马", + "hippowdon": "河马兽", + "skorupi": "钳尾蝎", + "drapion": "龙王蝎", + "croagunk": "不良蛙", + "toxicroak": "毒骷蛙", + "carnivine": "尖牙笼", + "finneon": "荧光鱼", + "lumineon": "霓虹鱼", + "mantyke": "小球飞鱼", + "snover": "雪笠怪", + "abomasnow": "暴雪王", + "weavile": "玛狃拉", + "magnezone": "自爆磁怪", + "lickilicky": "大舌舔", + "rhyperior": "超甲狂犀", + "tangrowth": "巨蔓藤", + "electivire": "电击魔兽", + "magmortar": "鸭嘴炎兽", + "togekiss": "波克基斯", + "yanmega": "远古巨蜓", + "leafeon": "叶伊布", + "glaceon": "冰伊布", + "gliscor": "天蝎王", + "mamoswine": "象牙猪", + "porygon_z": "多边兽Ｚ", + "gallade": "艾路雷朵", + "probopass": "大朝北鼻", + "dusknoir": "黑夜魔灵", + "froslass": "雪妖女", + "rotom": "洛托姆", + "uxie": "由克希", + "mesprit": "艾姆利多", + "azelf": "亚克诺姆", + "dialga": "帝牙卢卡", + "palkia": "帕路奇亚", + "heatran": "席多蓝恩", + "regigigas": "雷吉奇卡斯", + "giratina": "骑拉帝纳", + "cresselia": "克雷色利亚", + "phione": "霏欧纳", + "manaphy": "玛纳霏", + "darkrai": "达克莱伊", + "shaymin": "谢米", + "arceus": "阿尔宙斯", + "victini": "比克提尼", + "snivy": "藤藤蛇", + "servine": "青藤蛇", + "serperior": "君主蛇", + "tepig": "暖暖猪", + "pignite": "炒炒猪", + "emboar": "炎武王", + "oshawott": "水水獭", + "dewott": "双刃丸", + "samurott": "大剑鬼", + "patrat": "探探鼠", + "watchog": "步哨鼠", + "lillipup": "小约克", + "herdier": "哈约克", + "stoutland": "长毛狗", + "purrloin": "扒手猫", + "liepard": "酷豹", + "pansage": "花椰猴", + "simisage": "花椰猿", + "pansear": "爆香猴", + "simisear": "爆香猿", + "panpour": "冷水猴", + "simipour": "冷水猿", + "munna": "食梦梦", + "musharna": "梦梦蚀", + "pidove": "豆豆鸽", + "tranquill": "咕咕鸽", + "unfezant": "高傲雉鸡", + "blitzle": "斑斑马", + "zebstrika": "雷电斑马", + "roggenrola": "石丸子", + "boldore": "地幔岩", + "gigalith": "庞岩怪", + "woobat": "滚滚蝙蝠", + "swoobat": "心蝙蝠", + "drilbur": "螺钉地鼠", + "excadrill": "龙头地鼠", + "audino": "差不多娃娃", + "timburr": "搬运小匠", + "gurdurr": "铁骨土人", + "conkeldurr": "修建老匠", + "tympole": "圆蝌蚪", + "palpitoad": "蓝蟾蜍", + "seismitoad": "蟾蜍王", + "throh": "投摔鬼", + "sawk": "打击鬼", + "sewaddle": "虫宝包", + "swadloon": "宝包茧", + "leavanny": "保姆虫", + "venipede": "百足蜈蚣", + "whirlipede": "车轮球", + "scolipede": "蜈蚣王", + "cottonee": "木棉球", + "whimsicott": "风妖精", + "petilil": "百合根娃娃", + "lilligant": "裙儿小姐", + "basculin": "野蛮鲈鱼", + "sandile": "黑眼鳄", + "krokorok": "混混鳄", + "krookodile": "流氓鳄", + "darumaka": "火红不倒翁", + "darmanitan": "达摩狒狒", + "maractus": "沙铃仙人掌", + "dwebble": "石居蟹", + "crustle": "岩殿居蟹", + "scraggy": "滑滑小子", + "scrafty": "头巾混混", + "sigilyph": "象征鸟", + "yamask": "哭哭面具", + "cofagrigus": "死神棺", + "tirtouga": "原盖海龟", + "carracosta": "肋骨海龟", + "archen": "始祖小鸟", + "archeops": "始祖大鸟", + "trubbish": "破破袋", + "garbodor": "灰尘山", + "zorua": "索罗亚", + "zoroark": "索罗亚克", + "minccino": "泡沫栗鼠", + "cinccino": "奇诺栗鼠", + "gothita": "哥德宝宝", + "gothorita": "哥德小童", + "gothitelle": "哥德小姐", + "solosis": "单卵细胞球", + "duosion": "双卵细胞球", + "reuniclus": "人造细胞卵", + "ducklett": "鸭宝宝", + "swanna": "舞天鹅", + "vanillite": "迷你冰", + "vanillish": "多多冰", + "vanilluxe": "双倍多多冰", + "deerling": "四季鹿", + "sawsbuck": "萌芽鹿", + "emolga": "电飞鼠", + "karrablast": "盖盖虫", + "escavalier": "骑士蜗牛", + "foongus": "哎呀球菇", + "amoonguss": "败露球菇", + "frillish": "轻飘飘", + "jellicent": "胖嘟嘟", + "alomomola": "保母曼波", + "joltik": "电电虫", + "galvantula": "电蜘蛛", + "ferroseed": "种子铁球", + "ferrothorn": "坚果哑铃", + "klink": "齿轮儿", + "klang": "齿轮组", + "klinklang": "齿轮怪", + "tynamo": "麻麻小鱼", + "eelektrik": "麻麻鳗", + "eelektross": "麻麻鳗鱼王", + "elgyem": "小灰怪", + "beheeyem": "大宇怪", + "litwick": "烛光灵", + "lampent": "灯火幽灵", + "chandelure": "水晶灯火灵", + "axew": "牙牙", + "fraxure": "斧牙龙", + "haxorus": "双斧战龙", + "cubchoo": "喷嚏熊", + "beartic": "冻原熊", + "cryogonal": "几何雪花", + "shelmet": "小嘴蜗", + "accelgor": "敏捷虫", + "stunfisk": "泥巴鱼", + "mienfoo": "功夫鼬", + "mienshao": "师父鼬", + "druddigon": "赤面龙", + "golett": "泥偶小人", + "golurk": "泥偶巨人", + "pawniard": "驹刀小兵", + "bisharp": "劈斩司令", + "bouffalant": "爆炸头水牛", + "rufflet": "毛头小鹰", + "braviary": "勇士雄鹰", + "vullaby": "秃鹰丫头", + "mandibuzz": "秃鹰娜", + "heatmor": "熔蚁兽", + "durant": "铁蚁", + "deino": "单首龙", + "zweilous": "双首暴龙", + "hydreigon": "三首恶龙", + "larvesta": "燃烧虫", + "volcarona": "火神蛾", + "cobalion": "勾帕路翁", + "terrakion": "代拉基翁", + "virizion": "毕力吉翁", + "tornadus": "龙卷云", + "thundurus": "雷电云", + "reshiram": "莱希拉姆", + "zekrom": "捷克罗姆", + "landorus": "土地云", + "kyurem": "酋雷姆", + "keldeo": "凯路迪欧", + "meloetta": "美洛耶塔", + "genesect": "盖诺赛克特", + "chespin": "哈力栗", + "quilladin": "胖胖哈力", + "chesnaught": "布里卡隆", + "fennekin": "火狐狸", + "braixen": "长尾火狐", + "delphox": "妖火红狐", + "froakie": "呱呱泡蛙", + "frogadier": "呱头蛙", + "greninja": "甲贺忍蛙", + "bunnelby": "掘掘兔", + "diggersby": "掘地兔", + "fletchling": "小箭雀", + "fletchinder": "火箭雀", + "talonflame": "烈箭鹰", + "scatterbug": "粉蝶虫", + "spewpa": "粉蝶蛹", + "vivillon": "彩粉蝶", + "litleo": "小狮狮", + "pyroar": "火炎狮", + "flabebe": "花蓓蓓", + "floette": "花叶蒂", + "florges": "花洁夫人", + "skiddo": "坐骑小羊", + "gogoat": "坐骑山羊", + "pancham": "顽皮熊猫", + "pangoro": "流氓熊猫", + "furfrou": "多丽米亚", + "espurr": "妙喵", + "meowstic": "超能妙喵", + "honedge": "独剑鞘", + "doublade": "双剑鞘", + "aegislash": "坚盾剑怪", + "spritzee": "粉香香", + "aromatisse": "芳香精", + "swirlix": "绵绵泡芙", + "slurpuff": "胖甜妮", + "inkay": "好啦鱿", + "malamar": "乌贼王", + "binacle": "龟脚脚", + "barbaracle": "龟足巨铠", + "skrelp": "垃垃藻", + "dragalge": "毒藻龙", + "clauncher": "铁臂枪虾", + "clawitzer": "钢炮臂虾", + "helioptile": "伞电蜥", + "heliolisk": "光电伞蜥", + "tyrunt": "宝宝暴龙", + "tyrantrum": "怪颚龙", + "amaura": "冰雪龙", + "aurorus": "冰雪巨龙", + "sylveon": "仙子伊布", + "hawlucha": "摔角鹰人", + "dedenne": "咚咚鼠", + "carbink": "小碎钻", + "goomy": "黏黏宝", + "sliggoo": "黏美儿", + "goodra": "黏美龙", + "klefki": "钥圈儿", + "phantump": "小木灵", + "trevenant": "朽木妖", + "pumpkaboo": "南瓜精", + "gourgeist": "南瓜怪人", + "bergmite": "冰宝", + "avalugg": "冰岩怪", + "noibat": "嗡蝠", + "noivern": "音波龙", + "xerneas": "哲尔尼亚斯", + "yveltal": "伊裴尔塔尔", + "zygarde": "基格尔德", + "diancie": "蒂安希", + "hoopa": "胡帕", + "volcanion": "波尔凯尼恩", + "rowlet": "木木枭", + "dartrix": "投羽枭", + "decidueye": "狙射树枭", + "litten": "火斑喵", + "torracat": "炎热喵", + "incineroar": "炽焰咆哮虎", + "popplio": "球球海狮", + "brionne": "花漾海狮", + "primarina": "西狮海壬", + "pikipek": "小笃儿", + "trumbeak": "喇叭啄鸟", + "toucannon": "铳嘴大鸟", + "yungoos": "猫鼬少", + "gumshoos": "猫鼬探长", + "grubbin": "强颚鸡母虫", + "charjabug": "虫电宝", + "vikavolt": "锹农炮虫", + "crabrawler": "好胜蟹", + "crabominable": "好胜毛蟹", + "oricorio": "花舞鸟", + "cutiefly": "萌虻", + "ribombee": "蝶结萌虻", + "rockruff": "岩狗狗", + "lycanroc": "鬃岩狼人", + "wishiwashi": "弱丁鱼", + "mareanie": "好坏星", + "toxapex": "超坏星", + "mudbray": "泥驴仔", + "mudsdale": "重泥挽马", + "dewpider": "滴蛛", + "araquanid": "滴蛛霸", + "fomantis": "伪螳草", + "lurantis": "兰螳花", + "morelull": "睡睡菇", + "shiinotic": "灯罩夜菇", + "salandit": "夜盗火蜥", + "salazzle": "焰后蜥", + "stufful": "童偶熊", + "bewear": "穿著熊", + "bounsweet": "甜竹竹", + "steenee": "甜舞妮", + "tsareena": "甜冷美后", + "comfey": "花疗环环", + "oranguru": "智挥猩", + "passimian": "投掷猴", + "wimpod": "胆小虫", + "golisopod": "具甲武者", + "sandygast": "沙丘娃", + "palossand": "噬沙堡爷", + "pyukumuku": "拳海参", + "type_null": "属性：空", + "silvally": "银伴战兽", + "minior": "小陨星", + "komala": "树枕尾熊", + "turtonator": "爆焰龟兽", + "togedemaru": "托戈德玛尔", + "mimikyu": "谜拟Ｑ", + "bruxish": "磨牙彩皮鱼", + "drampa": "老翁龙", + "dhelmise": "破破舵轮", + "jangmo_o": "心鳞宝", + "hakamo_o": "鳞甲龙", + "kommo_o": "杖尾鳞甲龙", + "tapu_koko": "卡璞・鸣鸣", + "tapu_lele": "卡璞・蝶蝶", + "tapu_bulu": "卡璞・哞哞", + "tapu_fini": "卡璞・鳍鳍", + "cosmog": "科斯莫古", + "cosmoem": "科斯莫姆", + "solgaleo": "索尔迦雷欧", + "lunala": "露奈雅拉", + "nihilego": "虚吾伊德", + "buzzwole": "爆肌蚊", + "pheromosa": "费洛美螂", + "xurkitree": "电束木", + "celesteela": "铁火辉夜", + "kartana": "纸御剑", + "guzzlord": "恶食大王", + "necrozma": "奈克洛兹玛", + "magearna": "玛机雅娜", + "marshadow": "玛夏多", + "poipole": "毒贝比", + "naganadel": "四颚针龙", + "stakataka": "垒磊石", + "blacephalon": "砰头小丑", + "zeraora": "捷拉奥拉", + "meltan": "美录坦", + "melmetal": "美录梅塔", + "grookey": "敲音猴", + "thwackey": "啪咚猴", + "rillaboom": "轰擂金刚猩", + "scorbunny": "炎兔儿", + "raboot": "腾蹴小将", + "cinderace": "闪焰王牌", + "sobble": "泪眼蜥", + "drizzile": "变涩蜥", + "inteleon": "千面避役", + "skwovet": "贪心栗鼠", + "greedent": "藏饱栗鼠", + "rookidee": "稚山雀", + "corvisquire": "蓝鸦", + "corviknight": "钢铠鸦", + "blipbug": "索侦虫", + "dottler": "天罩虫", + "orbeetle": "以欧路普", + "nickit": "偷儿狐", + "thievul": "狐大盗", + "gossifleur": "幼棉棉", + "eldegoss": "白蓬蓬", + "wooloo": "毛辫羊", + "dubwool": "毛毛角羊", + "chewtle": "咬咬龟", + "drednaw": "暴噬龟", + "yamper": "来电汪", + "boltund": "逐电犬", + "rolycoly": "小炭仔", + "carkol": "大炭车", + "coalossal": "巨炭山", + "applin": "啃果虫", + "flapple": "苹裹龙", + "appletun": "丰蜜龙", + "silicobra": "沙包蛇", + "sandaconda": "沙螺蟒", + "cramorant": "古月鸟", + "arrokuda": "刺梭鱼", + "barraskewda": "戽斗尖梭", + "toxel": "毒电婴", + "toxtricity": "颤弦蝾螈", + "sizzlipede": "烧火蚣", + "centiskorch": "焚焰蚣", + "clobbopus": "拳拳蛸", + "grapploct": "八爪武师", + "sinistea": "来悲茶", + "polteageist": "怖思壶", + "hatenna": "迷布莉姆", + "hattrem": "提布莉姆", + "hatterene": "布莉姆温", + "impidimp": "捣蛋小妖", + "morgrem": "诈唬魔", + "grimmsnarl": "长毛巨魔", + "obstagoon": "堵拦熊", + "perrserker": "喵头目", + "cursola": "魔灵珊瑚", + "sirfetchd": "葱游兵", + "mr_rime": "踏冰人偶", + "runerigus": "死神板", + "milcery": "小仙奶", + "alcremie": "霜奶仙", + "falinks": "列阵兵", + "pincurchin": "啪嚓海胆", + "snom": "雪吞虫", + "frosmoth": "雪绒蛾", + "stonjourner": "巨石丁", + "eiscue": "冰砌鹅", + "indeedee": "爱管侍", + "morpeko": "莫鲁贝可", + "cufant": "铜象", + "copperajah": "大王铜象", + "dracozolt": "雷鸟龙", + "arctozolt": "雷鸟海兽", + "dracovish": "鳃鱼龙", + "arctovish": "鳃鱼海兽", + "duraludon": "铝钢龙", + "dreepy": "多龙梅西亚", + "drakloak": "多龙奇", + "dragapult": "多龙巴鲁托", + "zacian": "苍响", + "zamazenta": "藏玛然特", + "eternatus": "无极汰那", + "kubfu": "熊徒弟", + "urshifu": "武道熊师", + "zarude": "萨戮德", + "regieleki": "雷吉艾勒奇", + "regidrago": "雷吉铎拉戈", + "glastrier": "雪暴马", + "spectrier": "灵幽马", + "calyrex": "蕾冠王", + "wyrdeer": "诡角鹿", + "kleavor": "劈斧螳螂", + "ursaluna": "月月熊", + "basculegion": "幽尾玄鱼", + "sneasler": "大狃拉", + "overqwil": "万针鱼", + "enamorus": "眷恋云", + "sprigatito": "新叶喵", + "floragato": "蒂蕾喵", + "meowscarada": "魔幻假面喵", + "fuecoco": "呆火鳄", + "crocalor": "炙烫鳄", + "skeledirge": "骨纹巨声鳄", + "quaxly": "润水鸭", + "quaxwell": "涌跃鸭", + "quaquaval": "狂欢浪舞鸭", + "lechonk": "爱吃豚", + "oinkologne": "飘香豚", + "tarountula": "团珠蛛", + "spidops": "操陷蛛", + "nymble": "豆蟋蟀", + "lokix": "烈腿蝗", + "pawmi": "布拨", + "pawmo": "布土拨", + "pawmot": "巴布土拨", + "tandemaus": "一对鼠", + "maushold": "一家鼠", + "fidough": "狗仔包", + "dachsbun": "麻花犬", + "smoliv": "迷你芙", + "dolliv": "奥利纽", + "arboliva": "奥利瓦", + "squawkabilly": "怒鹦哥", + "nacli": "盐石宝", + "naclstack": "盐石垒", + "garganacl": "盐石巨灵", + "charcadet": "炭小侍", + "armarouge": "红莲铠骑", + "ceruledge": "苍炎刃鬼", + "tadbulb": "光蚪仔", + "bellibolt": "电肚蛙", + "wattrel": "电海燕", + "kilowattrel": "大电海燕", + "maschiff": "偶叫獒", + "mabosstiff": "獒教父", + "shroodle": "滋汁鼹", + "grafaiai": "涂标客", + "bramblin": "纳噬草", + "brambleghast": "怖纳噬草", + "toedscool": "原野水母", + "toedscruel": "陆地水母", + "klawf": "毛崖蟹", + "capsakid": "热辣娃", + "scovillain": "狠辣椒", + "rellor": "虫滚泥", + "rabsca": "虫甲圣", + "flittle": "飘飘雏", + "espathra": "超能艳鸵", + "tinkatink": "小锻匠", + "tinkatuff": "巧锻匠", + "tinkaton": "巨锻匠", + "wiglett": "海地鼠", + "wugtrio": "三海地鼠", + "bombirdier": "下石鸟", + "finizen": "波普海豚", + "palafin": "海豚侠", + "varoom": "噗隆隆", + "revavroom": "普隆隆姆", + "cyclizar": "摩托蜥", + "orthworm": "拖拖蚓", + "glimmet": "晶光芽", + "glimmora": "晶光花", + "greavard": "墓仔狗", + "houndstone": "墓扬犬", + "flamigo": "缠红鹤", + "cetoddle": "走鲸", + "cetitan": "浩大鲸", + "veluza": "轻身鳕", + "dondozo": "吃吼霸", + "tatsugiri": "米立龙", + "annihilape": "弃世猴", + "clodsire": "土王", + "farigiraf": "奇麒麟", + "dudunsparce": "土龙节节", + "kingambit": "仆刀将军", + "great_tusk": "雄伟牙", + "scream_tail": "吼叫尾", + "brute_bonnet": "猛恶菇", + "flutter_mane": "振翼发", + "slither_wing": "爬地翅", + "sandy_shocks": "沙铁皮", + "iron_treads": "铁辙迹", + "iron_bundle": "铁包袱", + "iron_hands": "铁臂膀", + "iron_jugulis": "铁脖颈", + "iron_moth": "铁毒蛾", + "iron_thorns": "铁荆棘", + "frigibax": "凉脊龙", + "arctibax": "冻脊龙", + "baxcalibur": "戟脊龙", + "gimmighoul": "索财灵", + "gholdengo": "赛富豪", + "wo_chien": "古简蜗", + "chien_pao": "古剑豹", + "ting_lu": "古鼎鹿", + "chi_yu": "古玉鱼", + "roaring_moon": "轰鸣月", + "iron_valiant": "铁武者", + "koraidon": "故勒顿", + "miraidon": "密勒顿", + "walking_wake": "波荡水", + "iron_leaves": "铁斑叶", + "dipplin": "裹蜜虫", + "poltchageist": "斯魔茶", + "sinistcha": "来悲粗茶", + "okidogi": "够赞狗", + "munkidori": "愿增猿", + "fezandipiti": "吉雉鸡", + "ogerpon": "厄诡椪", + "archaludon": "铝钢桥龙", + "hydrapple": "蜜集大蛇", + "gouging_fire": "破空焰", + "raging_bolt": "猛雷鼓", + "iron_boulder": "铁磐岩", + "iron_crown": "铁头壳", + "terapagos": "太乐巴戈斯", + "pecharunt": "桃歹郎", + "alola_rattata": "阿罗拉拉达", + "alola_raticate": "阿罗拉拉达", + "alola_raichu": "阿罗拉雷丘", + "alola_sandshrew": "阿罗拉穿山鼠", + "alola_sandslash": "阿罗拉穿山王", + "alola_vulpix": "阿罗拉六尾", + "alola_ninetales": "阿罗拉九尾", + "alola_diglett": "阿罗拉地鼠", + "alola_dugtrio": "阿罗拉三地鼠", + "alola_meowth": "阿罗拉喵喵", + "alola_persian": "阿罗拉猫老大", + "alola_geodude": "阿罗拉小拳石", + "alola_graveler": "阿罗拉隆隆石", + "alola_golem": "阿罗拉隆隆岩", + "alola_grimer": "阿罗拉臭泥", + "alola_muk": "阿罗拉臭臭泥", + "alola_exeggutor": "阿罗拉椰蛋树", + "alola_marowak": "阿罗拉嘎啦嘎啦", + "eternal_floette": "永恒之花花叶蒂", + "galar_meowth": "伽勒尔喵喵", + "galar_ponyta": "伽勒尔小火马", + "galar_rapidash": "伽勒尔烈焰马", + "galar_slowpoke": "伽勒尔呆呆兽", + "galar_slowbro": "伽勒尔呆壳兽", + "galar_farfetchd": "伽勒尔大葱鸭", + "galar_weezing": "伽勒尔双弹瓦斯", + "galar_mr_mime": "伽勒尔魔墙人偶", + "galar_articuno": "伽勒尔急冻鸟", + "galar_zapdos": "伽勒尔闪电鸟", + "galar_moltres": "伽勒尔火焰鸟", + "galar_slowking": "伽勒尔呆呆王", + "galar_corsola": "伽勒尔太阳珊瑚", + "galar_zigzagoon": "伽勒尔蛇纹熊", + "galar_linoone": "伽勒尔直冲熊", + "galar_darumaka": "伽勒尔火红不倒翁", + "galar_darmanitan": "伽勒尔达摩狒狒", + "galar_yamask": "伽勒尔哭哭面具", + "galar_stunfisk": "伽勒尔泥巴鱼", + "hisui_growlithe": "洗翠卡蒂狗", + "hisui_arcanine": "洗翠风速狗", + "hisui_voltorb": "洗翠霹雳电球", + "hisui_electrode": "洗翠顽皮雷弹", + "hisui_typhlosion": "洗翠火暴兽", + "hisui_qwilfish": "洗翠千针鱼", + "hisui_sneasel": "洗翠狃拉", + "hisui_samurott": "洗翠大剑鬼", + "hisui_lilligant": "洗翠裙儿小姐", + "hisui_zorua": "洗翠索罗亚", + "hisui_zoroark": "洗翠索罗亚克", + "hisui_braviary": "洗翠勇士雄鹰", + "hisui_sliggoo": "洗翠黏美儿", + "hisui_goodra": "洗翠黏美龙", + "hisui_avalugg": "洗翠冰岩怪", + "hisui_decidueye": "洗翠狙射树枭", + "paldea_tauros": "帕底亚肯泰罗", + "paldea_wooper": "帕底亚乌波", + "bloodmoon_ursaluna": "血月月月熊", +} as const; \ No newline at end of file diff --git a/src/locales/zh_CN/starter-select-ui-handler.ts b/src/locales/zh_CN/starter-select-ui-handler.ts new file mode 100644 index 000000000..9d3a076e5 --- /dev/null +++ b/src/locales/zh_CN/starter-select-ui-handler.ts @@ -0,0 +1,32 @@ +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +/** + * The menu namespace holds most miscellaneous text that isn't directly part of the game's + * contents or directly related to Pokemon data. This includes menu navigation, settings, + * account interactions, descriptive text, etc. + */ +export const starterSelectUiHandler: SimpleTranslationEntries = { + "confirmStartTeam":'使用这些宝可梦开始游戏吗？', + "growthRate": "成长速度：", + "ability": "特性：", + "passive": "被动：", + "nature": "性格：", + "eggMoves": '蛋招式', + "start": "开始", + "addToParty": "加入队伍", + "toggleIVs": '切换个体值', + "manageMoves": '管理招式', + "useCandies": '使用糖果', + "selectMoveSwapOut": "选择要替换的招式。", + "selectMoveSwapWith": "选择要替换成的招式", + "unlockPassive": "解锁被动", + "reduceCost": "降低花费", + "cycleShiny": "R: 切换闪光", + "cycleForm": 'F: 切换形态', + "cycleGender": 'G: 切换性别', + "cycleAbility": 'E: 切换特性', + "cycleNature": 'N: 切换性格', + "cycleVariant": 'V: 切换变种', + "enablePassive": "启用被动", + "disablePassive": "禁用被动" +} \ No newline at end of file diff --git a/src/locales/zh_CN/tutorial.ts b/src/locales/zh_CN/tutorial.ts new file mode 100644 index 000000000..3362fd147 --- /dev/null +++ b/src/locales/zh_CN/tutorial.ts @@ -0,0 +1,42 @@ +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +export const tutorial: SimpleTranslationEntries = { + "intro": `欢迎来到PokéRogue！这是一款以战斗为核心的融合了roguelite元素的宝可梦同人游戏。 + $本游戏未进行商业化，我们没有Pokémon或Pokémon使用的版权资产的所有权。 + $游戏仍在开发中，但已可完整游玩。\n如需报告错误，请使用 Discord 社区。 + $如果游戏运行缓慢，请确保在浏览器设置中打开了“硬件加速”。`, + + "accessMenu": `在等待输入时，按 M 或 Escape 键可访问菜单。\n菜单包含设置和各种功能。`, + + "menu": `在此菜单中，您可以访问设置。 + $在设置中，您可以更改游戏速度、窗口样式和其他选项。 + $这里还有各种其他功能，请务必全部查看！`, + + "starterSelect": `在此页面中，您可以选择您的初始宝可梦。\n这些是您最初的队伍成员。 + $每个初始宝可梦都有一个费用。您的队伍最多可以拥有\n6 名成员，只要总费用不超过 10。 + $您还可以根据\n您捕获或孵化的变种选择性别、特性和形态。 + $一个物种的个体值是您捕获或孵化的所有宝可梦中最好的，所以尽量获得更多同种宝可梦！`, + + "pokerus": `每天随机 3 个可选的初始宝可梦会有紫色边框。 + $如果您看到您拥有的初始宝可梦带有紫色边框，\n请尝试将其添加到您的队伍中。请务必查看其概况！`, + + "statChange": `只要您的宝可梦没有被召回，属性变化就会在战斗中持续存在。 + $在训练家战斗之前和进入新的宝可梦群落之前，您的宝可梦会被召回。 + $您还可以通过按住 C 或 Shift 键来查看场上宝可梦的能力变化。`, + + "selectItem": `每次战斗后，您都可以选择 3 个随机物品。\n您只能选择其中一个。 + $这些物品包括消耗品、宝可梦携带物品和永久被动道具。 + $大多数非消耗品的效果会以各种方式叠加。 + $某些物品只有在可以使用时才会出现，例如进化物品。 + $您还可以使用转移选项在宝可梦之间转移携带物品。 + $一旦您获得了携带物品，转移选项就会出现在右下角。 + $您可以用金钱购买消耗品，并且随着您游戏的深入，将会有更多种类的消耗品可供选择。 + $请务必在选择随机物品之前购买这些消耗品，因为一旦您选择，游戏就会进入下一场战斗。`, + + "eggGacha": `在此页面中，您可以使用您的兑换券兑换\n宝可梦蛋。 + $蛋需要孵化，并且在每场战斗后都会减少孵化周期。稀有蛋需要更长时间才能孵化。 + $孵化的宝可梦不会被添加到您的队伍中，它们将被添加到您的初始宝可梦中。 + $从蛋中孵化的宝可梦通常比\n野生宝可梦具有更好的个体值。 + $有些宝可梦只能从蛋中获得。 + $有 3 种不同的扭蛋机可供选择，每种扭蛋机都有不同的\n奖励，请选择最适合您的！`, +} as const; \ No newline at end of file diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index c119ba9c4..ba009cb7a 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -19,8 +19,9 @@ import { VoucherType } from '../system/voucher'; import { FormChangeItem, SpeciesFormChangeItemTrigger } from '../data/pokemon-forms'; import { Nature } from '#app/data/nature'; import { BattlerTagType } from '#app/data/enums/battler-tag-type'; +import * as Overrides from '../overrides'; +import { ModifierType, modifierTypes } from './modifier-type'; -type ModifierType = ModifierTypes.ModifierType; export type ModifierPredicate = (modifier: Modifier) => boolean; const iconOverflowIndex = 24; @@ -2175,4 +2176,63 @@ export class EnemyFusionChanceModifier extends EnemyPersistentModifier { getMaxStackCount(scene: BattleScene): integer { return 10; } +} + +/** + * Uses override from overrides.ts to set PersistentModifiers for starting a new game + * @param scene current BattleScene + * @param player is this for player for enemy + */ +export function overrideModifiers(scene: BattleScene, player: boolean = true): void { + const modifierOverride = player ? Overrides.STARTING_MODIFIER_OVERRIDE : Overrides.OPP_MODIFIER_OVERRIDE; + if (!modifierOverride || modifierOverride.length === 0 || !scene) return; // if no override, do nothing + // if it's the opponent, we clear all his current modifiers to avoid stacking + if (!player) { + scene.clearEnemyModifiers(); + } + // we loop through all the modifier name given in the override file + modifierOverride.forEach(item => { + const modifierName = item.name; + const qty = item.count || 1; + if (!modifierTypes.hasOwnProperty(modifierName)) return; // if the modifier does not exist, we skip it + const modifierType: ModifierType = modifierTypes[modifierName](); + const modifier: PersistentModifier = modifierType.withIdFromFunc(modifierTypes[modifierName]).newModifier() as PersistentModifier; + modifier.stackCount = qty; + if (player) { + scene.addModifier(modifier, true, false, false, true); + } else { + scene.addEnemyModifier(modifier, true, true); + } + }); +} + +/** + * Uses override from overrides.ts to set PokemonHeldItemModifiers for starting a new game + * @param scene current BattleScene + * @param player is this for player for enemy + */ +export function overrideHeldItems(scene: BattleScene, pokemon: Pokemon, player: boolean = true): void { + const heldItemsOverride = player ? Overrides.STARTING_HELD_ITEMS_OVERRIDE : Overrides.OPP_HELD_ITEMS_OVERRIDE; + if (!heldItemsOverride || heldItemsOverride.length === 0 || !scene) return; // if no override, do nothing + // we loop through all the itemName given in the override file + heldItemsOverride.forEach(item => { + const itemName = item.name; + const qty = item.count || 1; + if (!modifierTypes.hasOwnProperty(itemName)) return; // if the item does not exist, we skip it + const modifierType: ModifierType = modifierTypes[itemName](); // we retrieve the item in the list + var itemModifier: PokemonHeldItemModifier; + if (modifierType instanceof ModifierTypes.ModifierTypeGenerator) { + itemModifier = modifierType.generateType(null, [item.type]).withIdFromFunc(modifierTypes[itemName]).newModifier(pokemon) as PokemonHeldItemModifier; + } else { + itemModifier = modifierType.withIdFromFunc(modifierTypes[itemName]).newModifier(pokemon) as PokemonHeldItemModifier; + } + // we create the item + itemModifier.pokemonId = pokemon.id; // we assign the created item to the pokemon + itemModifier.stackCount = qty; // we say how many items we want + if (player) { + scene.addModifier(itemModifier, true, false, false, true); + } else { + scene.addEnemyModifier(itemModifier, true, true); + } + }); } \ No newline at end of file diff --git a/src/overrides.ts b/src/overrides.ts index 7608275ea..2b6106a74 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -3,26 +3,84 @@ import { Abilities } from "./data/enums/abilities"; import { Biome } from "./data/enums/biome"; import { Moves } from "./data/enums/moves"; import { WeatherType } from "./data/weather"; +import { Variant } from './data/variant'; +import { BerryType } from './data/berry'; +import { TempBattleStat } from './data/temp-battle-stat'; +import { Nature } from './data/nature'; +import { Type } from './data/type'; +import { Stat } from './data/pokemon-stat'; -export const SEED_OVERRIDE = ''; -export const STARTER_SPECIES_OVERRIDE = 0; -export const STARTER_FORM_OVERRIDE = 0; -export const STARTING_LEVEL_OVERRIDE = 0; -export const STARTING_WAVE_OVERRIDE = 0; -export const STARTING_BIOME_OVERRIDE = Biome.TOWN; -export const STARTING_MONEY_OVERRIDE = 0; -export const WEATHER_OVERRIDE = WeatherType.NONE; -export const DOUBLE_BATTLE_OVERRIDE = false; +/** + * Overrides for testing different in game situations + * if an override name starts with "STARTING", it will apply when a new run begins + */ -export const ABILITY_OVERRIDE = Abilities.NONE; -export const PASSIVE_ABILITY_OVERRIDE = Abilities.NONE; -export const MOVE_OVERRIDE = Moves.NONE; -export const MOVE_OVERRIDE_2 = Moves.NONE; -export const OPP_SPECIES_OVERRIDE = 0; -export const OPP_ABILITY_OVERRIDE = Abilities.NONE; +/** + * OVERALL OVERRIDES + */ + +// a specific seed (default: a random string of 24 characters) +export const SEED_OVERRIDE: string = ''; +export const WEATHER_OVERRIDE: WeatherType = WeatherType.NONE; +export const DOUBLE_BATTLE_OVERRIDE: boolean = false; +export const STARTING_WAVE_OVERRIDE: integer = 0; +export const STARTING_BIOME_OVERRIDE: Biome = Biome.TOWN; +// default 1000 +export const STARTING_MONEY_OVERRIDE: integer = 0; + +/** + * PLAYER OVERRIDES + */ + +// forms can be found in pokemon-species.ts +export const STARTER_FORM_OVERRIDE: integer = 0; +// default 5 or 20 for Daily +export const STARTING_LEVEL_OVERRIDE: integer = 0; +export const ABILITY_OVERRIDE: Abilities = Abilities.NONE; +export const PASSIVE_ABILITY_OVERRIDE: Abilities = Abilities.NONE; +export const MOVESET_OVERRIDE: Array = []; + +/** + * OPPONENT / ENEMY OVERRIDES + */ + +export const OPP_ABILITY_OVERRIDE: Abilities = Abilities.NONE; export const OPP_PASSIVE_ABILITY_OVERRIDE = Abilities.NONE; -export const OPP_MOVE_OVERRIDE = Moves.NONE; -export const OPP_MOVE_OVERRIDE_2 = Moves.NONE; +export const OPP_MOVESET_OVERRIDE: Array = []; +export const OPP_SHINY_OVERRIDE: boolean = false; +export const OPP_VARIANT_OVERRIDE: Variant = 0; -export const OPP_SHINY_OVERRIDE = false; -export const OPP_VARIANT_OVERRIDE = 0; +/** + * SPECIES OVERRIDE + * will only apply to the first starter in your party or each enemy pokemon + * default is 0 to not override + * @example SPECIES_OVERRIDE = Species.Bulbasaur; + */ +export const STARTER_SPECIES_OVERRIDE: Species | integer = 0; +export const OPP_SPECIES_OVERRIDE: Species | integer = 0; + +/** + * MODIFIER / ITEM OVERRIDES + * if count is not provided, it will default to 1 + * @example Modifier Override [{name: "EXP_SHARE", count: 2}] + * @example Held Item Override [{name: "LUCKY_EGG"}] + * + * Some items are generated based on a sub-type (i.e. berries), to override those: + * @example [{name: "BERRY", count: 5, type: BerryType.SITRUS}] + * types are listed in interface below + * - TempBattleStat is for TEMP_STAT_BOOSTER / X Items (Dire hit is separate) + * - Stat is for BASE_STAT_BOOSTER / Vitamin + * - Nature is for MINT + * - Type is for TERA_SHARD or ATTACK_TYPE_BOOSTER (type boosting items i.e Silk Scarf) + * - BerryType is for BERRY + */ +interface ModifierOverride { + name: string, + count?: integer + type?: TempBattleStat|Stat|Nature|Type|BerryType +} +export const STARTING_MODIFIER_OVERRIDE: Array = []; +export const OPP_MODIFIER_OVERRIDE: Array = []; + +export const STARTING_HELD_ITEMS_OVERRIDE: Array = []; +export const OPP_HELD_ITEMS_OVERRIDE: Array = []; diff --git a/src/phases.ts b/src/phases.ts index 9595ab9c3..e2532c1c0 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -6,7 +6,7 @@ import { allMoves, applyMoveAttrs, BypassSleepAttr, ChargeAttr, applyFilteredMov import { Mode } from './ui/ui'; import { Command } from "./ui/command-ui-handler"; import { Stat } from "./data/pokemon-stat"; -import { BerryModifier, ContactHeldItemTransferChanceModifier, EnemyAttackStatusEffectChanceModifier, EnemyPersistentModifier, EnemyStatusEffectHealChanceModifier, EnemyTurnHealModifier, ExpBalanceModifier, ExpBoosterModifier, ExpShareModifier, ExtraModifierModifier, FlinchChanceModifier, FusePokemonModifier, HealingBoosterModifier, HitHealModifier, LapsingPersistentModifier, MapModifier, Modifier, MultipleParticipantExpBonusModifier, PersistentModifier, PokemonExpBoosterModifier, PokemonHeldItemModifier, PokemonInstantReviveModifier, SwitchEffectTransferModifier, TempBattleStatBoosterModifier, TurnHealModifier, TurnHeldItemTransferModifier, MoneyMultiplierModifier, MoneyInterestModifier, IvScannerModifier, LapsingPokemonHeldItemModifier, PokemonMultiHitModifier, PokemonMoveAccuracyBoosterModifier } from "./modifier/modifier"; +import { BerryModifier, ContactHeldItemTransferChanceModifier, EnemyAttackStatusEffectChanceModifier, EnemyPersistentModifier, EnemyStatusEffectHealChanceModifier, EnemyTurnHealModifier, ExpBalanceModifier, ExpBoosterModifier, ExpShareModifier, ExtraModifierModifier, FlinchChanceModifier, FusePokemonModifier, HealingBoosterModifier, HitHealModifier, LapsingPersistentModifier, MapModifier, Modifier, MultipleParticipantExpBonusModifier, PersistentModifier, PokemonExpBoosterModifier, PokemonHeldItemModifier, PokemonInstantReviveModifier, SwitchEffectTransferModifier, TempBattleStatBoosterModifier, TurnHealModifier, TurnHeldItemTransferModifier, MoneyMultiplierModifier, MoneyInterestModifier, IvScannerModifier, LapsingPokemonHeldItemModifier, PokemonMultiHitModifier, PokemonMoveAccuracyBoosterModifier, overrideModifiers, overrideHeldItems } from "./modifier/modifier"; import PartyUiHandler, { PartyOption, PartyUiMode } from "./ui/party-ui-handler"; import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getPokeballTintColor, PokeballType } from "./data/pokeball"; import { CommonAnim, CommonBattleAnim, MoveAnim, initMoveAnim, loadMoveAnimAssets } from "./data/battle-anims"; @@ -23,7 +23,7 @@ import { FusePokemonModifierType, ModifierPoolType, ModifierType, ModifierTypeFu import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; import { BattlerTagLapseType, EncoreTag, HideSpriteTag as HiddenTag, ProtectedTag, TrappedTag } from "./data/battler-tags"; import { BattlerTagType } from "./data/enums/battler-tag-type"; -import { getPokemonMessage } from "./messages"; +import { getPokemonMessage, getPokemonPrefix } from "./messages"; import { Starter } from "./ui/starter-select-ui-handler"; import { Gender } from "./data/gender"; import { Weather, WeatherType, getRandomWeatherType, getTerrainBlockMessage, getWeatherDamageMessage, getWeatherLapseMessage } from "./data/weather"; @@ -58,7 +58,7 @@ import { GameModes, gameModes } from "./game-mode"; import PokemonSpecies, { getPokemonSpecies, getPokemonSpeciesForm, speciesStarters } from "./data/pokemon-species"; import i18next from './plugins/i18n'; import { Abilities } from "./data/enums/abilities"; -import { STARTER_FORM_OVERRIDE, STARTER_SPECIES_OVERRIDE } from './overrides'; +import * as Overrides from './overrides'; export class LoginPhase extends Phase { private showText: boolean; @@ -487,12 +487,12 @@ export class SelectStarterPhase extends Phase { const party = this.scene.getParty(); const loadPokemonAssets: Promise[] = []; starters.forEach((starter: Starter, i: integer) => { - if (!i && STARTER_SPECIES_OVERRIDE) - starter.species = getPokemonSpecies(STARTER_SPECIES_OVERRIDE as Species); + if (!i && Overrides.STARTER_SPECIES_OVERRIDE) + starter.species = getPokemonSpecies(Overrides.STARTER_SPECIES_OVERRIDE as Species); const starterProps = this.scene.gameData.getSpeciesDexAttrProps(starter.species, starter.dexAttr); let starterFormIndex = Math.min(starterProps.formIndex, Math.max(starter.species.forms.length - 1, 0)); - if (!i && STARTER_SPECIES_OVERRIDE) - starterFormIndex = STARTER_FORM_OVERRIDE; + if (!i && Overrides.STARTER_SPECIES_OVERRIDE) + starterFormIndex = Overrides.STARTER_FORM_OVERRIDE; const starterGender = starter.species.malePercent !== null ? !starterProps.female ? Gender.MALE : Gender.FEMALE : Gender.GENDERLESS; @@ -510,6 +510,8 @@ export class SelectStarterPhase extends Phase { party.push(starterPokemon); loadPokemonAssets.push(starterPokemon.loadAssets()); }); + overrideModifiers(this.scene); + overrideHeldItems(this.scene, party[0]); Promise.all(loadPokemonAssets).then(() => { SoundFade.fadeOut(this.scene, this.scene.sound.get('menu'), 500, true); this.scene.time.delayedCall(500, () => this.scene.playBgm()); @@ -2046,7 +2048,7 @@ export class TurnEndPhase extends FieldPhase { pokemon.lapseTags(BattlerTagLapseType.TURN_END); if (pokemon.summonData.disabledMove && !--pokemon.summonData.disabledTurns) { - this.scene.pushPhase(new MessagePhase(this.scene, i18next.t('battle:notDisabled', { moveName: allMoves[pokemon.summonData.disabledMove].name }))); + this.scene.pushPhase(new MessagePhase(this.scene, i18next.t('battle:notDisabled', { pokemonName: `${getPokemonPrefix(pokemon)}${pokemon.name}`, moveName: allMoves[pokemon.summonData.disabledMove].name }))); pokemon.summonData.disabledMove = Moves.NONE; } @@ -4544,6 +4546,48 @@ export class AddEnemyBuffModifierPhase extends Phase { } } +/** + * Cures the party of all non-volatile status conditions, shows a message + * @param {BattleScene} scene The current scene + * @param {Pokemon} user The user of the move that cures the party + * @param {string} message The message that should be displayed + * @param {Abilities} abilityCondition Pokemon with this ability will not be affected ie. Soundproof + */ +export class PartyStatusCurePhase extends BattlePhase { + private user: Pokemon; + private message: string; + private abilityCondition: Abilities; + + constructor(scene: BattleScene, user: Pokemon, message: string, abilityCondition: Abilities) { + super(scene); + + this.user = user; + this.message = message; + this.abilityCondition = abilityCondition; + } + + start() { + super.start(); + for (let pokemon of this.scene.getParty()) { + if (!pokemon.isOnField() || pokemon === this.user) { + pokemon.resetStatus(false); + pokemon.updateInfo(true); + } else { + if (!pokemon.hasAbility(this.abilityCondition)) { + pokemon.resetStatus(); + pokemon.updateInfo(true); + } else { + // Manually show ability bar, since we're not hooked into the targeting system + pokemon.scene.unshiftPhase(new ShowAbilityPhase(pokemon.scene, pokemon.id, pokemon.getPassiveAbility()?.id === this.abilityCondition)); + } + } + } + if (this.message) + this.scene.queueMessage(this.message); + this.end(); + } +} + export class PartyHealPhase extends BattlePhase { private resumeBgm: boolean; diff --git a/src/plugins/i18n.ts b/src/plugins/i18n.ts index 6265d35cf..91006979b 100644 --- a/src/plugins/i18n.ts +++ b/src/plugins/i18n.ts @@ -6,6 +6,7 @@ import { enConfig } from '#app/locales/en/config.js'; import { esConfig } from '#app/locales/es/config.js'; import { frConfig } from '#app/locales/fr/config.js'; import { itConfig } from '#app/locales/it/config.js'; +import { zhCnConfig } from '#app/locales/zh_CN/config.js'; export interface SimpleTranslationEntries { [key: string]: string @@ -58,7 +59,7 @@ export function initI18n(): void { i18next.use(LanguageDetector).init({ lng: lang, fallbackLng: 'en', - supportedLngs: ['en', 'es', 'fr', 'it', 'de'], + supportedLngs: ['en', 'es', 'fr', 'it', 'de', 'zh_CN'], debug: true, interpolation: { escapeValue: false, @@ -78,6 +79,9 @@ export function initI18n(): void { }, de: { ...deConfig + }, + zh_CN: { + ...zhCnConfig } }, }); diff --git a/src/system/game-data.ts b/src/system/game-data.ts index 125720475..37f506ad3 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -420,7 +420,7 @@ export class GameData { .then(response => response.text()) .then(response => { if (!response.length || response[0] !== '{') { - if (response.startsWith('failed to open save file')) { + if (response.startsWith('sql: no rows in result set')) { this.scene.queueMessage('Save data could not be found. If this is a new account, you can safely ignore this message.', null, true); return resolve(true); } else if (response.indexOf('Too many connections') > -1) { diff --git a/src/system/pokemon-data.ts b/src/system/pokemon-data.ts index b9589020e..dfbb9be57 100644 --- a/src/system/pokemon-data.ts +++ b/src/system/pokemon-data.ts @@ -11,6 +11,7 @@ import Pokemon, { EnemyPokemon, PokemonMove, PokemonSummonData } from "../field/ import { TrainerSlot } from "../data/trainer-config"; import { Moves } from "../data/enums/moves"; import { Variant } from "#app/data/variant"; +import { loadBattlerTag } from '../data/battler-tags'; export default class PokemonData { public id: integer; @@ -112,9 +113,18 @@ export default class PokemonData { if (!forHistory && source.summonData) { this.summonData.battleStats = source.summonData.battleStats; this.summonData.moveQueue = source.summonData.moveQueue; - this.summonData.tags = []; // TODO - this.summonData.moveset = source.summonData.moveset; + this.summonData.disabledMove = source.summonData.disabledMove; + this.summonData.disabledTurns = source.summonData.disabledTurns; + this.summonData.abilitySuppressed = source.summonData.abilitySuppressed; + + this.summonData.ability = source.summonData.ability; + this.summonData.moveset = source.summonData.moveset?.map(m => PokemonMove.loadMove(m)); this.summonData.types = source.summonData.types; + + if (source.summonData.tags) + this.summonData.tags = source.summonData.tags?.map(t => loadBattlerTag(t)); + else + this.summonData.tags = []; } } } diff --git a/src/system/settings.ts b/src/system/settings.ts index 5f4ab2fce..42a5e6719 100644 --- a/src/system/settings.ts +++ b/src/system/settings.ts @@ -142,6 +142,14 @@ export function setSetting(scene: BattleScene, setting: Setting, value: integer) } else return false; break; + case Setting.Gamepad_Support: + // if we change the value of the gamepad support, we call a method in the inputController to + // activate or deactivate the controller listener + scene.inputController.setGamepadSupport(settingOptions[setting][value] !== 'Disabled'); + break; + case Setting.Swap_A_and_B: + scene.abSwapped = settingOptions[setting][value] !== 'Disabled'; + break; case Setting.Touch_Controls: scene.enableTouchControls = settingOptions[setting][value] !== 'Disabled' && hasTouchscreen(); const touchControls = document.getElementById('touchControls'); @@ -186,6 +194,10 @@ export function setSetting(scene: BattleScene, setting: Setting, value: integer) label: 'Deutsch', handler: () => changeLocaleHandler('de') }, + { + label: '简体中文', + handler: () => changeLocaleHandler('zh_CN') + }, { label: 'Cancel', handler: () => cancelHandler() diff --git a/src/ui/battle-info.ts b/src/ui/battle-info.ts index 2ca0457c8..f2e48911e 100644 --- a/src/ui/battle-info.ts +++ b/src/ui/battle-info.ts @@ -417,7 +417,10 @@ export default class BattleInfo extends Phaser.GameObjects.Container { if (nameUpdated || teraTypeUpdated) { this.splicedIcon.setVisible(!!pokemon.fusionSpecies); + + this.teraIcon.setPositionRelative(this.nameText, this.nameText.displayWidth + this.genderText.displayWidth + 1, 2); this.splicedIcon.setPositionRelative(this.nameText, this.nameText.displayWidth + this.genderText.displayWidth + 1 + (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0), 1.5); + this.shinyIcon.setPositionRelative(this.nameText, this.nameText.displayWidth + this.genderText.displayWidth + 1 + (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0) + (this.splicedIcon.visible ? this.splicedIcon.displayWidth + 1 : 0), 2.5); } if (this.lastStatus !== (pokemon.status?.effect || StatusEffect.NONE)) { diff --git a/src/ui/settings-ui-handler.ts b/src/ui/settings-ui-handler.ts index 87892bb6d..7c045df4d 100644 --- a/src/ui/settings-ui-handler.ts +++ b/src/ui/settings-ui-handler.ts @@ -125,13 +125,25 @@ export default class SettingsUiHandler extends UiHandler { return true; } + /** + * Processes input from a specified button. + * This method handles navigation through a UI menu, including movement through menu items + * and handling special actions like cancellation. Each button press may adjust the cursor + * position or the menu scroll, and plays a sound effect if the action was successful. + * + * @param button - The button pressed by the user. + * @returns `true` if the action associated with the button was successfully processed, `false` otherwise. + */ processInput(button: Button): boolean { const ui = this.getUi(); + // Defines the maximum number of rows that can be displayed on the screen. + const rowsToDisplay = 9; let success = false; if (button === Button.CANCEL) { success = true; + // Reverts UI to its previous state on cancel. this.scene.ui.revertMode(); } else { const cursor = this.cursor + this.scrollCursor; @@ -142,21 +154,36 @@ export default class SettingsUiHandler extends UiHandler { success = this.setCursor(this.cursor - 1); else success = this.setScrollCursor(this.scrollCursor - 1); + } else { + // When at the top of the menu and pressing UP, move to the bottommost item. + // First, set the cursor to the last visible element, preparing for the scroll to the end. + const successA = this.setCursor(rowsToDisplay - 1); + // Then, adjust the scroll to display the bottommost elements of the menu. + const successB = this.setScrollCursor(this.optionValueLabels.length - rowsToDisplay); + success = successA && successB; // success is just there to play the little validation sound effect } break; case Button.DOWN: - if (cursor < this.optionValueLabels.length) { - if (this.cursor < 8) + if (cursor < this.optionValueLabels.length - 1) { + if (this.cursor < rowsToDisplay - 1) // if the visual cursor is in the frame of 0 to 8 success = this.setCursor(this.cursor + 1); - else if (this.scrollCursor < this.optionValueLabels.length - 9) + else if (this.scrollCursor < this.optionValueLabels.length - rowsToDisplay) success = this.setScrollCursor(this.scrollCursor + 1); + } else { + // When at the bottom of the menu and pressing DOWN, move to the topmost item. + // First, set the cursor to the first visible element, resetting the scroll to the top. + const successA = this.setCursor(0); + // Then, reset the scroll to start from the first element of the menu. + const successB = this.setScrollCursor(0); + success = successA && successB; // Indicates a successful cursor and scroll adjustment. } break; case Button.LEFT: - if (this.optionCursors[cursor]) + if (this.optionCursors[cursor]) // Moves the option cursor left, if possible. success = this.setOptionCursor(cursor, this.optionCursors[cursor] - 1, true); break; case Button.RIGHT: + // Moves the option cursor right, if possible. if (this.optionCursors[cursor] < this.optionValueLabels[cursor].length - 1) success = this.setOptionCursor(cursor, this.optionCursors[cursor] + 1, true); break; @@ -171,6 +198,7 @@ export default class SettingsUiHandler extends UiHandler { } } + // Plays a select sound effect if an action was successfully processed. if (success) ui.playSelect(); diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index ade04e223..4bfc4e35b 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -1098,7 +1098,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { // starterMoveData doesn't have base form moves or is using the single form format if (!this.scene.gameData.starterData[speciesId].moveset || Array.isArray(this.scene.gameData.starterData[speciesId].moveset)) this.scene.gameData.starterData[speciesId].moveset = { [props.formIndex]: this.starterMoveset.slice(0) as StarterMoveset }; - const starterMoveData = this.scene.gameData.starterData[speciesId].moveset[props.formIndex]; + const starterMoveData = this.scene.gameData.starterData[speciesId].moveset; // starterMoveData doesn't have active form moves if (!starterMoveData.hasOwnProperty(props.formIndex)) diff --git a/src/utils.ts b/src/utils.ts index 01656b8ed..25391a890 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -220,10 +220,9 @@ export function executeIf(condition: boolean, promiseFunc: () => Promise): } export const sessionIdKey = 'pokerogue_sessionId'; -export const isLocal = window.location.hostname === 'localhost'; +export const isLocal = window.location.hostname === 'localhost' || window.location.hostname === ''; export const serverUrl = isLocal ? 'http://localhost:8001' : ''; export const apiUrl = isLocal ? serverUrl : 'https://api.pokerogue.net'; -export const fallbackApiUrl = isLocal ? serverUrl : 'api'; export function setCookie(cName: string, cValue: string): void { const expiration = new Date(); @@ -244,7 +243,7 @@ export function getCookie(cName: string): string { return ''; } -export function apiFetch(path: string, authed: boolean = false, fallback: boolean = false): Promise { +export function apiFetch(path: string, authed: boolean = false): Promise { return new Promise((resolve, reject) => { const request = {}; if (authed) { @@ -252,22 +251,13 @@ export function apiFetch(path: string, authed: boolean = false, fallback: boolea if (sId) request['headers'] = { 'Authorization': sId }; } - fetch(`${!fallback ? apiUrl : fallbackApiUrl}/${path}`, request) - .then(response => { - if (!response.ok && response.status === 404 && !fallback) - return apiFetch(path, authed, true).then(res => resolve(res)); - resolve(response); - }) - .catch(err => { - if (fallback) - reject(err); - else - apiFetch(path, authed, true).then(res => resolve(res)); - }); + fetch(`${apiUrl}/${path}`, request) + .then(response => resolve(response)) + .catch(err => reject(err)); }); } -export function apiPost(path: string, data?: any, contentType: string = 'application/json', authed: boolean = false, fallback: boolean = false): Promise { +export function apiPost(path: string, data?: any, contentType: string = 'application/json', authed: boolean = false): Promise { return new Promise((resolve, reject) => { const headers = { 'Accept': contentType, @@ -278,14 +268,9 @@ export function apiPost(path: string, data?: any, contentType: string = 'applica if (sId) headers['Authorization'] = sId; } - fetch(`${!fallback ? apiUrl : fallbackApiUrl}/${path}`, { method: 'POST', headers: headers, body: data }) + fetch(`${apiUrl}/${path}`, { method: 'POST', headers: headers, body: data }) .then(response => resolve(response)) - .catch(err => { - if (fallback) - reject(err); - else - apiPost(path, data, contentType, authed, true).then(res => resolve(res)); - }); + .catch(err => reject(err)); }); }