diff --git a/public/images/items.json b/public/images/items.json index 6c17c12d9..e5fa05723 100644 --- a/public/images/items.json +++ b/public/images/items.json @@ -4,11 +4,53 @@ "image": "items.png", "format": "RGBA8888", "size": { - "w": 327, - "h": 327 + "w": 341, + "h": 341 }, "scale": 1, "frames": [ + { + "filename": "galarica_cuff", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 29, + "h": 30 + }, + "frame": { + "x": 0, + "y": 0, + "w": 29, + "h": 30 + } + }, + { + "filename": "galarica_wreath", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 0, + "y": 3, + "w": 32, + "h": 27 + }, + "frame": { + "x": 29, + "y": 0, + "w": 32, + "h": 27 + } + }, { "filename": "linking_cord", "rotated": false, @@ -25,7 +67,7 @@ }, "frame": { "x": 0, - "y": 0, + "y": 30, "w": 27, "h": 26 } @@ -45,8 +87,8 @@ "h": 26 }, "frame": { - "x": 0, - "y": 26, + "x": 61, + "y": 0, "w": 23, "h": 26 } @@ -66,12 +108,33 @@ "h": 22 }, "frame": { - "x": 27, - "y": 0, + "x": 0, + "y": 56, "w": 27, "h": 22 } }, + { + "filename": "choice_scarf", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 84, + "y": 0, + "w": 24, + "h": 24 + } + }, { "filename": "exp_charm", "rotated": false, @@ -88,11 +151,32 @@ }, "frame": { "x": 0, - "y": 52, + "y": 78, "w": 17, "h": 31 } }, + { + "filename": "focus_band", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 108, + "y": 0, + "w": 24, + "h": 24 + } + }, { "filename": "golden_exp_charm", "rotated": false, @@ -109,74 +193,11 @@ }, "frame": { "x": 0, - "y": 83, + "y": 109, "w": 17, "h": 31 } }, - { - "filename": "super_exp_charm", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 17, - "h": 31 - }, - "frame": { - "x": 0, - "y": 114, - "w": 17, - "h": 31 - } - }, - { - "filename": "choice_scarf", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 54, - "y": 0, - "w": 24, - "h": 24 - } - }, - { - "filename": "focus_band", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 78, - "y": 0, - "w": 24, - "h": 24 - } - }, { "filename": "golden_punch", "rotated": false, @@ -192,7 +213,7 @@ "h": 24 }, "frame": { - "x": 102, + "x": 132, "y": 0, "w": 24, "h": 24 @@ -213,7 +234,7 @@ "h": 24 }, "frame": { - "x": 126, + "x": 156, "y": 0, "w": 24, "h": 24 @@ -234,7 +255,7 @@ "h": 24 }, "frame": { - "x": 150, + "x": 180, "y": 0, "w": 24, "h": 24 @@ -255,7 +276,7 @@ "h": 24 }, "frame": { - "x": 174, + "x": 204, "y": 0, "w": 24, "h": 24 @@ -276,7 +297,7 @@ "h": 24 }, "frame": { - "x": 198, + "x": 228, "y": 0, "w": 24, "h": 24 @@ -297,7 +318,7 @@ "h": 24 }, "frame": { - "x": 222, + "x": 252, "y": 0, "w": 24, "h": 24 @@ -318,7 +339,7 @@ "h": 24 }, "frame": { - "x": 246, + "x": 276, "y": 0, "w": 24, "h": 24 @@ -339,14 +360,14 @@ "h": 24 }, "frame": { - "x": 270, + "x": 300, "y": 0, "w": 24, "h": 24 } }, { - "filename": "muscle_band", + "filename": "super_exp_charm", "rotated": false, "trimmed": true, "sourceSize": { @@ -354,16 +375,37 @@ "h": 32 }, "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 24, - "h": 24 + "x": 7, + "y": 1, + "w": 17, + "h": 31 }, "frame": { - "x": 294, + "x": 324, "y": 0, - "w": 24, - "h": 24 + "w": 17, + "h": 31 + } + }, + { + "filename": "black_augurite", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 3, + "w": 22, + "h": 25 + }, + "frame": { + "x": 0, + "y": 140, + "w": 22, + "h": 25 } }, { @@ -382,7 +424,7 @@ }, "frame": { "x": 0, - "y": 145, + "y": 165, "w": 23, "h": 24 } @@ -403,13 +445,13 @@ }, "frame": { "x": 0, - "y": 169, + "y": 189, "w": 23, "h": 24 } }, { - "filename": "reveal_glass", + "filename": "muscle_band", "rotated": false, "trimmed": true, "sourceSize": { @@ -419,13 +461,13 @@ "spriteSourceSize": { "x": 4, "y": 4, - "w": 23, + "w": 24, "h": 24 }, "frame": { "x": 0, - "y": 193, - "w": 23, + "y": 213, + "w": 24, "h": 24 } }, @@ -445,7 +487,7 @@ }, "frame": { "x": 0, - "y": 217, + "y": 237, "w": 24, "h": 24 } @@ -466,7 +508,7 @@ }, "frame": { "x": 0, - "y": 241, + "y": 261, "w": 24, "h": 24 } @@ -487,7 +529,7 @@ }, "frame": { "x": 0, - "y": 265, + "y": 285, "w": 24, "h": 24 } @@ -508,32 +550,11 @@ }, "frame": { "x": 0, - "y": 289, + "y": 309, "w": 24, "h": 24 } }, - { - "filename": "ability_capsule", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 9, - "w": 24, - "h": 14 - }, - "frame": { - "x": 0, - "y": 313, - "w": 24, - "h": 14 - } - }, { "filename": "calcium", "rotated": false, @@ -550,7 +571,7 @@ }, "frame": { "x": 17, - "y": 52, + "y": 78, "w": 16, "h": 24 } @@ -571,11 +592,32 @@ }, "frame": { "x": 17, - "y": 76, + "y": 102, "w": 16, "h": 24 } }, + { + "filename": "ability_capsule", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 9, + "w": 24, + "h": 14 + }, + "frame": { + "x": 17, + "y": 126, + "w": 24, + "h": 14 + } + }, { "filename": "catching_charm", "rotated": false, @@ -591,14 +633,35 @@ "h": 24 }, "frame": { - "x": 17, - "y": 100, + "x": 22, + "y": 140, "w": 21, "h": 24 } }, { - "filename": "adamant_crystal", + "filename": "max_revive", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 22, + "h": 24 + }, + "frame": { + "x": 23, + "y": 164, + "w": 22, + "h": 24 + } + }, + { + "filename": "reveal_glass", "rotated": false, "trimmed": true, "sourceSize": { @@ -607,166 +670,19 @@ }, "spriteSourceSize": { "x": 4, - "y": 6, + "y": 4, "w": 23, - "h": 21 + "h": 24 }, "frame": { - "x": 17, - "y": 124, + "x": 23, + "y": 188, "w": 23, - "h": 21 - } - }, - { - "filename": "elixir", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 18, - "h": 24 - }, - "frame": { - "x": 23, - "y": 145, - "w": 18, "h": 24 } }, { - "filename": "ether", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 18, - "h": 24 - }, - "frame": { - "x": 23, - "y": 169, - "w": 18, - "h": 24 - } - }, - { - "filename": "full_restore", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 18, - "h": 24 - }, - "frame": { - "x": 23, - "y": 193, - "w": 18, - "h": 24 - } - }, - { - "filename": "lure", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 17, - "h": 24 - }, - "frame": { - "x": 24, - "y": 217, - "w": 17, - "h": 24 - } - }, - { - "filename": "max_elixir", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 18, - "h": 24 - }, - "frame": { - "x": 24, - "y": 241, - "w": 18, - "h": 24 - } - }, - { - "filename": "max_ether", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 18, - "h": 24 - }, - "frame": { - "x": 24, - "y": 265, - "w": 18, - "h": 24 - } - }, - { - "filename": "max_potion", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 18, - "h": 24 - }, - "frame": { - "x": 24, - "y": 289, - "w": 18, - "h": 24 - } - }, - { - "filename": "choice_specs", + "filename": "berry_pouch", "rotated": false, "trimmed": true, "sourceSize": { @@ -775,15 +691,15 @@ }, "spriteSourceSize": { "x": 4, - "y": 8, - "w": 24, - "h": 18 + "y": 5, + "w": 23, + "h": 23 }, "frame": { - "x": 27, - "y": 22, - "w": 24, - "h": 18 + "x": 24, + "y": 212, + "w": 23, + "h": 23 } }, { @@ -801,8 +717,8 @@ "h": 23 }, "frame": { - "x": 51, - "y": 24, + "x": 24, + "y": 235, "w": 24, "h": 23 } @@ -822,8 +738,8 @@ "h": 23 }, "frame": { - "x": 75, - "y": 24, + "x": 24, + "y": 258, "w": 24, "h": 23 } @@ -843,8 +759,8 @@ "h": 23 }, "frame": { - "x": 99, - "y": 24, + "x": 24, + "y": 281, "w": 24, "h": 23 } @@ -864,12 +780,33 @@ "h": 23 }, "frame": { - "x": 123, - "y": 24, + "x": 24, + "y": 304, "w": 24, "h": 23 } }, + { + "filename": "chipped_pot", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 3, + "y": 6, + "w": 26, + "h": 20 + }, + "frame": { + "x": 29, + "y": 27, + "w": 26, + "h": 20 + } + }, { "filename": "twisted_spoon", "rotated": false, @@ -885,14 +822,14 @@ "h": 23 }, "frame": { - "x": 147, - "y": 24, + "x": 27, + "y": 47, "w": 24, "h": 23 } }, { - "filename": "berry_pouch", + "filename": "elixir", "rotated": false, "trimmed": true, "sourceSize": { @@ -900,16 +837,58 @@ "h": 32 }, "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 23, - "h": 23 + "x": 7, + "y": 4, + "w": 18, + "h": 24 }, "frame": { - "x": 171, + "x": 33, + "y": 70, + "w": 18, + "h": 24 + } + }, + { + "filename": "ether", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 18, + "h": 24 + }, + "frame": { + "x": 33, + "y": 94, + "w": 18, + "h": 24 + } + }, + { + "filename": "cracked_pot", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 3, + "y": 6, + "w": 26, + "h": 20 + }, + "frame": { + "x": 84, "y": 24, - "w": 23, - "h": 23 + "w": 26, + "h": 20 } }, { @@ -927,7 +906,7 @@ "h": 22 }, "frame": { - "x": 194, + "x": 110, "y": 24, "w": 24, "h": 22 @@ -948,7 +927,28 @@ "h": 22 }, "frame": { - "x": 218, + "x": 134, + "y": 24, + "w": 24, + "h": 22 + } + }, + { + "filename": "peat_block", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 24, + "h": 22 + }, + "frame": { + "x": 158, "y": 24, "w": 24, "h": 22 @@ -969,7 +969,7 @@ "h": 23 }, "frame": { - "x": 242, + "x": 182, "y": 24, "w": 23, "h": 23 @@ -990,7 +990,7 @@ "h": 23 }, "frame": { - "x": 265, + "x": 205, "y": 24, "w": 23, "h": 23 @@ -1011,14 +1011,14 @@ "h": 23 }, "frame": { - "x": 288, + "x": 228, "y": 24, "w": 23, "h": 23 } }, { - "filename": "hp_up", + "filename": "stick", "rotated": false, "trimmed": true, "sourceSize": { @@ -1026,121 +1026,16 @@ "h": 32 }, "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 311, - "y": 24, - "w": 16, - "h": 24 - } - }, - { - "filename": "razor_fang", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 18, - "h": 20 - }, - "frame": { - "x": 33, - "y": 40, - "w": 18, - "h": 20 - } - }, - { - "filename": "max_revive", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 22, - "h": 24 - }, - "frame": { - "x": 33, - "y": 60, - "w": 22, - "h": 24 - } - }, - { - "filename": "mega_bracelet", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 8, - "w": 20, - "h": 16 - }, - "frame": { - "x": 33, - "y": 84, - "w": 20, - "h": 16 - } - }, - { - "filename": "iron", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 38, - "y": 100, - "w": 16, - "h": 24 - } - }, - { - "filename": "amulet_coin", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, + "x": 4, "y": 5, "w": 23, - "h": 21 + "h": 23 }, "frame": { - "x": 40, - "y": 124, + "x": 251, + "y": 24, "w": 23, - "h": 21 + "h": 23 } }, { @@ -1158,8 +1053,8 @@ "h": 23 }, "frame": { - "x": 41, - "y": 145, + "x": 274, + "y": 24, "w": 22, "h": 23 } @@ -1179,12 +1074,54 @@ "h": 23 }, "frame": { - "x": 41, - "y": 168, + "x": 296, + "y": 24, "w": 22, "h": 23 } }, + { + "filename": "healing_charm", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 23, + "h": 22 + }, + "frame": { + "x": 318, + "y": 31, + "w": 23, + "h": 22 + } + }, + { + "filename": "adamant_crystal", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 6, + "w": 23, + "h": 21 + }, + "frame": { + "x": 61, + "y": 26, + "w": 23, + "h": 21 + } + }, { "filename": "focus_sash", "rotated": false, @@ -1200,8 +1137,8 @@ "h": 23 }, "frame": { - "x": 41, - "y": 191, + "x": 51, + "y": 47, "w": 22, "h": 23 } @@ -1221,8 +1158,8 @@ "h": 23 }, "frame": { - "x": 41, - "y": 214, + "x": 51, + "y": 70, "w": 22, "h": 23 } @@ -1242,14 +1179,14 @@ "h": 24 }, "frame": { - "x": 42, - "y": 237, + "x": 51, + "y": 93, "w": 21, "h": 24 } }, { - "filename": "shiny_charm", + "filename": "full_restore", "rotated": false, "trimmed": true, "sourceSize": { @@ -1257,102 +1194,18 @@ "h": 32 }, "spriteSourceSize": { - "x": 6, + "x": 7, "y": 4, - "w": 21, + "w": 18, "h": 24 }, "frame": { - "x": 42, - "y": 261, - "w": 21, + "x": 73, + "y": 47, + "w": 18, "h": 24 } }, - { - "filename": "dragon_fang", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 21, - "h": 23 - }, - "frame": { - "x": 42, - "y": 285, - "w": 21, - "h": 23 - } - }, - { - "filename": "coupon", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 23, - "h": 19 - }, - "frame": { - "x": 42, - "y": 308, - "w": 23, - "h": 19 - } - }, - { - "filename": "stick", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 23, - "h": 23 - }, - "frame": { - "x": 55, - "y": 47, - "w": 23, - "h": 23 - } - }, - { - "filename": "healing_charm", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 23, - "h": 22 - }, - "frame": { - "x": 78, - "y": 47, - "w": 23, - "h": 22 - } - }, { "filename": "charcoal", "rotated": false, @@ -1368,14 +1221,14 @@ "h": 22 }, "frame": { - "x": 101, - "y": 47, + "x": 73, + "y": 71, "w": 22, "h": 22 } }, { - "filename": "dire_hit", + "filename": "petaya_berry", "rotated": false, "trimmed": true, "sourceSize": { @@ -1386,17 +1239,17 @@ "x": 5, "y": 5, "w": 22, - "h": 22 + "h": 23 }, "frame": { - "x": 123, - "y": 47, + "x": 72, + "y": 93, "w": 22, - "h": 22 + "h": 23 } }, { - "filename": "dna_splicers", + "filename": "metal_coat", "rotated": false, "trimmed": true, "sourceSize": { @@ -1404,81 +1257,18 @@ "h": 32 }, "spriteSourceSize": { - "x": 5, + "x": 6, "y": 5, - "w": 22, + "w": 19, "h": 22 }, "frame": { - "x": 145, - "y": 47, - "w": 22, + "x": 91, + "y": 44, + "w": 19, "h": 22 } }, - { - "filename": "electirizer", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 167, - "y": 47, - "w": 22, - "h": 22 - } - }, - { - "filename": "binding_band", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 23, - "h": 20 - }, - "frame": { - "x": 55, - "y": 70, - "w": 23, - "h": 20 - } - }, - { - "filename": "moon_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 23, - "h": 21 - }, - "frame": { - "x": 78, - "y": 69, - "w": 23, - "h": 21 - } - }, { "filename": "sacred_ash", "rotated": false, @@ -1494,8 +1284,8 @@ "h": 20 }, "frame": { - "x": 101, - "y": 69, + "x": 110, + "y": 46, "w": 24, "h": 20 } @@ -1515,12 +1305,96 @@ "h": 20 }, "frame": { - "x": 125, - "y": 69, + "x": 134, + "y": 46, "w": 24, "h": 20 } }, + { + "filename": "amulet_coin", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 23, + "h": 21 + }, + "frame": { + "x": 158, + "y": 46, + "w": 23, + "h": 21 + } + }, + { + "filename": "auspicious_armor", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 23, + "h": 21 + }, + "frame": { + "x": 181, + "y": 47, + "w": 23, + "h": 21 + } + }, + { + "filename": "moon_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 6, + "w": 23, + "h": 21 + }, + "frame": { + "x": 204, + "y": 47, + "w": 23, + "h": 21 + } + }, + { + "filename": "binding_band", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 23, + "h": 20 + }, + "frame": { + "x": 227, + "y": 47, + "w": 23, + "h": 20 + } + }, { "filename": "reviver_seed", "rotated": false, @@ -1536,35 +1410,14 @@ "h": 20 }, "frame": { - "x": 149, - "y": 69, + "x": 250, + "y": 47, "w": 23, "h": 20 } }, { - "filename": "apicot_berry", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 19, - "h": 20 - }, - "frame": { - "x": 172, - "y": 69, - "w": 19, - "h": 20 - } - }, - { - "filename": "petaya_berry", + "filename": "shell_bell", "rotated": false, "trimmed": true, "sourceSize": { @@ -1573,15 +1426,57 @@ }, "spriteSourceSize": { "x": 5, - "y": 5, - "w": 22, - "h": 23 + "y": 7, + "w": 23, + "h": 20 }, "frame": { - "x": 54, - "y": 90, + "x": 273, + "y": 47, + "w": 23, + "h": 20 + } + }, + { + "filename": "deep_sea_scale", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, "w": 22, - "h": 23 + "h": 20 + }, + "frame": { + "x": 296, + "y": 47, + "w": 22, + "h": 20 + } + }, + { + "filename": "coupon", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 23, + "h": 19 + }, + "frame": { + "x": 318, + "y": 53, + "w": 23, + "h": 19 } }, { @@ -1599,14 +1494,14 @@ "h": 23 }, "frame": { - "x": 76, - "y": 90, + "x": 95, + "y": 66, "w": 22, "h": 23 } }, { - "filename": "relic_gold", + "filename": "dire_hit", "rotated": false, "trimmed": true, "sourceSize": { @@ -1614,20 +1509,62 @@ "h": 32 }, "spriteSourceSize": { - "x": 9, - "y": 11, - "w": 15, - "h": 11 + "x": 5, + "y": 5, + "w": 22, + "h": 22 }, "frame": { - "x": 54, - "y": 113, - "w": 15, - "h": 11 + "x": 117, + "y": 66, + "w": 22, + "h": 22 } }, { - "filename": "dragon_scale", + "filename": "spell_tag", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 19, + "h": 21 + }, + "frame": { + "x": 139, + "y": 66, + "w": 19, + "h": 21 + } + }, + { + "filename": "golden_mystic_ticket", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 23, + "h": 19 + }, + "frame": { + "x": 158, + "y": 67, + "w": 23, + "h": 19 + } + }, + { + "filename": "choice_specs", "rotated": false, "trimmed": true, "sourceSize": { @@ -1641,12 +1578,96 @@ "h": 18 }, "frame": { - "x": 69, - "y": 113, + "x": 181, + "y": 68, "w": 24, "h": 18 } }, + { + "filename": "blunder_policy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 22, + "h": 19 + }, + "frame": { + "x": 205, + "y": 68, + "w": 22, + "h": 19 + } + }, + { + "filename": "deep_sea_tooth", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 22, + "h": 21 + }, + "frame": { + "x": 227, + "y": 67, + "w": 22, + "h": 21 + } + }, + { + "filename": "dna_splicers", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 249, + "y": 67, + "w": 22, + "h": 22 + } + }, + { + "filename": "electirizer", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 271, + "y": 67, + "w": 22, + "h": 22 + } + }, { "filename": "enigma_berry", "rotated": false, @@ -1662,14 +1683,14 @@ "h": 22 }, "frame": { - "x": 63, - "y": 131, + "x": 293, + "y": 67, "w": 22, "h": 22 } }, { - "filename": "ganlon_berry", + "filename": "dragon_scale", "rotated": false, "trimmed": true, "sourceSize": { @@ -1677,20 +1698,20 @@ "h": 32 }, "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 + "x": 4, + "y": 8, + "w": 24, + "h": 18 }, "frame": { - "x": 63, - "y": 153, - "w": 22, - "h": 22 + "x": 315, + "y": 72, + "w": 24, + "h": 18 } }, { - "filename": "guard_spec", + "filename": "black_glasses", "rotated": false, "trimmed": true, "sourceSize": { @@ -1698,62 +1719,20 @@ "h": 32 }, "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 + "x": 4, + "y": 8, + "w": 23, + "h": 17 }, "frame": { - "x": 63, - "y": 175, - "w": 22, - "h": 22 + "x": 95, + "y": 89, + "w": 23, + "h": 17 } }, { - "filename": "ice_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 63, - "y": 197, - "w": 22, - "h": 22 - } - }, - { - "filename": "lansat_berry", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 21, - "h": 23 - }, - "frame": { - "x": 63, - "y": 219, - "w": 21, - "h": 23 - } - }, - { - "filename": "leaf_stone", + "filename": "dragon_fang", "rotated": false, "trimmed": true, "sourceSize": { @@ -1767,8 +1746,8 @@ "h": 23 }, "frame": { - "x": 63, - "y": 242, + "x": 118, + "y": 88, "w": 21, "h": 23 } @@ -1788,14 +1767,98 @@ "h": 24 }, "frame": { - "x": 63, - "y": 265, + "x": 139, + "y": 87, "w": 20, "h": 24 } }, { - "filename": "blunder_policy", + "filename": "shiny_charm", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 21, + "h": 24 + }, + "frame": { + "x": 159, + "y": 86, + "w": 21, + "h": 24 + } + }, + { + "filename": "ganlon_berry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 180, + "y": 86, + "w": 22, + "h": 22 + } + }, + { + "filename": "guard_spec", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 202, + "y": 87, + "w": 22, + "h": 22 + } + }, + { + "filename": "ice_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 224, + "y": 88, + "w": 22, + "h": 22 + } + }, + { + "filename": "liechi_berry", "rotated": false, "trimmed": true, "sourceSize": { @@ -1806,265 +1869,13 @@ "x": 5, "y": 6, "w": 22, - "h": 19 + "h": 21 }, "frame": { - "x": 63, - "y": 289, + "x": 246, + "y": 89, "w": 22, - "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": 65, - "y": 308, - "w": 23, - "h": 19 - } - }, - { - "filename": "max_lure", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 17, - "h": 24 - }, - "frame": { - "x": 85, - "y": 131, - "w": 17, - "h": 24 - } - }, - { - "filename": "super_lure", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 17, - "h": 24 - }, - "frame": { - "x": 85, - "y": 155, - "w": 17, - "h": 24 - } - }, - { - "filename": "hyper_potion", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 17, - "h": 23 - }, - "frame": { - "x": 85, - "y": 179, - "w": 17, - "h": 23 - } - }, - { - "filename": "big_mushroom", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 19, - "h": 19 - }, - "frame": { - "x": 85, - "y": 202, - "w": 19, - "h": 19 - } - }, - { - "filename": "mystic_water", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 20, - "h": 23 - }, - "frame": { - "x": 84, - "y": 221, - "w": 20, - "h": 23 - } - }, - { - "filename": "dawn_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, "h": 21 - }, - "frame": { - "x": 84, - "y": 244, - "w": 20, - "h": 21 - } - }, - { - "filename": "sharp_beak", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 21, - "h": 23 - }, - "frame": { - "x": 83, - "y": 265, - "w": 21, - "h": 23 - } - }, - { - "filename": "big_nugget", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 20 - }, - "frame": { - "x": 85, - "y": 288, - "w": 20, - "h": 20 - } - }, - { - "filename": "mystic_ticket", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 23, - "h": 19 - }, - "frame": { - "x": 88, - "y": 308, - "w": 23, - "h": 19 - } - }, - { - "filename": "relic_crown", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 23, - "h": 18 - }, - "frame": { - "x": 93, - "y": 113, - "w": 23, - "h": 18 - } - }, - { - "filename": "potion", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 17, - "h": 23 - }, - "frame": { - "x": 98, - "y": 90, - "w": 17, - "h": 23 } }, { @@ -2082,7 +1893,7 @@ "h": 22 }, "frame": { - "x": 115, + "x": 268, "y": 89, "w": 22, "h": 22 @@ -2103,7 +1914,7 @@ "h": 22 }, "frame": { - "x": 137, + "x": 290, "y": 89, "w": 22, "h": 22 @@ -2124,14 +1935,98 @@ "h": 22 }, "frame": { - "x": 159, - "y": 89, + "x": 312, + "y": 90, "w": 22, "h": 22 } }, { - "filename": "shell_bell", + "filename": "silver_powder", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 11, + "w": 24, + "h": 15 + }, + "frame": { + "x": 94, + "y": 106, + "w": 24, + "h": 15 + } + }, + { + "filename": "mystic_ticket", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 23, + "h": 19 + }, + "frame": { + "x": 118, + "y": 111, + "w": 23, + "h": 19 + } + }, + { + "filename": "apicot_berry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 19, + "h": 20 + }, + "frame": { + "x": 141, + "y": 111, + "w": 19, + "h": 20 + } + }, + { + "filename": "dawn_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 20, + "h": 21 + }, + "frame": { + "x": 160, + "y": 110, + "w": 20, + "h": 21 + } + }, + { + "filename": "scroll_of_darkness", "rotated": false, "trimmed": true, "sourceSize": { @@ -2140,15 +2035,36 @@ }, "spriteSourceSize": { "x": 5, - "y": 7, - "w": 23, - "h": 20 + "y": 5, + "w": 22, + "h": 22 }, "frame": { - "x": 116, - "y": 111, - "w": 23, - "h": 20 + "x": 180, + "y": 108, + "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": 202, + "y": 109, + "w": 22, + "h": 22 } }, { @@ -2166,8 +2082,8 @@ "h": 22 }, "frame": { - "x": 102, - "y": 131, + "x": 224, + "y": 110, "w": 22, "h": 22 } @@ -2187,12 +2103,390 @@ "h": 22 }, "frame": { - "x": 102, - "y": 153, + "x": 246, + "y": 110, "w": 22, "h": 22 } }, + { + "filename": "sweet_apple", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 22, + "h": 21 + }, + "frame": { + "x": 268, + "y": 111, + "w": 22, + "h": 21 + } + }, + { + "filename": "syrupy_apple", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 22, + "h": 21 + }, + "frame": { + "x": 290, + "y": 111, + "w": 22, + "h": 21 + } + }, + { + "filename": "fairy_feather", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 22, + "h": 20 + }, + "frame": { + "x": 312, + "y": 112, + "w": 22, + "h": 20 + } + }, + { + "filename": "dubious_disc", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 22, + "h": 19 + }, + "frame": { + "x": 72, + "y": 116, + "w": 22, + "h": 19 + } + }, + { + "filename": "dusk_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 21, + "h": 21 + }, + "frame": { + "x": 51, + "y": 117, + "w": 21, + "h": 21 + } + }, + { + "filename": "pair_of_tickets", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 23, + "h": 19 + }, + "frame": { + "x": 94, + "y": 121, + "w": 23, + "h": 19 + } + }, + { + "filename": "lansat_berry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 21, + "h": 23 + }, + "frame": { + "x": 43, + "y": 138, + "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": 45, + "y": 161, + "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": 46, + "y": 184, + "w": 20, + "h": 23 + } + }, + { + "filename": "max_elixir", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 18, + "h": 24 + }, + "frame": { + "x": 47, + "y": 207, + "w": 18, + "h": 24 + } + }, + { + "filename": "lure", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 17, + "h": 24 + }, + "frame": { + "x": 48, + "y": 231, + "w": 17, + "h": 24 + } + }, + { + "filename": "max_ether", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 18, + "h": 24 + }, + "frame": { + "x": 48, + "y": 255, + "w": 18, + "h": 24 + } + }, + { + "filename": "max_potion", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 18, + "h": 24 + }, + "frame": { + "x": 48, + "y": 279, + "w": 18, + "h": 24 + } + }, + { + "filename": "max_lure", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 17, + "h": 24 + }, + "frame": { + "x": 48, + "y": 303, + "w": 17, + "h": 24 + } + }, + { + "filename": "full_heal", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 15, + "h": 23 + }, + "frame": { + "x": 64, + "y": 138, + "w": 15, + "h": 23 + } + }, + { + "filename": "leftovers", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 15, + "h": 22 + }, + "frame": { + "x": 79, + "y": 135, + "w": 15, + "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": 94, + "y": 140, + "w": 23, + "h": 18 + } + }, + { + "filename": "sharp_beak", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 117, + "y": 130, + "w": 21, + "h": 23 + } + }, { "filename": "thunder_stone", "rotated": false, @@ -2208,14 +2502,14 @@ "h": 22 }, "frame": { - "x": 102, - "y": 175, + "x": 138, + "y": 131, "w": 22, "h": 22 } }, { - "filename": "deep_sea_scale", + "filename": "sitrus_berry", "rotated": false, "trimmed": true, "sourceSize": { @@ -2223,16 +2517,16 @@ "h": 32 }, "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 22, - "h": 20 + "x": 6, + "y": 5, + "w": 20, + "h": 22 }, "frame": { - "x": 139, - "y": 111, - "w": 22, - "h": 20 + "x": 160, + "y": 131, + "w": 20, + "h": 22 } }, { @@ -2250,12 +2544,54 @@ "h": 22 }, "frame": { - "x": 124, - "y": 131, + "x": 180, + "y": 130, "w": 22, "h": 22 } }, + { + "filename": "tart_apple", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 22, + "h": 21 + }, + "frame": { + "x": 202, + "y": 131, + "w": 22, + "h": 21 + } + }, + { + "filename": "malicious_armor", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 22, + "h": 20 + }, + "frame": { + "x": 224, + "y": 132, + "w": 22, + "h": 20 + } + }, { "filename": "tm_dark", "rotated": false, @@ -2271,8 +2607,8 @@ "h": 22 }, "frame": { - "x": 124, - "y": 153, + "x": 246, + "y": 132, "w": 22, "h": 22 } @@ -2292,33 +2628,12 @@ "h": 22 }, "frame": { - "x": 124, - "y": 175, + "x": 268, + "y": 132, "w": 22, "h": 22 } }, - { - "filename": "blue_orb", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 20 - }, - "frame": { - "x": 161, - "y": 111, - "w": 20, - "h": 20 - } - }, { "filename": "tm_electric", "rotated": false, @@ -2334,8 +2649,8 @@ "h": 22 }, "frame": { - "x": 146, - "y": 131, + "x": 290, + "y": 132, "w": 22, "h": 22 } @@ -2355,12 +2670,180 @@ "h": 22 }, "frame": { - "x": 146, - "y": 153, + "x": 312, + "y": 132, "w": 22, "h": 22 } }, + { + "filename": "hp_up", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 66, + "y": 161, + "w": 16, + "h": 24 + } + }, + { + "filename": "hyper_potion", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 17, + "h": 23 + }, + "frame": { + "x": 66, + "y": 185, + "w": 17, + "h": 23 + } + }, + { + "filename": "sachet", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 18, + "h": 23 + }, + "frame": { + "x": 65, + "y": 208, + "w": 18, + "h": 23 + } + }, + { + "filename": "super_lure", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 17, + "h": 24 + }, + "frame": { + "x": 65, + "y": 231, + "w": 17, + "h": 24 + } + }, + { + "filename": "iron", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 66, + "y": 255, + "w": 16, + "h": 24 + } + }, + { + "filename": "pp_max", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 66, + "y": 279, + "w": 16, + "h": 24 + } + }, + { + "filename": "potion", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 17, + "h": 23 + }, + "frame": { + "x": 65, + "y": 303, + "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": 65, + "y": 326, + "w": 15, + "h": 15 + } + }, { "filename": "tm_fighting", "rotated": false, @@ -2376,12 +2859,33 @@ "h": 22 }, "frame": { - "x": 146, - "y": 175, + "x": 82, + "y": 158, "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": 83, + "y": 180, + "w": 21, + "h": 23 + } + }, { "filename": "tm_fire", "rotated": false, @@ -2397,12 +2901,33 @@ "h": 22 }, "frame": { - "x": 104, - "y": 197, + "x": 83, + "y": 203, "w": 22, "h": 22 } }, + { + "filename": "pp_up", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 104, + "y": 158, + "w": 16, + "h": 24 + } + }, { "filename": "tm_flying", "rotated": false, @@ -2418,8 +2943,8 @@ "h": 22 }, "frame": { - "x": 104, - "y": 219, + "x": 120, + "y": 153, "w": 22, "h": 22 } @@ -2439,12 +2964,33 @@ "h": 22 }, "frame": { - "x": 126, - "y": 197, + "x": 142, + "y": 153, "w": 22, "h": 22 } }, + { + "filename": "metronome", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 17, + "h": 22 + }, + "frame": { + "x": 164, + "y": 153, + "w": 17, + "h": 22 + } + }, { "filename": "tm_grass", "rotated": false, @@ -2460,8 +3006,8 @@ "h": 22 }, "frame": { - "x": 104, - "y": 241, + "x": 181, + "y": 152, "w": 22, "h": 22 } @@ -2481,12 +3027,33 @@ "h": 22 }, "frame": { - "x": 126, - "y": 219, + "x": 203, + "y": 152, "w": 22, "h": 22 } }, + { + "filename": "poison_barb", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 21, + "h": 21 + }, + "frame": { + "x": 225, + "y": 152, + "w": 21, + "h": 21 + } + }, { "filename": "tm_ice", "rotated": false, @@ -2502,8 +3069,8 @@ "h": 22 }, "frame": { - "x": 104, - "y": 263, + "x": 246, + "y": 154, "w": 22, "h": 22 } @@ -2523,8 +3090,8 @@ "h": 22 }, "frame": { - "x": 126, - "y": 241, + "x": 268, + "y": 154, "w": 22, "h": 22 } @@ -2544,117 +3111,12 @@ "h": 22 }, "frame": { - "x": 126, - "y": 263, + "x": 290, + "y": 154, "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": 285, - "w": 17, - "h": 23 - } - }, - { - "filename": "pair_of_tickets", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 23, - "h": 19 - }, - "frame": { - "x": 111, - "y": 308, - "w": 23, - "h": 19 - } - }, - { - "filename": "full_heal", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 15, - "h": 23 - }, - "frame": { - "x": 122, - "y": 285, - "w": 15, - "h": 23 - } - }, - { - "filename": "dubious_disc", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 22, - "h": 19 - }, - "frame": { - "x": 134, - "y": 308, - "w": 22, - "h": 19 - } - }, - { - "filename": "sitrus_berry", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 20, - "h": 22 - }, - "frame": { - "x": 148, - "y": 197, - "w": 20, - "h": 22 - } - }, { "filename": "tm_psychic", "rotated": false, @@ -2670,12 +3132,33 @@ "h": 22 }, "frame": { - "x": 148, - "y": 219, + "x": 312, + "y": 154, "w": 22, "h": 22 } }, + { + "filename": "shiny_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 21, + "h": 21 + }, + "frame": { + "x": 104, + "y": 182, + "w": 21, + "h": 21 + } + }, { "filename": "tm_rock", "rotated": false, @@ -2691,8 +3174,8 @@ "h": 22 }, "frame": { - "x": 148, - "y": 241, + "x": 105, + "y": 203, "w": 22, "h": 22 } @@ -2712,8 +3195,8 @@ "h": 22 }, "frame": { - "x": 148, - "y": 263, + "x": 125, + "y": 175, "w": 22, "h": 22 } @@ -2733,306 +3216,12 @@ "h": 22 }, "frame": { - "x": 137, - "y": 285, + "x": 147, + "y": 175, "w": 22, "h": 22 } }, - { - "filename": "fairy_feather", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 22, - "h": 20 - }, - "frame": { - "x": 156, - "y": 307, - "w": 22, - "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": 159, - "y": 285, - "w": 19, - "h": 22 - } - }, - { - "filename": "pp_max", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 168, - "y": 131, - "w": 16, - "h": 24 - } - }, - { - "filename": "pp_up", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 168, - "y": 155, - "w": 16, - "h": 24 - } - }, - { - "filename": "protein", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 168, - "y": 179, - "w": 16, - "h": 24 - } - }, - { - "filename": "abomasite", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 16, - "h": 16 - }, - "frame": { - "x": 168, - "y": 203, - "w": 16, - "h": 16 - } - }, - { - "filename": "unknown", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 170, - "y": 219, - "w": 16, - "h": 24 - } - }, - { - "filename": "zinc", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 170, - "y": 243, - "w": 16, - "h": 24 - } - }, - { - "filename": "wl_ability_urge", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 8, - "w": 20, - "h": 18 - }, - "frame": { - "x": 170, - "y": 267, - "w": 20, - "h": 18 - } - }, - { - "filename": "leftovers", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 15, - "h": 22 - }, - "frame": { - "x": 178, - "y": 285, - "w": 15, - "h": 22 - } - }, - { - "filename": "gb", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 20 - }, - "frame": { - "x": 178, - "y": 307, - "w": 20, - "h": 20 - } - }, - { - "filename": "metronome", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 17, - "h": 22 - }, - "frame": { - "x": 181, - "y": 89, - "w": 17, - "h": 22 - } - }, - { - "filename": "candy_jar", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 19, - "h": 20 - }, - "frame": { - "x": 181, - "y": 111, - "w": 19, - "h": 20 - } - }, - { - "filename": "soothe_bell", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 17, - "h": 22 - }, - "frame": { - "x": 184, - "y": 131, - "w": 17, - "h": 22 - } - }, { "filename": "water_stone", "rotated": false, @@ -3048,8 +3237,8 @@ "h": 22 }, "frame": { - "x": 184, - "y": 153, + "x": 127, + "y": 197, "w": 22, "h": 22 } @@ -3069,12 +3258,33 @@ "h": 22 }, "frame": { - "x": 184, - "y": 175, + "x": 149, + "y": 197, "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": 169, + "y": 175, + "w": 17, + "h": 22 + } + }, { "filename": "x_attack", "rotated": false, @@ -3090,12 +3300,75 @@ "h": 22 }, "frame": { - "x": 184, - "y": 197, + "x": 186, + "y": 174, "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": 208, + "y": 174, + "w": 17, + "h": 23 + } + }, + { + "filename": "zoom_lens", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 21, + "h": 21 + }, + "frame": { + "x": 225, + "y": 173, + "w": 21, + "h": 21 + } + }, + { + "filename": "upgrade", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 22, + "h": 19 + }, + "frame": { + "x": 246, + "y": 176, + "w": 22, + "h": 19 + } + }, { "filename": "x_defense", "rotated": false, @@ -3111,8 +3384,8 @@ "h": 22 }, "frame": { - "x": 186, - "y": 219, + "x": 268, + "y": 176, "w": 22, "h": 22 } @@ -3132,8 +3405,8 @@ "h": 22 }, "frame": { - "x": 186, - "y": 241, + "x": 290, + "y": 176, "w": 22, "h": 22 } @@ -3153,12 +3426,96 @@ "h": 22 }, "frame": { - "x": 190, - "y": 263, + "x": 312, + "y": 176, "w": 22, "h": 22 } }, + { + "filename": "protein", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 171, + "y": 197, + "w": 16, + "h": 24 + } + }, + { + "filename": "metal_alloy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 21, + "h": 19 + }, + "frame": { + "x": 187, + "y": 196, + "w": 21, + "h": 19 + } + }, + { + "filename": "big_mushroom", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 19, + "h": 19 + }, + "frame": { + "x": 208, + "y": 197, + "w": 19, + "h": 19 + } + }, + { + "filename": "candy_jar", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 19, + "h": 20 + }, + "frame": { + "x": 227, + "y": 194, + "w": 19, + "h": 20 + } + }, { "filename": "x_speed", "rotated": false, @@ -3174,12 +3531,138 @@ "h": 22 }, "frame": { - "x": 193, - "y": 285, + "x": 246, + "y": 195, "w": 22, "h": 22 } }, + { + "filename": "wise_glasses", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 8, + "w": 23, + "h": 17 + }, + "frame": { + "x": 268, + "y": 198, + "w": 23, + "h": 17 + } + }, + { + "filename": "masterpiece_teacup", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 21, + "h": 18 + }, + "frame": { + "x": 291, + "y": 198, + "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": 312, + "y": 198, + "w": 21, + "h": 18 + } + }, + { + "filename": "big_nugget", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 20, + "h": 20 + }, + "frame": { + "x": 83, + "y": 225, + "w": 20, + "h": 20 + } + }, + { + "filename": "blue_orb", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 20, + "h": 20 + }, + "frame": { + "x": 103, + "y": 225, + "w": 20, + "h": 20 + } + }, + { + "filename": "gb", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 20, + "h": 20 + }, + "frame": { + "x": 82, + "y": 245, + "w": 20, + "h": 20 + } + }, { "filename": "magnet", "rotated": false, @@ -3195,201 +3678,12 @@ "h": 20 }, "frame": { - "x": 198, - "y": 307, + "x": 82, + "y": 265, "w": 20, "h": 20 } }, - { - "filename": "deep_sea_tooth", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 22, - "h": 21 - }, - "frame": { - "x": 189, - "y": 47, - "w": 22, - "h": 21 - } - }, - { - "filename": "dusk_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 21, - "h": 21 - }, - "frame": { - "x": 191, - "y": 68, - "w": 21, - "h": 21 - } - }, - { - "filename": "liechi_berry", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 22, - "h": 21 - }, - "frame": { - "x": 211, - "y": 46, - "w": 22, - "h": 21 - } - }, - { - "filename": "poison_barb", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 21, - "h": 21 - }, - "frame": { - "x": 212, - "y": 67, - "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": 198, - "y": 89, - "w": 21, - "h": 21 - } - }, - { - "filename": "spell_tag", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 19, - "h": 21 - }, - "frame": { - "x": 200, - "y": 110, - "w": 19, - "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": 201, - "y": 131, - "w": 21, - "h": 21 - } - }, - { - "filename": "golden_egg", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 17, - "h": 20 - }, - "frame": { - "x": 206, - "y": 152, - "w": 17, - "h": 20 - } - }, - { - "filename": "hard_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 19, - "h": 20 - }, - "frame": { - "x": 206, - "y": 172, - "w": 19, - "h": 20 - } - }, { "filename": "mb", "rotated": false, @@ -3405,33 +3699,12 @@ "h": 20 }, "frame": { - "x": 206, - "y": 192, + "x": 102, + "y": 245, "w": 20, "h": 20 } }, - { - "filename": "lucky_egg", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 17, - "h": 20 - }, - "frame": { - "x": 219, - "y": 88, - "w": 17, - "h": 20 - } - }, { "filename": "pb", "rotated": false, @@ -3447,8 +3720,8 @@ "h": 20 }, "frame": { - "x": 219, - "y": 108, + "x": 82, + "y": 285, "w": 20, "h": 20 } @@ -3468,8 +3741,8 @@ "h": 20 }, "frame": { - "x": 222, - "y": 128, + "x": 102, + "y": 265, "w": 20, "h": 20 } @@ -3489,12 +3762,33 @@ "h": 20 }, "frame": { - "x": 223, - "y": 148, + "x": 82, + "y": 305, "w": 20, "h": 20 } }, + { + "filename": "mega_bracelet", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 20, + "h": 16 + }, + "frame": { + "x": 82, + "y": 325, + "w": 20, + "h": 16 + } + }, { "filename": "ub", "rotated": false, @@ -3510,12 +3804,75 @@ "h": 20 }, "frame": { - "x": 225, - "y": 168, + "x": 102, + "y": 285, "w": 20, "h": 20 } }, + { + "filename": "unknown", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 102, + "y": 305, + "w": 16, + "h": 24 + } + }, + { + "filename": "zinc", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 118, + "y": 305, + "w": 16, + "h": 24 + } + }, + { + "filename": "everstone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 20, + "h": 17 + }, + "frame": { + "x": 187, + "y": 215, + "w": 20, + "h": 17 + } + }, { "filename": "lum_berry", "rotated": false, @@ -3531,14 +3888,14 @@ "h": 19 }, "frame": { - "x": 226, - "y": 188, + "x": 207, + "y": 216, "w": 20, "h": 19 } }, { - "filename": "upgrade", + "filename": "hard_stone", "rotated": false, "trimmed": true, "sourceSize": { @@ -3546,58 +3903,16 @@ "h": 32 }, "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 22, - "h": 19 + "x": 6, + "y": 6, + "w": 19, + "h": 20 }, "frame": { - "x": 233, - "y": 47, - "w": 22, - "h": 19 - } - }, - { - "filename": "black_glasses", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 8, - "w": 23, - "h": 17 - }, - "frame": { - "x": 255, - "y": 47, - "w": 23, - "h": 17 - } - }, - { - "filename": "wise_glasses", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 8, - "w": 23, - "h": 17 - }, - "frame": { - "x": 278, - "y": 47, - "w": 23, - "h": 17 + "x": 227, + "y": 214, + "w": 19, + "h": 20 } }, { @@ -3615,14 +3930,35 @@ "h": 19 }, "frame": { - "x": 233, - "y": 66, + "x": 246, + "y": 217, "w": 20, "h": 19 } }, { - "filename": "miracle_seed", + "filename": "relic_gold", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 9, + "y": 11, + "w": 15, + "h": 11 + }, + "frame": { + "x": 102, + "y": 329, + "w": 15, + "h": 11 + } + }, + { + "filename": "wl_ability_urge", "rotated": false, "trimmed": true, "sourceSize": { @@ -3631,57 +3967,15 @@ }, "spriteSourceSize": { "x": 6, - "y": 7, - "w": 19, - "h": 19 + "y": 8, + "w": 20, + "h": 18 }, "frame": { - "x": 236, - "y": 85, - "w": 19, - "h": 19 - } - }, - { - "filename": "oval_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 18, - "h": 19 - }, - "frame": { - "x": 239, - "y": 104, - "w": 18, - "h": 19 - } - }, - { - "filename": "silver_powder", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 11, - "w": 24, - "h": 15 - }, - "frame": { - "x": 301, - "y": 48, - "w": 24, - "h": 15 + "x": 127, + "y": 219, + "w": 20, + "h": 18 } }, { @@ -3699,8 +3993,8 @@ "h": 18 }, "frame": { - "x": 208, - "y": 212, + "x": 147, + "y": 219, "w": 20, "h": 18 } @@ -3720,33 +4014,12 @@ "h": 18 }, "frame": { - "x": 208, - "y": 230, + "x": 167, + "y": 221, "w": 20, "h": 18 } }, - { - "filename": "prism_scale", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 15, - "h": 15 - }, - "frame": { - "x": 208, - "y": 248, - "w": 15, - "h": 15 - } - }, { "filename": "wl_burn_heal", "rotated": false, @@ -3762,8 +4035,8 @@ "h": 18 }, "frame": { - "x": 228, - "y": 207, + "x": 187, + "y": 232, "w": 20, "h": 18 } @@ -3783,12 +4056,33 @@ "h": 18 }, "frame": { - "x": 228, - "y": 225, + "x": 207, + "y": 235, "w": 20, "h": 18 } }, + { + "filename": "miracle_seed", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 19, + "h": 19 + }, + "frame": { + "x": 227, + "y": 234, + "w": 19, + "h": 19 + } + }, { "filename": "wl_full_heal", "rotated": false, @@ -3804,8 +4098,8 @@ "h": 18 }, "frame": { - "x": 212, - "y": 263, + "x": 246, + "y": 236, "w": 20, "h": 18 } @@ -3825,8 +4119,8 @@ "h": 18 }, "frame": { - "x": 215, - "y": 281, + "x": 123, + "y": 237, "w": 20, "h": 18 } @@ -3846,12 +4140,33 @@ "h": 18 }, "frame": { - "x": 242, - "y": 123, + "x": 143, + "y": 237, "w": 20, "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": 122, + "y": 255, + "w": 18, + "h": 20 + } + }, { "filename": "wl_hyper_potion", "rotated": false, @@ -3867,12 +4182,33 @@ "h": 18 }, "frame": { - "x": 243, - "y": 141, + "x": 140, + "y": 255, "w": 20, "h": 18 } }, + { + "filename": "golden_egg", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 17, + "h": 20 + }, + "frame": { + "x": 122, + "y": 275, + "w": 17, + "h": 20 + } + }, { "filename": "wl_ice_heal", "rotated": false, @@ -3888,8 +4224,8 @@ "h": 18 }, "frame": { - "x": 218, - "y": 299, + "x": 163, + "y": 239, "w": 20, "h": 18 } @@ -3909,8 +4245,8 @@ "h": 18 }, "frame": { - "x": 245, - "y": 159, + "x": 160, + "y": 257, "w": 20, "h": 18 } @@ -3930,33 +4266,12 @@ "h": 18 }, "frame": { - "x": 246, - "y": 177, + "x": 140, + "y": 273, "w": 20, "h": 18 } }, - { - "filename": "everstone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 8, - "w": 20, - "h": 17 - }, - "frame": { - "x": 228, - "y": 243, - "w": 20, - "h": 17 - } - }, { "filename": "wl_max_potion", "rotated": false, @@ -3972,12 +4287,54 @@ "h": 18 }, "frame": { - "x": 232, - "y": 260, + "x": 160, + "y": 275, "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": 180, + "y": 257, + "w": 17, + "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": 180, + "y": 277, + "w": 18, + "h": 19 + } + }, { "filename": "wl_max_revive", "rotated": false, @@ -3993,8 +4350,8 @@ "h": 18 }, "frame": { - "x": 235, - "y": 278, + "x": 197, + "y": 253, "w": 20, "h": 18 } @@ -4014,8 +4371,8 @@ "h": 18 }, "frame": { - "x": 238, - "y": 296, + "x": 217, + "y": 253, "w": 20, "h": 18 } @@ -4035,8 +4392,8 @@ "h": 18 }, "frame": { - "x": 248, - "y": 195, + "x": 198, + "y": 271, "w": 20, "h": 18 } @@ -4056,8 +4413,8 @@ "h": 18 }, "frame": { - "x": 248, - "y": 213, + "x": 218, + "y": 271, "w": 20, "h": 18 } @@ -4077,8 +4434,8 @@ "h": 18 }, "frame": { - "x": 248, - "y": 231, + "x": 198, + "y": 289, "w": 20, "h": 18 } @@ -4098,12 +4455,33 @@ "h": 18 }, "frame": { - "x": 252, - "y": 249, + "x": 218, + "y": 289, "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": 254, + "w": 16, + "h": 16 + } + }, { "filename": "absolite", "rotated": false, @@ -4119,33 +4497,12 @@ "h": 16 }, "frame": { - "x": 255, - "y": 267, + "x": 238, + "y": 270, "w": 16, "h": 16 } }, - { - "filename": "revive", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 12, - "h": 17 - }, - "frame": { - "x": 253, - "y": 66, - "w": 12, - "h": 17 - } - }, { "filename": "aerodactylite", "rotated": false, @@ -4161,8 +4518,8 @@ "h": 16 }, "frame": { - "x": 265, - "y": 64, + "x": 238, + "y": 286, "w": 16, "h": 16 } @@ -4182,8 +4539,8 @@ "h": 16 }, "frame": { - "x": 281, - "y": 64, + "x": 253, + "y": 254, "w": 16, "h": 16 } @@ -4203,8 +4560,8 @@ "h": 16 }, "frame": { - "x": 255, - "y": 83, + "x": 254, + "y": 270, "w": 16, "h": 16 } @@ -4224,8 +4581,8 @@ "h": 16 }, "frame": { - "x": 271, - "y": 80, + "x": 254, + "y": 286, "w": 16, "h": 16 } @@ -4245,8 +4602,8 @@ "h": 16 }, "frame": { - "x": 287, - "y": 80, + "x": 238, + "y": 302, "w": 16, "h": 16 } @@ -4266,8 +4623,8 @@ "h": 16 }, "frame": { - "x": 297, - "y": 64, + "x": 254, + "y": 302, "w": 16, "h": 16 } @@ -4287,8 +4644,8 @@ "h": 16 }, "frame": { - "x": 303, - "y": 80, + "x": 139, + "y": 291, "w": 16, "h": 16 } @@ -4308,8 +4665,8 @@ "h": 16 }, "frame": { - "x": 257, - "y": 99, + "x": 134, + "y": 307, "w": 16, "h": 16 } @@ -4329,8 +4686,8 @@ "h": 16 }, "frame": { - "x": 273, - "y": 96, + "x": 155, + "y": 293, "w": 16, "h": 16 } @@ -4350,8 +4707,8 @@ "h": 16 }, "frame": { - "x": 289, - "y": 96, + "x": 150, + "y": 309, "w": 16, "h": 16 } @@ -4371,8 +4728,8 @@ "h": 16 }, "frame": { - "x": 305, - "y": 96, + "x": 134, + "y": 323, "w": 16, "h": 16 } @@ -4392,12 +4749,33 @@ "h": 16 }, "frame": { - "x": 262, - "y": 115, + "x": 150, + "y": 325, "w": 16, "h": 16 } }, + { + "filename": "revive", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 12, + "h": 17 + }, + "frame": { + "x": 166, + "y": 309, + "w": 12, + "h": 17 + } + }, { "filename": "charizardite_y", "rotated": false, @@ -4413,8 +4791,8 @@ "h": 16 }, "frame": { - "x": 278, - "y": 112, + "x": 268, + "y": 215, "w": 16, "h": 16 } @@ -4434,8 +4812,8 @@ "h": 16 }, "frame": { - "x": 294, - "y": 112, + "x": 266, + "y": 231, "w": 16, "h": 16 } @@ -4455,8 +4833,8 @@ "h": 16 }, "frame": { - "x": 310, - "y": 112, + "x": 284, + "y": 216, "w": 16, "h": 16 } @@ -4476,8 +4854,8 @@ "h": 16 }, "frame": { - "x": 263, - "y": 131, + "x": 300, + "y": 216, "w": 16, "h": 16 } @@ -4497,8 +4875,8 @@ "h": 16 }, "frame": { - "x": 279, - "y": 128, + "x": 316, + "y": 216, "w": 16, "h": 16 } @@ -4518,8 +4896,8 @@ "h": 16 }, "frame": { - "x": 295, - "y": 128, + "x": 282, + "y": 232, "w": 16, "h": 16 } @@ -4539,8 +4917,8 @@ "h": 16 }, "frame": { - "x": 311, - "y": 128, + "x": 298, + "y": 232, "w": 16, "h": 16 } @@ -4560,8 +4938,8 @@ "h": 16 }, "frame": { - "x": 279, - "y": 144, + "x": 314, + "y": 232, "w": 16, "h": 16 } @@ -4581,8 +4959,8 @@ "h": 16 }, "frame": { - "x": 295, - "y": 144, + "x": 178, + "y": 296, "w": 16, "h": 16 } @@ -4602,8 +4980,8 @@ "h": 16 }, "frame": { - "x": 311, - "y": 144, + "x": 178, + "y": 312, "w": 16, "h": 16 } @@ -4623,8 +5001,8 @@ "h": 16 }, "frame": { - "x": 265, - "y": 160, + "x": 194, + "y": 307, "w": 16, "h": 16 } @@ -4644,8 +5022,8 @@ "h": 16 }, "frame": { - "x": 281, - "y": 160, + "x": 210, + "y": 307, "w": 16, "h": 16 } @@ -4665,8 +5043,8 @@ "h": 16 }, "frame": { - "x": 297, - "y": 160, + "x": 194, + "y": 323, "w": 16, "h": 16 } @@ -4686,8 +5064,8 @@ "h": 16 }, "frame": { - "x": 266, - "y": 176, + "x": 210, + "y": 323, "w": 16, "h": 16 } @@ -4707,8 +5085,8 @@ "h": 16 }, "frame": { - "x": 282, - "y": 176, + "x": 226, + "y": 318, "w": 16, "h": 16 } @@ -4728,8 +5106,8 @@ "h": 16 }, "frame": { - "x": 298, - "y": 176, + "x": 242, + "y": 318, "w": 16, "h": 16 } @@ -4749,8 +5127,8 @@ "h": 16 }, "frame": { - "x": 268, - "y": 192, + "x": 258, + "y": 318, "w": 16, "h": 16 } @@ -4770,8 +5148,8 @@ "h": 16 }, "frame": { - "x": 268, - "y": 208, + "x": 269, + "y": 248, "w": 16, "h": 16 } @@ -4791,8 +5169,8 @@ "h": 16 }, "frame": { - "x": 284, - "y": 192, + "x": 285, + "y": 248, "w": 16, "h": 16 } @@ -4812,8 +5190,8 @@ "h": 16 }, "frame": { - "x": 268, - "y": 224, + "x": 301, + "y": 248, "w": 16, "h": 16 } @@ -4833,8 +5211,8 @@ "h": 16 }, "frame": { - "x": 284, - "y": 208, + "x": 317, + "y": 248, "w": 16, "h": 16 } @@ -4854,8 +5232,8 @@ "h": 16 }, "frame": { - "x": 284, - "y": 224, + "x": 270, + "y": 264, "w": 16, "h": 16 } @@ -4875,8 +5253,8 @@ "h": 16 }, "frame": { - "x": 300, - "y": 192, + "x": 270, + "y": 280, "w": 16, "h": 16 } @@ -4896,8 +5274,8 @@ "h": 16 }, "frame": { - "x": 300, - "y": 208, + "x": 286, + "y": 264, "w": 16, "h": 16 } @@ -4917,8 +5295,8 @@ "h": 16 }, "frame": { - "x": 300, - "y": 224, + "x": 270, + "y": 296, "w": 16, "h": 16 } @@ -4938,8 +5316,8 @@ "h": 16 }, "frame": { - "x": 272, - "y": 240, + "x": 286, + "y": 280, "w": 16, "h": 16 } @@ -4959,8 +5337,8 @@ "h": 16 }, "frame": { - "x": 288, - "y": 240, + "x": 302, + "y": 264, "w": 16, "h": 16 } @@ -4980,8 +5358,8 @@ "h": 16 }, "frame": { - "x": 304, - "y": 240, + "x": 286, + "y": 296, "w": 16, "h": 16 } @@ -5001,8 +5379,8 @@ "h": 16 }, "frame": { - "x": 272, - "y": 256, + "x": 302, + "y": 280, "w": 16, "h": 16 } @@ -5022,8 +5400,8 @@ "h": 16 }, "frame": { - "x": 288, - "y": 256, + "x": 302, + "y": 296, "w": 16, "h": 16 } @@ -5043,8 +5421,8 @@ "h": 16 }, "frame": { - "x": 304, - "y": 256, + "x": 318, + "y": 264, "w": 16, "h": 16 } @@ -5064,8 +5442,8 @@ "h": 16 }, "frame": { - "x": 271, - "y": 272, + "x": 318, + "y": 280, "w": 16, "h": 16 } @@ -5085,8 +5463,29 @@ "h": 16 }, "frame": { - "x": 287, - "y": 272, + "x": 318, + "y": 296, + "w": 16, + "h": 16 + } + }, + { + "filename": "strawberry_sweet", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 16, + "h": 16 + }, + "frame": { + "x": 274, + "y": 312, "w": 16, "h": 16 } @@ -5106,8 +5505,8 @@ "h": 16 }, "frame": { - "x": 303, - "y": 272, + "x": 290, + "y": 312, "w": 16, "h": 16 } @@ -5127,8 +5526,8 @@ "h": 16 }, "frame": { - "x": 258, - "y": 288, + "x": 306, + "y": 312, "w": 16, "h": 16 } @@ -5148,8 +5547,8 @@ "h": 16 }, "frame": { - "x": 274, - "y": 288, + "x": 322, + "y": 312, "w": 16, "h": 16 } @@ -5160,6 +5559,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:6633a2c1c8ba5a849b0ed9650d9ac5a0:c4256b2cc1ff3ba479deffde19dd262a:110e074689c9edd2c54833ce2e4d9270$" + "smartupdate": "$TexturePacker:SmartUpdate:e26b13bb72028dbfab283c071b2a49b7:4c945bbe8b4a3959bea56fa43143c240:110e074689c9edd2c54833ce2e4d9270$" } } diff --git a/public/images/items.png b/public/images/items.png index f4146907b..e29ee9bd2 100644 Binary files a/public/images/items.png and b/public/images/items.png differ diff --git a/public/images/items/auspicious_armor.png b/public/images/items/auspicious_armor.png new file mode 100644 index 000000000..e3620bb60 Binary files /dev/null and b/public/images/items/auspicious_armor.png differ diff --git a/public/images/items/black_augurite.png b/public/images/items/black_augurite.png new file mode 100644 index 000000000..e8531a1a8 Binary files /dev/null and b/public/images/items/black_augurite.png differ diff --git a/public/images/items/chipped_pot.png b/public/images/items/chipped_pot.png new file mode 100644 index 000000000..a2f35f9ae Binary files /dev/null and b/public/images/items/chipped_pot.png differ diff --git a/public/images/items/cracked_pot.png b/public/images/items/cracked_pot.png new file mode 100644 index 000000000..61cad0d85 Binary files /dev/null and b/public/images/items/cracked_pot.png differ diff --git a/public/images/items/galarica_cuff.png b/public/images/items/galarica_cuff.png new file mode 100644 index 000000000..1b3f9c692 Binary files /dev/null and b/public/images/items/galarica_cuff.png differ diff --git a/public/images/items/galarica_wreath.png b/public/images/items/galarica_wreath.png new file mode 100644 index 000000000..7fe319f20 Binary files /dev/null and b/public/images/items/galarica_wreath.png differ diff --git a/public/images/items/malicious_armor.png b/public/images/items/malicious_armor.png new file mode 100644 index 000000000..495024ced Binary files /dev/null and b/public/images/items/malicious_armor.png differ diff --git a/public/images/items/masterpiece_teacup.png b/public/images/items/masterpiece_teacup.png new file mode 100644 index 000000000..36b8c39dc Binary files /dev/null and b/public/images/items/masterpiece_teacup.png differ diff --git a/public/images/items/metal_alloy.png b/public/images/items/metal_alloy.png new file mode 100644 index 000000000..1201f58b4 Binary files /dev/null and b/public/images/items/metal_alloy.png differ diff --git a/public/images/items/peat_block.png b/public/images/items/peat_block.png new file mode 100644 index 000000000..b62e94d52 Binary files /dev/null and b/public/images/items/peat_block.png differ diff --git a/public/images/items/sachet.png b/public/images/items/sachet.png new file mode 100644 index 000000000..1ec6010f1 Binary files /dev/null and b/public/images/items/sachet.png differ diff --git a/public/images/items/scroll_of_darkness.png b/public/images/items/scroll_of_darkness.png new file mode 100644 index 000000000..19be0feb6 Binary files /dev/null and b/public/images/items/scroll_of_darkness.png differ diff --git a/public/images/items/scroll_of_waters.png b/public/images/items/scroll_of_waters.png new file mode 100644 index 000000000..d1e6a0388 Binary files /dev/null and b/public/images/items/scroll_of_waters.png differ diff --git a/public/images/items/strawberry_sweet.png b/public/images/items/strawberry_sweet.png new file mode 100644 index 000000000..b08fece34 Binary files /dev/null and b/public/images/items/strawberry_sweet.png differ diff --git a/public/images/items/sweet_apple.png b/public/images/items/sweet_apple.png new file mode 100644 index 000000000..5070af6ae Binary files /dev/null and b/public/images/items/sweet_apple.png differ diff --git a/public/images/items/syrupy_apple.png b/public/images/items/syrupy_apple.png new file mode 100644 index 000000000..99a0b7b56 Binary files /dev/null and b/public/images/items/syrupy_apple.png differ diff --git a/public/images/items/tart_apple.png b/public/images/items/tart_apple.png new file mode 100644 index 000000000..8f9cf89da Binary files /dev/null and b/public/images/items/tart_apple.png differ diff --git a/public/images/items/unremarkable_teacup.png b/public/images/items/unremarkable_teacup.png new file mode 100644 index 000000000..fd4298b6a Binary files /dev/null and b/public/images/items/unremarkable_teacup.png differ diff --git a/public/images/items/whipped_dream.png b/public/images/items/whipped_dream.png new file mode 100644 index 000000000..94628a443 Binary files /dev/null and b/public/images/items/whipped_dream.png differ diff --git a/src/data/pokemon-evolutions.ts b/src/data/pokemon-evolutions.ts index c10f0fbb8..dbaaa3eee 100644 --- a/src/data/pokemon-evolutions.ts +++ b/src/data/pokemon-evolutions.ts @@ -34,7 +34,24 @@ export enum EvolutionItem { ICE_STONE, DUSK_STONE, DAWN_STONE, - SHINY_STONE + SHINY_STONE, + BLACK_AUGURITE, + CHIPPED_POT, + CRACKED_POT, + GALARICA_CUFF, + GALARICA_WREATH, + PEAT_BLOCK, + SWEET_APPLE, + TART_APPLE, + STRAWBERRY_SWEET, + AUSPICIOUS_ARMOR, + MALICIOUS_ARMOR, + MASTERPIECE_TEACUP, + METAL_ALLOY, + SCROLL_OF_DARKNESS, + SCROLL_OF_WATERS, + SYRUPY_APPLE, + UNREMARKABLE_TEACUP } export type EvolutionConditionPredicate = (p: Pokemon) => boolean; @@ -1057,8 +1074,8 @@ export const pokemonEvolutions: PokemonEvolutions = { new SpeciesEvolution(Species.SIRFETCHD, 30, null, null) ], [Species.GALAR_SLOWPOKE]: [ - new SpeciesEvolution(Species.GALAR_SLOWBRO, 37, null, null), - new SpeciesEvolution(Species.GALAR_SLOWKING, 1, EvolutionItem.LINKING_CORD, null, SpeciesWildEvolutionDelay.VERY_LONG) + new SpeciesEvolution(Species.GALAR_SLOWBRO, 1, EvolutionItem.GALARICA_CUFF, null, SpeciesWildEvolutionDelay.VERY_LONG), + new SpeciesEvolution(Species.GALAR_SLOWKING, 1, EvolutionItem.GALARICA_WREATH, null, SpeciesWildEvolutionDelay.VERY_LONG) ], [Species.GALAR_MR_MIME]: [ new SpeciesEvolution(Species.MR_RIME, 42, null, null) @@ -1280,7 +1297,7 @@ export const pokemonEvolutions: PokemonEvolutions = { new SpeciesEvolution(Species.WEAVILE, 1, null, new SpeciesEvolutionCondition(p => p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT /* Razor claw at night*/), SpeciesWildEvolutionDelay.LONG) ], [Species.URSARING]: [ - new SpeciesEvolution(Species.URSALUNA, 1, EvolutionItem.MOON_STONE, new SpeciesEvolutionCondition(p => p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT), SpeciesWildEvolutionDelay.VERY_LONG) //Ursaring does not evolve into Bloodmoon Ursaluna + new SpeciesEvolution(Species.URSALUNA, 1, EvolutionItem.PEAT_BLOCK, null, SpeciesWildEvolutionDelay.VERY_LONG) //Ursaring does not evolve into Bloodmoon Ursaluna ], [Species.PILOSWINE]: [ new SpeciesEvolution(Species.MAMOSWINE, 1, null, new SpeciesEvolutionCondition(p => p.moveset.filter(m => m.moveId === Moves.ANCIENT_POWER).length > 0), SpeciesWildEvolutionDelay.VERY_LONG) @@ -1378,24 +1395,26 @@ export const pokemonEvolutions: PokemonEvolutions = { new SpeciesEvolution(Species.ALOLA_NINETALES, 1, EvolutionItem.ICE_STONE, null, SpeciesWildEvolutionDelay.LONG) ], [Species.APPLIN]: [ - new SpeciesEvolution(Species.DIPPLIN, 1, EvolutionItem.LEAF_STONE, new SpeciesEvolutionCondition(p => p.scene.arena.biomeType === Biome.ISLAND), SpeciesWildEvolutionDelay.LONG), - new SpeciesEvolution(Species.FLAPPLE, 1, EvolutionItem.LEAF_STONE, new SpeciesEvolutionCondition(p => p.scene.arena.getTimeOfDay() === TimeOfDay.DAY), SpeciesWildEvolutionDelay.LONG), - new SpeciesEvolution(Species.APPLETUN, 1, EvolutionItem.LEAF_STONE, new SpeciesEvolutionCondition(p => p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT), SpeciesWildEvolutionDelay.LONG) + new SpeciesEvolution(Species.DIPPLIN, 1, EvolutionItem.SYRUPY_APPLE, null, SpeciesWildEvolutionDelay.LONG), + new SpeciesEvolution(Species.FLAPPLE, 1, EvolutionItem.TART_APPLE, null, SpeciesWildEvolutionDelay.LONG), + new SpeciesEvolution(Species.APPLETUN, 1, EvolutionItem.SWEET_APPLE, null, SpeciesWildEvolutionDelay.LONG) ], [Species.CLOBBOPUS]: [ new SpeciesEvolution(Species.GRAPPLOCT, 1, null, new SpeciesEvolutionCondition(p => p.moveset.filter(m => m.moveId === Moves.TAUNT).length > 0), SpeciesWildEvolutionDelay.MEDIUM) ], [Species.SINISTEA]: [ - new SpeciesEvolution(Species.POLTEAGEIST, 1, EvolutionItem.DUSK_STONE, null, SpeciesWildEvolutionDelay.LONG) + new SpeciesFormEvolution(Species.POLTEAGEIST, 'phony', 'phony', 1, EvolutionItem.CRACKED_POT, null, SpeciesWildEvolutionDelay.LONG), + new SpeciesFormEvolution(Species.POLTEAGEIST, 'antique', 'antique', 1, EvolutionItem.CHIPPED_POT, null, SpeciesWildEvolutionDelay.LONG) + ], + [Species.MILCERY]: [ + new SpeciesEvolution(Species.ALCREMIE, 1, EvolutionItem.STRAWBERRY_SWEET, null, SpeciesWildEvolutionDelay.MEDIUM) ], [Species.DURALUDON]: [ - new SpeciesEvolution(Species.ARCHALUDON, 1, EvolutionItem.DUSK_STONE, new SpeciesEvolutionCondition( - p => !!p.scene.findModifier(m => m instanceof AttackTypeBoosterModifier && (m.type as AttackTypeBoosterModifierType).moveType === Type.STEEL) ), - SpeciesWildEvolutionDelay.VERY_LONG) + new SpeciesEvolution(Species.ARCHALUDON, 1, EvolutionItem.METAL_ALLOY, null, SpeciesWildEvolutionDelay.VERY_LONG) ], [Species.KUBFU]: [ - new SpeciesFormEvolution(Species.URSHIFU, '', 'single-strike', 1, EvolutionItem.DUSK_STONE, new SpeciesEvolutionCondition(p => p.scene.arena.biomeType === Biome.ABYSS), null), - new SpeciesFormEvolution(Species.URSHIFU, '', 'rapid-strike', 1, EvolutionItem.WATER_STONE, new SpeciesEvolutionCondition(p => p.scene.arena.biomeType === Biome.SEA), null) + new SpeciesFormEvolution(Species.URSHIFU, '', 'single-strike', 1, EvolutionItem.SCROLL_OF_DARKNESS, null, null), + new SpeciesFormEvolution(Species.URSHIFU, '', 'rapid-strike', 1, EvolutionItem.SCROLL_OF_WATERS, null, null) ], [Species.GALAR_DARUMAKA]: [ new SpeciesEvolution(Species.GALAR_DARMANITAN, 1, EvolutionItem.ICE_STONE, null, SpeciesWildEvolutionDelay.LONG) @@ -1413,8 +1432,8 @@ export const pokemonEvolutions: PokemonEvolutions = { new SpeciesEvolution(Species.SNEASLER, 1, null, new SpeciesEvolutionCondition(p => p.scene.arena.getTimeOfDay() === TimeOfDay.DAY /* Razor claw at day*/), SpeciesWildEvolutionDelay.LONG) ], [Species.CHARCADET]: [ - new SpeciesEvolution(Species.ARMAROUGE, 1, EvolutionItem.FIRE_STONE, null, SpeciesWildEvolutionDelay.LONG), - new SpeciesEvolution(Species.CERULEDGE, 1, EvolutionItem.DUSK_STONE, null, SpeciesWildEvolutionDelay.LONG) + new SpeciesEvolution(Species.ARMAROUGE, 1, EvolutionItem.AUSPICIOUS_ARMOR, null, SpeciesWildEvolutionDelay.LONG), + new SpeciesEvolution(Species.CERULEDGE, 1, EvolutionItem.MALICIOUS_ARMOR, null, SpeciesWildEvolutionDelay.LONG) ], [Species.TADBULB]: [ new SpeciesEvolution(Species.BELLIBOLT, 1, EvolutionItem.THUNDER_STONE, null, SpeciesWildEvolutionDelay.MEDIUM) @@ -1426,7 +1445,8 @@ export const pokemonEvolutions: PokemonEvolutions = { new SpeciesEvolution(Species.CETITAN, 1, EvolutionItem.ICE_STONE, null, SpeciesWildEvolutionDelay.MEDIUM) ], [Species.POLTCHAGEIST]: [ - new SpeciesEvolution(Species.SINISTCHA, 1, EvolutionItem.DUSK_STONE, null, SpeciesWildEvolutionDelay.LONG) + new SpeciesFormEvolution(Species.SINISTCHA, 'counterfeit', 'unremarkable', 1, EvolutionItem.UNREMARKABLE_TEACUP, null, null), + new SpeciesFormEvolution(Species.SINISTCHA, 'artisan', 'masterpiece', 1, EvolutionItem.MASTERPIECE_TEACUP, null, null) ], [Species.DIPPLIN]: [ new SpeciesEvolution(Species.HYDRAPPLE, 1, null, new SpeciesEvolutionCondition(p => p.moveset.filter(m => m.moveId === Moves.DRAGON_CHEER).length > 0), SpeciesWildEvolutionDelay.VERY_LONG) @@ -1458,7 +1478,7 @@ export const pokemonEvolutions: PokemonEvolutions = { new SpeciesEvolution(Species.SCIZOR, 1, EvolutionItem.LINKING_CORD, new SpeciesEvolutionCondition( p => !!p.scene.findModifier(m => m instanceof AttackTypeBoosterModifier && (m.type as AttackTypeBoosterModifierType).moveType === Type.STEEL) ), SpeciesWildEvolutionDelay.VERY_LONG), - new SpeciesEvolution(Species.KLEAVOR, 1, EvolutionItem.MOON_STONE, null, SpeciesWildEvolutionDelay.VERY_LONG) + new SpeciesEvolution(Species.KLEAVOR, 1, EvolutionItem.BLACK_AUGURITE, null, SpeciesWildEvolutionDelay.VERY_LONG) ], [Species.ELECTABUZZ]: [ new SpeciesEvolution(Species.ELECTIVIRE, 1, EvolutionItem.LINKING_CORD, new SpeciesEvolutionCondition(p => true /* Electirizer*/), SpeciesWildEvolutionDelay.VERY_LONG) @@ -1537,10 +1557,10 @@ export const pokemonEvolutions: PokemonEvolutions = { new SpeciesEvolution(Species.MARILL, 1, null, new SpeciesFriendshipEvolutionCondition(70), SpeciesWildEvolutionDelay.SHORT) ], [Species.BUDEW]: [ - new SpeciesEvolution(Species.ROSELIA, 1, null, new SpeciesFriendshipEvolutionCondition(70, p => p.scene.arena.getTimeOfDay() === TimeOfDay.DAY), SpeciesWildEvolutionDelay.SHORT) + new SpeciesEvolution(Species.ROSELIA, 1, null, new SpeciesFriendshipEvolutionCondition(70, p => p.scene.arena.getTimeOfDay() === TimeOfDay.DAWN || p.scene.arena.getTimeOfDay() === TimeOfDay.DAY), SpeciesWildEvolutionDelay.SHORT) ], [Species.CHINGLING]: [ - new SpeciesEvolution(Species.CHIMECHO, 1, null, new SpeciesFriendshipEvolutionCondition(70, p => p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT), SpeciesWildEvolutionDelay.MEDIUM) + new SpeciesEvolution(Species.CHIMECHO, 1, null, new SpeciesFriendshipEvolutionCondition(70, p => p.scene.arena.getTimeOfDay() === TimeOfDay.DUSK || p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT), SpeciesWildEvolutionDelay.MEDIUM) ], [Species.BUNEARY]: [ new SpeciesEvolution(Species.LOPUNNY, 1, null, new SpeciesFriendshipEvolutionCondition(90), SpeciesWildEvolutionDelay.MEDIUM) @@ -1549,7 +1569,7 @@ export const pokemonEvolutions: PokemonEvolutions = { new SpeciesEvolution(Species.CHANSEY, 1, null, new SpeciesFriendshipEvolutionCondition(160), SpeciesWildEvolutionDelay.SHORT) ], [Species.RIOLU]: [ - new SpeciesEvolution(Species.LUCARIO, 1, null, new SpeciesFriendshipEvolutionCondition(90, p => p.scene.arena.getTimeOfDay() === TimeOfDay.DAY), SpeciesWildEvolutionDelay.MEDIUM) + new SpeciesEvolution(Species.LUCARIO, 1, null, new SpeciesFriendshipEvolutionCondition(90, p => p.scene.arena.getTimeOfDay() === TimeOfDay.DAWN || p.scene.arena.getTimeOfDay() === TimeOfDay.DAY), SpeciesWildEvolutionDelay.MEDIUM) ], [Species.WOOBAT]: [ new SpeciesEvolution(Species.SWOOBAT, 1, null, new SpeciesFriendshipEvolutionCondition(70), SpeciesWildEvolutionDelay.MEDIUM) @@ -1563,11 +1583,8 @@ export const pokemonEvolutions: PokemonEvolutions = { [Species.ALOLA_MEOWTH]: [ new SpeciesEvolution(Species.ALOLA_PERSIAN, 1, null, new SpeciesFriendshipEvolutionCondition(70), SpeciesWildEvolutionDelay.LONG) ], - [Species.MILCERY]: [ - new SpeciesEvolution(Species.ALCREMIE, 1, null, new SpeciesFriendshipEvolutionCondition(90), SpeciesWildEvolutionDelay.MEDIUM) - ], [Species.SNOM]: [ - new SpeciesEvolution(Species.FROSMOTH, 1, null, new SpeciesFriendshipEvolutionCondition(90, p => p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT), SpeciesWildEvolutionDelay.MEDIUM) + new SpeciesEvolution(Species.FROSMOTH, 1, null, new SpeciesFriendshipEvolutionCondition(90, p => p.scene.arena.getTimeOfDay() === TimeOfDay.DUSK || p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT), SpeciesWildEvolutionDelay.MEDIUM) ], [Species.GIMMIGHOUL]: [ new SpeciesEvolution(Species.GHOLDENGO, 1, null, new SpeciesFriendshipEvolutionCondition(70), SpeciesWildEvolutionDelay.VERY_LONG) diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index 2e13424ab..70cfcdef4 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -2096,8 +2096,14 @@ export function initSpecies() { new PokemonSpecies(Species.WALKING_WAKE, "Walking Wake", 9, false, false, false, "Paradox Pokémon", Type.WATER, Type.DRAGON, 3.5, 280, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 590, 99, 83, 91, 125, 83, 109, 5, 0, 295, GrowthRate.SLOW, null, false), new PokemonSpecies(Species.IRON_LEAVES, "Iron Leaves", 9, false, false, false, "Paradox Pokémon", Type.GRASS, Type.PSYCHIC, 1.5, 125, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 590, 90, 130, 88, 70, 108, 104, 5, 0, 295, GrowthRate.SLOW, null, false), new PokemonSpecies(Species.DIPPLIN, "Dipplin", 9, false, false, false, "Candy Apple Pokémon", Type.GRASS, Type.DRAGON, 0.4, 9.7, Abilities.SUPERSWEET_SYRUP, Abilities.GLUTTONY, Abilities.STICKY_HOLD, 485, 80, 80, 110, 95, 80, 40, 45, 50, 170, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.POLTCHAGEIST, "Poltchageist", 9, false, false, false, "Matcha Pokémon", Type.GRASS, Type.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.SINISTCHA, "Sinistcha", 9, false, false, false, "Matcha Pokémon", Type.GRASS, Type.GHOST, 0.2, 2.2, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 508, 71, 60, 106, 121, 80, 70, 60, 50, 178, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.POLTCHAGEIST, "Poltchageist", 9, false, false, false, "Matcha Pokémon", Type.GRASS, Type.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, GrowthRate.SLOW, null, false, false, + new PokemonForm("Counterfeit Form", "counterfeit", Type.GRASS, Type.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62), + new PokemonForm("Artisan Form", "artisan", Type.GRASS, Type.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62), + ), + new PokemonSpecies(Species.SINISTCHA, "Sinistcha", 9, false, false, false, "Matcha Pokémon", Type.GRASS, Type.GHOST, 0.2, 2.2, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 508, 71, 60, 106, 121, 80, 70, 60, 50, 178, GrowthRate.SLOW, null, false, false, + new PokemonForm("Unremarkable Form", "unremarkable", Type.GRASS, Type.GHOST, 0.2, 2.2, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 508, 71, 60, 106, 121, 80, 70, 60, 50, 178), + new PokemonForm("Masterpiece Form", "masterpiece", Type.GRASS, Type.GHOST, 0.2, 2.2, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 508, 71, 60, 106, 121, 80, 70, 60, 50, 178), + ), new PokemonSpecies(Species.OKIDOGI, "Okidogi", 9, false, true, false, "Retainer Pokémon", Type.POISON, Type.FIGHTING, 1.8, 92.2, Abilities.TOXIC_CHAIN, Abilities.NONE, Abilities.GUARD_DOG, 555, 88, 128, 115, 58, 86, 80, 3, 0, 276, GrowthRate.SLOW, null, false), new PokemonSpecies(Species.MUNKIDORI, "Munkidori", 9, false, true, false, "Retainer Pokémon", Type.POISON, Type.PSYCHIC, 1, 12.2, Abilities.TOXIC_CHAIN, Abilities.NONE, Abilities.FRISK, 555, 88, 75, 66, 130, 90, 106, 3, 0, 276, GrowthRate.SLOW, null, false), new PokemonSpecies(Species.FEZANDIPITI, "Fezandipiti", 9, false, true, false, "Retainer Pokémon", Type.POISON, Type.FAIRY, 1.4, 30.1, Abilities.TOXIC_CHAIN, Abilities.NONE, Abilities.TECHNICIAN, 555, 88, 91, 82, 70, 125, 99, 3, 0, 276, GrowthRate.SLOW, null, false),