diff --git a/public/images/items.json b/public/images/items.json index a52303ac6..60dc8a0c5 100644 --- a/public/images/items.json +++ b/public/images/items.json @@ -4,8 +4,8 @@ "image": "items.png", "format": "RGBA8888", "size": { - "w": 386, - "h": 386 + "w": 387, + "h": 387 }, "scale": 1, "frames": [ @@ -597,6 +597,27 @@ "h": 24 } }, + { + "filename": "relic_gold", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 9, + "y": 11, + "w": 15, + "h": 11 + }, + "frame": { + "x": 0, + "y": 376, + "w": 15, + "h": 11 + } + }, { "filename": "calcium", "rotated": false, @@ -850,7 +871,7 @@ } }, { - "filename": "ability_capsule", + "filename": "silver_powder", "rotated": false, "trimmed": true, "sourceSize": { @@ -859,15 +880,15 @@ }, "spriteSourceSize": { "x": 4, - "y": 9, + "y": 11, "w": 24, - "h": 14 + "h": 15 }, "frame": { "x": 24, "y": 372, "w": 24, - "h": 14 + "h": 15 } }, { @@ -1165,7 +1186,7 @@ } }, { - "filename": "choice_specs", + "filename": "coupon", "rotated": false, "trimmed": true, "sourceSize": { @@ -1174,15 +1195,36 @@ }, "spriteSourceSize": { "x": 4, - "y": 8, - "w": 24, - "h": 18 + "y": 7, + "w": 23, + "h": 19 }, "frame": { "x": 48, "y": 368, - "w": 24, - "h": 18 + "w": 23, + "h": 19 + } + }, + { + "filename": "golden_mystic_ticket", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 23, + "h": 19 + }, + "frame": { + "x": 71, + "y": 368, + "w": 23, + "h": 19 } }, { @@ -1438,7 +1480,7 @@ } }, { - "filename": "dragon_scale", + "filename": "choice_specs", "rotated": false, "trimmed": true, "sourceSize": { @@ -1459,7 +1501,7 @@ } }, { - "filename": "icy_reins_of_unity", + "filename": "dragon_scale", "rotated": false, "trimmed": true, "sourceSize": { @@ -1468,15 +1510,15 @@ }, "spriteSourceSize": { "x": 4, - "y": 7, + "y": 8, "w": 24, - "h": 20 + "h": 18 }, "frame": { "x": 352, "y": 24, "w": 24, - "h": 20 + "h": 18 } }, { @@ -1753,7 +1795,7 @@ } }, { - "filename": "adamant_crystal", + "filename": "electric_tera_shard", "rotated": false, "trimmed": true, "sourceSize": { @@ -1761,20 +1803,20 @@ "h": 32 }, "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 23, - "h": 21 + "x": 6, + "y": 4, + "w": 22, + "h": 23 }, "frame": { "x": 340, - "y": 44, - "w": 23, - "h": 21 + "y": 42, + "w": 22, + "h": 23 } }, { - "filename": "rusted_sword", + "filename": "dragon_fang", "rotated": false, "trimmed": true, "sourceSize": { @@ -1782,16 +1824,16 @@ "h": 32 }, "spriteSourceSize": { - "x": 4, + "x": 5, "y": 5, - "w": 23, - "h": 22 + "w": 21, + "h": 23 }, "frame": { - "x": 363, - "y": 44, - "w": 23, - "h": 22 + "x": 362, + "y": 42, + "w": 21, + "h": 23 } }, { @@ -1921,7 +1963,7 @@ } }, { - "filename": "dragon_fang", + "filename": "fairy_tera_shard", "rotated": false, "trimmed": true, "sourceSize": { @@ -1929,20 +1971,20 @@ "h": 32 }, "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 21, + "x": 6, + "y": 4, + "w": 22, "h": 23 }, "frame": { "x": 67, "y": 99, - "w": 21, + "w": 22, "h": 23 } }, { - "filename": "electric_tera_shard", + "filename": "fighting_tera_shard", "rotated": false, "trimmed": true, "sourceSize": { @@ -1963,7 +2005,7 @@ } }, { - "filename": "fairy_tera_shard", + "filename": "fire_stone", "rotated": false, "trimmed": true, "sourceSize": { @@ -1971,8 +2013,8 @@ "h": 32 }, "spriteSourceSize": { - "x": 6, - "y": 4, + "x": 5, + "y": 5, "w": 22, "h": 23 }, @@ -1984,7 +2026,7 @@ } }, { - "filename": "fighting_tera_shard", + "filename": "fire_tera_shard", "rotated": false, "trimmed": true, "sourceSize": { @@ -2005,28 +2047,7 @@ } }, { - "filename": "fire_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 23 - }, - "frame": { - "x": 83, - "y": 74, - "w": 22, - "h": 23 - } - }, - { - "filename": "fire_tera_shard", + "filename": "flying_tera_shard", "rotated": false, "trimmed": true, "sourceSize": { @@ -2040,14 +2061,35 @@ "h": 23 }, "frame": { - "x": 88, + "x": 83, + "y": 74, + "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": 89, "y": 97, "w": 22, "h": 23 } }, { - "filename": "flying_tera_shard", + "filename": "ghost_tera_shard", "rotated": false, "trimmed": true, "sourceSize": { @@ -2068,7 +2110,7 @@ } }, { - "filename": "focus_sash", + "filename": "grass_tera_shard", "rotated": false, "trimmed": true, "sourceSize": { @@ -2076,7 +2118,7 @@ "h": 32 }, "spriteSourceSize": { - "x": 5, + "x": 6, "y": 4, "w": 22, "h": 23 @@ -2089,7 +2131,7 @@ } }, { - "filename": "ghost_tera_shard", + "filename": "ground_tera_shard", "rotated": false, "trimmed": true, "sourceSize": { @@ -2110,7 +2152,7 @@ } }, { - "filename": "amulet_coin", + "filename": "ability_capsule", "rotated": false, "trimmed": true, "sourceSize": { @@ -2118,58 +2160,16 @@ "h": 32 }, "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 23, - "h": 21 + "x": 4, + "y": 9, + "w": 24, + "h": 14 }, "frame": { "x": 74, "y": 191, - "w": 23, - "h": 21 - } - }, - { - "filename": "grass_tera_shard", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 22, - "h": 23 - }, - "frame": { - "x": 97, - "y": 189, - "w": 22, - "h": 23 - } - }, - { - "filename": "ground_tera_shard", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 22, - "h": 23 - }, - "frame": { - "x": 64, - "y": 212, - "w": 22, - "h": 23 + "w": 24, + "h": 14 } }, { @@ -2187,35 +2187,14 @@ "h": 23 }, "frame": { - "x": 86, - "y": 212, + "x": 64, + "y": 205, "w": 22, "h": 23 } }, { - "filename": "silver_powder", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 11, - "w": 24, - "h": 15 - }, - "frame": { - "x": 64, - "y": 235, - "w": 24, - "h": 15 - } - }, - { - "filename": "never_melt_ice", + "filename": "charcoal", "rotated": false, "trimmed": true, "sourceSize": { @@ -2226,13 +2205,13 @@ "x": 5, "y": 5, "w": 22, - "h": 23 + "h": 22 }, "frame": { - "x": 66, - "y": 250, + "x": 64, + "y": 228, "w": 22, - "h": 23 + "h": 22 } }, { @@ -2250,138 +2229,12 @@ "h": 23 }, "frame": { - "x": 88, - "y": 235, + "x": 66, + "y": 250, "w": 21, "h": 23 } }, - { - "filename": "leaf_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 21, - "h": 23 - }, - "frame": { - "x": 70, - "y": 273, - "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": 71, - "y": 296, - "w": 20, - "h": 23 - } - }, - { - "filename": "normal_tera_shard", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 22, - "h": 23 - }, - "frame": { - "x": 71, - "y": 319, - "w": 22, - "h": 23 - } - }, - { - "filename": "petaya_berry", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 23 - }, - "frame": { - "x": 72, - "y": 342, - "w": 22, - "h": 23 - } - }, - { - "filename": "auspicious_armor", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 23, - "h": 21 - }, - "frame": { - "x": 72, - "y": 365, - "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": 108, - "y": 212, - "w": 15, - "h": 23 - } - }, { "filename": "hyper_potion", "rotated": false, @@ -2397,35 +2250,14 @@ "h": 23 }, "frame": { - "x": 109, - "y": 235, + "x": 70, + "y": 273, "w": 17, "h": 23 } }, { - "filename": "prism_scale", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 15, - "h": 15 - }, - "frame": { - "x": 88, - "y": 258, - "w": 15, - "h": 15 - } - }, - { - "filename": "binding_band", + "filename": "leaf_stone", "rotated": false, "trimmed": true, "sourceSize": { @@ -2434,19 +2266,19 @@ }, "spriteSourceSize": { "x": 5, - "y": 6, - "w": 23, - "h": 20 + "y": 5, + "w": 21, + "h": 23 }, "frame": { - "x": 103, - "y": 258, - "w": 23, - "h": 20 + "x": 71, + "y": 296, + "w": 21, + "h": 23 } }, { - "filename": "revive", + "filename": "never_melt_ice", "rotated": false, "trimmed": true, "sourceSize": { @@ -2454,37 +2286,121 @@ "h": 32 }, "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 12, - "h": 17 + "x": 5, + "y": 5, + "w": 22, + "h": 23 }, "frame": { - "x": 91, + "x": 71, + "y": 319, + "w": 22, + "h": 23 + } + }, + { + "filename": "normal_tera_shard", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 22, + "h": 23 + }, + "frame": { + "x": 72, + "y": 342, + "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": 86, + "y": 205, + "w": 15, + "h": 23 + } + }, + { + "filename": "berry_pot", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 18, + "h": 22 + }, + "frame": { + "x": 86, + "y": 228, + "w": 18, + "h": 22 + } + }, + { + "filename": "mystic_water", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 20, + "h": 23 + }, + "frame": { + "x": 87, + "y": 250, + "w": 20, + "h": 23 + } + }, + { + "filename": "petaya_berry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 23 + }, + "frame": { + "x": 87, "y": 273, - "w": 12, - "h": 17 - } - }, - { - "filename": "black_glasses", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 8, - "w": 23, - "h": 17 - }, - "frame": { - "x": 103, - "y": 278, - "w": 23, - "h": 17 + "w": 22, + "h": 23 } }, { @@ -2502,8 +2418,8 @@ "h": 23 }, "frame": { - "x": 91, - "y": 295, + "x": 92, + "y": 296, "w": 22, "h": 23 } @@ -2524,7 +2440,7 @@ }, "frame": { "x": 93, - "y": 318, + "y": 319, "w": 22, "h": 23 } @@ -2545,13 +2461,13 @@ }, "frame": { "x": 94, - "y": 341, + "y": 342, "w": 22, "h": 23 } }, { - "filename": "charcoal", + "filename": "rusted_sword", "rotated": false, "trimmed": true, "sourceSize": { @@ -2559,18 +2475,39 @@ "h": 32 }, "spriteSourceSize": { - "x": 5, + "x": 4, "y": 5, - "w": 22, + "w": 23, "h": 22 }, "frame": { - "x": 95, - "y": 364, - "w": 22, + "x": 94, + "y": 365, + "w": 23, "h": 22 } }, + { + "filename": "mega_bracelet", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 20, + "h": 16 + }, + "frame": { + "x": 98, + "y": 189, + "w": 20, + "h": 16 + } + }, { "filename": "potion", "rotated": false, @@ -2586,12 +2523,33 @@ "h": 23 }, "frame": { - "x": 113, - "y": 295, + "x": 101, + "y": 205, "w": 17, "h": 23 } }, + { + "filename": "dire_hit", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 104, + "y": 228, + "w": 22, + "h": 22 + } + }, { "filename": "rock_tera_shard", "rotated": false, @@ -2607,8 +2565,8 @@ "h": 23 }, "frame": { - "x": 115, - "y": 318, + "x": 107, + "y": 250, "w": 22, "h": 23 } @@ -2628,33 +2586,12 @@ "h": 23 }, "frame": { - "x": 116, - "y": 341, + "x": 109, + "y": 273, "w": 21, "h": 23 } }, - { - "filename": "dire_hit", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 117, - "y": 364, - "w": 22, - "h": 22 - } - }, { "filename": "sachet", "rotated": false, @@ -2670,8 +2607,8 @@ "h": 23 }, "frame": { - "x": 105, - "y": 70, + "x": 114, + "y": 296, "w": 18, "h": 23 } @@ -2691,8 +2628,8 @@ "h": 23 }, "frame": { - "x": 123, - "y": 67, + "x": 115, + "y": 319, "w": 22, "h": 23 } @@ -2712,12 +2649,96 @@ "h": 23 }, "frame": { - "x": 145, - "y": 66, + "x": 116, + "y": 342, "w": 22, "h": 23 } }, + { + "filename": "dna_splicers", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 117, + "y": 365, + "w": 22, + "h": 22 + } + }, + { + "filename": "super_potion", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 17, + "h": 23 + }, + "frame": { + "x": 105, + "y": 70, + "w": 17, + "h": 23 + } + }, + { + "filename": "water_tera_shard", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 22, + "h": 23 + }, + "frame": { + "x": 122, + "y": 67, + "w": 22, + "h": 23 + } + }, + { + "filename": "adamant_crystal", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 6, + "w": 23, + "h": 21 + }, + "frame": { + "x": 144, + "y": 66, + "w": 23, + "h": 21 + } + }, { "filename": "leftovers", "rotated": false, @@ -2740,7 +2761,7 @@ } }, { - "filename": "moon_stone", + "filename": "amulet_coin", "rotated": false, "trimmed": true, "sourceSize": { @@ -2748,8 +2769,8 @@ "h": 32 }, "spriteSourceSize": { - "x": 4, - "y": 6, + "x": 6, + "y": 5, "w": 23, "h": 21 }, @@ -2761,7 +2782,7 @@ } }, { - "filename": "n_lunarizer", + "filename": "auspicious_armor", "rotated": false, "trimmed": true, "sourceSize": { @@ -2770,7 +2791,7 @@ }, "spriteSourceSize": { "x": 4, - "y": 6, + "y": 5, "w": 23, "h": 21 }, @@ -2782,7 +2803,7 @@ } }, { - "filename": "n_solarizer", + "filename": "icy_reins_of_unity", "rotated": false, "trimmed": true, "sourceSize": { @@ -2791,15 +2812,15 @@ }, "spriteSourceSize": { "x": 4, - "y": 6, - "w": 23, - "h": 21 + "y": 7, + "w": 24, + "h": 20 }, "frame": { "x": 228, "y": 67, - "w": 23, - "h": 21 + "w": 24, + "h": 20 } }, { @@ -2817,14 +2838,14 @@ "h": 20 }, "frame": { - "x": 251, + "x": 252, "y": 67, "w": 24, "h": 20 } }, { - "filename": "deep_sea_scale", + "filename": "big_nugget", "rotated": false, "trimmed": true, "sourceSize": { @@ -2832,39 +2853,18 @@ "h": 32 }, "spriteSourceSize": { - "x": 5, + "x": 6, "y": 6, - "w": 22, + "w": 20, "h": 20 }, "frame": { - "x": 275, + "x": 276, "y": 67, - "w": 22, + "w": 20, "h": 20 } }, - { - "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": 65, - "w": 22, - "h": 22 - } - }, { "filename": "electirizer", "rotated": false, @@ -2880,7 +2880,7 @@ "h": 22 }, "frame": { - "x": 319, + "x": 296, "y": 65, "w": 22, "h": 22 @@ -2901,96 +2901,12 @@ "h": 22 }, "frame": { - "x": 341, + "x": 318, "y": 65, "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": 363, - "y": 66, - "w": 23, - "h": 21 - } - }, - { - "filename": "super_potion", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 17, - "h": 23 - }, - "frame": { - "x": 110, - "y": 93, - "w": 17, - "h": 23 - } - }, - { - "filename": "water_tera_shard", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 22, - "h": 23 - }, - "frame": { - "x": 127, - "y": 90, - "w": 22, - "h": 23 - } - }, - { - "filename": "whipped_dream", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 21, - "h": 23 - }, - "frame": { - "x": 149, - "y": 89, - "w": 21, - "h": 23 - } - }, { "filename": "ganlon_berry", "rotated": false, @@ -3006,8 +2922,8 @@ "h": 22 }, "frame": { - "x": 170, - "y": 88, + "x": 340, + "y": 65, "w": 22, "h": 22 } @@ -3027,12 +2943,33 @@ "h": 22 }, "frame": { - "x": 192, - "y": 88, + "x": 362, + "y": 65, "w": 22, "h": 22 } }, + { + "filename": "whipped_dream", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 21, + "h": 23 + }, + "frame": { + "x": 111, + "y": 93, + "w": 21, + "h": 23 + } + }, { "filename": "ice_stone", "rotated": false, @@ -3047,195 +2984,6 @@ "w": 22, "h": 22 }, - "frame": { - "x": 214, - "y": 88, - "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": 236, - "y": 88, - "w": 22, - "h": 22 - } - }, - { - "filename": "memory_bug", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 258, - "y": 87, - "w": 22, - "h": 22 - } - }, - { - "filename": "memory_dark", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 280, - "y": 87, - "w": 22, - "h": 22 - } - }, - { - "filename": "memory_dragon", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 302, - "y": 87, - "w": 22, - "h": 22 - } - }, - { - "filename": "memory_electric", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 324, - "y": 87, - "w": 22, - "h": 22 - } - }, - { - "filename": "memory_fairy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 346, - "y": 87, - "w": 22, - "h": 22 - } - }, - { - "filename": "razor_fang", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 18, - "h": 20 - }, - "frame": { - "x": 368, - "y": 87, - "w": 18, - "h": 20 - } - }, - { - "filename": "oval_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 18, - "h": 19 - }, - "frame": { - "x": 368, - "y": 107, - "w": 18, - "h": 19 - } - }, - { - "filename": "memory_fighting", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, "frame": { "x": 114, "y": 116, @@ -3244,7 +2992,7 @@ } }, { - "filename": "memory_fire", + "filename": "magmarizer", "rotated": false, "trimmed": true, "sourceSize": { @@ -3265,7 +3013,7 @@ } }, { - "filename": "memory_flying", + "filename": "memory_bug", "rotated": false, "trimmed": true, "sourceSize": { @@ -3286,7 +3034,7 @@ } }, { - "filename": "memory_ghost", + "filename": "memory_dark", "rotated": false, "trimmed": true, "sourceSize": { @@ -3300,14 +3048,14 @@ "h": 22 }, "frame": { - "x": 119, + "x": 118, "y": 182, "w": 22, "h": 22 } }, { - "filename": "memory_grass", + "filename": "memory_dragon", "rotated": false, "trimmed": true, "sourceSize": { @@ -3321,1211 +3069,14 @@ "h": 22 }, "frame": { - "x": 136, - "y": 113, - "w": 22, - "h": 22 - } - }, - { - "filename": "memory_ground", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 138, - "y": 135, - "w": 22, - "h": 22 - } - }, - { - "filename": "memory_ice", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 140, - "y": 157, - "w": 22, - "h": 22 - } - }, - { - "filename": "memory_normal", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 141, - "y": 179, - "w": 22, - "h": 22 - } - }, - { - "filename": "tm_normal", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 141, - "y": 179, - "w": 22, - "h": 22 - } - }, - { - "filename": "memory_poison", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 158, - "y": 112, - "w": 22, - "h": 22 - } - }, - { - "filename": "memory_psychic", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 180, - "y": 110, - "w": 22, - "h": 22 - } - }, - { - "filename": "memory_rock", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 202, - "y": 110, - "w": 22, - "h": 22 - } - }, - { - "filename": "memory_steel", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 224, - "y": 110, - "w": 22, - "h": 22 - } - }, - { - "filename": "memory_water", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 160, - "y": 134, - "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": 182, - "y": 132, - "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": 204, - "y": 132, - "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": 226, - "y": 132, - "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": 162, - "y": 156, - "w": 22, - "h": 22 - } - }, - { - "filename": "sacred_ash", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 24, - "h": 20 - }, - "frame": { - "x": 184, - "y": 154, - "w": 24, - "h": 20 - } - }, - { - "filename": "shadow_reins_of_unity", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 24, - "h": 20 - }, - "frame": { - "x": 208, - "y": 154, - "w": 24, - "h": 20 - } - }, - { - "filename": "shed_shell", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 163, - "y": 178, - "w": 22, - "h": 22 - } - }, - { - "filename": "soft_sand", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 24, - "h": 20 - }, - "frame": { - "x": 185, - "y": 174, - "w": 24, - "h": 20 - } - }, - { - "filename": "reviver_seed", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 8, - "w": 23, - "h": 20 - }, - "frame": { - "x": 209, - "y": 174, - "w": 23, - "h": 20 - } - }, - { - "filename": "metal_coat", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 19, - "h": 22 - }, - "frame": { - "x": 232, - "y": 154, - "w": 19, - "h": 22 - } - }, - { - "filename": "apicot_berry", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 19, - "h": 20 - }, - "frame": { - "x": 232, - "y": 176, - "w": 19, - "h": 20 - } - }, - { - "filename": "metronome", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 17, - "h": 22 - }, - "frame": { - "x": 246, - "y": 110, - "w": 17, - "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": 263, - "y": 109, - "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": 285, - "y": 109, - "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": 307, - "y": 109, - "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": 329, - "y": 109, - "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": 351, - "y": 109, - "w": 17, - "h": 22 - } - }, - { - "filename": "dark_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 18, - "h": 18 - }, - "frame": { - "x": 368, - "y": 126, - "w": 18, - "h": 18 - } - }, - { - "filename": "sitrus_berry", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 20, - "h": 22 - }, - "frame": { - "x": 248, - "y": 132, - "w": 20, - "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": 268, - "y": 131, - "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": 290, - "y": 131, - "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": 312, - "y": 131, - "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": 334, - "y": 131, - "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": 251, - "y": 154, - "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": 273, - "y": 153, - "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": 295, - "y": 153, - "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": 317, - "y": 153, - "w": 22, - "h": 22 - } - }, - { - "filename": "deep_sea_tooth", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 22, - "h": 21 - }, - "frame": { - "x": 251, - "y": 176, - "w": 22, - "h": 21 - } - }, - { - "filename": "tm_ground", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 273, - "y": 175, - "w": 22, - "h": 22 - } - }, - { - "filename": "tm_ice", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 295, - "y": 175, - "w": 22, - "h": 22 - } - }, - { - "filename": "tm_poison", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 317, - "y": 175, - "w": 22, - "h": 22 - } - }, - { - "filename": "tm_psychic", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 339, - "y": 153, - "w": 22, - "h": 22 - } - }, - { - "filename": "tm_rock", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 339, - "y": 175, - "w": 22, - "h": 22 - } - }, - { - "filename": "tm_steel", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 123, + "x": 118, "y": 204, "w": 22, "h": 22 } }, { - "filename": "tm_water", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 145, - "y": 201, - "w": 22, - "h": 22 - } - }, - { - "filename": "water_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 167, - "y": 200, - "w": 22, - "h": 22 - } - }, - { - "filename": "x_accuracy", - "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": "dusk_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 21, - "h": 21 - }, - "frame": { - "x": 211, - "y": 194, - "w": 21, - "h": 21 - } - }, - { - "filename": "big_mushroom", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 19, - "h": 19 - }, - "frame": { - "x": 232, - "y": 196, - "w": 19, - "h": 19 - } - }, - { - "filename": "coupon", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 23, - "h": 19 - }, - "frame": { - "x": 251, - "y": 197, - "w": 23, - "h": 19 - } - }, - { - "filename": "golden_mystic_ticket", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 23, - "h": 19 - }, - "frame": { - "x": 274, - "y": 197, - "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": 297, - "y": 197, - "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": 320, - "y": 197, - "w": 23, - "h": 19 - } - }, - { - "filename": "big_nugget", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 20 - }, - "frame": { - "x": 343, - "y": 197, - "w": 20, - "h": 20 - } - }, - { - "filename": "shell_bell", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 23, - "h": 20 - }, - "frame": { - "x": 363, - "y": 144, - "w": 23, - "h": 20 - } - }, - { - "filename": "x_attack", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 361, - "y": 164, - "w": 22, - "h": 22 - } - }, - { - "filename": "relic_crown", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 23, - "h": 18 - }, - "frame": { - "x": 363, - "y": 186, - "w": 23, - "h": 18 - } - }, - { - "filename": "wise_glasses", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 8, - "w": 23, - "h": 17 - }, - "frame": { - "x": 363, - "y": 204, - "w": 23, - "h": 17 - } - }, - { - "filename": "x_defense", + "filename": "memory_electric", "rotated": false, "trimmed": true, "sourceSize": { @@ -4546,7 +3097,7 @@ } }, { - "filename": "x_sp_atk", + "filename": "memory_fairy", "rotated": false, "trimmed": true, "sourceSize": { @@ -4560,14 +3111,14 @@ "h": 22 }, "frame": { - "x": 126, + "x": 129, "y": 248, "w": 22, "h": 22 } }, { - "filename": "x_sp_def", + "filename": "memory_fighting", "rotated": false, "trimmed": true, "sourceSize": { @@ -4581,14 +3132,245 @@ "h": 22 }, "frame": { - "x": 126, + "x": 130, "y": 270, "w": 22, "h": 22 } }, { - "filename": "x_speed", + "filename": "memory_fire", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 132, + "y": 292, + "w": 22, + "h": 22 + } + }, + { + "filename": "memory_flying", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 137, + "y": 314, + "w": 22, + "h": 22 + } + }, + { + "filename": "memory_ghost", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 138, + "y": 336, + "w": 22, + "h": 22 + } + }, + { + "filename": "memory_grass", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 139, + "y": 358, + "w": 22, + "h": 22 + } + }, + { + "filename": "memory_ground", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 132, + "y": 90, + "w": 22, + "h": 22 + } + }, + { + "filename": "memory_ice", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 136, + "y": 112, + "w": 22, + "h": 22 + } + }, + { + "filename": "memory_normal", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 138, + "y": 134, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_normal", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 138, + "y": 134, + "w": 22, + "h": 22 + } + }, + { + "filename": "memory_poison", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 140, + "y": 156, + "w": 22, + "h": 22 + } + }, + { + "filename": "memory_psychic", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 140, + "y": 178, + "w": 22, + "h": 22 + } + }, + { + "filename": "memory_rock", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 140, + "y": 200, + "w": 22, + "h": 22 + } + }, + { + "filename": "memory_steel", "rotated": false, "trimmed": true, "sourceSize": { @@ -4603,13 +3385,13 @@ }, "frame": { "x": 148, - "y": 223, + "y": 222, "w": 22, "h": 22 } }, { - "filename": "liechi_berry", + "filename": "memory_water", "rotated": false, "trimmed": true, "sourceSize": { @@ -4618,19 +3400,439 @@ }, "spriteSourceSize": { "x": 5, - "y": 6, + "y": 5, "w": 22, + "h": 22 + }, + "frame": { + "x": 151, + "y": 244, + "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": 152, + "y": 266, + "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": 154, + "y": 288, + "w": 22, + "h": 22 + } + }, + { + "filename": "metal_coat", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 19, + "h": 22 + }, + "frame": { + "x": 159, + "y": 310, + "w": 19, + "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": 160, + "y": 332, + "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": 161, + "y": 354, + "w": 22, + "h": 22 + } + }, + { + "filename": "moon_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 6, + "w": 23, "h": 21 }, "frame": { - "x": 148, - "y": 245, - "w": 22, + "x": 154, + "y": 88, + "w": 23, "h": 21 } }, { - "filename": "sweet_apple", + "filename": "n_lunarizer", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 6, + "w": 23, + "h": 21 + }, + "frame": { + "x": 177, + "y": 88, + "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": 200, + "y": 88, + "w": 23, + "h": 21 + } + }, + { + "filename": "sacred_ash", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 24, + "h": 20 + }, + "frame": { + "x": 158, + "y": 109, + "w": 24, + "h": 20 + } + }, + { + "filename": "shadow_reins_of_unity", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 24, + "h": 20 + }, + "frame": { + "x": 182, + "y": 109, + "w": 24, + "h": 20 + } + }, + { + "filename": "shed_shell", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 160, + "y": 129, + "w": 22, + "h": 22 + } + }, + { + "filename": "soft_sand", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 24, + "h": 20 + }, + "frame": { + "x": 182, + "y": 129, + "w": 24, + "h": 20 + } + }, + { + "filename": "metronome", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 17, + "h": 22 + }, + "frame": { + "x": 206, + "y": 109, + "w": 17, + "h": 22 + } + }, + { + "filename": "sitrus_berry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 20, + "h": 22 + }, + "frame": { + "x": 162, + "y": 151, + "w": 20, + "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": 182, + "y": 149, + "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": 162, + "y": 173, + "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": 162, + "y": 195, + "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": 184, + "y": 171, + "w": 22, + "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": 184, + "y": 193, + "w": 22, + "h": 22 + } + }, + { + "filename": "apicot_berry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 19, + "h": 20 + }, + "frame": { + "x": 206, + "y": 131, + "w": 19, + "h": 20 + } + }, + { + "filename": "binding_band", "rotated": false, "trimmed": true, "sourceSize": { @@ -4640,13 +3842,412 @@ "spriteSourceSize": { "x": 5, "y": 6, + "w": 23, + "h": 20 + }, + "frame": { + "x": 204, + "y": 151, + "w": 23, + "h": 20 + } + }, + { + "filename": "tm_electric", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, "w": 22, + "h": 22 + }, + "frame": { + "x": 206, + "y": 171, + "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": 206, + "y": 193, + "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": 170, + "y": 217, + "w": 17, + "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": 187, + "y": 215, + "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": 209, + "y": 215, + "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": 173, + "y": 239, + "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": 195, + "y": 237, + "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": 174, + "y": 261, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_ground", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 196, + "y": 259, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_ice", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 176, + "y": 283, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_poison", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 198, + "y": 281, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_psychic", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 217, + "y": 237, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_rock", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 218, + "y": 259, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_steel", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 220, + "y": 281, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_water", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 178, + "y": 305, + "w": 22, + "h": 22 + } + }, + { + "filename": "water_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 200, + "y": 303, + "w": 22, + "h": 22 + } + }, + { + "filename": "x_accuracy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 222, + "y": 303, + "w": 22, + "h": 22 + } + }, + { + "filename": "x_attack", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 182, + "y": 327, + "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": 148, - "y": 266, - "w": 22, + "x": 204, + "y": 325, + "w": 23, "h": 21 } }, @@ -4665,14 +4266,14 @@ "h": 21 }, "frame": { - "x": 170, - "y": 222, + "x": 227, + "y": 325, "w": 20, "h": 21 } }, { - "filename": "poison_barb", + "filename": "x_defense", "rotated": false, "trimmed": true, "sourceSize": { @@ -4681,19 +4282,19 @@ }, "spriteSourceSize": { "x": 5, - "y": 6, - "w": 21, - "h": 21 + "y": 5, + "w": 22, + "h": 22 }, "frame": { - "x": 170, - "y": 243, - "w": 21, - "h": 21 + "x": 183, + "y": 349, + "w": 22, + "h": 22 } }, { - "filename": "shiny_stone", + "filename": "x_sp_atk", "rotated": false, "trimmed": true, "sourceSize": { @@ -4702,19 +4303,82 @@ }, "spriteSourceSize": { "x": 5, - "y": 6, - "w": 21, - "h": 21 + "y": 5, + "w": 22, + "h": 22 }, "frame": { - "x": 170, - "y": 264, - "w": 21, - "h": 21 + "x": 205, + "y": 346, + "w": 22, + "h": 22 } }, { - "filename": "spell_tag", + "filename": "mystic_ticket", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 23, + "h": 19 + }, + "frame": { + "x": 205, + "y": 368, + "w": 23, + "h": 19 + } + }, + { + "filename": "x_sp_def", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 227, + "y": 346, + "w": 22, + "h": 22 + } + }, + { + "filename": "pair_of_tickets", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 23, + "h": 19 + }, + "frame": { + "x": 228, + "y": 368, + "w": 23, + "h": 19 + } + }, + { + "filename": "relic_band", "rotated": false, "trimmed": true, "sourceSize": { @@ -4723,14 +4387,161 @@ }, "spriteSourceSize": { "x": 7, + "y": 9, + "w": 17, + "h": 16 + }, + "frame": { + "x": 183, + "y": 371, + "w": 17, + "h": 16 + } + }, + { + "filename": "x_speed", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 223, + "y": 88, + "w": 22, + "h": 22 + } + }, + { + "filename": "deep_sea_tooth", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, "y": 6, - "w": 19, + "w": 22, "h": 21 }, "frame": { - "x": 130, - "y": 292, - "w": 19, + "x": 223, + "y": 110, + "w": 22, + "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": 225, + "y": 131, + "w": 20, + "h": 20 + } + }, + { + "filename": "liechi_berry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 22, + "h": 21 + }, + "frame": { + "x": 245, + "y": 87, + "w": 22, + "h": 21 + } + }, + { + "filename": "reviver_seed", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 8, + "w": 23, + "h": 20 + }, + "frame": { + "x": 267, + "y": 87, + "w": 23, + "h": 20 + } + }, + { + "filename": "shell_bell", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 23, + "h": 20 + }, + "frame": { + "x": 290, + "y": 87, + "w": 23, + "h": 20 + } + }, + { + "filename": "sweet_apple", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 22, + "h": 21 + }, + "frame": { + "x": 245, + "y": 108, + "w": 22, "h": 21 } }, @@ -4749,8 +4560,8 @@ "h": 21 }, "frame": { - "x": 149, - "y": 287, + "x": 267, + "y": 107, "w": 22, "h": 21 } @@ -4770,14 +4581,14 @@ "h": 21 }, "frame": { - "x": 171, - "y": 285, + "x": 245, + "y": 129, "w": 22, "h": 21 } }, { - "filename": "zoom_lens", + "filename": "deep_sea_scale", "rotated": false, "trimmed": true, "sourceSize": { @@ -4787,12 +4598,33 @@ "spriteSourceSize": { "x": 5, "y": 6, + "w": 22, + "h": 20 + }, + "frame": { + "x": 313, + "y": 87, + "w": 22, + "h": 20 + } + }, + { + "filename": "dusk_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, "w": 21, "h": 21 }, "frame": { - "x": 190, - "y": 216, + "x": 267, + "y": 128, "w": 21, "h": 21 } @@ -4812,75 +4644,12 @@ "h": 20 }, "frame": { - "x": 211, - "y": 215, + "x": 289, + "y": 107, "w": 22, "h": 20 } }, - { - "filename": "golden_egg", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 17, - "h": 20 - }, - "frame": { - "x": 233, - "y": 215, - "w": 17, - "h": 20 - } - }, - { - "filename": "blunder_policy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 22, - "h": 19 - }, - "frame": { - "x": 250, - "y": 216, - "w": 22, - "h": 19 - } - }, - { - "filename": "dubious_disc", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 22, - "h": 19 - }, - "frame": { - "x": 272, - "y": 216, - "w": 22, - "h": 19 - } - }, { "filename": "malicious_armor", "rotated": false, @@ -4896,8 +4665,8 @@ "h": 20 }, "frame": { - "x": 294, - "y": 216, + "x": 335, + "y": 87, "w": 22, "h": 20 } @@ -4917,14 +4686,35 @@ "h": 20 }, "frame": { - "x": 316, - "y": 216, + "x": 311, + "y": 107, "w": 22, "h": 20 } }, { - "filename": "upgrade", + "filename": "blunder_policy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 22, + "h": 19 + }, + "frame": { + "x": 357, + "y": 87, + "w": 22, + "h": 19 + } + }, + { + "filename": "dubious_disc", "rotated": false, "trimmed": true, "sourceSize": { @@ -4938,14 +4728,14 @@ "h": 19 }, "frame": { - "x": 338, - "y": 217, + "x": 333, + "y": 107, "w": 22, "h": 19 } }, { - "filename": "blue_orb", + "filename": "candy_jar", "rotated": false, "trimmed": true, "sourceSize": { @@ -4955,16 +4745,79 @@ "spriteSourceSize": { "x": 6, "y": 6, - "w": 20, + "w": 19, "h": 20 }, "frame": { - "x": 191, - "y": 237, - "w": 20, + "x": 227, + "y": 151, + "w": 19, "h": 20 } }, + { + "filename": "poison_barb", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 21, + "h": 21 + }, + "frame": { + "x": 246, + "y": 150, + "w": 21, + "h": 21 + } + }, + { + "filename": "shiny_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 21, + "h": 21 + }, + "frame": { + "x": 267, + "y": 149, + "w": 21, + "h": 21 + } + }, + { + "filename": "zoom_lens", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 21, + "h": 21 + }, + "frame": { + "x": 228, + "y": 171, + "w": 21, + "h": 21 + } + }, { "filename": "gb", "rotated": false, @@ -4980,12 +4833,33 @@ "h": 20 }, "frame": { - "x": 211, - "y": 235, + "x": 228, + "y": 192, "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": 249, + "y": 171, + "w": 19, + "h": 21 + } + }, { "filename": "magnet", "rotated": false, @@ -5001,8 +4875,8 @@ "h": 20 }, "frame": { - "x": 191, - "y": 257, + "x": 248, + "y": 192, "w": 20, "h": 20 } @@ -5022,33 +4896,12 @@ "h": 20 }, "frame": { - "x": 211, - "y": 255, + "x": 268, + "y": 170, "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": 231, - "y": 235, - "w": 21, - "h": 19 - } - }, { "filename": "pb", "rotated": false, @@ -5064,14 +4917,119 @@ "h": 20 }, "frame": { - "x": 231, - "y": 254, + "x": 268, + "y": 190, "w": 20, "h": 20 } }, { - "filename": "lum_berry", + "filename": "relic_crown", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 23, + "h": 18 + }, + "frame": { + "x": 231, + "y": 212, + "w": 23, + "h": 18 + } + }, + { + "filename": "big_mushroom", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 19, + "h": 19 + }, + "frame": { + "x": 254, + "y": 212, + "w": 19, + "h": 19 + } + }, + { + "filename": "golden_egg", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 17, + "h": 20 + }, + "frame": { + "x": 273, + "y": 210, + "w": 17, + "h": 20 + } + }, + { + "filename": "black_glasses", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 8, + "w": 23, + "h": 17 + }, + "frame": { + "x": 289, + "y": 127, + "w": 23, + "h": 17 + } + }, + { + "filename": "upgrade", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 22, + "h": 19 + }, + "frame": { + "x": 288, + "y": 144, + "w": 22, + "h": 19 + } + }, + { + "filename": "metal_alloy", "rotated": false, "trimmed": true, "sourceSize": { @@ -5081,13 +5039,13 @@ "spriteSourceSize": { "x": 6, "y": 7, - "w": 20, + "w": 21, "h": 19 }, "frame": { - "x": 252, - "y": 235, - "w": 20, + "x": 288, + "y": 163, + "w": 21, "h": 19 } }, @@ -5106,8 +5064,8 @@ "h": 20 }, "frame": { - "x": 251, - "y": 254, + "x": 288, + "y": 182, "w": 20, "h": 20 } @@ -5127,35 +5085,14 @@ "h": 18 }, "frame": { - "x": 272, - "y": 235, + "x": 312, + "y": 127, "w": 21, "h": 18 } }, { - "filename": "unremarkable_teacup", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 21, - "h": 18 - }, - "frame": { - "x": 293, - "y": 236, - "w": 21, - "h": 18 - } - }, - { - "filename": "razor_claw", + "filename": "lum_berry", "rotated": false, "trimmed": true, "sourceSize": { @@ -5169,14 +5106,14 @@ "h": 19 }, "frame": { - "x": 314, - "y": 236, + "x": 333, + "y": 126, "w": 20, "h": 19 } }, { - "filename": "rb", + "filename": "wise_glasses", "rotated": false, "trimmed": true, "sourceSize": { @@ -5184,16 +5121,16 @@ "h": 32 }, "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 20 + "x": 4, + "y": 8, + "w": 23, + "h": 17 }, "frame": { - "x": 334, - "y": 236, - "w": 20, - "h": 20 + "x": 310, + "y": 145, + "w": 23, + "h": 17 } }, { @@ -5211,54 +5148,12 @@ "h": 17 }, "frame": { - "x": 360, - "y": 221, + "x": 333, + "y": 145, "w": 20, "h": 17 } }, - { - "filename": "strange_ball", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 20 - }, - "frame": { - "x": 354, - "y": 238, - "w": 20, - "h": 20 - } - }, - { - "filename": "candy_jar", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 19, - "h": 20 - }, - "frame": { - "x": 193, - "y": 277, - "w": 19, - "h": 20 - } - }, { "filename": "hard_stone", "rotated": false, @@ -5274,33 +5169,12 @@ "h": 20 }, "frame": { - "x": 212, - "y": 275, + "x": 290, + "y": 202, "w": 19, "h": 20 } }, - { - "filename": "ub", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 20 - }, - "frame": { - "x": 231, - "y": 274, - "w": 20, - "h": 20 - } - }, { "filename": "miracle_seed", "rotated": false, @@ -5316,14 +5190,35 @@ "h": 19 }, "frame": { - "x": 251, - "y": 274, + "x": 290, + "y": 222, "w": 19, "h": 19 } }, { - "filename": "mega_bracelet", + "filename": "lucky_egg", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 17, + "h": 20 + }, + "frame": { + "x": 273, + "y": 230, + "w": 17, + "h": 20 + } + }, + { + "filename": "razor_claw", "rotated": false, "trimmed": true, "sourceSize": { @@ -5332,14 +5227,140 @@ }, "spriteSourceSize": { "x": 6, - "y": 8, + "y": 7, "w": 20, + "h": 19 + }, + "frame": { + "x": 290, + "y": 241, + "w": 20, + "h": 19 + } + }, + { + "filename": "prism_scale", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 15, + "h": 15 + }, + "frame": { + "x": 239, + "y": 230, + "w": 15, + "h": 15 + } + }, + { + "filename": "dark_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 18, + "h": 18 + }, + "frame": { + "x": 254, + "y": 231, + "w": 18, + "h": 18 + } + }, + { + "filename": "razor_fang", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 18, + "h": 20 + }, + "frame": { + "x": 353, + "y": 126, + "w": 18, + "h": 20 + } + }, + { + "filename": "oval_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 18, + "h": 19 + }, + "frame": { + "x": 355, + "y": 107, + "w": 18, + "h": 19 + } + }, + { + "filename": "abomasite", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 16, "h": 16 }, "frame": { - "x": 193, - "y": 297, - "w": 20, + "x": 371, + "y": 126, + "w": 16, + "h": 16 + } + }, + { + "filename": "absolite", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 16, + "h": 16 + }, + "frame": { + "x": 371, + "y": 142, + "w": 16, "h": 16 } }, @@ -5358,12 +5379,138 @@ "h": 18 }, "frame": { - "x": 213, - "y": 295, + "x": 353, + "y": 146, "w": 18, "h": 18 } }, + { + "filename": "aerodactylite", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 16, + "h": 16 + }, + "frame": { + "x": 371, + "y": 158, + "w": 16, + "h": 16 + } + }, + { + "filename": "rb", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 20, + "h": 20 + }, + "frame": { + "x": 308, + "y": 182, + "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": 310, + "y": 162, + "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": 330, + "y": 162, + "w": 20, + "h": 20 + } + }, + { + "filename": "unremarkable_teacup", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 21, + "h": 18 + }, + "frame": { + "x": 350, + "y": 164, + "w": 21, + "h": 18 + } + }, + { + "filename": "aggronite", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 16, + "h": 16 + }, + "frame": { + "x": 371, + "y": 174, + "w": 16, + "h": 16 + } + }, { "filename": "wl_ability_urge", "rotated": false, @@ -5379,8 +5526,8 @@ "h": 18 }, "frame": { - "x": 231, - "y": 294, + "x": 328, + "y": 182, "w": 20, "h": 18 } @@ -5400,33 +5547,12 @@ "h": 18 }, "frame": { - "x": 251, - "y": 293, + "x": 348, + "y": 182, "w": 20, "h": 18 } }, - { - "filename": "lucky_egg", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 17, - "h": 20 - }, - "frame": { - "x": 137, - "y": 313, - "w": 17, - "h": 20 - } - }, { "filename": "wl_awakening", "rotated": false, @@ -5442,8 +5568,8 @@ "h": 18 }, "frame": { - "x": 137, - "y": 333, + "x": 309, + "y": 202, "w": 20, "h": 18 } @@ -5463,33 +5589,12 @@ "h": 18 }, "frame": { - "x": 154, - "y": 308, + "x": 309, + "y": 220, "w": 20, "h": 18 } }, - { - "filename": "relic_band", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 9, - "w": 17, - "h": 16 - }, - "frame": { - "x": 174, - "y": 306, - "w": 17, - "h": 16 - } - }, { "filename": "wl_custom_spliced", "rotated": false, @@ -5505,8 +5610,29 @@ "h": 18 }, "frame": { - "x": 157, - "y": 326, + "x": 329, + "y": 200, + "w": 20, + "h": 18 + } + }, + { + "filename": "wl_custom_thief", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 20, + "h": 18 + }, + "frame": { + "x": 329, + "y": 218, "w": 20, "h": 18 } @@ -5526,8 +5652,8 @@ "h": 18 }, "frame": { - "x": 177, - "y": 322, + "x": 349, + "y": 200, "w": 20, "h": 18 } @@ -5547,8 +5673,8 @@ "h": 18 }, "frame": { - "x": 197, - "y": 313, + "x": 349, + "y": 218, "w": 20, "h": 18 } @@ -5568,8 +5694,8 @@ "h": 18 }, "frame": { - "x": 217, - "y": 313, + "x": 310, + "y": 238, "w": 20, "h": 18 } @@ -5589,8 +5715,8 @@ "h": 18 }, "frame": { - "x": 237, - "y": 312, + "x": 330, + "y": 236, "w": 20, "h": 18 } @@ -5610,8 +5736,8 @@ "h": 18 }, "frame": { - "x": 257, - "y": 311, + "x": 350, + "y": 236, "w": 20, "h": 18 } @@ -5631,8 +5757,8 @@ "h": 18 }, "frame": { - "x": 197, - "y": 331, + "x": 310, + "y": 256, "w": 20, "h": 18 } @@ -5652,8 +5778,8 @@ "h": 18 }, "frame": { - "x": 217, - "y": 331, + "x": 330, + "y": 254, "w": 20, "h": 18 } @@ -5673,12 +5799,33 @@ "h": 18 }, "frame": { - "x": 237, - "y": 330, + "x": 350, + "y": 254, "w": 20, "h": 18 } }, + { + "filename": "revive", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 12, + "h": 17 + }, + "frame": { + "x": 373, + "y": 106, + "w": 12, + "h": 17 + } + }, { "filename": "wl_item_urge", "rotated": false, @@ -5694,8 +5841,8 @@ "h": 18 }, "frame": { - "x": 257, - "y": 329, + "x": 330, + "y": 272, "w": 20, "h": 18 } @@ -5715,285 +5862,12 @@ "h": 18 }, "frame": { - "x": 177, - "y": 340, + "x": 350, + "y": 272, "w": 20, "h": 18 } }, - { - "filename": "wl_max_ether", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 8, - "w": 20, - "h": 18 - }, - "frame": { - "x": 157, - "y": 344, - "w": 20, - "h": 18 - } - }, - { - "filename": "wl_max_potion", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 8, - "w": 20, - "h": 18 - }, - "frame": { - "x": 197, - "y": 349, - "w": 20, - "h": 18 - } - }, - { - "filename": "wl_max_revive", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 8, - "w": 20, - "h": 18 - }, - "frame": { - "x": 217, - "y": 349, - "w": 20, - "h": 18 - } - }, - { - "filename": "wl_paralyze_heal", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 8, - "w": 20, - "h": 18 - }, - "frame": { - "x": 237, - "y": 348, - "w": 20, - "h": 18 - } - }, - { - "filename": "wl_potion", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 8, - "w": 20, - "h": 18 - }, - "frame": { - "x": 257, - "y": 347, - "w": 20, - "h": 18 - } - }, - { - "filename": "wl_reset_urge", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 8, - "w": 20, - "h": 18 - }, - "frame": { - "x": 177, - "y": 358, - "w": 20, - "h": 18 - } - }, - { - "filename": "wl_revive", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 8, - "w": 20, - "h": 18 - }, - "frame": { - "x": 197, - "y": 367, - "w": 20, - "h": 18 - } - }, - { - "filename": "wl_super_potion", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 8, - "w": 20, - "h": 18 - }, - "frame": { - "x": 217, - "y": 367, - "w": 20, - "h": 18 - } - }, - { - "filename": "abomasite", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 16, - "h": 16 - }, - "frame": { - "x": 237, - "y": 366, - "w": 16, - "h": 16 - } - }, - { - "filename": "relic_gold", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 9, - "y": 11, - "w": 15, - "h": 11 - }, - "frame": { - "x": 137, - "y": 351, - "w": 15, - "h": 11 - } - }, - { - "filename": "absolite", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 16, - "h": 16 - }, - "frame": { - "x": 139, - "y": 362, - "w": 16, - "h": 16 - } - }, - { - "filename": "aerodactylite", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 16, - "h": 16 - }, - "frame": { - "x": 155, - "y": 362, - "w": 16, - "h": 16 - } - }, - { - "filename": "aggronite", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 16, - "h": 16 - }, - "frame": { - "x": 253, - "y": 366, - "w": 16, - "h": 16 - } - }, { "filename": "alakazite", "rotated": false, @@ -6009,8 +5883,8 @@ "h": 16 }, "frame": { - "x": 269, - "y": 365, + "x": 369, + "y": 190, "w": 16, "h": 16 } @@ -6030,12 +5904,180 @@ "h": 16 }, "frame": { - "x": 270, - "y": 274, + "x": 369, + "y": 206, "w": 16, "h": 16 } }, + { + "filename": "wl_max_ether", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 20, + "h": 18 + }, + "frame": { + "x": 240, + "y": 260, + "w": 20, + "h": 18 + } + }, + { + "filename": "wl_max_potion", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 20, + "h": 18 + }, + "frame": { + "x": 242, + "y": 278, + "w": 20, + "h": 18 + } + }, + { + "filename": "wl_max_revive", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 20, + "h": 18 + }, + "frame": { + "x": 244, + "y": 296, + "w": 20, + "h": 18 + } + }, + { + "filename": "wl_paralyze_heal", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 20, + "h": 18 + }, + "frame": { + "x": 247, + "y": 314, + "w": 20, + "h": 18 + } + }, + { + "filename": "wl_potion", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 20, + "h": 18 + }, + "frame": { + "x": 249, + "y": 332, + "w": 20, + "h": 18 + } + }, + { + "filename": "wl_reset_urge", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 20, + "h": 18 + }, + "frame": { + "x": 249, + "y": 350, + "w": 20, + "h": 18 + } + }, + { + "filename": "wl_revive", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 20, + "h": 18 + }, + "frame": { + "x": 251, + "y": 368, + "w": 20, + "h": 18 + } + }, + { + "filename": "wl_super_potion", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 20, + "h": 18 + }, + "frame": { + "x": 260, + "y": 260, + "w": 20, + "h": 18 + } + }, { "filename": "ampharosite", "rotated": false, @@ -6051,8 +6093,8 @@ "h": 16 }, "frame": { - "x": 271, - "y": 258, + "x": 262, + "y": 278, "w": 16, "h": 16 } @@ -6072,8 +6114,8 @@ "h": 16 }, "frame": { - "x": 271, - "y": 290, + "x": 264, + "y": 294, "w": 16, "h": 16 } @@ -6093,8 +6135,8 @@ "h": 16 }, "frame": { - "x": 287, - "y": 254, + "x": 267, + "y": 310, "w": 16, "h": 16 } @@ -6114,8 +6156,8 @@ "h": 16 }, "frame": { - "x": 277, - "y": 306, + "x": 269, + "y": 326, "w": 16, "h": 16 } @@ -6135,8 +6177,8 @@ "h": 16 }, "frame": { - "x": 277, - "y": 322, + "x": 269, + "y": 342, "w": 16, "h": 16 } @@ -6156,8 +6198,8 @@ "h": 16 }, "frame": { - "x": 277, - "y": 338, + "x": 280, + "y": 260, "w": 16, "h": 16 } @@ -6177,8 +6219,8 @@ "h": 16 }, "frame": { - "x": 303, - "y": 255, + "x": 278, + "y": 278, "w": 16, "h": 16 } @@ -6198,8 +6240,8 @@ "h": 16 }, "frame": { - "x": 287, - "y": 270, + "x": 280, + "y": 294, "w": 16, "h": 16 } @@ -6219,8 +6261,8 @@ "h": 16 }, "frame": { - "x": 303, - "y": 271, + "x": 283, + "y": 310, "w": 16, "h": 16 } @@ -6240,8 +6282,8 @@ "h": 16 }, "frame": { - "x": 287, - "y": 286, + "x": 285, + "y": 326, "w": 16, "h": 16 } @@ -6261,8 +6303,8 @@ "h": 16 }, "frame": { - "x": 303, - "y": 287, + "x": 285, + "y": 342, "w": 16, "h": 16 } @@ -6282,8 +6324,8 @@ "h": 16 }, "frame": { - "x": 293, - "y": 303, + "x": 271, + "y": 358, "w": 16, "h": 16 } @@ -6303,8 +6345,8 @@ "h": 16 }, "frame": { - "x": 293, - "y": 319, + "x": 287, + "y": 358, "w": 16, "h": 16 } @@ -6324,8 +6366,8 @@ "h": 16 }, "frame": { - "x": 293, - "y": 335, + "x": 370, + "y": 222, "w": 16, "h": 16 } @@ -6345,8 +6387,8 @@ "h": 16 }, "frame": { - "x": 309, - "y": 303, + "x": 370, + "y": 238, "w": 16, "h": 16 } @@ -6366,8 +6408,8 @@ "h": 16 }, "frame": { - "x": 309, - "y": 319, + "x": 370, + "y": 254, "w": 16, "h": 16 } @@ -6387,8 +6429,8 @@ "h": 16 }, "frame": { - "x": 309, - "y": 335, + "x": 370, + "y": 270, "w": 16, "h": 16 } @@ -6408,8 +6450,8 @@ "h": 16 }, "frame": { - "x": 293, - "y": 351, + "x": 370, + "y": 286, "w": 16, "h": 16 } @@ -6429,8 +6471,8 @@ "h": 16 }, "frame": { - "x": 309, - "y": 351, + "x": 294, + "y": 276, "w": 16, "h": 16 } @@ -6450,8 +6492,8 @@ "h": 16 }, "frame": { - "x": 285, - "y": 367, + "x": 310, + "y": 274, "w": 16, "h": 16 } @@ -6471,8 +6513,8 @@ "h": 16 }, "frame": { - "x": 301, - "y": 367, + "x": 296, + "y": 292, "w": 16, "h": 16 } @@ -6492,8 +6534,8 @@ "h": 16 }, "frame": { - "x": 317, - "y": 367, + "x": 312, + "y": 290, "w": 16, "h": 16 } @@ -6513,8 +6555,8 @@ "h": 16 }, "frame": { - "x": 319, - "y": 256, + "x": 328, + "y": 290, "w": 16, "h": 16 } @@ -6534,8 +6576,8 @@ "h": 16 }, "frame": { - "x": 319, - "y": 272, + "x": 344, + "y": 290, "w": 16, "h": 16 } @@ -6555,8 +6597,8 @@ "h": 16 }, "frame": { - "x": 335, - "y": 256, + "x": 299, + "y": 308, "w": 16, "h": 16 } @@ -6576,8 +6618,8 @@ "h": 16 }, "frame": { - "x": 335, - "y": 272, + "x": 315, + "y": 306, "w": 16, "h": 16 } @@ -6597,8 +6639,8 @@ "h": 16 }, "frame": { - "x": 351, - "y": 258, + "x": 331, + "y": 306, "w": 16, "h": 16 } @@ -6618,8 +6660,8 @@ "h": 16 }, "frame": { - "x": 351, - "y": 274, + "x": 347, + "y": 306, "w": 16, "h": 16 } @@ -6639,8 +6681,8 @@ "h": 16 }, "frame": { - "x": 367, - "y": 258, + "x": 301, + "y": 324, "w": 16, "h": 16 } @@ -6660,8 +6702,8 @@ "h": 16 }, "frame": { - "x": 367, - "y": 274, + "x": 301, + "y": 340, "w": 16, "h": 16 } @@ -6681,8 +6723,8 @@ "h": 16 }, "frame": { - "x": 325, - "y": 288, + "x": 317, + "y": 322, "w": 16, "h": 16 } @@ -6702,8 +6744,8 @@ "h": 16 }, "frame": { - "x": 325, - "y": 304, + "x": 317, + "y": 338, "w": 16, "h": 16 } @@ -6723,8 +6765,8 @@ "h": 16 }, "frame": { - "x": 325, - "y": 320, + "x": 333, + "y": 322, "w": 16, "h": 16 } @@ -6744,8 +6786,8 @@ "h": 16 }, "frame": { - "x": 325, - "y": 336, + "x": 333, + "y": 338, "w": 16, "h": 16 } @@ -6765,8 +6807,8 @@ "h": 16 }, "frame": { - "x": 341, - "y": 290, + "x": 349, + "y": 322, "w": 16, "h": 16 } @@ -6786,8 +6828,8 @@ "h": 16 }, "frame": { - "x": 341, - "y": 306, + "x": 349, + "y": 338, "w": 16, "h": 16 } @@ -6807,8 +6849,8 @@ "h": 16 }, "frame": { - "x": 357, - "y": 290, + "x": 303, + "y": 356, "w": 16, "h": 16 } @@ -6828,8 +6870,8 @@ "h": 16 }, "frame": { - "x": 341, - "y": 322, + "x": 319, + "y": 354, "w": 16, "h": 16 } @@ -6849,8 +6891,8 @@ "h": 16 }, "frame": { - "x": 357, - "y": 306, + "x": 335, + "y": 354, "w": 16, "h": 16 } @@ -6870,8 +6912,8 @@ "h": 16 }, "frame": { - "x": 357, - "y": 322, + "x": 351, + "y": 354, "w": 16, "h": 16 } @@ -6891,8 +6933,8 @@ "h": 16 }, "frame": { - "x": 341, - "y": 338, + "x": 363, + "y": 302, "w": 16, "h": 16 } @@ -6912,8 +6954,8 @@ "h": 16 }, "frame": { - "x": 357, - "y": 338, + "x": 365, + "y": 318, "w": 16, "h": 16 } @@ -6933,8 +6975,8 @@ "h": 16 }, "frame": { - "x": 333, - "y": 354, + "x": 365, + "y": 334, "w": 16, "h": 16 } @@ -6954,8 +6996,8 @@ "h": 16 }, "frame": { - "x": 333, - "y": 370, + "x": 367, + "y": 350, "w": 16, "h": 16 } @@ -6975,8 +7017,8 @@ "h": 16 }, "frame": { - "x": 349, - "y": 354, + "x": 367, + "y": 366, "w": 16, "h": 16 } @@ -6987,6 +7029,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:584bee7ab6a26f2fe898751773fcf091:35c932b6e469c017a9daa551701f1da4:110e074689c9edd2c54833ce2e4d9270$" + "smartupdate": "$TexturePacker:SmartUpdate:497152a1a65f6eb786d86fc30401ba1a:74cd2d4ffe94815a47316a9fbc51c025:110e074689c9edd2c54833ce2e4d9270$" } } diff --git a/public/images/items.png b/public/images/items.png index 94b70efad..1e9041980 100644 Binary files a/public/images/items.png and b/public/images/items.png differ diff --git a/public/images/items/berry_pot.png b/public/images/items/berry_pot.png new file mode 100644 index 000000000..5841ef1c3 Binary files /dev/null and b/public/images/items/berry_pot.png differ diff --git a/public/images/items/wl_custom_thief.png b/public/images/items/wl_custom_thief.png new file mode 100644 index 000000000..cc1302ffb Binary files /dev/null and b/public/images/items/wl_custom_thief.png differ diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 95f8e5a06..65b862cdf 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -8,7 +8,7 @@ import * as Utils from '../utils'; import { Type, TypeDamageMultiplier, getTypeDamageMultiplier, getTypeRgb } from '../data/type'; import { getLevelTotalExp } from '../data/exp'; import { Stat } from '../data/pokemon-stat'; -import { AttackTypeBoosterModifier, DamageMoneyRewardModifier, EnemyDamageBoosterModifier, EnemyDamageReducerModifier, EnemyFusionChanceModifier, HiddenAbilityRateBoosterModifier, PokemonBaseStatModifier, PokemonHeldItemModifier, PokemonMultiHitModifier, PokemonNatureWeightModifier, ShinyRateBoosterModifier, SurviveDamageModifier, TempBattleStatBoosterModifier, TerastallizeModifier } from '../modifier/modifier'; +import { AttackTypeBoosterModifier, DamageMoneyRewardModifier, EnemyDamageBoosterModifier, EnemyDamageReducerModifier, EnemyEndureChanceModifier, EnemyFusionChanceModifier, HiddenAbilityRateBoosterModifier, PokemonBaseStatModifier, PokemonHeldItemModifier, PokemonMultiHitModifier, PokemonNatureWeightModifier, ShinyRateBoosterModifier, SurviveDamageModifier, TempBattleStatBoosterModifier, TerastallizeModifier } from '../modifier/modifier'; import { PokeballType } from '../data/pokeball'; import { Gender } from '../data/gender'; import { initMoveAnim, loadMoveAnimAssets } from '../data/battle-anims'; @@ -1194,6 +1194,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (damage.value) { if (this.getHpRatio() === 1) applyPreDefendAbAttrs(PreDefendFullHpEndureAbAttr, this, source, battlerMove, cancelled, damage); + else if (!this.isPlayer() && damage.value >= this.hp) + this.scene.applyModifiers(EnemyEndureChanceModifier, false, this); const oneHitKo = result === HitResult.ONE_HIT_KO; damage.value = this.damageAndUpdate(damage.value, result as DamageResult, isCritical, oneHitKo, oneHitKo); @@ -2671,8 +2673,7 @@ export class PokemonSummonData { export class PokemonBattleData { public hitCount: integer = 0; - public revived: boolean = false; - public maxRevived: boolean = false; + public endured: boolean = false; } export class PokemonBattleSummonData { diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index 7c8698673..4e11f6e3b 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -688,9 +688,9 @@ export class EnemyAttackStatusEffectChanceModifierType extends ModifierType { } } -export class EnemyInstantReviveChanceModifierType extends ModifierType { - constructor(name: string, chancePercent: number, fullHeal: boolean, iconImage?: string) { - super(name, `Adds a ${chancePercent}% chance of reviving with ${fullHeal ? 100 : 50}% HP`, (type, _args) => new Modifiers.EnemyInstantReviveChanceModifier(type, fullHeal, chancePercent), iconImage, 'enemy_revive'); +export class EnemyEndureChanceModifierType extends ModifierType { + constructor(name: string, chancePercent: number, iconImage?: string) { + super(name, `Adds a ${chancePercent}% chance of enduring a hit`, (type, _args) => new Modifiers.EnemyEndureChanceModifier(type, chancePercent), iconImage, 'enemy_endure'); } } @@ -899,15 +899,14 @@ export const modifierTypes = { ENEMY_DAMAGE_BOOSTER: () => new ModifierType('Damage Token', 'Increases damage by 10%', (type, _args) => new Modifiers.EnemyDamageBoosterModifier(type, 10), 'wl_item_drop'), ENEMY_DAMAGE_REDUCTION: () => new ModifierType('Protection Token', 'Reduces incoming damage by 5%', (type, _args) => new Modifiers.EnemyDamageReducerModifier(type, 5), 'wl_guard_spec'), //ENEMY_SUPER_EFFECT_BOOSTER: () => new ModifierType('Type Advantage Token', 'Increases damage of super effective attacks by 30%', (type, _args) => new Modifiers.EnemySuperEffectiveDamageBoosterModifier(type, 30), 'wl_custom_super_effective'), - ENEMY_HEAL: () => new ModifierType('Recovery Token', 'Heals 5% of max HP every turn', (type, _args) => new Modifiers.EnemyTurnHealModifier(type, 5), 'wl_potion'), + ENEMY_HEAL: () => new ModifierType('Recovery Token', 'Heals 5% of max HP every turn', (type, _args) => new Modifiers.EnemyTurnHealModifier(type, 3), 'wl_potion'), ENEMY_ATTACK_POISON_CHANCE: () => new EnemyAttackStatusEffectChanceModifierType('Poison Token', 10, StatusEffect.POISON, 'wl_antidote'), ENEMY_ATTACK_PARALYZE_CHANCE: () => new EnemyAttackStatusEffectChanceModifierType('Paralyze Token', 10, StatusEffect.PARALYSIS, 'wl_paralyze_heal'), ENEMY_ATTACK_SLEEP_CHANCE: () => new EnemyAttackStatusEffectChanceModifierType('Sleep Token', 10, StatusEffect.SLEEP, 'wl_awakening'), ENEMY_ATTACK_FREEZE_CHANCE: () => new EnemyAttackStatusEffectChanceModifierType('Freeze Token', 10, StatusEffect.FREEZE, 'wl_ice_heal'), ENEMY_ATTACK_BURN_CHANCE: () => new EnemyAttackStatusEffectChanceModifierType('Burn Token', 10, StatusEffect.BURN, 'wl_burn_heal'), ENEMY_STATUS_EFFECT_HEAL_CHANCE: () => new ModifierType('Full Heal Token', 'Adds a 10% chance every turn to heal a status condition', (type, _args) => new Modifiers.EnemyStatusEffectHealChanceModifier(type, 10), 'wl_full_heal'), - ENEMY_INSTANT_REVIVE_CHANCE: () => new EnemyInstantReviveChanceModifierType('Revive Token', 5, false, 'wl_revive'), - ENEMY_INSTANT_MAX_REVIVE_CHANCE: () => new EnemyInstantReviveChanceModifierType('Max Revive Token', 2, true, 'wl_max_revive'), + ENEMY_ENDURE_CHANCE: () => new EnemyEndureChanceModifierType('Endure Token', 5, 'wl_reset_urge'), ENEMY_FUSED_CHANCE: () => new ModifierType('Fusion Token', 'Adds a 1% chance that a wild Pokémon will be a fusion', (type, _args) => new Modifiers.EnemyFusionChanceModifier(type, 1), 'wl_custom_spliced'), }; @@ -1095,24 +1094,20 @@ const enemyBuffModifierPool: ModifierPool = { [ModifierTier.COMMON]: [ new WeightedModifierType(modifierTypes.ENEMY_DAMAGE_BOOSTER, 10), new WeightedModifierType(modifierTypes.ENEMY_DAMAGE_REDUCTION, 10), - new WeightedModifierType(modifierTypes.ENEMY_HEAL, 10), new WeightedModifierType(modifierTypes.ENEMY_ATTACK_POISON_CHANCE, 2), new WeightedModifierType(modifierTypes.ENEMY_ATTACK_PARALYZE_CHANCE, 2), new WeightedModifierType(modifierTypes.ENEMY_ATTACK_SLEEP_CHANCE, 2), new WeightedModifierType(modifierTypes.ENEMY_ATTACK_FREEZE_CHANCE, 2), new WeightedModifierType(modifierTypes.ENEMY_ATTACK_BURN_CHANCE, 2), new WeightedModifierType(modifierTypes.ENEMY_STATUS_EFFECT_HEAL_CHANCE, 10), - new WeightedModifierType(modifierTypes.ENEMY_INSTANT_REVIVE_CHANCE, 10), - new WeightedModifierType(modifierTypes.ENEMY_INSTANT_MAX_REVIVE_CHANCE, 6), + new WeightedModifierType(modifierTypes.ENEMY_ENDURE_CHANCE, 10000), new WeightedModifierType(modifierTypes.ENEMY_FUSED_CHANCE, 1) ].map(m => { m.setTier(ModifierTier.COMMON); return m; }), [ModifierTier.GREAT]: [ new WeightedModifierType(modifierTypes.ENEMY_DAMAGE_BOOSTER, 5), new WeightedModifierType(modifierTypes.ENEMY_DAMAGE_REDUCTION, 5), - new WeightedModifierType(modifierTypes.ENEMY_HEAL, 5), new WeightedModifierType(modifierTypes.ENEMY_STATUS_EFFECT_HEAL_CHANCE, 5), - new WeightedModifierType(modifierTypes.ENEMY_INSTANT_REVIVE_CHANCE, 5), - new WeightedModifierType(modifierTypes.ENEMY_INSTANT_MAX_REVIVE_CHANCE, 3), + new WeightedModifierType(modifierTypes.ENEMY_ENDURE_CHANCE, 5), new WeightedModifierType(modifierTypes.ENEMY_FUSED_CHANCE, 1) ].map(m => { m.setTier(ModifierTier.GREAT); return m; }), [ModifierTier.ULTRA]: [ @@ -1120,8 +1115,7 @@ const enemyBuffModifierPool: ModifierPool = { new WeightedModifierType(modifierTypes.ENEMY_DAMAGE_REDUCTION, 5), new WeightedModifierType(modifierTypes.ENEMY_HEAL, 5), new WeightedModifierType(modifierTypes.ENEMY_STATUS_EFFECT_HEAL_CHANCE, 5), - new WeightedModifierType(modifierTypes.ENEMY_INSTANT_REVIVE_CHANCE, 5), - new WeightedModifierType(modifierTypes.ENEMY_INSTANT_MAX_REVIVE_CHANCE, 3), + new WeightedModifierType(modifierTypes.ENEMY_ENDURE_CHANCE, 5), new WeightedModifierType(modifierTypes.ENEMY_FUSED_CHANCE, 300) ].map(m => { m.setTier(ModifierTier.ULTRA); return m; }), [ModifierTier.ROGUE]: [ ].map(m => { m.setTier(ModifierTier.ROGUE); return m; }), diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index 3638c2380..4c5713fd7 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -19,6 +19,7 @@ import { VoucherType } from '../system/voucher'; import { PreventBerryUseAbAttr, applyAbAttrs } from '../data/ability'; import { FormChangeItem, SpeciesFormChangeItemTrigger } from '../data/pokemon-forms'; import { Nature } from '#app/data/nature'; +import { BattlerTagType } from '#app/data/enums/battler-tag-type'; type ModifierType = ModifierTypes.ModifierType; export type ModifierPredicate = (modifier: Modifier) => boolean; @@ -1946,7 +1947,7 @@ export class EnemyTurnHealModifier extends EnemyPersistentModifier { constructor(type: ModifierType, healPercent: number, stackCount?: integer) { super(type, stackCount); - this.healPercent = healPercent || 10; + this.healPercent = healPercent || 3; } match(modifier: Modifier): boolean { @@ -1975,7 +1976,7 @@ export class EnemyTurnHealModifier extends EnemyPersistentModifier { } getMaxStackCount(scene: BattleScene): integer { - return 20; + return 10; } } @@ -2045,39 +2046,36 @@ export class EnemyStatusEffectHealChanceModifier extends EnemyPersistentModifier } } -export class EnemyInstantReviveChanceModifier extends EnemyPersistentModifier { - public fullHeal: boolean; +export class EnemyEndureChanceModifier extends EnemyPersistentModifier { private chance: number; - constructor(type: ModifierType, healFull: boolean, chancePercent: number, stackCount?: integer) { + constructor(type: ModifierType, chancePercent: number, stackCount?: integer) { super(type, stackCount); - this.fullHeal = healFull; - this.chance = (chancePercent || healFull ? 2 : 5) / 100; + this.chance = (chancePercent || 5) / 100; } match(modifier: Modifier) { - return modifier instanceof EnemyInstantReviveChanceModifier && modifier.fullHeal === this.fullHeal && modifier.chance === this.chance; + return modifier instanceof EnemyEndureChanceModifier && modifier.chance === this.chance; } clone() { - return new EnemyInstantReviveChanceModifier(this.type, this.fullHeal, this.chance * 100, this.stackCount); + return new EnemyEndureChanceModifier(this.type, this.chance * 100, this.stackCount); } getArgs(): any[] { - return [ this.fullHeal, this.chance * 100 ]; + return [ this.chance * 100 ]; } apply(args: any[]): boolean { - if (Phaser.Math.RND.realInRange(0, 1) >= (this.chance * this.getStackCount())) + const target = (args[0] as Pokemon); + + if (target.battleData.endured || Phaser.Math.RND.realInRange(0, 1) >= (this.chance * this.getStackCount())) return false; + + target.addTag(BattlerTagType.ENDURING, 1); - const pokemon = args[0] as Pokemon; - - pokemon.scene.unshiftPhase(new PokemonHealPhase(pokemon.scene, pokemon.getBattlerIndex(), - Math.max(Math.floor(pokemon.getMaxHp() / (this.fullHeal ? 1 : 2)), 1), getPokemonMessage(pokemon, ` was revived\nby its ${this.type.name}!`), false, false, true)); - - pokemon.resetStatus(); + target.battleData.endured = true; return true; } diff --git a/src/phases.ts b/src/phases.ts index 9d04ccec8..0121199ce 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -6,7 +6,7 @@ import { allMoves, applyMoveAttrs, BypassSleepAttr, ChargeAttr, applyFilteredMov import { Mode } from './ui/ui'; import { Command } from "./ui/command-ui-handler"; import { Stat } from "./data/pokemon-stat"; -import { BerryModifier, ContactHeldItemTransferChanceModifier, EnemyAttackStatusEffectChanceModifier, EnemyInstantReviveChanceModifier, EnemyPersistentModifier, EnemyStatusEffectHealChanceModifier, EnemyTurnHealModifier, ExpBalanceModifier, ExpBoosterModifier, ExpShareModifier, ExtraModifierModifier, FlinchChanceModifier, FusePokemonModifier, HealingBoosterModifier, HitHealModifier, LapsingPersistentModifier, MapModifier, Modifier, MultipleParticipantExpBonusModifier, PersistentModifier, PokemonExpBoosterModifier, PokemonHeldItemModifier, PokemonInstantReviveModifier, SwitchEffectTransferModifier, TempBattleStatBoosterModifier, TurnHealModifier, TurnHeldItemTransferModifier, MoneyMultiplierModifier, MoneyInterestModifier, IvScannerModifier, PokemonFriendshipBoosterModifier, LapsingPokemonHeldItemModifier, PokemonMultiHitModifier } from "./modifier/modifier"; +import { BerryModifier, ContactHeldItemTransferChanceModifier, EnemyAttackStatusEffectChanceModifier, EnemyEndureChanceModifier, EnemyPersistentModifier, EnemyStatusEffectHealChanceModifier, EnemyTurnHealModifier, ExpBalanceModifier, ExpBoosterModifier, ExpShareModifier, ExtraModifierModifier, FlinchChanceModifier, FusePokemonModifier, HealingBoosterModifier, HitHealModifier, LapsingPersistentModifier, MapModifier, Modifier, MultipleParticipantExpBonusModifier, PersistentModifier, PokemonExpBoosterModifier, PokemonHeldItemModifier, PokemonInstantReviveModifier, SwitchEffectTransferModifier, TempBattleStatBoosterModifier, TurnHealModifier, TurnHeldItemTransferModifier, MoneyMultiplierModifier, MoneyInterestModifier, IvScannerModifier, PokemonFriendshipBoosterModifier, LapsingPokemonHeldItemModifier, PokemonMultiHitModifier } from "./modifier/modifier"; import PartyUiHandler, { PartyOption, PartyUiMode } from "./ui/party-ui-handler"; import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getPokeballTintColor, PokeballType } from "./data/pokeball"; import { CommonAnim, CommonBattleAnim, MoveAnim, initMoveAnim, loadMoveAnimAssets } from "./data/battle-anims"; @@ -2791,8 +2791,6 @@ export class FaintPhase extends PokemonPhase { start() { super.start(); - const pokemon = this.getPokemon(); - if (!this.preventEndure) { const instantReviveModifier = this.scene.applyModifier(PokemonInstantReviveModifier, this.player, this.getPokemon()) as PokemonInstantReviveModifier; @@ -2802,20 +2800,6 @@ export class FaintPhase extends PokemonPhase { this.scene.updateModifiers(this.player); return this.end(); } - - if (!pokemon.isPlayer()) { - const enemyInstantReviveModifiers = this.scene.findModifiers(m => m instanceof EnemyInstantReviveChanceModifier, false); - for (let modifier of enemyInstantReviveModifiers) { - const maxRevive = (modifier as EnemyInstantReviveChanceModifier).fullHeal; - const prop = maxRevive ? 'maxRevived' : 'revived'; - if (pokemon.battleData[prop]) - continue; - if (modifier.shouldApply([ pokemon ]) && modifier.apply([ pokemon ])) { - pokemon.battleData[prop] = true; - return this.end(); - } - } - } } if (!this.tryOverrideForBattleSpec())