diff --git a/README.md b/README.md index ac4ed05b0ae..ade4adc2c59 100644 --- a/README.md +++ b/README.md @@ -112,6 +112,7 @@ Check out [Github Issues](https://github.com/pagefaultgames/pokerogue/issues) to - mangalos810 - Involuntary-Twitch - selstar + - koda_want_to_sleep ### 🎨 Move Animations - Pokémon Reborn diff --git a/public/images/items.json b/public/images/items.json index 7f8eaf31e0b..faf98d2064e 100644 --- a/public/images/items.json +++ b/public/images/items.json @@ -4,8 +4,8 @@ "image": "items.png", "format": "RGBA8888", "size": { - "w": 415, - "h": 415 + "w": 423, + "h": 423 }, "scale": 1, "frames": [ @@ -72,6 +72,48 @@ "h": 28 } }, + { + "filename": "ribbon-gen4", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 1, + "y": 2, + "w": 30, + "h": 28 + }, + "frame": { + "x": 29, + "y": 27, + "w": 30, + "h": 28 + } + }, + { + "filename": "ribbon-gen2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 2, + "y": 2, + "w": 28, + "h": 28 + }, + "frame": { + "x": 0, + "y": 58, + "w": 28, + "h": 28 + } + }, { "filename": "bronze_ribbon", "rotated": false, @@ -87,8 +129,8 @@ "h": 31 }, "frame": { - "x": 29, - "y": 27, + "x": 0, + "y": 86, "w": 22, "h": 31 } @@ -109,7 +151,7 @@ }, "frame": { "x": 0, - "y": 58, + "y": 117, "w": 22, "h": 31 } @@ -151,7 +193,7 @@ }, "frame": { "x": 0, - "y": 89, + "y": 148, "w": 22, "h": 31 } @@ -171,8 +213,8 @@ "h": 31 }, "frame": { - "x": 22, - "y": 58, + "x": 0, + "y": 179, "w": 22, "h": 31 } @@ -193,11 +235,74 @@ }, "frame": { "x": 0, - "y": 120, + "y": 210, "w": 22, "h": 31 } }, + { + "filename": "ribbon-gen3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 22, + "h": 29 + }, + "frame": { + "x": 0, + "y": 241, + "w": 22, + "h": 29 + } + }, + { + "filename": "ribbon-gen7", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 22, + "h": 29 + }, + "frame": { + "x": 0, + "y": 270, + "w": 22, + "h": 29 + } + }, + { + "filename": "ribbon-gen9", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 22, + "h": 29 + }, + "frame": { + "x": 0, + "y": 299, + "w": 22, + "h": 29 + } + }, { "filename": "cornerstone_mask", "rotated": false, @@ -219,6 +324,69 @@ "h": 26 } }, + { + "filename": "ribbon-gen1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 2, + "w": 22, + "h": 28 + }, + "frame": { + "x": 0, + "y": 328, + "w": 22, + "h": 28 + } + }, + { + "filename": "ribbon-gen5", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 2, + "w": 22, + "h": 28 + }, + "frame": { + "x": 0, + "y": 356, + "w": 22, + "h": 28 + } + }, + { + "filename": "ribbon-gen6", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 2, + "w": 22, + "h": 28 + }, + "frame": { + "x": 0, + "y": 384, + "w": 22, + "h": 28 + } + }, { "filename": "ability_charm", "rotated": false, @@ -387,132 +555,6 @@ "h": 21 } }, - { - "filename": "exp_charm", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 17, - "h": 31 - }, - "frame": { - "x": 22, - "y": 89, - "w": 17, - "h": 31 - } - }, - { - "filename": "golden_exp_charm", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 17, - "h": 31 - }, - "frame": { - "x": 0, - "y": 151, - "w": 17, - "h": 31 - } - }, - { - "filename": "super_exp_charm", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 17, - "h": 31 - }, - "frame": { - "x": 22, - "y": 120, - "w": 17, - "h": 31 - } - }, - { - "filename": "black_augurite", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 22, - "h": 25 - }, - "frame": { - "x": 17, - "y": 151, - "w": 22, - "h": 25 - } - }, - { - "filename": "prison_bottle", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 17, - "h": 30 - }, - "frame": { - "x": 0, - "y": 182, - "w": 17, - "h": 30 - } - }, - { - "filename": "big_root", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 17, - "y": 176, - "w": 23, - "h": 24 - } - }, { "filename": "chipped_pot", "rotated": false, @@ -577,7 +619,7 @@ } }, { - "filename": "blank_plate", + "filename": "calcium", "rotated": false, "trimmed": true, "sourceSize": { @@ -585,162 +627,15 @@ "h": 32 }, "spriteSourceSize": { - "x": 4, + "x": 8, "y": 4, - "w": 24, + "w": 16, "h": 24 }, "frame": { - "x": 0, - "y": 212, - "w": 24, - "h": 24 - } - }, - { - "filename": "choice_scarf", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 0, - "y": 236, - "w": 24, - "h": 24 - } - }, - { - "filename": "draco_plate", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 0, - "y": 260, - "w": 24, - "h": 24 - } - }, - { - "filename": "dread_plate", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 0, - "y": 284, - "w": 24, - "h": 24 - } - }, - { - "filename": "earth_plate", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 0, - "y": 308, - "w": 24, - "h": 24 - } - }, - { - "filename": "fist_plate", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 0, - "y": 332, - "w": 24, - "h": 24 - } - }, - { - "filename": "flame_plate", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 0, - "y": 356, - "w": 24, - "h": 24 - } - }, - { - "filename": "focus_band", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 0, - "y": 380, - "w": 24, + "x": 407, + "y": 0, + "w": 16, "h": 24 } }, @@ -760,13 +655,349 @@ }, "frame": { "x": 0, - "y": 404, + "y": 412, "w": 15, "h": 11 } }, { - "filename": "calcium", + "filename": "exp_charm", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 17, + "h": 31 + }, + "frame": { + "x": 22, + "y": 86, + "w": 17, + "h": 31 + } + }, + { + "filename": "golden_exp_charm", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 17, + "h": 31 + }, + "frame": { + "x": 22, + "y": 117, + "w": 17, + "h": 31 + } + }, + { + "filename": "super_exp_charm", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 17, + "h": 31 + }, + "frame": { + "x": 22, + "y": 148, + "w": 17, + "h": 31 + } + }, + { + "filename": "prison_bottle", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 17, + "h": 30 + }, + "frame": { + "x": 22, + "y": 179, + "w": 17, + "h": 30 + } + }, + { + "filename": "ribbon-gen8", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 2, + "w": 22, + "h": 28 + }, + "frame": { + "x": 22, + "y": 209, + "w": 22, + "h": 28 + } + }, + { + "filename": "black_augurite", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 3, + "w": 22, + "h": 25 + }, + "frame": { + "x": 22, + "y": 237, + "w": 22, + "h": 25 + } + }, + { + "filename": "big_root", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 22, + "y": 262, + "w": 23, + "h": 24 + } + }, + { + "filename": "blank_plate", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 22, + "y": 286, + "w": 24, + "h": 24 + } + }, + { + "filename": "choice_scarf", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 22, + "y": 310, + "w": 24, + "h": 24 + } + }, + { + "filename": "draco_plate", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 22, + "y": 334, + "w": 24, + "h": 24 + } + }, + { + "filename": "dread_plate", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 22, + "y": 358, + "w": 24, + "h": 24 + } + }, + { + "filename": "earth_plate", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 22, + "y": 382, + "w": 24, + "h": 24 + } + }, + { + "filename": "black_glasses", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 8, + "w": 23, + "h": 17 + }, + "frame": { + "x": 22, + "y": 406, + "w": 23, + "h": 17 + } + }, + { + "filename": "burn_drive", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 8, + "w": 23, + "h": 17 + }, + "frame": { + "x": 45, + "y": 406, + "w": 23, + "h": 17 + } + }, + { + "filename": "ability_capsule", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 9, + "w": 24, + "h": 14 + }, + "frame": { + "x": 135, + "y": 22, + "w": 24, + "h": 14 + } + }, + { + "filename": "choice_specs", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 8, + "w": 24, + "h": 18 + }, + "frame": { + "x": 29, + "y": 55, + "w": 24, + "h": 18 + } + }, + { + "filename": "carbos", "rotated": false, "trimmed": true, "sourceSize": { @@ -780,12 +1011,138 @@ "h": 24 }, "frame": { - "x": 51, + "x": 59, "y": 27, "w": 16, "h": 24 } }, + { + "filename": "fist_plate", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 75, + "y": 26, + "w": 24, + "h": 24 + } + }, + { + "filename": "flame_plate", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 99, + "y": 26, + "w": 24, + "h": 24 + } + }, + { + "filename": "revive", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 12, + "h": 17 + }, + "frame": { + "x": 123, + "y": 26, + "w": 12, + "h": 17 + } + }, + { + "filename": "clefairy_doll", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 24, + "h": 23 + }, + "frame": { + "x": 135, + "y": 36, + "w": 24, + "h": 23 + } + }, + { + "filename": "catching_charm", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 21, + "h": 24 + }, + "frame": { + "x": 159, + "y": 22, + "w": 21, + "h": 24 + } + }, + { + "filename": "focus_band", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 180, + "y": 21, + "w": 24, + "h": 24 + } + }, { "filename": "golden_punch", "rotated": false, @@ -801,8 +1158,8 @@ "h": 24 }, "frame": { - "x": 67, - "y": 26, + "x": 204, + "y": 21, "w": 24, "h": 24 } @@ -822,33 +1179,12 @@ "h": 24 }, "frame": { - "x": 91, - "y": 26, + "x": 228, + "y": 21, "w": 24, "h": 24 } }, - { - "filename": "catching_charm", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 21, - "h": 24 - }, - "frame": { - "x": 115, - "y": 26, - "w": 21, - "h": 24 - } - }, { "filename": "grip_claw", "rotated": false, @@ -864,117 +1200,12 @@ "h": 24 }, "frame": { - "x": 136, - "y": 22, + "x": 252, + "y": 21, "w": 24, "h": 24 } }, - { - "filename": "carbos", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 44, - "y": 58, - "w": 16, - "h": 24 - } - }, - { - "filename": "elixir", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 18, - "h": 24 - }, - "frame": { - "x": 39, - "y": 89, - "w": 18, - "h": 24 - } - }, - { - "filename": "ether", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 18, - "h": 24 - }, - "frame": { - "x": 39, - "y": 113, - "w": 18, - "h": 24 - } - }, - { - "filename": "full_restore", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 18, - "h": 24 - }, - "frame": { - "x": 39, - "y": 137, - "w": 18, - "h": 24 - } - }, - { - "filename": "silver_powder", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 11, - "w": 24, - "h": 15 - }, - "frame": { - "x": 39, - "y": 161, - "w": 24, - "h": 15 - } - }, { "filename": "icicle_plate", "rotated": false, @@ -990,8 +1221,8 @@ "h": 24 }, "frame": { - "x": 40, - "y": 176, + "x": 276, + "y": 21, "w": 24, "h": 24 } @@ -1011,621 +1242,12 @@ "h": 24 }, "frame": { - "x": 24, - "y": 200, - "w": 24, - "h": 24 - } - }, - { - "filename": "iron_plate", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 24, - "y": 224, - "w": 24, - "h": 24 - } - }, - { - "filename": "lucky_punch", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 24, - "y": 248, - "w": 24, - "h": 24 - } - }, - { - "filename": "lucky_punch_great", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 24, - "y": 272, - "w": 24, - "h": 24 - } - }, - { - "filename": "lucky_punch_master", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 24, - "y": 296, - "w": 24, - "h": 24 - } - }, - { - "filename": "lucky_punch_ultra", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 24, - "y": 320, - "w": 24, - "h": 24 - } - }, - { - "filename": "lustrous_globe", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 24, - "y": 344, - "w": 24, - "h": 24 - } - }, - { - "filename": "meadow_plate", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 24, - "y": 368, - "w": 24, - "h": 24 - } - }, - { - "filename": "clefairy_doll", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 24, - "h": 23 - }, - "frame": { - "x": 24, - "y": 392, - "w": 24, - "h": 23 - } - }, - { - "filename": "hp_up", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 48, - "y": 200, - "w": 16, - "h": 24 - } - }, - { - "filename": "iron", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 48, - "y": 224, - "w": 16, - "h": 24 - } - }, - { - "filename": "kings_rock", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 48, - "y": 248, - "w": 23, - "h": 24 - } - }, - { - "filename": "mind_plate", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 48, - "y": 272, - "w": 24, - "h": 24 - } - }, - { - "filename": "muscle_band", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 48, - "y": 296, - "w": 24, - "h": 24 - } - }, - { - "filename": "pixie_plate", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 48, - "y": 320, - "w": 24, - "h": 24 - } - }, - { - "filename": "salac_berry", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 48, - "y": 344, - "w": 24, - "h": 24 - } - }, - { - "filename": "scanner", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 48, - "y": 368, - "w": 24, - "h": 24 - } - }, - { - "filename": "coin_case", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 24, - "h": 23 - }, - "frame": { - "x": 48, - "y": 392, - "w": 24, - "h": 23 - } - }, - { - "filename": "ability_capsule", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 9, - "w": 24, - "h": 14 - }, - "frame": { - "x": 136, - "y": 46, - "w": 24, - "h": 14 - } - }, - { - "filename": "lure", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 17, - "h": 24 - }, - "frame": { - "x": 160, - "y": 22, - "w": 17, - "h": 24 - } - }, - { - "filename": "silk_scarf", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 177, + "x": 300, "y": 21, "w": 24, "h": 24 } }, - { - "filename": "sky_plate", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 201, - "y": 21, - "w": 24, - "h": 24 - } - }, - { - "filename": "splash_plate", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 225, - "y": 21, - "w": 24, - "h": 24 - } - }, - { - "filename": "spooky_plate", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 249, - "y": 21, - "w": 24, - "h": 24 - } - }, - { - "filename": "stone_plate", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 273, - "y": 21, - "w": 24, - "h": 24 - } - }, - { - "filename": "sun_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 297, - "y": 21, - "w": 24, - "h": 24 - } - }, - { - "filename": "max_elixir", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 18, - "h": 24 - }, - "frame": { - "x": 321, - "y": 21, - "w": 18, - "h": 24 - } - }, - { - "filename": "toxic_plate", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 339, - "y": 20, - "w": 24, - "h": 24 - } - }, - { - "filename": "zap_plate", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 363, - "y": 20, - "w": 24, - "h": 24 - } - }, - { - "filename": "max_revive", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 22, - "h": 24 - }, - "frame": { - "x": 387, - "y": 20, - "w": 22, - "h": 24 - } - }, { "filename": "adamant_crystal", "rotated": false, @@ -1641,14 +1263,14 @@ "h": 21 }, "frame": { - "x": 160, + "x": 159, "y": 46, "w": 23, "h": 21 } }, { - "filename": "exp_balance", + "filename": "coin_case", "rotated": false, "trimmed": true, "sourceSize": { @@ -1659,34 +1281,13 @@ "x": 4, "y": 5, "w": 24, - "h": 22 + "h": 23 }, "frame": { - "x": 183, + "x": 182, "y": 45, "w": 24, - "h": 22 - } - }, - { - "filename": "exp_share", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 24, - "h": 22 - }, - "frame": { - "x": 207, - "y": 45, - "w": 24, - "h": 22 + "h": 23 } }, { @@ -1704,7 +1305,7 @@ "h": 23 }, "frame": { - "x": 231, + "x": 206, "y": 45, "w": 24, "h": 23 @@ -1725,12 +1326,411 @@ "h": 23 }, "frame": { - "x": 255, + "x": 230, "y": 45, "w": 24, "h": 23 } }, + { + "filename": "iron_plate", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 254, + "y": 45, + "w": 24, + "h": 24 + } + }, + { + "filename": "lucky_punch", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 278, + "y": 45, + "w": 24, + "h": 24 + } + }, + { + "filename": "kings_rock", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 302, + "y": 45, + "w": 23, + "h": 24 + } + }, + { + "filename": "elixir", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 18, + "h": 24 + }, + "frame": { + "x": 324, + "y": 21, + "w": 18, + "h": 24 + } + }, + { + "filename": "lucky_punch_great", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 342, + "y": 20, + "w": 24, + "h": 24 + } + }, + { + "filename": "lucky_punch_master", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 366, + "y": 20, + "w": 24, + "h": 24 + } + }, + { + "filename": "lure", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 17, + "h": 24 + }, + "frame": { + "x": 390, + "y": 20, + "w": 17, + "h": 24 + } + }, + { + "filename": "hp_up", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 407, + "y": 24, + "w": 16, + "h": 24 + } + }, + { + "filename": "ether", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 18, + "h": 24 + }, + "frame": { + "x": 325, + "y": 45, + "w": 18, + "h": 24 + } + }, + { + "filename": "lucky_punch_ultra", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 343, + "y": 44, + "w": 24, + "h": 24 + } + }, + { + "filename": "lustrous_globe", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 367, + "y": 44, + "w": 24, + "h": 24 + } + }, + { + "filename": "iron", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 391, + "y": 44, + "w": 16, + "h": 24 + } + }, + { + "filename": "max_repel", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 407, + "y": 48, + "w": 16, + "h": 24 + } + }, + { + "filename": "dragon_scale", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 8, + "w": 24, + "h": 18 + }, + "frame": { + "x": 75, + "y": 50, + "w": 24, + "h": 18 + } + }, + { + "filename": "exp_balance", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 24, + "h": 22 + }, + "frame": { + "x": 99, + "y": 50, + "w": 24, + "h": 22 + } + }, + { + "filename": "black_belt", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 22, + "h": 23 + }, + "frame": { + "x": 53, + "y": 55, + "w": 22, + "h": 23 + } + }, + { + "filename": "exp_share", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 24, + "h": 22 + }, + "frame": { + "x": 75, + "y": 68, + "w": 24, + "h": 22 + } + }, + { + "filename": "icy_reins_of_unity", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 24, + "h": 20 + }, + "frame": { + "x": 99, + "y": 72, + "w": 24, + "h": 20 + } + }, + { + "filename": "meadow_plate", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 123, + "y": 59, + "w": 24, + "h": 24 + } + }, { "filename": "leppa_berry", "rotated": false, @@ -1746,12 +1746,117 @@ "h": 23 }, "frame": { - "x": 279, - "y": 45, + "x": 123, + "y": 83, "w": 24, "h": 23 } }, + { + "filename": "mind_plate", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 147, + "y": 67, + "w": 24, + "h": 24 + } + }, + { + "filename": "muscle_band", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 147, + "y": 91, + "w": 24, + "h": 24 + } + }, + { + "filename": "pixie_plate", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 171, + "y": 68, + "w": 24, + "h": 24 + } + }, + { + "filename": "salac_berry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 195, + "y": 68, + "w": 24, + "h": 24 + } + }, + { + "filename": "scanner", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 219, + "y": 68, + "w": 24, + "h": 24 + } + }, { "filename": "scope_lens", "rotated": false, @@ -1767,14 +1872,14 @@ "h": 23 }, "frame": { - "x": 303, - "y": 45, + "x": 171, + "y": 92, "w": 24, "h": 23 } }, { - "filename": "berry_pouch", + "filename": "silk_scarf", "rotated": false, "trimmed": true, "sourceSize": { @@ -1783,15 +1888,162 @@ }, "spriteSourceSize": { "x": 4, - "y": 5, - "w": 23, - "h": 23 + "y": 4, + "w": 24, + "h": 24 }, "frame": { - "x": 327, - "y": 45, - "w": 23, - "h": 23 + "x": 195, + "y": 92, + "w": 24, + "h": 24 + } + }, + { + "filename": "sky_plate", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 219, + "y": 92, + "w": 24, + "h": 24 + } + }, + { + "filename": "splash_plate", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 243, + "y": 69, + "w": 24, + "h": 24 + } + }, + { + "filename": "spooky_plate", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 267, + "y": 69, + "w": 24, + "h": 24 + } + }, + { + "filename": "stone_plate", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 291, + "y": 69, + "w": 24, + "h": 24 + } + }, + { + "filename": "sun_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 315, + "y": 69, + "w": 24, + "h": 24 + } + }, + { + "filename": "toxic_plate", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 243, + "y": 93, + "w": 24, + "h": 24 + } + }, + { + "filename": "zap_plate", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 267, + "y": 93, + "w": 24, + "h": 24 } }, { @@ -1809,8 +2061,8 @@ "h": 24 }, "frame": { - "x": 350, - "y": 44, + "x": 291, + "y": 93, "w": 23, "h": 24 } @@ -1830,14 +2082,14 @@ "h": 23 }, "frame": { - "x": 373, - "y": 44, + "x": 314, + "y": 93, "w": 24, "h": 23 } }, { - "filename": "max_ether", + "filename": "full_restore", "rotated": false, "trimmed": true, "sourceSize": { @@ -1851,14 +2103,14 @@ "h": 24 }, "frame": { - "x": 397, - "y": 44, + "x": 339, + "y": 69, "w": 18, "h": 24 } }, { - "filename": "choice_specs", + "filename": "berry_pouch", "rotated": false, "trimmed": true, "sourceSize": { @@ -1867,141 +2119,15 @@ }, "spriteSourceSize": { "x": 4, - "y": 8, - "w": 24, - "h": 18 + "y": 5, + "w": 23, + "h": 23 }, "frame": { - "x": 373, - "y": 67, - "w": 24, - "h": 18 - } - }, - { - "filename": "max_potion", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 18, - "h": 24 - }, - "frame": { - "x": 397, + "x": 357, "y": 68, - "w": 18, - "h": 24 - } - }, - { - "filename": "dragon_scale", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 8, - "w": 24, - "h": 18 - }, - "frame": { - "x": 67, - "y": 50, - "w": 24, - "h": 18 - } - }, - { - "filename": "icy_reins_of_unity", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 24, - "h": 20 - }, - "frame": { - "x": 91, - "y": 50, - "w": 24, - "h": 20 - } - }, - { - "filename": "dragon_fang", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 21, + "w": 23, "h": 23 - }, - "frame": { - "x": 115, - "y": 50, - "w": 21, - "h": 23 - } - }, - { - "filename": "metal_powder", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 24, - "h": 20 - }, - "frame": { - "x": 136, - "y": 60, - "w": 24, - "h": 20 - } - }, - { - "filename": "peat_block", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 24, - "h": 22 - }, - "frame": { - "x": 160, - "y": 67, - "w": 24, - "h": 22 } }, { @@ -2019,12 +2145,54 @@ "h": 23 }, "frame": { - "x": 184, - "y": 67, + "x": 380, + "y": 68, "w": 23, "h": 23 } }, + { + "filename": "red_orb", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 20, + "h": 24 + }, + "frame": { + "x": 403, + "y": 72, + "w": 20, + "h": 24 + } + }, + { + "filename": "bug_tera_shard", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 22, + "h": 23 + }, + "frame": { + "x": 338, + "y": 93, + "w": 22, + "h": 23 + } + }, { "filename": "griseous_core", "rotated": false, @@ -2040,14 +2208,14 @@ "h": 23 }, "frame": { - "x": 207, - "y": 67, + "x": 360, + "y": 91, "w": 23, "h": 23 } }, { - "filename": "healing_charm", + "filename": "mystic_water", "rotated": false, "trimmed": true, "sourceSize": { @@ -2055,20 +2223,41 @@ "h": 32 }, "spriteSourceSize": { - "x": 5, + "x": 6, "y": 5, - "w": 23, + "w": 20, + "h": 23 + }, + "frame": { + "x": 383, + "y": 91, + "w": 20, + "h": 23 + } + }, + { + "filename": "hard_meteorite", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 20, "h": 22 }, "frame": { - "x": 230, - "y": 68, - "w": 23, + "x": 403, + "y": 96, + "w": 20, "h": 22 } }, { - "filename": "leek", + "filename": "peat_block", "rotated": false, "trimmed": true, "sourceSize": { @@ -2078,123 +2267,39 @@ "spriteSourceSize": { "x": 4, "y": 5, - "w": 23, - "h": 23 - }, - "frame": { - "x": 253, - "y": 68, - "w": 23, - "h": 23 - } - }, - { - "filename": "rare_candy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 23, - "h": 23 - }, - "frame": { - "x": 276, - "y": 68, - "w": 23, - "h": 23 - } - }, - { - "filename": "rarer_candy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 23, - "h": 23 - }, - "frame": { - "x": 299, - "y": 68, - "w": 23, - "h": 23 - } - }, - { - "filename": "black_belt", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 22, - "h": 23 - }, - "frame": { - "x": 322, - "y": 68, - "w": 22, - "h": 23 - } - }, - { - "filename": "bug_tera_shard", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 22, - "h": 23 - }, - "frame": { - "x": 344, - "y": 68, - "w": 22, - "h": 23 - } - }, - { - "filename": "quick_powder", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, "w": 24, - "h": 20 + "h": 22 }, "frame": { - "x": 60, - "y": 68, + "x": 360, + "y": 114, "w": 24, - "h": 20 + "h": 22 } }, { - "filename": "dark_tera_shard", + "filename": "lock_capsule", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 19, + "h": 22 + }, + "frame": { + "x": 384, + "y": 114, + "w": 19, + "h": 22 + } + }, + { + "filename": "sitrus_berry", "rotated": false, "trimmed": true, "sourceSize": { @@ -2203,57 +2308,15 @@ }, "spriteSourceSize": { "x": 6, - "y": 4, - "w": 22, - "h": 23 + "y": 5, + "w": 20, + "h": 22 }, "frame": { - "x": 57, - "y": 88, - "w": 22, - "h": 23 - } - }, - { - "filename": "dragon_tera_shard", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 22, - "h": 23 - }, - "frame": { - "x": 57, - "y": 111, - "w": 22, - "h": 23 - } - }, - { - "filename": "electric_tera_shard", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 22, - "h": 23 - }, - "frame": { - "x": 57, - "y": 134, - "w": 22, - "h": 23 + "x": 403, + "y": 118, + "w": 20, + "h": 22 } }, { @@ -2271,98 +2334,14 @@ "h": 20 }, "frame": { - "x": 84, - "y": 70, + "x": 314, + "y": 116, "w": 24, "h": 20 } }, { - "filename": "fairy_tera_shard", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 22, - "h": 23 - }, - "frame": { - "x": 79, - "y": 90, - "w": 22, - "h": 23 - } - }, - { - "filename": "fighting_tera_shard", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 22, - "h": 23 - }, - "frame": { - "x": 79, - "y": 113, - "w": 22, - "h": 23 - } - }, - { - "filename": "amulet_coin", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 23, - "h": 21 - }, - "frame": { - "x": 79, - "y": 136, - "w": 23, - "h": 21 - } - }, - { - "filename": "coupon", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 23, - "h": 19 - }, - "frame": { - "x": 63, - "y": 157, - "w": 23, - "h": 19 - } - }, - { - "filename": "fire_stone", + "filename": "blank_memory", "rotated": false, "trimmed": true, "sourceSize": { @@ -2373,17 +2352,164 @@ "x": 5, "y": 5, "w": 22, - "h": 23 + "h": 22 }, "frame": { - "x": 64, - "y": 176, + "x": 338, + "y": 116, "w": 22, - "h": 23 + "h": 22 } }, { - "filename": "fire_tera_shard", + "filename": "sacred_ash", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 24, + "h": 20 + }, + "frame": { + "x": 360, + "y": 136, + "w": 24, + "h": 20 + } + }, + { + "filename": "apicot_berry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 19, + "h": 20 + }, + "frame": { + "x": 384, + "y": 136, + "w": 19, + "h": 20 + } + }, + { + "filename": "dawn_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 20, + "h": 21 + }, + "frame": { + "x": 403, + "y": 140, + "w": 20, + "h": 21 + } + }, + { + "filename": "max_elixir", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 18, + "h": 24 + }, + "frame": { + "x": 39, + "y": 90, + "w": 18, + "h": 24 + } + }, + { + "filename": "max_ether", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 18, + "h": 24 + }, + "frame": { + "x": 57, + "y": 78, + "w": 18, + "h": 24 + } + }, + { + "filename": "max_potion", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 18, + "h": 24 + }, + "frame": { + "x": 39, + "y": 114, + "w": 18, + "h": 24 + } + }, + { + "filename": "max_revive", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 22, + "h": 24 + }, + "frame": { + "x": 39, + "y": 138, + "w": 22, + "h": 24 + } + }, + { + "filename": "dark_tera_shard", "rotated": false, "trimmed": true, "sourceSize": { @@ -2397,54 +2523,12 @@ "h": 23 }, "frame": { - "x": 64, - "y": 199, + "x": 39, + "y": 162, "w": 22, "h": 23 } }, - { - "filename": "flying_tera_shard", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 22, - "h": 23 - }, - "frame": { - "x": 64, - "y": 222, - "w": 22, - "h": 23 - } - }, - { - "filename": "max_lure", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 17, - "h": 24 - }, - "frame": { - "x": 86, - "y": 157, - "w": 17, - "h": 24 - } - }, { "filename": "oval_charm", "rotated": false, @@ -2460,8 +2544,8 @@ "h": 24 }, "frame": { - "x": 86, - "y": 181, + "x": 39, + "y": 185, "w": 21, "h": 24 } @@ -2481,182 +2565,14 @@ "h": 24 }, "frame": { - "x": 86, - "y": 205, + "x": 57, + "y": 102, "w": 21, "h": 24 } }, { - "filename": "auspicious_armor", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 23, - "h": 21 - }, - "frame": { - "x": 86, - "y": 229, - "w": 23, - "h": 21 - } - }, - { - "filename": "full_heal", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 15, - "h": 23 - }, - "frame": { - "x": 71, - "y": 245, - "w": 15, - "h": 23 - } - }, - { - "filename": "binding_band", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 23, - "h": 20 - }, - "frame": { - "x": 86, - "y": 250, - "w": 23, - "h": 20 - } - }, - { - "filename": "sacred_ash", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 24, - "h": 20 - }, - "frame": { - "x": 108, - "y": 73, - "w": 24, - "h": 20 - } - }, - { - "filename": "focus_sash", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 22, - "h": 23 - }, - "frame": { - "x": 101, - "y": 93, - "w": 22, - "h": 23 - } - }, - { - "filename": "deep_sea_scale", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 22, - "h": 20 - }, - "frame": { - "x": 101, - "y": 116, - "w": 22, - "h": 20 - } - }, - { - "filename": "deep_sea_tooth", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 22, - "h": 21 - }, - "frame": { - "x": 102, - "y": 136, - "w": 22, - "h": 21 - } - }, - { - "filename": "red_orb", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 20, - "h": 24 - }, - "frame": { - "x": 103, - "y": 157, - "w": 20, - "h": 24 - } - }, - { - "filename": "max_repel", + "filename": "max_lure", "rotated": false, "trimmed": true, "sourceSize": { @@ -2666,13 +2582,34 @@ "spriteSourceSize": { "x": 8, "y": 4, - "w": 16, + "w": 17, "h": 24 }, "frame": { - "x": 107, - "y": 181, - "w": 16, + "x": 44, + "y": 209, + "w": 17, + "h": 24 + } + }, + { + "filename": "super_lure", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 17, + "h": 24 + }, + "frame": { + "x": 44, + "y": 233, + "w": 17, "h": 24 } }, @@ -2691,77 +2628,14 @@ "h": 24 }, "frame": { - "x": 107, - "y": 205, + "x": 45, + "y": 257, "w": 16, "h": 24 } }, { - "filename": "pp_up", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 109, - "y": 229, - "w": 16, - "h": 24 - } - }, - { - "filename": "apicot_berry", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 19, - "h": 20 - }, - "frame": { - "x": 109, - "y": 253, - "w": 19, - "h": 20 - } - }, - { - "filename": "protein", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 123, - "y": 93, - "w": 16, - "h": 24 - } - }, - { - "filename": "lansat_berry", + "filename": "dragon_fang", "rotated": false, "trimmed": true, "sourceSize": { @@ -2770,13 +2644,13 @@ }, "spriteSourceSize": { "x": 5, - "y": 4, + "y": 5, "w": 21, "h": 23 }, "frame": { - "x": 139, - "y": 80, + "x": 78, + "y": 90, "w": 21, "h": 23 } @@ -2796,14 +2670,14 @@ "h": 20 }, "frame": { - "x": 160, - "y": 89, + "x": 99, + "y": 92, "w": 24, "h": 20 } }, { - "filename": "soft_sand", + "filename": "silver_powder", "rotated": false, "trimmed": true, "sourceSize": { @@ -2812,19 +2686,19 @@ }, "spriteSourceSize": { "x": 4, - "y": 7, + "y": 11, "w": 24, - "h": 20 + "h": 15 }, "frame": { - "x": 184, - "y": 90, + "x": 123, + "y": 106, "w": 24, - "h": 20 + "h": 15 } }, { - "filename": "moon_stone", + "filename": "amulet_coin", "rotated": false, "trimmed": true, "sourceSize": { @@ -2832,100 +2706,16 @@ "h": 32 }, "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 23, - "h": 21 - }, - "frame": { - "x": 208, - "y": 90, - "w": 23, - "h": 21 - } - }, - { - "filename": "blank_memory", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 231, - "y": 90, - "w": 22, - "h": 22 - } - }, - { - "filename": "n_lunarizer", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 23, - "h": 21 - }, - "frame": { - "x": 253, - "y": 91, - "w": 23, - "h": 21 - } - }, - { - "filename": "n_solarizer", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 23, - "h": 21 - }, - "frame": { - "x": 276, - "y": 91, - "w": 23, - "h": 21 - } - }, - { - "filename": "rusted_sword", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, + "x": 6, "y": 5, "w": 23, - "h": 22 + "h": 21 }, "frame": { - "x": 299, - "y": 91, + "x": 78, + "y": 113, "w": 23, - "h": 22 + "h": 21 } }, { @@ -2943,14 +2733,77 @@ "h": 22 }, "frame": { - "x": 322, - "y": 91, + "x": 101, + "y": 112, "w": 22, "h": 22 } }, { - "filename": "charcoal", + "filename": "soft_sand", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 24, + "h": 20 + }, + "frame": { + "x": 123, + "y": 121, + "w": 24, + "h": 20 + } + }, + { + "filename": "rare_candy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 23, + "h": 23 + }, + "frame": { + "x": 147, + "y": 115, + "w": 23, + "h": 23 + } + }, + { + "filename": "rarer_candy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 23, + "h": 23 + }, + "frame": { + "x": 170, + "y": 115, + "w": 23, + "h": 23 + } + }, + { + "filename": "healing_charm", "rotated": false, "trimmed": true, "sourceSize": { @@ -2960,18 +2813,18 @@ "spriteSourceSize": { "x": 5, "y": 5, - "w": 22, + "w": 23, "h": 22 }, "frame": { - "x": 344, - "y": 91, - "w": 22, + "x": 193, + "y": 116, + "w": 23, "h": 22 } }, { - "filename": "dusk_stone", + "filename": "rusted_sword", "rotated": false, "trimmed": true, "sourceSize": { @@ -2979,20 +2832,83 @@ "h": 32 }, "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 21, + "x": 4, + "y": 5, + "w": 23, + "h": 22 + }, + "frame": { + "x": 216, + "y": 116, + "w": 23, + "h": 22 + } + }, + { + "filename": "auspicious_armor", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 23, "h": 21 }, "frame": { - "x": 139, - "y": 103, - "w": 21, + "x": 239, + "y": 117, + "w": 23, "h": 21 } }, { - "filename": "mystery_egg", + "filename": "moon_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 6, + "w": 23, + "h": 21 + }, + "frame": { + "x": 262, + "y": 117, + "w": 23, + "h": 21 + } + }, + { + "filename": "n_lunarizer", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 6, + "w": 23, + "h": 21 + }, + "frame": { + "x": 285, + "y": 117, + "w": 23, + "h": 21 + } + }, + { + "filename": "hyper_potion", "rotated": false, "trimmed": true, "sourceSize": { @@ -3001,61 +2917,19 @@ }, "spriteSourceSize": { "x": 8, - "y": 8, - "w": 16, - "h": 18 + "y": 5, + "w": 17, + "h": 23 }, "frame": { - "x": 123, - "y": 117, - "w": 16, - "h": 18 + "x": 61, + "y": 126, + "w": 17, + "h": 23 } }, { - "filename": "black_glasses", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 8, - "w": 23, - "h": 17 - }, - "frame": { - "x": 160, - "y": 109, - "w": 23, - "h": 17 - } - }, - { - "filename": "burn_drive", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 8, - "w": 23, - "h": 17 - }, - "frame": { - "x": 183, - "y": 110, - "w": 23, - "h": 17 - } - }, - { - "filename": "ghost_tera_shard", + "filename": "dragon_tera_shard", "rotated": false, "trimmed": true, "sourceSize": { @@ -3069,14 +2943,14 @@ "h": 23 }, "frame": { - "x": 366, - "y": 85, + "x": 61, + "y": 149, "w": 22, "h": 23 } }, { - "filename": "chill_drive", + "filename": "candy_overlay", "rotated": false, "trimmed": true, "sourceSize": { @@ -3084,104 +2958,20 @@ "h": 32 }, "spriteSourceSize": { - "x": 4, - "y": 8, - "w": 23, - "h": 17 + "x": 8, + "y": 12, + "w": 16, + "h": 15 }, "frame": { - "x": 206, - "y": 111, - "w": 23, - "h": 17 + "x": 78, + "y": 134, + "w": 16, + "h": 15 } }, { - "filename": "douse_drive", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 8, - "w": 23, - "h": 17 - }, - "frame": { - "x": 229, - "y": 112, - "w": 23, - "h": 17 - } - }, - { - "filename": "golden_mystic_ticket", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 23, - "h": 19 - }, - "frame": { - "x": 252, - "y": 112, - "w": 23, - "h": 19 - } - }, - { - "filename": "mystic_ticket", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 23, - "h": 19 - }, - "frame": { - "x": 275, - "y": 112, - "w": 23, - "h": 19 - } - }, - { - "filename": "pair_of_tickets", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 23, - "h": 19 - }, - "frame": { - "x": 298, - "y": 113, - "w": 23, - "h": 19 - } - }, - { - "filename": "reviver_seed", + "filename": "binding_band", "rotated": false, "trimmed": true, "sourceSize": { @@ -3190,19 +2980,145 @@ }, "spriteSourceSize": { "x": 5, - "y": 8, + "y": 6, "w": 23, "h": 20 }, "frame": { - "x": 321, - "y": 113, + "x": 94, + "y": 134, "w": 23, "h": 20 } }, { - "filename": "dark_memory", + "filename": "blunder_policy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 22, + "h": 19 + }, + "frame": { + "x": 61, + "y": 172, + "w": 22, + "h": 19 + } + }, + { + "filename": "relic_crown", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 23, + "h": 18 + }, + "frame": { + "x": 60, + "y": 191, + "w": 23, + "h": 18 + } + }, + { + "filename": "electric_tera_shard", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 22, + "h": 23 + }, + "frame": { + "x": 61, + "y": 209, + "w": 22, + "h": 23 + } + }, + { + "filename": "fairy_tera_shard", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 22, + "h": 23 + }, + "frame": { + "x": 61, + "y": 232, + "w": 22, + "h": 23 + } + }, + { + "filename": "fighting_tera_shard", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 22, + "h": 23 + }, + "frame": { + "x": 61, + "y": 255, + "w": 22, + "h": 23 + } + }, + { + "filename": "stick", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 23, + "h": 23 + }, + "frame": { + "x": 83, + "y": 154, + "w": 23, + "h": 23 + } + }, + { + "filename": "fire_stone", "rotated": false, "trimmed": true, "sourceSize": { @@ -3213,17 +3129,17 @@ "x": 5, "y": 5, "w": 22, - "h": 22 + "h": 23 }, "frame": { - "x": 344, - "y": 113, + "x": 83, + "y": 177, "w": 22, - "h": 22 + "h": 23 } }, { - "filename": "grass_tera_shard", + "filename": "fire_tera_shard", "rotated": false, "trimmed": true, "sourceSize": { @@ -3237,12 +3153,138 @@ "h": 23 }, "frame": { - "x": 366, - "y": 108, + "x": 83, + "y": 200, "w": 22, "h": 23 } }, + { + "filename": "flying_tera_shard", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 22, + "h": 23 + }, + "frame": { + "x": 83, + "y": 223, + "w": 22, + "h": 23 + } + }, + { + "filename": "focus_sash", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 22, + "h": 23 + }, + "frame": { + "x": 83, + "y": 246, + "w": 22, + "h": 23 + } + }, + { + "filename": "full_heal", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 15, + "h": 23 + }, + "frame": { + "x": 106, + "y": 154, + "w": 15, + "h": 23 + } + }, + { + "filename": "pp_up", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 105, + "y": 177, + "w": 16, + "h": 24 + } + }, + { + "filename": "protein", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 105, + "y": 201, + "w": 16, + "h": 24 + } + }, + { + "filename": "repel", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 105, + "y": 225, + "w": 16, + "h": 24 + } + }, { "filename": "berry_pot", "rotated": false, @@ -3258,12 +3300,117 @@ "h": 22 }, "frame": { - "x": 124, - "y": 135, + "x": 105, + "y": 249, "w": 18, "h": 22 } }, + { + "filename": "super_repel", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 46, + "y": 281, + "w": 16, + "h": 24 + } + }, + { + "filename": "ghost_tera_shard", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 22, + "h": 23 + }, + "frame": { + "x": 62, + "y": 278, + "w": 22, + "h": 23 + } + }, + { + "filename": "unknown", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 46, + "y": 305, + "w": 16, + "h": 24 + } + }, + { + "filename": "grass_tera_shard", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 22, + "h": 23 + }, + "frame": { + "x": 62, + "y": 301, + "w": 22, + "h": 23 + } + }, + { + "filename": "zinc", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 46, + "y": 329, + "w": 16, + "h": 24 + } + }, { "filename": "ground_tera_shard", "rotated": false, @@ -3279,8 +3426,8 @@ "h": 23 }, "frame": { - "x": 123, - "y": 157, + "x": 62, + "y": 324, "w": 22, "h": 23 } @@ -3300,8 +3447,8 @@ "h": 23 }, "frame": { - "x": 123, - "y": 180, + "x": 46, + "y": 353, "w": 22, "h": 23 } @@ -3321,12 +3468,33 @@ "h": 23 }, "frame": { - "x": 123, - "y": 203, + "x": 46, + "y": 376, "w": 22, "h": 23 } }, + { + "filename": "lansat_berry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 21, + "h": 23 + }, + "frame": { + "x": 84, + "y": 269, + "w": 21, + "h": 23 + } + }, { "filename": "leaf_stone", "rotated": false, @@ -3342,33 +3510,12 @@ "h": 23 }, "frame": { - "x": 125, - "y": 226, + "x": 84, + "y": 292, "w": 21, "h": 23 } }, - { - "filename": "mystic_water", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 20, - "h": 23 - }, - "frame": { - "x": 128, - "y": 249, - "w": 20, - "h": 23 - } - }, { "filename": "normal_tera_shard", "rotated": false, @@ -3384,243 +3531,12 @@ "h": 23 }, "frame": { - "x": 388, - "y": 92, + "x": 84, + "y": 315, "w": 22, "h": 23 } }, - { - "filename": "blunder_policy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 22, - "h": 19 - }, - "frame": { - "x": 388, - "y": 115, - "w": 22, - "h": 19 - } - }, - { - "filename": "sachet", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 18, - "h": 23 - }, - "frame": { - "x": 142, - "y": 124, - "w": 18, - "h": 23 - } - }, - { - "filename": "wellspring_mask", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 23, - "h": 21 - }, - "frame": { - "x": 160, - "y": 126, - "w": 23, - "h": 21 - } - }, - { - "filename": "shell_bell", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 23, - "h": 20 - }, - "frame": { - "x": 183, - "y": 127, - "w": 23, - "h": 20 - } - }, - { - "filename": "relic_crown", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 23, - "h": 18 - }, - "frame": { - "x": 206, - "y": 128, - "w": 23, - "h": 18 - } - }, - { - "filename": "shock_drive", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 8, - "w": 23, - "h": 17 - }, - "frame": { - "x": 229, - "y": 129, - "w": 23, - "h": 17 - } - }, - { - "filename": "wise_glasses", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 8, - "w": 23, - "h": 17 - }, - "frame": { - "x": 252, - "y": 131, - "w": 23, - "h": 17 - } - }, - { - "filename": "dire_hit", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 275, - "y": 131, - "w": 22, - "h": 22 - } - }, - { - "filename": "dna_splicers", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 297, - "y": 132, - "w": 22, - "h": 22 - } - }, - { - "filename": "dragon_memory", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 319, - "y": 133, - "w": 22, - "h": 22 - } - }, - { - "filename": "electirizer", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 341, - "y": 135, - "w": 22, - "h": 22 - } - }, { "filename": "petaya_berry", "rotated": false, @@ -3636,12 +3552,33 @@ "h": 23 }, "frame": { - "x": 145, - "y": 147, + "x": 105, + "y": 271, "w": 22, "h": 23 } }, + { + "filename": "deep_sea_tooth", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 22, + "h": 21 + }, + "frame": { + "x": 105, + "y": 294, + "w": 22, + "h": 21 + } + }, { "filename": "poison_tera_shard", "rotated": false, @@ -3657,12 +3594,33 @@ "h": 23 }, "frame": { - "x": 167, - "y": 147, + "x": 106, + "y": 315, "w": 22, "h": 23 } }, + { + "filename": "potion", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 17, + "h": 23 + }, + "frame": { + "x": 68, + "y": 347, + "w": 17, + "h": 23 + } + }, { "filename": "psychic_tera_shard", "rotated": false, @@ -3678,8 +3636,8 @@ "h": 23 }, "frame": { - "x": 145, - "y": 170, + "x": 68, + "y": 370, "w": 22, "h": 23 } @@ -3699,8 +3657,8 @@ "h": 23 }, "frame": { - "x": 145, - "y": 193, + "x": 68, + "y": 393, "w": 22, "h": 23 } @@ -3720,12 +3678,33 @@ "h": 23 }, "frame": { - "x": 167, - "y": 170, + "x": 85, + "y": 338, "w": 22, "h": 23 } }, + { + "filename": "sharp_beak", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 107, + "y": 338, + "w": 21, + "h": 23 + } + }, { "filename": "steel_tera_shard", "rotated": false, @@ -3741,33 +3720,12 @@ "h": 23 }, "frame": { - "x": 167, - "y": 193, + "x": 90, + "y": 361, "w": 22, "h": 23 } }, - { - "filename": "super_lure", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 17, - "h": 24 - }, - "frame": { - "x": 189, - "y": 147, - "w": 17, - "h": 24 - } - }, { "filename": "stellar_tera_shard", "rotated": false, @@ -3783,12 +3741,54 @@ "h": 23 }, "frame": { - "x": 206, - "y": 146, + "x": 90, + "y": 384, "w": 22, "h": 23 } }, + { + "filename": "mega_bracelet", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 20, + "h": 16 + }, + "frame": { + "x": 90, + "y": 407, + "w": 20, + "h": 16 + } + }, + { + "filename": "sachet", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 18, + "h": 23 + }, + "frame": { + "x": 112, + "y": 361, + "w": 18, + "h": 23 + } + }, { "filename": "water_tera_shard", "rotated": false, @@ -3804,14 +3804,14 @@ "h": 23 }, "frame": { - "x": 228, - "y": 146, + "x": 112, + "y": 384, "w": 22, "h": 23 } }, { - "filename": "electric_memory", + "filename": "relic_band", "rotated": false, "trimmed": true, "sourceSize": { @@ -3819,20 +3819,20 @@ "h": 32 }, "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 + "x": 7, + "y": 9, + "w": 17, + "h": 16 }, "frame": { - "x": 250, - "y": 148, - "w": 22, - "h": 22 + "x": 110, + "y": 407, + "w": 17, + "h": 16 } }, { - "filename": "hyper_potion", + "filename": "abomasite", "rotated": false, "trimmed": true, "sourceSize": { @@ -3841,15 +3841,15 @@ }, "spriteSourceSize": { "x": 8, - "y": 5, - "w": 17, - "h": 23 + "y": 8, + "w": 16, + "h": 16 }, "frame": { - "x": 189, - "y": 171, - "w": 17, - "h": 23 + "x": 127, + "y": 407, + "w": 16, + "h": 16 } }, { @@ -3867,14 +3867,14 @@ "h": 23 }, "frame": { - "x": 206, - "y": 169, + "x": 121, + "y": 141, "w": 22, "h": 23 } }, { - "filename": "enigma_berry", + "filename": "charcoal", "rotated": false, "trimmed": true, "sourceSize": { @@ -3888,14 +3888,14 @@ "h": 22 }, "frame": { - "x": 228, - "y": 169, + "x": 121, + "y": 164, "w": 22, "h": 22 } }, { - "filename": "fairy_memory", + "filename": "dark_memory", "rotated": false, "trimmed": true, "sourceSize": { @@ -3909,14 +3909,14 @@ "h": 22 }, "frame": { - "x": 250, - "y": 170, + "x": 121, + "y": 186, "w": 22, "h": 22 } }, { - "filename": "fighting_memory", + "filename": "dire_hit", "rotated": false, "trimmed": true, "sourceSize": { @@ -3930,14 +3930,14 @@ "h": 22 }, "frame": { - "x": 272, - "y": 153, + "x": 121, + "y": 208, "w": 22, "h": 22 } }, { - "filename": "fire_memory", + "filename": "coupon", "rotated": false, "trimmed": true, "sourceSize": { @@ -3945,62 +3945,20 @@ "h": 32 }, "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 294, - "y": 154, - "w": 22, - "h": 22 - } - }, - { - "filename": "dubious_disc", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, + "x": 4, "y": 7, - "w": 22, + "w": 23, "h": 19 }, "frame": { - "x": 272, - "y": 175, - "w": 22, + "x": 121, + "y": 230, + "w": 23, "h": 19 } }, { - "filename": "fairy_feather", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 22, - "h": 20 - }, - "frame": { - "x": 294, - "y": 176, - "w": 22, - "h": 20 - } - }, - { - "filename": "flying_memory", + "filename": "dna_splicers", "rotated": false, "trimmed": true, "sourceSize": { @@ -4014,491 +3972,8 @@ "h": 22 }, "frame": { - "x": 316, - "y": 155, - "w": 22, - "h": 22 - } - }, - { - "filename": "ganlon_berry", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 316, - "y": 177, - "w": 22, - "h": 22 - } - }, - { - "filename": "ghost_memory", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 338, - "y": 157, - "w": 22, - "h": 22 - } - }, - { - "filename": "grass_memory", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 338, - "y": 179, - "w": 22, - "h": 22 - } - }, - { - "filename": "ground_memory", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 189, - "y": 194, - "w": 22, - "h": 22 - } - }, - { - "filename": "potion", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 17, - "h": 23 - }, - "frame": { - "x": 211, - "y": 192, - "w": 17, - "h": 23 - } - }, - { - "filename": "guard_spec", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 228, - "y": 191, - "w": 22, - "h": 22 - } - }, - { - "filename": "ice_memory", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 250, - "y": 192, - "w": 22, - "h": 22 - } - }, - { - "filename": "ice_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 272, - "y": 194, - "w": 22, - "h": 22 - } - }, - { - "filename": "liechi_berry", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 22, - "h": 21 - }, - "frame": { - "x": 294, - "y": 196, - "w": 22, - "h": 21 - } - }, - { - "filename": "magmarizer", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 316, - "y": 199, - "w": 22, - "h": 22 - } - }, - { - "filename": "malicious_armor", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 22, - "h": 20 - }, - "frame": { - "x": 338, - "y": 201, - "w": 22, - "h": 20 - } - }, - { - "filename": "mini_black_hole", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 146, - "y": 216, - "w": 22, - "h": 22 - } - }, - { - "filename": "poison_memory", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 168, - "y": 216, - "w": 22, - "h": 22 - } - }, - { - "filename": "protector", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 190, - "y": 216, - "w": 22, - "h": 22 - } - }, - { - "filename": "repel", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 212, - "y": 215, - "w": 16, - "h": 24 - } - }, - { - "filename": "psychic_memory", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 228, - "y": 213, - "w": 22, - "h": 22 - } - }, - { - "filename": "rock_memory", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 250, - "y": 214, - "w": 22, - "h": 22 - } - }, - { - "filename": "scroll_of_darkness", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 272, - "y": 216, - "w": 22, - "h": 22 - } - }, - { - "filename": "scroll_of_waters", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 294, - "y": 217, - "w": 22, - "h": 22 - } - }, - { - "filename": "shed_shell", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 316, - "y": 221, - "w": 22, - "h": 22 - } - }, - { - "filename": "starf_berry", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 338, - "y": 221, - "w": 22, - "h": 22 - } - }, - { - "filename": "sharp_beak", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 21, - "h": 23 - }, - "frame": { - "x": 148, - "y": 238, - "w": 21, - "h": 23 - } - }, - { - "filename": "steel_memory", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 169, - "y": 238, + "x": 123, + "y": 249, "w": 22, "h": 22 } @@ -4518,14 +3993,14 @@ "h": 23 }, "frame": { - "x": 191, - "y": 238, + "x": 127, + "y": 271, "w": 21, "h": 23 } }, { - "filename": "hard_meteorite", + "filename": "dusk_stone", "rotated": false, "trimmed": true, "sourceSize": { @@ -4533,18 +4008,123 @@ "h": 32 }, "spriteSourceSize": { - "x": 7, + "x": 6, + "y": 6, + "w": 21, + "h": 21 + }, + "frame": { + "x": 127, + "y": 294, + "w": 21, + "h": 21 + } + }, + { + "filename": "dragon_memory", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, "y": 5, - "w": 20, + "w": 22, "h": 22 }, "frame": { - "x": 212, - "y": 239, - "w": 20, + "x": 128, + "y": 315, + "w": 22, "h": 22 } }, + { + "filename": "electirizer", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 128, + "y": 337, + "w": 22, + "h": 22 + } + }, + { + "filename": "electric_memory", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 130, + "y": 359, + "w": 22, + "h": 22 + } + }, + { + "filename": "enigma_berry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 134, + "y": 381, + "w": 22, + "h": 22 + } + }, + { + "filename": "reviver_seed", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 8, + "w": 23, + "h": 20 + }, + "frame": { + "x": 143, + "y": 403, + "w": 23, + "h": 20 + } + }, { "filename": "super_potion", "rotated": false, @@ -4560,14 +4140,14 @@ "h": 23 }, "frame": { - "x": 232, - "y": 235, + "x": 143, + "y": 141, "w": 17, "h": 23 } }, { - "filename": "thick_club", + "filename": "fairy_memory", "rotated": false, "trimmed": true, "sourceSize": { @@ -4581,77 +4161,14 @@ "h": 22 }, "frame": { - "x": 249, - "y": 236, + "x": 160, + "y": 138, "w": 22, "h": 22 } }, { - "filename": "sweet_apple", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 22, - "h": 21 - }, - "frame": { - "x": 271, - "y": 238, - "w": 22, - "h": 21 - } - }, - { - "filename": "syrupy_apple", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 22, - "h": 21 - }, - "frame": { - "x": 293, - "y": 239, - "w": 22, - "h": 21 - } - }, - { - "filename": "tart_apple", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 22, - "h": 21 - }, - "frame": { - "x": 315, - "y": 243, - "w": 22, - "h": 21 - } - }, - { - "filename": "thunder_stone", + "filename": "fighting_memory", "rotated": false, "trimmed": true, "sourceSize": { @@ -4665,14 +4182,161 @@ "h": 22 }, "frame": { - "x": 337, - "y": 243, + "x": 182, + "y": 138, "w": 22, "h": 22 } }, { - "filename": "masterpiece_teacup", + "filename": "fire_memory", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 204, + "y": 138, + "w": 22, + "h": 22 + } + }, + { + "filename": "flying_memory", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 226, + "y": 138, + "w": 22, + "h": 22 + } + }, + { + "filename": "ganlon_berry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 248, + "y": 138, + "w": 22, + "h": 22 + } + }, + { + "filename": "ghost_memory", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 270, + "y": 138, + "w": 22, + "h": 22 + } + }, + { + "filename": "grass_memory", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 143, + "y": 164, + "w": 22, + "h": 22 + } + }, + { + "filename": "ground_memory", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 143, + "y": 186, + "w": 22, + "h": 22 + } + }, + { + "filename": "guard_spec", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 143, + "y": 208, + "w": 22, + "h": 22 + } + }, + { + "filename": "dubious_disc", "rotated": false, "trimmed": true, "sourceSize": { @@ -4682,291 +4346,18 @@ "spriteSourceSize": { "x": 5, "y": 7, - "w": 21, - "h": 18 - }, - "frame": { - "x": 148, - "y": 261, - "w": 21, - "h": 18 - } - }, - { - "filename": "tera_orb", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, "w": 22, - "h": 20 - }, - "frame": { - "x": 169, - "y": 260, - "w": 22, - "h": 20 - } - }, - { - "filename": "tm_bug", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 191, - "y": 261, - "w": 22, - "h": 22 - } - }, - { - "filename": "lock_capsule", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 19, - "h": 22 - }, - "frame": { - "x": 213, - "y": 261, - "w": 19, - "h": 22 - } - }, - { - "filename": "tm_dark", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 232, - "y": 258, - "w": 22, - "h": 22 - } - }, - { - "filename": "metronome", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 17, - "h": 22 - }, - "frame": { - "x": 254, - "y": 258, - "w": 17, - "h": 22 - } - }, - { - "filename": "tm_dragon", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 271, - "y": 259, - "w": 22, - "h": 22 - } - }, - { - "filename": "tm_electric", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 293, - "y": 260, - "w": 22, - "h": 22 - } - }, - { - "filename": "tm_fairy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 315, - "y": 264, - "w": 22, - "h": 22 - } - }, - { - "filename": "tm_fighting", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 337, - "y": 265, - "w": 22, - "h": 22 - } - }, - { - "filename": "tm_fire", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 366, - "y": 131, - "w": 22, - "h": 22 - } - }, - { - "filename": "tm_flying", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 388, - "y": 134, - "w": 22, - "h": 22 - } - }, - { - "filename": "big_nugget", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 20 - }, - "frame": { - "x": 128, - "y": 272, - "w": 20, - "h": 20 - } - }, - { - "filename": "metal_alloy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 21, "h": 19 }, "frame": { - "x": 148, - "y": 279, - "w": 21, + "x": 144, + "y": 230, + "w": 22, "h": 19 } }, { - "filename": "tm_ghost", + "filename": "ice_memory", "rotated": false, "trimmed": true, "sourceSize": { @@ -4980,14 +4371,14 @@ "h": 22 }, "frame": { - "x": 169, - "y": 280, + "x": 145, + "y": 249, "w": 22, "h": 22 } }, { - "filename": "tm_grass", + "filename": "ice_stone", "rotated": false, "trimmed": true, "sourceSize": { @@ -5001,8 +4392,92 @@ "h": 22 }, "frame": { - "x": 191, - "y": 283, + "x": 148, + "y": 271, + "w": 22, + "h": 22 + } + }, + { + "filename": "magmarizer", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 148, + "y": 293, + "w": 22, + "h": 22 + } + }, + { + "filename": "mini_black_hole", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 150, + "y": 315, + "w": 22, + "h": 22 + } + }, + { + "filename": "poison_memory", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 150, + "y": 337, + "w": 22, + "h": 22 + } + }, + { + "filename": "protector", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 152, + "y": 359, "w": 22, "h": 22 } @@ -5022,12 +4497,516 @@ "h": 22 }, "frame": { - "x": 213, - "y": 283, + "x": 156, + "y": 381, "w": 19, "h": 22 } }, + { + "filename": "shell_bell", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 23, + "h": 20 + }, + "frame": { + "x": 166, + "y": 403, + "w": 23, + "h": 20 + } + }, + { + "filename": "n_solarizer", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 6, + "w": 23, + "h": 21 + }, + "frame": { + "x": 165, + "y": 160, + "w": 23, + "h": 21 + } + }, + { + "filename": "psychic_memory", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 165, + "y": 181, + "w": 22, + "h": 22 + } + }, + { + "filename": "rock_memory", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 165, + "y": 203, + "w": 22, + "h": 22 + } + }, + { + "filename": "wellspring_mask", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 23, + "h": 21 + }, + "frame": { + "x": 188, + "y": 160, + "w": 23, + "h": 21 + } + }, + { + "filename": "scroll_of_darkness", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 187, + "y": 181, + "w": 22, + "h": 22 + } + }, + { + "filename": "scroll_of_waters", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 187, + "y": 203, + "w": 22, + "h": 22 + } + }, + { + "filename": "liechi_berry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 22, + "h": 21 + }, + "frame": { + "x": 211, + "y": 160, + "w": 22, + "h": 21 + } + }, + { + "filename": "shed_shell", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 209, + "y": 181, + "w": 22, + "h": 22 + } + }, + { + "filename": "starf_berry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 209, + "y": 203, + "w": 22, + "h": 22 + } + }, + { + "filename": "steel_memory", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 233, + "y": 160, + "w": 22, + "h": 22 + } + }, + { + "filename": "thunder_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 255, + "y": 160, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_bug", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 231, + "y": 182, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_dark", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 253, + "y": 182, + "w": 22, + "h": 22 + } + }, + { + "filename": "sweet_apple", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 22, + "h": 21 + }, + "frame": { + "x": 231, + "y": 204, + "w": 22, + "h": 21 + } + }, + { + "filename": "syrupy_apple", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 22, + "h": 21 + }, + "frame": { + "x": 253, + "y": 204, + "w": 22, + "h": 21 + } + }, + { + "filename": "tm_dragon", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 166, + "y": 225, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_electric", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 188, + "y": 225, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_fairy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 210, + "y": 225, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_fighting", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 232, + "y": 225, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_fire", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 254, + "y": 225, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_flying", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 167, + "y": 247, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_ghost", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 189, + "y": 247, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_grass", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 211, + "y": 247, + "w": 22, + "h": 22 + } + }, { "filename": "tm_ground", "rotated": false, @@ -5043,33 +5022,12 @@ "h": 22 }, "frame": { - "x": 232, - "y": 280, + "x": 233, + "y": 247, "w": 22, "h": 22 } }, - { - "filename": "soothe_bell", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 17, - "h": 22 - }, - "frame": { - "x": 254, - "y": 280, - "w": 17, - "h": 22 - } - }, { "filename": "tm_ice", "rotated": false, @@ -5085,8 +5043,8 @@ "h": 22 }, "frame": { - "x": 271, - "y": 281, + "x": 255, + "y": 247, "w": 22, "h": 22 } @@ -5106,8 +5064,8 @@ "h": 22 }, "frame": { - "x": 293, - "y": 282, + "x": 170, + "y": 269, "w": 22, "h": 22 } @@ -5127,8 +5085,8 @@ "h": 22 }, "frame": { - "x": 315, - "y": 286, + "x": 170, + "y": 291, "w": 22, "h": 22 } @@ -5148,8 +5106,8 @@ "h": 22 }, "frame": { - "x": 337, - "y": 287, + "x": 192, + "y": 269, "w": 22, "h": 22 } @@ -5169,8 +5127,8 @@ "h": 22 }, "frame": { - "x": 72, - "y": 270, + "x": 192, + "y": 291, "w": 22, "h": 22 } @@ -5190,8 +5148,8 @@ "h": 22 }, "frame": { - "x": 72, - "y": 292, + "x": 214, + "y": 269, "w": 22, "h": 22 } @@ -5211,8 +5169,8 @@ "h": 22 }, "frame": { - "x": 72, - "y": 314, + "x": 214, + "y": 291, "w": 22, "h": 22 } @@ -5232,8 +5190,8 @@ "h": 22 }, "frame": { - "x": 72, - "y": 336, + "x": 236, + "y": 269, "w": 22, "h": 22 } @@ -5253,8 +5211,8 @@ "h": 22 }, "frame": { - "x": 72, - "y": 358, + "x": 236, + "y": 291, "w": 22, "h": 22 } @@ -5274,54 +5232,12 @@ "h": 22 }, "frame": { - "x": 72, - "y": 380, + "x": 172, + "y": 313, "w": 22, "h": 22 } }, - { - "filename": "leftovers", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 15, - "h": 22 - }, - "frame": { - "x": 94, - "y": 270, - "w": 15, - "h": 22 - } - }, - { - "filename": "big_mushroom", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 19, - "h": 19 - }, - "frame": { - "x": 109, - "y": 273, - "w": 19, - "h": 19 - } - }, { "filename": "x_attack", "rotated": false, @@ -5337,8 +5253,8 @@ "h": 22 }, "frame": { - "x": 94, - "y": 292, + "x": 172, + "y": 335, "w": 22, "h": 22 } @@ -5358,8 +5274,8 @@ "h": 22 }, "frame": { - "x": 116, - "y": 292, + "x": 194, + "y": 313, "w": 22, "h": 22 } @@ -5379,8 +5295,8 @@ "h": 22 }, "frame": { - "x": 94, - "y": 314, + "x": 194, + "y": 335, "w": 22, "h": 22 } @@ -5400,8 +5316,8 @@ "h": 22 }, "frame": { - "x": 94, - "y": 336, + "x": 216, + "y": 313, "w": 22, "h": 22 } @@ -5421,8 +5337,8 @@ "h": 22 }, "frame": { - "x": 116, - "y": 314, + "x": 216, + "y": 335, "w": 22, "h": 22 } @@ -5442,8 +5358,8 @@ "h": 21 }, "frame": { - "x": 94, - "y": 358, + "x": 238, + "y": 313, "w": 21, "h": 21 } @@ -5463,14 +5379,56 @@ "h": 21 }, "frame": { - "x": 116, - "y": 336, + "x": 238, + "y": 334, "w": 21, "h": 21 } }, { - "filename": "sitrus_berry", + "filename": "tart_apple", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 22, + "h": 21 + }, + "frame": { + "x": 174, + "y": 357, + "w": 22, + "h": 21 + } + }, + { + "filename": "deep_sea_scale", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 22, + "h": 20 + }, + "frame": { + "x": 196, + "y": 357, + "w": 22, + "h": 20 + } + }, + { + "filename": "big_nugget", "rotated": false, "trimmed": true, "sourceSize": { @@ -5479,15 +5437,15 @@ }, "spriteSourceSize": { "x": 6, - "y": 5, + "y": 6, "w": 20, - "h": 22 + "h": 20 }, "frame": { - "x": 94, - "y": 379, + "x": 218, + "y": 357, "w": 20, - "h": 22 + "h": 20 } }, { @@ -5505,222 +5463,12 @@ "h": 21 }, "frame": { - "x": 138, - "y": 298, + "x": 238, + "y": 355, "w": 21, "h": 21 } }, - { - "filename": "sharp_meteorite", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 8, - "w": 21, - "h": 18 - }, - "frame": { - "x": 138, - "y": 319, - "w": 21, - "h": 18 - } - }, - { - "filename": "upgrade", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 22, - "h": 19 - }, - "frame": { - "x": 137, - "y": 337, - "w": 22, - "h": 19 - } - }, - { - "filename": "dawn_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 21 - }, - "frame": { - "x": 159, - "y": 302, - "w": 20, - "h": 21 - } - }, - { - "filename": "blue_orb", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 20 - }, - "frame": { - "x": 159, - "y": 323, - "w": 20, - "h": 20 - } - }, - { - "filename": "everstone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 8, - "w": 20, - "h": 17 - }, - "frame": { - "x": 159, - "y": 343, - "w": 20, - "h": 17 - } - }, - { - "filename": "revive", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 12, - "h": 17 - }, - "frame": { - "x": 179, - "y": 302, - "w": 12, - "h": 17 - } - }, - { - "filename": "super_repel", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 179, - "y": 319, - "w": 16, - "h": 24 - } - }, - { - "filename": "baton", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 18, - "h": 18 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 18, - "h": 18 - }, - "frame": { - "x": 179, - "y": 343, - "w": 18, - "h": 18 - } - }, - { - "filename": "unknown", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 360, - "y": 157, - "w": 16, - "h": 24 - } - }, - { - "filename": "zinc", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 360, - "y": 181, - "w": 16, - "h": 24 - } - }, { "filename": "quick_claw", "rotated": false, @@ -5736,12 +5484,180 @@ "h": 21 }, "frame": { - "x": 360, - "y": 205, + "x": 258, + "y": 269, "w": 19, "h": 21 } }, + { + "filename": "spell_tag", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 19, + "h": 21 + }, + "frame": { + "x": 258, + "y": 290, + "w": 19, + "h": 21 + } + }, + { + "filename": "fairy_feather", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 22, + "h": 20 + }, + "frame": { + "x": 175, + "y": 378, + "w": 22, + "h": 20 + } + }, + { + "filename": "golden_mystic_ticket", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 23, + "h": 19 + }, + "frame": { + "x": 197, + "y": 377, + "w": 23, + "h": 19 + } + }, + { + "filename": "metronome", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 17, + "h": 22 + }, + "frame": { + "x": 292, + "y": 138, + "w": 17, + "h": 22 + } + }, + { + "filename": "malicious_armor", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 22, + "h": 20 + }, + "frame": { + "x": 277, + "y": 160, + "w": 22, + "h": 20 + } + }, + { + "filename": "big_mushroom", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 19, + "h": 19 + }, + "frame": { + "x": 220, + "y": 377, + "w": 19, + "h": 19 + } + }, + { + "filename": "blue_orb", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 20, + "h": 20 + }, + "frame": { + "x": 239, + "y": 376, + "w": 20, + "h": 20 + } + }, + { + "filename": "soothe_bell", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 17, + "h": 22 + }, + "frame": { + "x": 259, + "y": 311, + "w": 17, + "h": 22 + } + }, { "filename": "candy_jar", "rotated": false, @@ -5757,8 +5673,8 @@ "h": 20 }, "frame": { - "x": 360, - "y": 226, + "x": 259, + "y": 333, "w": 19, "h": 20 } @@ -5778,8 +5694,8 @@ "h": 20 }, "frame": { - "x": 359, - "y": 246, + "x": 259, + "y": 353, "w": 20, "h": 20 } @@ -5799,14 +5715,14 @@ "h": 20 }, "frame": { - "x": 359, - "y": 266, + "x": 259, + "y": 373, "w": 20, "h": 20 } }, { - "filename": "mb", + "filename": "mystic_ticket", "rotated": false, "trimmed": true, "sourceSize": { @@ -5814,20 +5730,20 @@ "h": 32 }, "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 20 + "x": 4, + "y": 7, + "w": 23, + "h": 19 }, "frame": { - "x": 359, - "y": 286, - "w": 20, - "h": 20 + "x": 309, + "y": 136, + "w": 23, + "h": 19 } }, { - "filename": "pb", + "filename": "chill_drive", "rotated": false, "trimmed": true, "sourceSize": { @@ -5835,79 +5751,16 @@ "h": 32 }, "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 20 + "x": 4, + "y": 8, + "w": 23, + "h": 17 }, "frame": { - "x": 376, - "y": 156, - "w": 20, - "h": 20 - } - }, - { - "filename": "spell_tag", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 19, - "h": 21 - }, - "frame": { - "x": 396, - "y": 156, - "w": 19, - "h": 21 - } - }, - { - "filename": "pb_gold", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 20 - }, - "frame": { - "x": 376, - "y": 176, - "w": 20, - "h": 20 - } - }, - { - "filename": "hard_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 19, - "h": 20 - }, - "frame": { - "x": 396, - "y": 177, - "w": 19, - "h": 20 + "x": 332, + "y": 138, + "w": 23, + "h": 17 } }, { @@ -5925,14 +5778,35 @@ "h": 20 }, "frame": { - "x": 379, - "y": 196, + "x": 299, + "y": 160, "w": 17, "h": 20 } }, { - "filename": "miracle_seed", + "filename": "pair_of_tickets", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 23, + "h": 19 + }, + "frame": { + "x": 316, + "y": 155, + "w": 23, + "h": 19 + } + }, + { + "filename": "metal_alloy", "rotated": false, "trimmed": true, "sourceSize": { @@ -5942,18 +5816,60 @@ "spriteSourceSize": { "x": 6, "y": 7, - "w": 19, + "w": 21, "h": 19 }, "frame": { - "x": 396, - "y": 197, - "w": 19, + "x": 339, + "y": 155, + "w": 21, "h": 19 } }, { - "filename": "rb", + "filename": "douse_drive", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 8, + "w": 23, + "h": 17 + }, + "frame": { + "x": 360, + "y": 156, + "w": 23, + "h": 17 + } + }, + { + "filename": "everstone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 20, + "h": 17 + }, + "frame": { + "x": 383, + "y": 156, + "w": 20, + "h": 17 + } + }, + { + "filename": "mb", "rotated": false, "trimmed": true, "sourceSize": { @@ -5967,14 +5883,14 @@ "h": 20 }, "frame": { - "x": 379, - "y": 216, + "x": 403, + "y": 161, "w": 20, "h": 20 } }, { - "filename": "abomasite", + "filename": "shock_drive", "rotated": false, "trimmed": true, "sourceSize": { @@ -5982,20 +5898,20 @@ "h": 32 }, "spriteSourceSize": { - "x": 8, + "x": 4, "y": 8, - "w": 16, - "h": 16 + "w": 23, + "h": 17 }, "frame": { - "x": 399, - "y": 216, - "w": 16, - "h": 16 + "x": 316, + "y": 174, + "w": 23, + "h": 17 } }, { - "filename": "smooth_meteorite", + "filename": "masterpiece_teacup", "rotated": false, "trimmed": true, "sourceSize": { @@ -6003,20 +5919,41 @@ "h": 32 }, "spriteSourceSize": { - "x": 7, + "x": 5, + "y": 7, + "w": 21, + "h": 18 + }, + "frame": { + "x": 339, + "y": 174, + "w": 21, + "h": 18 + } + }, + { + "filename": "tera_orb", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, "y": 6, - "w": 20, + "w": 22, "h": 20 }, "frame": { - "x": 379, - "y": 236, - "w": 20, + "x": 360, + "y": 173, + "w": 22, "h": 20 } }, { - "filename": "absolite", + "filename": "sharp_meteorite", "rotated": false, "trimmed": true, "sourceSize": { @@ -6024,41 +5961,20 @@ "h": 32 }, "spriteSourceSize": { - "x": 8, + "x": 6, "y": 8, - "w": 16, - "h": 16 + "w": 21, + "h": 18 }, "frame": { - "x": 399, - "y": 232, - "w": 16, - "h": 16 + "x": 382, + "y": 173, + "w": 21, + "h": 18 } }, { - "filename": "aerodactylite", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 16, - "h": 16 - }, - "frame": { - "x": 399, - "y": 248, - "w": 16, - "h": 16 - } - }, - { - "filename": "strange_ball", + "filename": "pb", "rotated": false, "trimmed": true, "sourceSize": { @@ -6072,75 +5988,12 @@ "h": 20 }, "frame": { - "x": 379, - "y": 256, + "x": 403, + "y": 181, "w": 20, "h": 20 } }, - { - "filename": "aggronite", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 16, - "h": 16 - }, - "frame": { - "x": 399, - "y": 264, - "w": 16, - "h": 16 - } - }, - { - "filename": "ub", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 20 - }, - "frame": { - "x": 379, - "y": 276, - "w": 20, - "h": 20 - } - }, - { - "filename": "alakazite", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 16, - "h": 16 - }, - "frame": { - "x": 399, - "y": 280, - "w": 16, - "h": 16 - } - }, { "filename": "unremarkable_teacup", "rotated": false, @@ -6156,14 +6009,35 @@ "h": 18 }, "frame": { - "x": 379, - "y": 296, + "x": 382, + "y": 191, "w": 21, "h": 18 } }, { - "filename": "eviolite", + "filename": "pb_gold", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 20, + "h": 20 + }, + "frame": { + "x": 403, + "y": 201, + "w": 20, + "h": 20 + } + }, + { + "filename": "leftovers", "rotated": false, "trimmed": true, "sourceSize": { @@ -6172,19 +6046,19 @@ }, "spriteSourceSize": { "x": 8, - "y": 8, + "y": 5, "w": 15, - "h": 15 + "h": 22 }, "frame": { - "x": 400, - "y": 296, + "x": 189, + "y": 398, "w": 15, - "h": 15 + "h": 22 } }, { - "filename": "prism_scale", + "filename": "upgrade", "rotated": false, "trimmed": true, "sourceSize": { @@ -6192,41 +6066,20 @@ "h": 32 }, "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 15, - "h": 15 - }, - "frame": { - "x": 400, - "y": 311, - "w": 15, - "h": 15 - } - }, - { - "filename": "lum_berry", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, + "x": 5, "y": 7, - "w": 20, + "w": 22, "h": 19 }, "frame": { - "x": 359, - "y": 306, - "w": 20, + "x": 204, + "y": 396, + "w": 22, "h": 19 } }, { - "filename": "mega_bracelet", + "filename": "wise_glasses", "rotated": false, "trimmed": true, "sourceSize": { @@ -6234,62 +6087,20 @@ "h": 32 }, "spriteSourceSize": { - "x": 6, + "x": 4, "y": 8, - "w": 20, - "h": 16 + "w": 23, + "h": 17 }, "frame": { - "x": 379, - "y": 314, - "w": 20, - "h": 16 + "x": 226, + "y": 396, + "w": 23, + "h": 17 } }, { - "filename": "altarianite", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 16, - "h": 16 - }, - "frame": { - "x": 399, - "y": 326, - "w": 16, - "h": 16 - } - }, - { - "filename": "razor_claw", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 20, - "h": 19 - }, - "frame": { - "x": 195, - "y": 305, - "w": 20, - "h": 19 - } - }, - { - "filename": "oval_stone", + "filename": "candy", "rotated": false, "trimmed": true, "sourceSize": { @@ -6298,15 +6109,36 @@ }, "spriteSourceSize": { "x": 7, - "y": 7, + "y": 11, "w": 18, - "h": 19 + "h": 18 }, "frame": { - "x": 195, - "y": 324, + "x": 249, + "y": 396, "w": 18, - "h": 19 + "h": 18 + } + }, + { + "filename": "hard_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 19, + "h": 20 + }, + "frame": { + "x": 267, + "y": 393, + "w": 19, + "h": 20 } }, { @@ -6324,12 +6156,33 @@ "h": 20 }, "frame": { - "x": 215, - "y": 305, + "x": 275, + "y": 182, "w": 17, "h": 20 } }, + { + "filename": "rb", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 20, + "h": 20 + }, + "frame": { + "x": 292, + "y": 180, + "w": 20, + "h": 20 + } + }, { "filename": "razor_fang", "rotated": false, @@ -6345,12 +6198,180 @@ "h": 20 }, "frame": { - "x": 232, - "y": 302, + "x": 275, + "y": 202, "w": 18, "h": 20 } }, + { + "filename": "smooth_meteorite", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 20, + "h": 20 + }, + "frame": { + "x": 293, + "y": 200, + "w": 20, + "h": 20 + } + }, + { + "filename": "strange_ball", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 20, + "h": 20 + }, + "frame": { + "x": 276, + "y": 222, + "w": 20, + "h": 20 + } + }, + { + "filename": "ub", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 20, + "h": 20 + }, + "frame": { + "x": 296, + "y": 220, + "w": 20, + "h": 20 + } + }, + { + "filename": "lum_berry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 20, + "h": 19 + }, + "frame": { + "x": 277, + "y": 242, + "w": 20, + "h": 19 + } + }, + { + "filename": "razor_claw", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 20, + "h": 19 + }, + "frame": { + "x": 277, + "y": 261, + "w": 20, + "h": 19 + } + }, + { + "filename": "miracle_seed", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 19, + "h": 19 + }, + "frame": { + "x": 277, + "y": 280, + "w": 19, + "h": 19 + } + }, + { + "filename": "oval_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 18, + "h": 19 + }, + "frame": { + "x": 297, + "y": 240, + "w": 18, + "h": 19 + } + }, + { + "filename": "dark_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 18, + "h": 18 + }, + "frame": { + "x": 297, + "y": 259, + "w": 18, + "h": 18 + } + }, { "filename": "wl_ability_urge", "rotated": false, @@ -6366,12 +6387,96 @@ "h": 18 }, "frame": { - "x": 250, - "y": 302, + "x": 277, + "y": 299, "w": 20, "h": 18 } }, + { + "filename": "absolite", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 16, + "h": 16 + }, + "frame": { + "x": 276, + "y": 317, + "w": 16, + "h": 16 + } + }, + { + "filename": "flame_orb", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 18, + "h": 18 + }, + "frame": { + "x": 278, + "y": 333, + "w": 18, + "h": 18 + } + }, + { + "filename": "light_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 18, + "h": 18 + }, + "frame": { + "x": 279, + "y": 351, + "w": 18, + "h": 18 + } + }, + { + "filename": "toxic_orb", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 18, + "h": 18 + }, + "frame": { + "x": 279, + "y": 369, + "w": 18, + "h": 18 + } + }, { "filename": "wl_antidote", "rotated": false, @@ -6387,8 +6492,8 @@ "h": 18 }, "frame": { - "x": 270, - "y": 303, + "x": 313, + "y": 191, "w": 20, "h": 18 } @@ -6408,8 +6513,8 @@ "h": 18 }, "frame": { - "x": 213, - "y": 325, + "x": 333, + "y": 192, "w": 20, "h": 18 } @@ -6429,14 +6534,14 @@ "h": 18 }, "frame": { - "x": 197, - "y": 343, + "x": 353, + "y": 193, "w": 20, "h": 18 } }, { - "filename": "candy", + "filename": "aerodactylite", "rotated": false, "trimmed": true, "sourceSize": { @@ -6444,15 +6549,36 @@ "h": 32 }, "spriteSourceSize": { - "x": 7, - "y": 11, - "w": 18, + "x": 8, + "y": 8, + "w": 16, + "h": 16 + }, + "frame": { + "x": 292, + "y": 317, + "w": 16, + "h": 16 + } + }, + { + "filename": "mystery_egg", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 16, "h": 18 }, "frame": { - "x": 217, - "y": 343, - "w": 18, + "x": 296, + "y": 333, + "w": 16, "h": 18 } }, @@ -6471,54 +6597,12 @@ "h": 18 }, "frame": { - "x": 290, - "y": 304, + "x": 297, + "y": 351, "w": 20, "h": 18 } }, - { - "filename": "dark_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 18, - "h": 18 - }, - "frame": { - "x": 233, - "y": 322, - "w": 18, - "h": 18 - } - }, - { - "filename": "flame_orb", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 18, - "h": 18 - }, - "frame": { - "x": 251, - "y": 320, - "w": 18, - "h": 18 - } - }, { "filename": "wl_custom_thief", "rotated": false, @@ -6534,8 +6618,8 @@ "h": 18 }, "frame": { - "x": 269, - "y": 321, + "x": 297, + "y": 369, "w": 20, "h": 18 } @@ -6555,54 +6639,12 @@ "h": 18 }, "frame": { - "x": 289, - "y": 322, + "x": 286, + "y": 387, "w": 20, "h": 18 } }, - { - "filename": "light_ball", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 18, - "h": 18 - }, - "frame": { - "x": 235, - "y": 340, - "w": 18, - "h": 18 - } - }, - { - "filename": "ampharosite", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 16, - "h": 16 - }, - "frame": { - "x": 253, - "y": 338, - "w": 16, - "h": 16 - } - }, { "filename": "wl_ether", "rotated": false, @@ -6618,8 +6660,8 @@ "h": 18 }, "frame": { - "x": 269, - "y": 339, + "x": 286, + "y": 405, "w": 20, "h": 18 } @@ -6639,8 +6681,8 @@ "h": 18 }, "frame": { - "x": 289, - "y": 340, + "x": 306, + "y": 387, "w": 20, "h": 18 } @@ -6660,12 +6702,33 @@ "h": 18 }, "frame": { - "x": 310, - "y": 308, + "x": 306, + "y": 405, "w": 20, "h": 18 } }, + { + "filename": "aggronite", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 16, + "h": 16 + }, + "frame": { + "x": 316, + "y": 209, + "w": 16, + "h": 16 + } + }, { "filename": "wl_guard_spec", "rotated": false, @@ -6681,8 +6744,8 @@ "h": 18 }, "frame": { - "x": 309, - "y": 326, + "x": 332, + "y": 210, "w": 20, "h": 18 } @@ -6702,12 +6765,33 @@ "h": 18 }, "frame": { - "x": 309, - "y": 344, + "x": 352, + "y": 211, "w": 20, "h": 18 } }, + { + "filename": "alakazite", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 16, + "h": 16 + }, + "frame": { + "x": 316, + "y": 225, + "w": 16, + "h": 16 + } + }, { "filename": "wl_ice_heal", "rotated": false, @@ -6723,8 +6807,8 @@ "h": 18 }, "frame": { - "x": 330, - "y": 309, + "x": 315, + "y": 241, "w": 20, "h": 18 } @@ -6744,8 +6828,8 @@ "h": 18 }, "frame": { - "x": 329, - "y": 327, + "x": 315, + "y": 259, "w": 20, "h": 18 } @@ -6765,33 +6849,12 @@ "h": 18 }, "frame": { - "x": 329, - "y": 345, + "x": 297, + "y": 277, "w": 20, "h": 18 } }, - { - "filename": "audinite", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 16, - "h": 16 - }, - "frame": { - "x": 253, - "y": 354, - "w": 16, - "h": 16 - } - }, { "filename": "wl_max_elixir", "rotated": false, @@ -6807,8 +6870,8 @@ "h": 18 }, "frame": { - "x": 269, - "y": 357, + "x": 317, + "y": 277, "w": 20, "h": 18 } @@ -6828,8 +6891,8 @@ "h": 18 }, "frame": { - "x": 289, - "y": 358, + "x": 297, + "y": 295, "w": 20, "h": 18 } @@ -6849,8 +6912,8 @@ "h": 18 }, "frame": { - "x": 309, - "y": 362, + "x": 317, + "y": 295, "w": 20, "h": 18 } @@ -6870,54 +6933,12 @@ "h": 18 }, "frame": { - "x": 329, - "y": 363, + "x": 308, + "y": 313, "w": 20, "h": 18 } }, - { - "filename": "light_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 18, - "h": 18 - }, - "frame": { - "x": 235, - "y": 358, - "w": 18, - "h": 18 - } - }, - { - "filename": "banettite", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 16, - "h": 16 - }, - "frame": { - "x": 253, - "y": 370, - "w": 16, - "h": 16 - } - }, { "filename": "wl_paralyze_heal", "rotated": false, @@ -6933,8 +6954,8 @@ "h": 18 }, "frame": { - "x": 269, - "y": 375, + "x": 312, + "y": 331, "w": 20, "h": 18 } @@ -6954,8 +6975,8 @@ "h": 18 }, "frame": { - "x": 289, - "y": 376, + "x": 317, + "y": 349, "w": 20, "h": 18 } @@ -6975,8 +6996,8 @@ "h": 18 }, "frame": { - "x": 309, - "y": 380, + "x": 317, + "y": 367, "w": 20, "h": 18 } @@ -6996,8 +7017,8 @@ "h": 18 }, "frame": { - "x": 329, - "y": 381, + "x": 328, + "y": 313, "w": 20, "h": 18 } @@ -7017,14 +7038,14 @@ "h": 18 }, "frame": { - "x": 116, - "y": 357, + "x": 332, + "y": 331, "w": 20, "h": 18 } }, { - "filename": "toxic_orb", + "filename": "altarianite", "rotated": false, "trimmed": true, "sourceSize": { @@ -7032,36 +7053,78 @@ "h": 32 }, "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 18, - "h": 18 - }, - "frame": { - "x": 115, - "y": 375, - "w": 18, - "h": 18 - } - }, - { - "filename": "relic_band", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 9, - "w": 17, + "x": 8, + "y": 8, + "w": 16, "h": 16 }, "frame": { - "x": 114, - "y": 393, - "w": 17, + "x": 337, + "y": 349, + "w": 16, + "h": 16 + } + }, + { + "filename": "ampharosite", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 16, + "h": 16 + }, + "frame": { + "x": 337, + "y": 365, + "w": 16, + "h": 16 + } + }, + { + "filename": "audinite", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 16, + "h": 16 + }, + "frame": { + "x": 326, + "y": 385, + "w": 16, + "h": 16 + } + }, + { + "filename": "banettite", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 16, + "h": 16 + }, + "frame": { + "x": 326, + "y": 401, + "w": 16, "h": 16 } }, @@ -7080,8 +7143,8 @@ "h": 16 }, "frame": { - "x": 131, - "y": 399, + "x": 342, + "y": 381, "w": 16, "h": 16 } @@ -7101,8 +7164,8 @@ "h": 16 }, "frame": { - "x": 147, - "y": 399, + "x": 342, + "y": 397, "w": 16, "h": 16 } @@ -7122,8 +7185,8 @@ "h": 16 }, "frame": { - "x": 163, - "y": 399, + "x": 335, + "y": 228, "w": 16, "h": 16 } @@ -7143,8 +7206,8 @@ "h": 16 }, "frame": { - "x": 179, - "y": 399, + "x": 335, + "y": 244, "w": 16, "h": 16 } @@ -7164,8 +7227,8 @@ "h": 16 }, "frame": { - "x": 195, - "y": 399, + "x": 335, + "y": 260, "w": 16, "h": 16 } @@ -7185,8 +7248,8 @@ "h": 16 }, "frame": { - "x": 211, - "y": 399, + "x": 351, + "y": 229, "w": 16, "h": 16 } @@ -7206,8 +7269,8 @@ "h": 16 }, "frame": { - "x": 227, - "y": 399, + "x": 351, + "y": 245, "w": 16, "h": 16 } @@ -7227,8 +7290,8 @@ "h": 16 }, "frame": { - "x": 243, - "y": 399, + "x": 351, + "y": 261, "w": 16, "h": 16 } @@ -7248,8 +7311,8 @@ "h": 16 }, "frame": { - "x": 259, - "y": 399, + "x": 367, + "y": 229, "w": 16, "h": 16 } @@ -7269,8 +7332,8 @@ "h": 16 }, "frame": { - "x": 275, - "y": 399, + "x": 367, + "y": 245, "w": 16, "h": 16 } @@ -7290,8 +7353,8 @@ "h": 16 }, "frame": { - "x": 291, - "y": 399, + "x": 367, + "y": 261, "w": 16, "h": 16 } @@ -7311,8 +7374,8 @@ "h": 16 }, "frame": { - "x": 307, - "y": 399, + "x": 337, + "y": 277, "w": 16, "h": 16 } @@ -7332,8 +7395,8 @@ "h": 16 }, "frame": { - "x": 323, - "y": 399, + "x": 353, + "y": 277, "w": 16, "h": 16 } @@ -7353,8 +7416,8 @@ "h": 16 }, "frame": { - "x": 339, - "y": 399, + "x": 337, + "y": 293, "w": 16, "h": 16 } @@ -7374,33 +7437,12 @@ "h": 16 }, "frame": { - "x": 133, - "y": 375, + "x": 353, + "y": 293, "w": 16, "h": 16 } }, - { - "filename": "candy_overlay", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 12, - "w": 16, - "h": 15 - }, - "frame": { - "x": 136, - "y": 360, - "w": 16, - "h": 15 - } - }, { "filename": "kangaskhanite", "rotated": false, @@ -7416,8 +7458,8 @@ "h": 16 }, "frame": { - "x": 152, - "y": 360, + "x": 369, + "y": 277, "w": 16, "h": 16 } @@ -7437,8 +7479,8 @@ "h": 16 }, "frame": { - "x": 149, - "y": 376, + "x": 369, + "y": 293, "w": 16, "h": 16 } @@ -7458,8 +7500,8 @@ "h": 16 }, "frame": { - "x": 168, - "y": 361, + "x": 348, + "y": 309, "w": 16, "h": 16 } @@ -7479,8 +7521,8 @@ "h": 16 }, "frame": { - "x": 184, - "y": 361, + "x": 364, + "y": 309, "w": 16, "h": 16 } @@ -7500,8 +7542,8 @@ "h": 16 }, "frame": { - "x": 200, - "y": 361, + "x": 352, + "y": 325, "w": 16, "h": 16 } @@ -7521,8 +7563,8 @@ "h": 16 }, "frame": { - "x": 216, - "y": 361, + "x": 368, + "y": 325, "w": 16, "h": 16 } @@ -7542,8 +7584,8 @@ "h": 16 }, "frame": { - "x": 165, - "y": 377, + "x": 380, + "y": 309, "w": 16, "h": 16 } @@ -7563,8 +7605,8 @@ "h": 16 }, "frame": { - "x": 181, - "y": 377, + "x": 384, + "y": 325, "w": 16, "h": 16 } @@ -7584,8 +7626,8 @@ "h": 16 }, "frame": { - "x": 197, - "y": 377, + "x": 353, + "y": 341, "w": 16, "h": 16 } @@ -7605,8 +7647,8 @@ "h": 16 }, "frame": { - "x": 213, - "y": 377, + "x": 353, + "y": 357, "w": 16, "h": 16 } @@ -7626,8 +7668,8 @@ "h": 16 }, "frame": { - "x": 229, - "y": 377, + "x": 369, + "y": 341, "w": 16, "h": 16 } @@ -7647,8 +7689,8 @@ "h": 16 }, "frame": { - "x": 349, - "y": 327, + "x": 369, + "y": 357, "w": 16, "h": 16 } @@ -7668,8 +7710,8 @@ "h": 16 }, "frame": { - "x": 349, - "y": 343, + "x": 385, + "y": 341, "w": 16, "h": 16 } @@ -7689,8 +7731,8 @@ "h": 16 }, "frame": { - "x": 349, - "y": 359, + "x": 385, + "y": 357, "w": 16, "h": 16 } @@ -7710,8 +7752,8 @@ "h": 16 }, "frame": { - "x": 349, - "y": 375, + "x": 358, + "y": 373, "w": 16, "h": 16 } @@ -7731,8 +7773,8 @@ "h": 16 }, "frame": { - "x": 365, - "y": 330, + "x": 358, + "y": 389, "w": 16, "h": 16 } @@ -7752,8 +7794,8 @@ "h": 16 }, "frame": { - "x": 381, - "y": 330, + "x": 374, + "y": 373, "w": 16, "h": 16 } @@ -7773,8 +7815,8 @@ "h": 16 }, "frame": { - "x": 365, - "y": 346, + "x": 374, + "y": 389, "w": 16, "h": 16 } @@ -7794,8 +7836,8 @@ "h": 16 }, "frame": { - "x": 365, - "y": 362, + "x": 390, + "y": 373, "w": 16, "h": 16 } @@ -7815,8 +7857,8 @@ "h": 16 }, "frame": { - "x": 381, - "y": 346, + "x": 390, + "y": 389, "w": 16, "h": 16 } @@ -7836,8 +7878,8 @@ "h": 16 }, "frame": { - "x": 381, - "y": 362, + "x": 358, + "y": 405, "w": 16, "h": 16 } @@ -7857,8 +7899,8 @@ "h": 16 }, "frame": { - "x": 397, - "y": 342, + "x": 374, + "y": 405, "w": 16, "h": 16 } @@ -7878,8 +7920,8 @@ "h": 16 }, "frame": { - "x": 397, - "y": 358, + "x": 390, + "y": 405, "w": 16, "h": 16 } @@ -7899,12 +7941,33 @@ "h": 16 }, "frame": { - "x": 365, - "y": 378, + "x": 372, + "y": 211, "w": 16, "h": 16 } }, + { + "filename": "prism_scale", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 15, + "h": 15 + }, + "frame": { + "x": 388, + "y": 209, + "w": 15, + "h": 15 + } + }, { "filename": "swampertite", "rotated": false, @@ -7920,8 +7983,8 @@ "h": 16 }, "frame": { - "x": 381, - "y": 378, + "x": 383, + "y": 227, "w": 16, "h": 16 } @@ -7941,8 +8004,8 @@ "h": 16 }, "frame": { - "x": 397, - "y": 374, + "x": 383, + "y": 243, "w": 16, "h": 16 } @@ -7962,8 +8025,8 @@ "h": 16 }, "frame": { - "x": 397, - "y": 390, + "x": 383, + "y": 259, "w": 16, "h": 16 } @@ -7974,6 +8037,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:d3848d1a2f1d71413dd485f5f629a4eb:a418dc4833fcd357930c1512c8417df7:110e074689c9edd2c54833ce2e4d9270$" + "smartupdate": "$TexturePacker:SmartUpdate:6b2a4560d5cf30251c4b4c3be9f16589:f1e153f025227c53855c501b67bcbe1b:110e074689c9edd2c54833ce2e4d9270$" } } diff --git a/public/images/items.png b/public/images/items.png index d9efd889f1f..2d6c22e6cc7 100644 Binary files a/public/images/items.png and b/public/images/items.png differ diff --git a/public/images/items/ribbon-gen1.png b/public/images/items/ribbon-gen1.png new file mode 100644 index 00000000000..a9774d18ad0 Binary files /dev/null and b/public/images/items/ribbon-gen1.png differ diff --git a/public/images/items/ribbon-gen2.png b/public/images/items/ribbon-gen2.png new file mode 100644 index 00000000000..a04f6a32a62 Binary files /dev/null and b/public/images/items/ribbon-gen2.png differ diff --git a/public/images/items/ribbon-gen3.png b/public/images/items/ribbon-gen3.png new file mode 100644 index 00000000000..0cf20ed92ee Binary files /dev/null and b/public/images/items/ribbon-gen3.png differ diff --git a/public/images/items/ribbon-gen4.png b/public/images/items/ribbon-gen4.png new file mode 100644 index 00000000000..aa24433b71b Binary files /dev/null and b/public/images/items/ribbon-gen4.png differ diff --git a/public/images/items/ribbon-gen5.png b/public/images/items/ribbon-gen5.png new file mode 100644 index 00000000000..7bb7800671f Binary files /dev/null and b/public/images/items/ribbon-gen5.png differ diff --git a/public/images/items/ribbon-gen6.png b/public/images/items/ribbon-gen6.png new file mode 100644 index 00000000000..e466eb78842 Binary files /dev/null and b/public/images/items/ribbon-gen6.png differ diff --git a/public/images/items/ribbon-gen7.png b/public/images/items/ribbon-gen7.png new file mode 100644 index 00000000000..9c156ebd1c6 Binary files /dev/null and b/public/images/items/ribbon-gen7.png differ diff --git a/public/images/items/ribbon-gen8.png b/public/images/items/ribbon-gen8.png new file mode 100644 index 00000000000..86b3748e348 Binary files /dev/null and b/public/images/items/ribbon-gen8.png differ diff --git a/public/images/items/ribbon-gen9.png b/public/images/items/ribbon-gen9.png new file mode 100644 index 00000000000..e9609daf3cd Binary files /dev/null and b/public/images/items/ribbon-gen9.png differ diff --git a/public/images/items/ribbon_gen1.png b/public/images/items/ribbon_gen1.png new file mode 100644 index 00000000000..a9774d18ad0 Binary files /dev/null and b/public/images/items/ribbon_gen1.png differ diff --git a/public/images/items/ribbon_gen2.png b/public/images/items/ribbon_gen2.png new file mode 100644 index 00000000000..a04f6a32a62 Binary files /dev/null and b/public/images/items/ribbon_gen2.png differ diff --git a/public/images/items/ribbon_gen3.png b/public/images/items/ribbon_gen3.png new file mode 100644 index 00000000000..0cf20ed92ee Binary files /dev/null and b/public/images/items/ribbon_gen3.png differ diff --git a/public/images/items/ribbon_gen4.png b/public/images/items/ribbon_gen4.png new file mode 100644 index 00000000000..aa24433b71b Binary files /dev/null and b/public/images/items/ribbon_gen4.png differ diff --git a/public/images/items/ribbon_gen5.png b/public/images/items/ribbon_gen5.png new file mode 100644 index 00000000000..7bb7800671f Binary files /dev/null and b/public/images/items/ribbon_gen5.png differ diff --git a/public/images/items/ribbon_gen6.png b/public/images/items/ribbon_gen6.png new file mode 100644 index 00000000000..e466eb78842 Binary files /dev/null and b/public/images/items/ribbon_gen6.png differ diff --git a/public/images/items/ribbon_gen7.png b/public/images/items/ribbon_gen7.png new file mode 100644 index 00000000000..9c156ebd1c6 Binary files /dev/null and b/public/images/items/ribbon_gen7.png differ diff --git a/public/images/items/ribbon_gen8.png b/public/images/items/ribbon_gen8.png new file mode 100644 index 00000000000..86b3748e348 Binary files /dev/null and b/public/images/items/ribbon_gen8.png differ diff --git a/public/images/items/ribbon_gen9.png b/public/images/items/ribbon_gen9.png new file mode 100644 index 00000000000..e9609daf3cd Binary files /dev/null and b/public/images/items/ribbon_gen9.png differ diff --git a/public/images/pokemon/variant/133-partner.json b/public/images/pokemon/variant/133-partner.json deleted file mode 100644 index 7e68923fbff..00000000000 --- a/public/images/pokemon/variant/133-partner.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "1": { - "a5634a": "5982b7", - "734a4a": "334b7d", - "d69c4a": "90c1f1", - "000000": "000000", - "523121": "13235c", - "e6c594": "9db5d8", - "bd9c7b": "5f6f94", - "ffffff": "ffffff", - "ffe6ad": "d7ebff" - }, - "2": { - "a5634a": "915ea3", - "734a4a": "5e3372", - "d69c4a": "bf88cb", - "000000": "000000", - "523121": "461144", - "e6c594": "d7b8ba", - "bd9c7b": "a07c83", - "ffffff": "ffffff", - "ffe6ad": "f3e6e3" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/_masterlist.json b/public/images/pokemon/variant/_masterlist.json index c936fc8d0a1..a60e25a7c9d 100644 --- a/public/images/pokemon/variant/_masterlist.json +++ b/public/images/pokemon/variant/_masterlist.json @@ -364,11 +364,6 @@ 1, 1 ], - "133-partner": [ - 0, - 1, - 1 - ], "134": [ 0, 1, @@ -3737,11 +3732,6 @@ 1, 1 ], - "133-partner": [ - 0, - 1, - 1 - ], "134": [ 0, 1, diff --git a/public/images/pokemon/variant/back/133-partner.json b/public/images/pokemon/variant/back/133-partner.json deleted file mode 100644 index 9cf1bd158ad..00000000000 --- a/public/images/pokemon/variant/back/133-partner.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "1": { - "734a4a": "13235c", - "523121": "0b1145", - "d69c4a": "90c1f1", - "a5634a": "5982b7", - "000000": "000000", - "ffe6ad": "d7ebff", - "bd9c7b": "5f6f94", - "e6c594": "8ca8d2" - }, - "2": { - "734a4a": "5e3372", - "523121": "461144", - "d69c4a": "bf88cb", - "a5634a": "915ea3", - "000000": "000000", - "ffe6ad": "f3e6e3", - "bd9c7b": "a07c83", - "e6c594": "cfa7a9" - } -} \ No newline at end of file diff --git a/src/battle.ts b/src/battle.ts index b8df7635472..1e0605bdc64 100644 --- a/src/battle.ts +++ b/src/battle.ts @@ -294,20 +294,9 @@ export default class Battle { if (pokemon.species.speciesId === Species.TAPU_KOKO || pokemon.species.speciesId === Species.TAPU_LELE || pokemon.species.speciesId === Species.TAPU_BULU || pokemon.species.speciesId === Species.TAPU_FINI) { return "battle_legendary_tapu"; } - if (pokemon.species.speciesId === Species.COSMOG || pokemon.species.speciesId === Species.COSMOEM || pokemon.species.speciesId === Species.SOLGALEO || pokemon.species.speciesId === Species.LUNALA) { + if (pokemon.species.speciesId === Species.COSMOG || pokemon.species.speciesId === Species.COSMOEM || pokemon.species.speciesId === Species.SOLGALEO || pokemon.species.speciesId === Species.LUNALA || pokemon.species.speciesId === Species.NECROZMA) { return "battle_legendary_sol_lun"; } - if (pokemon.species.speciesId === Species.NECROZMA) { - if (pokemon.getFormKey() === "") { - return "battle_legendary_sol_lun"; - } - if (pokemon.getFormKey() === "dusk-mane" || pokemon.getFormKey() === "dawn-wings") { - return "battle_legendary_dusk_dawn"; - } - if (pokemon.getFormKey() === "ultra") { - return "battle_legendary_ultra_nec"; - } - } if (pokemon.species.speciesId === Species.NIHILEGO || pokemon.species.speciesId === Species.BUZZWOLE || pokemon.species.speciesId === Species.PHEROMOSA || pokemon.species.speciesId === Species.XURKITREE || pokemon.species.speciesId === Species.CELESTEELA || pokemon.species.speciesId === Species.KARTANA || pokemon.species.speciesId === Species.GUZZLORD || pokemon.species.speciesId === Species.POIPOLE || pokemon.species.speciesId === Species.NAGANADEL || pokemon.species.speciesId === Species.STAKATAKA || pokemon.species.speciesId === Species.BLACEPHALON) { return "battle_legendary_ub"; } diff --git a/src/system/achv.ts b/src/system/achv.ts index 408ed0dde3b..7bce46bebe6 100644 --- a/src/system/achv.ts +++ b/src/system/achv.ts @@ -325,15 +325,15 @@ export const achvs = { HIDDEN_ABILITY: new Achv("HIDDEN_ABILITY","", "HIDDEN_ABILITY.description","ability_charm", 75), PERFECT_IVS: new Achv("PERFECT_IVS","", "PERFECT_IVS.description","blunder_policy", 100), CLASSIC_VICTORY: new Achv("CLASSIC_VICTORY","", "CLASSIC_VICTORY.description","relic_crown", 150), - MONO_GEN_ONE_VICTORY: new ChallengeAchv("MONO_GEN_ONE","", "MONO_GEN_ONE.description", "mystic_ticket", 100, c => c instanceof SingleGenerationChallenge && c.value === 1), - MONO_GEN_TWO_VICTORY: new ChallengeAchv("MONO_GEN_TWO","", "MONO_GEN_TWO.description", "mystic_ticket", 100, c => c instanceof SingleGenerationChallenge && c.value === 2), - MONO_GEN_THREE_VICTORY: new ChallengeAchv("MONO_GEN_THREE","", "MONO_GEN_THREE.description", "mystic_ticket", 100, c => c instanceof SingleGenerationChallenge && c.value === 3), - MONO_GEN_FOUR_VICTORY: new ChallengeAchv("MONO_GEN_FOUR","", "MONO_GEN_FOUR.description", "mystic_ticket", 100, c => c instanceof SingleGenerationChallenge && c.value === 4), - MONO_GEN_FIVE_VICTORY: new ChallengeAchv("MONO_GEN_FIVE","", "MONO_GEN_FIVE.description", "mystic_ticket", 100, c => c instanceof SingleGenerationChallenge && c.value === 5), - MONO_GEN_SIX_VICTORY: new ChallengeAchv("MONO_GEN_SIX","", "MONO_GEN_SIX.description", "mystic_ticket", 100, c => c instanceof SingleGenerationChallenge && c.value === 6), - MONO_GEN_SEVEN_VICTORY: new ChallengeAchv("MONO_GEN_SEVEN","", "MONO_GEN_SEVEN.description", "mystic_ticket", 100, c => c instanceof SingleGenerationChallenge && c.value === 7), - MONO_GEN_EIGHT_VICTORY: new ChallengeAchv("MONO_GEN_EIGHT","", "MONO_GEN_EIGHT.description", "mystic_ticket", 100, c => c instanceof SingleGenerationChallenge && c.value === 8), - MONO_GEN_NINE_VICTORY: new ChallengeAchv("MONO_GEN_NINE","", "MONO_GEN_NINE.description", "mystic_ticket", 100, c => c instanceof SingleGenerationChallenge && c.value === 9), + MONO_GEN_ONE_VICTORY: new ChallengeAchv("MONO_GEN_ONE","", "MONO_GEN_ONE.description", "ribbon_gen1", 100, c => c instanceof SingleGenerationChallenge && c.value === 1), + MONO_GEN_TWO_VICTORY: new ChallengeAchv("MONO_GEN_TWO","", "MONO_GEN_TWO.description", "ribbon_gen2", 100, c => c instanceof SingleGenerationChallenge && c.value === 2), + MONO_GEN_THREE_VICTORY: new ChallengeAchv("MONO_GEN_THREE","", "MONO_GEN_THREE.description", "ribbon_gen3", 100, c => c instanceof SingleGenerationChallenge && c.value === 3), + MONO_GEN_FOUR_VICTORY: new ChallengeAchv("MONO_GEN_FOUR","", "MONO_GEN_FOUR.description", "ribbon_gen4", 100, c => c instanceof SingleGenerationChallenge && c.value === 4), + MONO_GEN_FIVE_VICTORY: new ChallengeAchv("MONO_GEN_FIVE","", "MONO_GEN_FIVE.description", "ribbon_gen5", 100, c => c instanceof SingleGenerationChallenge && c.value === 5), + MONO_GEN_SIX_VICTORY: new ChallengeAchv("MONO_GEN_SIX","", "MONO_GEN_SIX.description", "ribbon_gen6", 100, c => c instanceof SingleGenerationChallenge && c.value === 6), + MONO_GEN_SEVEN_VICTORY: new ChallengeAchv("MONO_GEN_SEVEN","", "MONO_GEN_SEVEN.description", "ribbon_gen7", 100, c => c instanceof SingleGenerationChallenge && c.value === 7), + MONO_GEN_EIGHT_VICTORY: new ChallengeAchv("MONO_GEN_EIGHT","", "MONO_GEN_EIGHT.description", "ribbon_gen8", 100, c => c instanceof SingleGenerationChallenge && c.value === 8), + MONO_GEN_NINE_VICTORY: new ChallengeAchv("MONO_GEN_NINE","", "MONO_GEN_NINE.description", "ribbon_gen9", 100, c => c instanceof SingleGenerationChallenge && c.value === 9), MONO_NORMAL: new ChallengeAchv("MONO_NORMAL","", "MONO_NORMAL.description", "silk_scarf", 100, c => c instanceof SingleTypeChallenge && c.value === 1), MONO_FIGHTING: new ChallengeAchv("MONO_FIGHTING","", "MONO_FIGHTING.description", "black_belt", 100, c => c instanceof SingleTypeChallenge && c.value === 2), MONO_FLYING: new ChallengeAchv("MONO_FLYING","", "MONO_FLYING.description", "sharp_beak", 100, c => c instanceof SingleTypeChallenge && c.value === 3),