diff --git a/public/images/items.json b/public/images/items.json
index 9d84476a8a0..64265382dea 100644
--- a/public/images/items.json
+++ b/public/images/items.json
@@ -9,6 +9,27 @@
 			},
 			"scale": 1,
 			"frames": [
+				{
+					"filename": "mystical_rock",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 32,
+						"h": 29
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 29
+					}
+				},
 				{
 					"filename": "galarica_cuff",
 					"rotated": false,
@@ -25,7 +46,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 0,
+						"y": 29,
 						"w": 29,
 						"h": 30
 					}
@@ -45,7 +66,7 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 29,
+						"x": 32,
 						"y": 0,
 						"w": 32,
 						"h": 27
@@ -67,7 +88,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 30,
+						"y": 59,
 						"w": 29,
 						"h": 28
 					}
@@ -87,8 +108,8 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 29,
-						"y": 27,
+						"x": 64,
+						"y": 0,
 						"w": 30,
 						"h": 28
 					}
@@ -108,8 +129,8 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 61,
-						"y": 0,
+						"x": 0,
+						"y": 87,
 						"w": 29,
 						"h": 27
 					}
@@ -129,8 +150,8 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 0,
-						"y": 58,
+						"x": 94,
+						"y": 0,
 						"w": 28,
 						"h": 28
 					}
@@ -151,7 +172,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 86,
+						"y": 114,
 						"w": 22,
 						"h": 31
 					}
@@ -172,7 +193,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 117,
+						"y": 145,
 						"w": 22,
 						"h": 31
 					}
@@ -192,8 +213,8 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 59,
-						"y": 27,
+						"x": 122,
+						"y": 0,
 						"w": 27,
 						"h": 26
 					}
@@ -214,7 +235,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 148,
+						"y": 176,
 						"w": 22,
 						"h": 31
 					}
@@ -235,7 +256,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 179,
+						"y": 207,
 						"w": 22,
 						"h": 31
 					}
@@ -256,7 +277,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 210,
+						"y": 238,
 						"w": 22,
 						"h": 31
 					}
@@ -277,7 +298,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 241,
+						"y": 269,
 						"w": 22,
 						"h": 30
 					}
@@ -298,7 +319,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 271,
+						"y": 299,
 						"w": 22,
 						"h": 29
 					}
@@ -319,7 +340,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 300,
+						"y": 328,
 						"w": 22,
 						"h": 29
 					}
@@ -340,7 +361,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 329,
+						"y": 357,
 						"w": 22,
 						"h": 29
 					}
@@ -360,7 +381,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 90,
+						"x": 149,
 						"y": 0,
 						"w": 24,
 						"h": 26
@@ -380,27 +401,6 @@
 						"w": 22,
 						"h": 28
 					},
-					"frame": {
-						"x": 0,
-						"y": 358,
-						"w": 22,
-						"h": 28
-					}
-				},
-				{
-					"filename": "ribbon_gen5",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 22,
-						"h": 28
-					},
 					"frame": {
 						"x": 0,
 						"y": 386,
@@ -444,7 +444,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 114,
+						"x": 173,
 						"y": 0,
 						"w": 23,
 						"h": 26
@@ -465,7 +465,7 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 137,
+						"x": 196,
 						"y": 0,
 						"w": 27,
 						"h": 22
@@ -486,7 +486,7 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 164,
+						"x": 223,
 						"y": 0,
 						"w": 28,
 						"h": 21
@@ -507,7 +507,7 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 192,
+						"x": 251,
 						"y": 0,
 						"w": 28,
 						"h": 21
@@ -528,7 +528,7 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 220,
+						"x": 279,
 						"y": 0,
 						"w": 28,
 						"h": 21
@@ -549,7 +549,7 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 248,
+						"x": 307,
 						"y": 0,
 						"w": 28,
 						"h": 21
@@ -570,7 +570,7 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 276,
+						"x": 335,
 						"y": 0,
 						"w": 28,
 						"h": 21
@@ -591,7 +591,7 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 304,
+						"x": 363,
 						"y": 0,
 						"w": 28,
 						"h": 21
@@ -612,75 +612,12 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 332,
+						"x": 391,
 						"y": 0,
 						"w": 26,
 						"h": 20
 					}
 				},
-				{
-					"filename": "cracked_pot",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 6,
-						"w": 26,
-						"h": 20
-					},
-					"frame": {
-						"x": 358,
-						"y": 0,
-						"w": 26,
-						"h": 20
-					}
-				},
-				{
-					"filename": "legend_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 6,
-						"w": 25,
-						"h": 20
-					},
-					"frame": {
-						"x": 384,
-						"y": 0,
-						"w": 25,
-						"h": 20
-					}
-				},
-				{
-					"filename": "ribbon_gen6",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 22,
-						"h": 28
-					},
-					"frame": {
-						"x": 409,
-						"y": 0,
-						"w": 22,
-						"h": 28
-					}
-				},
 				{
 					"filename": "exp_charm",
 					"rotated": false,
@@ -697,7 +634,7 @@
 					},
 					"frame": {
 						"x": 22,
-						"y": 86,
+						"y": 114,
 						"w": 17,
 						"h": 31
 					}
@@ -718,7 +655,7 @@
 					},
 					"frame": {
 						"x": 22,
-						"y": 117,
+						"y": 145,
 						"w": 17,
 						"h": 31
 					}
@@ -739,7 +676,7 @@
 					},
 					"frame": {
 						"x": 22,
-						"y": 148,
+						"y": 176,
 						"w": 17,
 						"h": 31
 					}
@@ -760,11 +697,53 @@
 					},
 					"frame": {
 						"x": 22,
-						"y": 179,
+						"y": 207,
 						"w": 17,
 						"h": 30
 					}
 				},
+				{
+					"filename": "ribbon_gen5",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 2,
+						"w": 22,
+						"h": 28
+					},
+					"frame": {
+						"x": 22,
+						"y": 237,
+						"w": 22,
+						"h": 28
+					}
+				},
+				{
+					"filename": "ribbon_gen6",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 2,
+						"w": 22,
+						"h": 28
+					},
+					"frame": {
+						"x": 22,
+						"y": 265,
+						"w": 22,
+						"h": 28
+					}
+				},
 				{
 					"filename": "ribbon_gen8",
 					"rotated": false,
@@ -781,7 +760,7 @@
 					},
 					"frame": {
 						"x": 22,
-						"y": 209,
+						"y": 293,
 						"w": 22,
 						"h": 28
 					}
@@ -802,7 +781,7 @@
 					},
 					"frame": {
 						"x": 22,
-						"y": 237,
+						"y": 321,
 						"w": 22,
 						"h": 25
 					}
@@ -823,7 +802,7 @@
 					},
 					"frame": {
 						"x": 22,
-						"y": 262,
+						"y": 346,
 						"w": 23,
 						"h": 24
 					}
@@ -844,13 +823,13 @@
 					},
 					"frame": {
 						"x": 22,
-						"y": 286,
+						"y": 370,
 						"w": 24,
 						"h": 24
 					}
 				},
 				{
-					"filename": "choice_scarf",
+					"filename": "cracked_pot",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -858,2200 +837,16 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
+						"x": 3,
+						"y": 6,
+						"w": 26,
+						"h": 20
 					},
 					"frame": {
 						"x": 22,
-						"y": 310,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "draco_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 22,
-						"y": 334,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "dread_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 22,
-						"y": 358,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "earth_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 22,
-						"y": 382,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "fist_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 23,
-						"y": 406,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "ultranecrozium_z",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 9,
-						"w": 30,
-						"h": 15
-					},
-					"frame": {
-						"x": 29,
-						"y": 55,
-						"w": 30,
-						"h": 15
-					}
-				},
-				{
-					"filename": "mega_bracelet",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 8,
-						"w": 20,
-						"h": 16
-					},
-					"frame": {
-						"x": 28,
-						"y": 70,
-						"w": 20,
-						"h": 16
-					}
-				},
-				{
-					"filename": "choice_specs",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 8,
-						"w": 24,
-						"h": 18
-					},
-					"frame": {
-						"x": 59,
-						"y": 53,
-						"w": 24,
-						"h": 18
-					}
-				},
-				{
-					"filename": "calcium",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 39,
-						"y": 86,
-						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "carbos",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 39,
-						"y": 110,
-						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "catching_charm",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 21,
-						"h": 24
-					},
-					"frame": {
-						"x": 39,
-						"y": 134,
-						"w": 21,
-						"h": 24
-					}
-				},
-				{
-					"filename": "flame_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 39,
-						"y": 158,
-						"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": 39,
-						"y": 182,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "golden_punch",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 44,
-						"y": 206,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "gracidea",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 44,
-						"y": 230,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "grip_claw",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 45,
-						"y": 254,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "icicle_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 46,
-						"y": 278,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "insect_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 46,
-						"y": 302,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "iron_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 46,
-						"y": 326,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "lucky_punch",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 46,
-						"y": 350,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "lucky_punch_great",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 46,
-						"y": 374,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "kings_rock",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 23,
-						"h": 24
-					},
-					"frame": {
-						"x": 47,
-						"y": 398,
-						"w": 23,
-						"h": 24
-					}
-				},
-				{
-					"filename": "silver_powder",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 11,
-						"w": 24,
-						"h": 15
-					},
-					"frame": {
-						"x": 48,
-						"y": 71,
-						"w": 24,
-						"h": 15
-					}
-				},
-				{
-					"filename": "elixir",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 18,
-						"h": 24
-					},
-					"frame": {
-						"x": 55,
-						"y": 86,
-						"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": 55,
-						"y": 110,
-						"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": 60,
-						"y": 134,
-						"w": 18,
-						"h": 24
-					}
-				},
-				{
-					"filename": "hp_up",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 63,
-						"y": 158,
-						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "iron",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 63,
-						"y": 182,
-						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "lucky_punch_master",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 68,
-						"y": 206,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "lucky_punch_ultra",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 68,
-						"y": 230,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "lustrous_globe",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 69,
-						"y": 254,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "meadow_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 70,
-						"y": 278,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "mind_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 70,
-						"y": 302,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "muscle_band",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 70,
-						"y": 326,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "pixie_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 70,
-						"y": 350,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "salac_berry",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 70,
-						"y": 374,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "scanner",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 70,
-						"y": 398,
-						"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": 137,
-						"y": 22,
-						"w": 24,
-						"h": 14
-					}
-				},
-				{
-					"filename": "lure",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 17,
-						"h": 24
-					},
-					"frame": {
-						"x": 86,
-						"y": 27,
-						"w": 17,
-						"h": 24
-					}
-				},
-				{
-					"filename": "silk_scarf",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 103,
-						"y": 26,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "clefairy_doll",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 24,
-						"h": 23
-					},
-					"frame": {
-						"x": 127,
-						"y": 36,
-						"w": 24,
-						"h": 23
-					}
-				},
-				{
-					"filename": "coin_case",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 24,
-						"h": 23
-					},
-					"frame": {
-						"x": 103,
-						"y": 50,
-						"w": 24,
-						"h": 23
-					}
-				},
-				{
-					"filename": "big_nugget",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 20,
+						"y": 394,
+						"w": 26,
 						"h": 20
-					},
-					"frame": {
-						"x": 83,
-						"y": 53,
-						"w": 20,
-						"h": 20
-					}
-				},
-				{
-					"filename": "dragon_scale",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 8,
-						"w": 24,
-						"h": 18
-					},
-					"frame": {
-						"x": 127,
-						"y": 59,
-						"w": 24,
-						"h": 18
-					}
-				},
-				{
-					"filename": "max_elixir",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 18,
-						"h": 24
-					},
-					"frame": {
-						"x": 151,
-						"y": 36,
-						"w": 18,
-						"h": 24
-					}
-				},
-				{
-					"filename": "adamant_crystal",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 23,
-						"h": 21
-					},
-					"frame": {
-						"x": 151,
-						"y": 60,
-						"w": 23,
-						"h": 21
-					}
-				},
-				{
-					"filename": "sky_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 169,
-						"y": 21,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "splash_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 193,
-						"y": 21,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "spooky_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 217,
-						"y": 21,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "stone_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 241,
-						"y": 21,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "sun_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 265,
-						"y": 21,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "toxic_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 289,
-						"y": 21,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "max_revive",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 22,
-						"h": 24
-					},
-					"frame": {
-						"x": 313,
-						"y": 21,
-						"w": 22,
-						"h": 24
-					}
-				},
-				{
-					"filename": "zap_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 335,
-						"y": 20,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "expert_belt",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 23
-					},
-					"frame": {
-						"x": 359,
-						"y": 20,
-						"w": 24,
-						"h": 23
-					}
-				},
-				{
-					"filename": "hearthflame_mask",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 23
-					},
-					"frame": {
-						"x": 383,
-						"y": 20,
-						"w": 24,
-						"h": 23
-					}
-				},
-				{
-					"filename": "leppa_berry",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 24,
-						"h": 23
-					},
-					"frame": {
-						"x": 407,
-						"y": 28,
-						"w": 24,
-						"h": 23
-					}
-				},
-				{
-					"filename": "candy_overlay",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 12,
-						"w": 16,
-						"h": 15
-					},
-					"frame": {
-						"x": 169,
-						"y": 45,
-						"w": 16,
-						"h": 15
-					}
-				},
-				{
-					"filename": "exp_balance",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 24,
-						"h": 22
-					},
-					"frame": {
-						"x": 185,
-						"y": 45,
-						"w": 24,
-						"h": 22
-					}
-				},
-				{
-					"filename": "exp_share",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 24,
-						"h": 22
-					},
-					"frame": {
-						"x": 209,
-						"y": 45,
-						"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": 233,
-						"y": 45,
-						"w": 24,
-						"h": 22
-					}
-				},
-				{
-					"filename": "scope_lens",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 24,
-						"h": 23
-					},
-					"frame": {
-						"x": 257,
-						"y": 45,
-						"w": 24,
-						"h": 23
-					}
-				},
-				{
-					"filename": "twisted_spoon",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 24,
-						"h": 23
-					},
-					"frame": {
-						"x": 281,
-						"y": 45,
-						"w": 24,
-						"h": 23
-					}
-				},
-				{
-					"filename": "berry_pouch",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 23,
-						"h": 23
-					},
-					"frame": {
-						"x": 305,
-						"y": 45,
-						"w": 23,
-						"h": 23
-					}
-				},
-				{
-					"filename": "black_belt",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 328,
-						"y": 45,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "max_ether",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 18,
-						"h": 24
-					},
-					"frame": {
-						"x": 350,
-						"y": 44,
-						"w": 18,
-						"h": 24
-					}
-				},
-				{
-					"filename": "reveal_glass",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 23,
-						"h": 24
-					},
-					"frame": {
-						"x": 368,
-						"y": 43,
-						"w": 23,
-						"h": 24
-					}
-				},
-				{
-					"filename": "max_repel",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 391,
-						"y": 43,
-						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "golden_net",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 24,
-						"h": 21
-					},
-					"frame": {
-						"x": 407,
-						"y": 51,
-						"w": 24,
-						"h": 21
-					}
-				},
-				{
-					"filename": "icy_reins_of_unity",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 24,
-						"h": 20
-					},
-					"frame": {
-						"x": 174,
-						"y": 67,
-						"w": 24,
-						"h": 20
-					}
-				},
-				{
-					"filename": "metal_powder",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 24,
-						"h": 20
-					},
-					"frame": {
-						"x": 198,
-						"y": 67,
-						"w": 24,
-						"h": 20
-					}
-				},
-				{
-					"filename": "quick_powder",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 24,
-						"h": 20
-					},
-					"frame": {
-						"x": 222,
-						"y": 67,
-						"w": 24,
-						"h": 20
-					}
-				},
-				{
-					"filename": "rusted_shield",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 24,
-						"h": 20
-					},
-					"frame": {
-						"x": 246,
-						"y": 68,
-						"w": 24,
-						"h": 20
-					}
-				},
-				{
-					"filename": "sacred_ash",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 24,
-						"h": 20
-					},
-					"frame": {
-						"x": 270,
-						"y": 68,
-						"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": 294,
-						"y": 68,
-						"w": 24,
-						"h": 20
-					}
-				},
-				{
-					"filename": "soft_sand",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 24,
-						"h": 20
-					},
-					"frame": {
-						"x": 318,
-						"y": 68,
-						"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": 342,
-						"y": 68,
-						"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": 368,
-						"y": 67,
-						"w": 23,
-						"h": 21
-					}
-				},
-				{
-					"filename": "pp_max",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 391,
-						"y": 67,
-						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "binding_band",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 23,
-						"h": 20
-					},
-					"frame": {
-						"x": 407,
-						"y": 72,
-						"w": 23,
-						"h": 20
-					}
-				},
-				{
-					"filename": "max_lure",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 17,
-						"h": 24
-					},
-					"frame": {
-						"x": 73,
-						"y": 87,
-						"w": 17,
-						"h": 24
-					}
-				},
-				{
-					"filename": "bug_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 73,
-						"y": 111,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "max_potion",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 18,
-						"h": 24
-					},
-					"frame": {
-						"x": 78,
-						"y": 134,
-						"w": 18,
-						"h": 24
-					}
-				},
-				{
-					"filename": "oval_charm",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 21,
-						"h": 24
-					},
-					"frame": {
-						"x": 79,
-						"y": 158,
-						"w": 21,
-						"h": 24
-					}
-				},
-				{
-					"filename": "shiny_charm",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 21,
-						"h": 24
-					},
-					"frame": {
-						"x": 79,
-						"y": 182,
-						"w": 21,
-						"h": 24
-					}
-				},
-				{
-					"filename": "dynamax_band",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 23,
-						"h": 23
-					},
-					"frame": {
-						"x": 90,
-						"y": 73,
-						"w": 23,
-						"h": 23
-					}
-				},
-				{
-					"filename": "eviolite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 15,
-						"h": 15
-					},
-					"frame": {
-						"x": 90,
-						"y": 96,
-						"w": 15,
-						"h": 15
-					}
-				},
-				{
-					"filename": "dark_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 95,
-						"y": 111,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "red_orb",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 20,
-						"h": 24
-					},
-					"frame": {
-						"x": 96,
-						"y": 134,
-						"w": 20,
-						"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": 100,
-						"y": 158,
-						"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": 100,
-						"y": 182,
-						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "griseous_core",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 23,
-						"h": 23
-					},
-					"frame": {
-						"x": 92,
-						"y": 206,
-						"w": 23,
-						"h": 23
-					}
-				},
-				{
-					"filename": "leek",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 23,
-						"h": 23
-					},
-					"frame": {
-						"x": 92,
-						"y": 229,
-						"w": 23,
-						"h": 23
-					}
-				},
-				{
-					"filename": "dragon_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 93,
-						"y": 252,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "dragon_fang",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 21,
-						"h": 23
-					},
-					"frame": {
-						"x": 94,
-						"y": 275,
-						"w": 21,
-						"h": 23
-					}
-				},
-				{
-					"filename": "electric_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 94,
-						"y": 298,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "fairy_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 94,
-						"y": 321,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "fighting_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 94,
-						"y": 344,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "fire_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 94,
-						"y": 367,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "fire_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 94,
-						"y": 390,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"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": 413,
-						"w": 23,
-						"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": 105,
-						"y": 96,
-						"w": 15,
-						"h": 15
-					}
-				},
-				{
-					"filename": "coupon",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 23,
-						"h": 19
-					},
-					"frame": {
-						"x": 113,
-						"y": 77,
-						"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": 136,
-						"y": 77,
-						"w": 15,
-						"h": 23
-					}
-				},
-				{
-					"filename": "golden_mystic_ticket",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 23,
-						"h": 19
-					},
-					"frame": {
-						"x": 151,
-						"y": 81,
-						"w": 23,
-						"h": 19
 					}
 				},
 				{
@@ -3069,8 +864,8 @@
 						"h": 17
 					},
 					"frame": {
-						"x": 174,
-						"y": 87,
+						"x": 23,
+						"y": 414,
 						"w": 23,
 						"h": 17
 					}
@@ -3090,14 +885,917 @@
 						"h": 17
 					},
 					"frame": {
-						"x": 197,
-						"y": 87,
+						"x": 46,
+						"y": 414,
 						"w": 23,
 						"h": 17
 					}
 				},
 				{
-					"filename": "douse_drive",
+					"filename": "ultranecrozium_z",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 9,
+						"w": 30,
+						"h": 15
+					},
+					"frame": {
+						"x": 122,
+						"y": 26,
+						"w": 30,
+						"h": 15
+					}
+				},
+				{
+					"filename": "legend_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 6,
+						"w": 25,
+						"h": 20
+					},
+					"frame": {
+						"x": 152,
+						"y": 26,
+						"w": 25,
+						"h": 20
+					}
+				},
+				{
+					"filename": "adamant_crystal",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 6,
+						"w": 23,
+						"h": 21
+					},
+					"frame": {
+						"x": 177,
+						"y": 26,
+						"w": 23,
+						"h": 21
+					}
+				},
+				{
+					"filename": "choice_scarf",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 200,
+						"y": 22,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "draco_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 224,
+						"y": 21,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "dread_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 248,
+						"y": 21,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "earth_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 272,
+						"y": 21,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "fist_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 296,
+						"y": 21,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "flame_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 320,
+						"y": 21,
+						"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": 344,
+						"y": 21,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "golden_punch",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 368,
+						"y": 21,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "gracidea",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 392,
+						"y": 20,
+						"w": 24,
+						"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": 416,
+						"y": 20,
+						"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": 416,
+						"y": 43,
+						"w": 15,
+						"h": 22
+					}
+				},
+				{
+					"filename": "clefairy_doll",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 24,
+						"h": 23
+					},
+					"frame": {
+						"x": 392,
+						"y": 44,
+						"w": 24,
+						"h": 23
+					}
+				},
+				{
+					"filename": "eviolite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 15,
+						"h": 15
+					},
+					"frame": {
+						"x": 416,
+						"y": 65,
+						"w": 15,
+						"h": 15
+					}
+				},
+				{
+					"filename": "revive",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 8,
+						"w": 12,
+						"h": 17
+					},
+					"frame": {
+						"x": 417,
+						"y": 0,
+						"w": 12,
+						"h": 17
+					}
+				},
+				{
+					"filename": "calcium",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 29,
+						"y": 29,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "carbos",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 29,
+						"y": 53,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "catching_charm",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 4,
+						"w": 21,
+						"h": 24
+					},
+					"frame": {
+						"x": 29,
+						"y": 77,
+						"w": 21,
+						"h": 24
+					}
+				},
+				{
+					"filename": "elixir",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 4,
+						"w": 18,
+						"h": 24
+					},
+					"frame": {
+						"x": 45,
+						"y": 27,
+						"w": 18,
+						"h": 24
+					}
+				},
+				{
+					"filename": "coin_case",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 24,
+						"h": 23
+					},
+					"frame": {
+						"x": 63,
+						"y": 28,
+						"w": 24,
+						"h": 23
+					}
+				},
+				{
+					"filename": "grip_claw",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 45,
+						"y": 51,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "expert_belt",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 23
+					},
+					"frame": {
+						"x": 87,
+						"y": 28,
+						"w": 24,
+						"h": 23
+					}
+				},
+				{
+					"filename": "icicle_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 69,
+						"y": 51,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "insect_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 50,
+						"y": 75,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "iron_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 74,
+						"y": 75,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "ether",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 4,
+						"w": 18,
+						"h": 24
+					},
+					"frame": {
+						"x": 93,
+						"y": 51,
+						"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": 98,
+						"y": 75,
+						"w": 18,
+						"h": 24
+					}
+				},
+				{
+					"filename": "lucky_punch",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 111,
+						"y": 41,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "lure",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 17,
+						"h": 24
+					},
+					"frame": {
+						"x": 135,
+						"y": 41,
+						"w": 17,
+						"h": 24
+					}
+				},
+				{
+					"filename": "exp_balance",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 24,
+						"h": 22
+					},
+					"frame": {
+						"x": 152,
+						"y": 46,
+						"w": 24,
+						"h": 22
+					}
+				},
+				{
+					"filename": "exp_share",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 24,
+						"h": 22
+					},
+					"frame": {
+						"x": 176,
+						"y": 47,
+						"w": 24,
+						"h": 22
+					}
+				},
+				{
+					"filename": "hearthflame_mask",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 23
+					},
+					"frame": {
+						"x": 200,
+						"y": 46,
+						"w": 24,
+						"h": 23
+					}
+				},
+				{
+					"filename": "lucky_punch_great",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 224,
+						"y": 45,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "lucky_punch_master",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 248,
+						"y": 45,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "lucky_punch_ultra",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 272,
+						"y": 45,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "lustrous_globe",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 296,
+						"y": 45,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "meadow_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 320,
+						"y": 45,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "mind_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 344,
+						"y": 45,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "muscle_band",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 368,
+						"y": 45,
+						"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": 392,
+						"y": 67,
+						"w": 24,
+						"h": 14
+					}
+				},
+				{
+					"filename": "pixie_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 116,
+						"y": 65,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "choice_specs",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3107,14 +1805,770 @@
 					"spriteSourceSize": {
 						"x": 4,
 						"y": 8,
-						"w": 23,
-						"h": 17
+						"w": 24,
+						"h": 18
 					},
 					"frame": {
-						"x": 220,
-						"y": 87,
+						"x": 116,
+						"y": 89,
+						"w": 24,
+						"h": 18
+					}
+				},
+				{
+					"filename": "salac_berry",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 140,
+						"y": 68,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "dragon_scale",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 8,
+						"w": 24,
+						"h": 18
+					},
+					"frame": {
+						"x": 140,
+						"y": 92,
+						"w": 24,
+						"h": 18
+					}
+				},
+				{
+					"filename": "scanner",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 164,
+						"y": 69,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "silk_scarf",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 188,
+						"y": 69,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "sky_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 212,
+						"y": 69,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "splash_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 236,
+						"y": 69,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "spooky_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 260,
+						"y": 69,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "stone_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 284,
+						"y": 69,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "sun_stone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 308,
+						"y": 69,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "toxic_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 332,
+						"y": 69,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "zap_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 356,
+						"y": 69,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "golden_net",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 24,
+						"h": 21
+					},
+					"frame": {
+						"x": 164,
+						"y": 93,
+						"w": 24,
+						"h": 21
+					}
+				},
+				{
+					"filename": "leppa_berry",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 24,
+						"h": 23
+					},
+					"frame": {
+						"x": 188,
+						"y": 93,
+						"w": 24,
+						"h": 23
+					}
+				},
+				{
+					"filename": "scope_lens",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 24,
+						"h": 23
+					},
+					"frame": {
+						"x": 212,
+						"y": 93,
+						"w": 24,
+						"h": 23
+					}
+				},
+				{
+					"filename": "twisted_spoon",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 24,
+						"h": 23
+					},
+					"frame": {
+						"x": 236,
+						"y": 93,
+						"w": 24,
+						"h": 23
+					}
+				},
+				{
+					"filename": "berry_pouch",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
 						"w": 23,
-						"h": 17
+						"h": 23
+					},
+					"frame": {
+						"x": 260,
+						"y": 93,
+						"w": 23,
+						"h": 23
+					}
+				},
+				{
+					"filename": "dynamax_band",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 23,
+						"h": 23
+					},
+					"frame": {
+						"x": 283,
+						"y": 93,
+						"w": 23,
+						"h": 23
+					}
+				},
+				{
+					"filename": "griseous_core",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 23,
+						"h": 23
+					},
+					"frame": {
+						"x": 306,
+						"y": 93,
+						"w": 23,
+						"h": 23
+					}
+				},
+				{
+					"filename": "kings_rock",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 4,
+						"w": 23,
+						"h": 24
+					},
+					"frame": {
+						"x": 329,
+						"y": 93,
+						"w": 23,
+						"h": 24
+					}
+				},
+				{
+					"filename": "reveal_glass",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 23,
+						"h": 24
+					},
+					"frame": {
+						"x": 352,
+						"y": 93,
+						"w": 23,
+						"h": 24
+					}
+				},
+				{
+					"filename": "prism_scale",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 8,
+						"w": 15,
+						"h": 15
+					},
+					"frame": {
+						"x": 416,
+						"y": 80,
+						"w": 15,
+						"h": 15
+					}
+				},
+				{
+					"filename": "hp_up",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 375,
+						"y": 93,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "leek",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 23,
+						"h": 23
+					},
+					"frame": {
+						"x": 391,
+						"y": 81,
+						"w": 23,
+						"h": 23
+					}
+				},
+				{
+					"filename": "max_lure",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 17,
+						"h": 24
+					},
+					"frame": {
+						"x": 414,
+						"y": 95,
+						"w": 17,
+						"h": 24
+					}
+				},
+				{
+					"filename": "amulet_coin",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 5,
+						"w": 23,
+						"h": 21
+					},
+					"frame": {
+						"x": 391,
+						"y": 104,
+						"w": 23,
+						"h": 21
+					}
+				},
+				{
+					"filename": "super_lure",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 17,
+						"h": 24
+					},
+					"frame": {
+						"x": 414,
+						"y": 119,
+						"w": 17,
+						"h": 24
+					}
+				},
+				{
+					"filename": "icy_reins_of_unity",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 24,
+						"h": 20
+					},
+					"frame": {
+						"x": 50,
+						"y": 99,
+						"w": 24,
+						"h": 20
+					}
+				},
+				{
+					"filename": "metal_powder",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 6,
+						"w": 24,
+						"h": 20
+					},
+					"frame": {
+						"x": 74,
+						"y": 99,
+						"w": 24,
+						"h": 20
+					}
+				},
+				{
+					"filename": "berry_pot",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 5,
+						"w": 18,
+						"h": 22
+					},
+					"frame": {
+						"x": 98,
+						"y": 99,
+						"w": 18,
+						"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": 116,
+						"y": 107,
+						"w": 24,
+						"h": 22
+					}
+				},
+				{
+					"filename": "quick_powder",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 6,
+						"w": 24,
+						"h": 20
+					},
+					"frame": {
+						"x": 140,
+						"y": 110,
+						"w": 24,
+						"h": 20
+					}
+				},
+				{
+					"filename": "rusted_shield",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 6,
+						"w": 24,
+						"h": 20
+					},
+					"frame": {
+						"x": 164,
+						"y": 114,
+						"w": 24,
+						"h": 20
+					}
+				},
+				{
+					"filename": "sacred_ash",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 24,
+						"h": 20
+					},
+					"frame": {
+						"x": 188,
+						"y": 116,
+						"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": 212,
+						"y": 116,
+						"w": 24,
+						"h": 20
+					}
+				},
+				{
+					"filename": "soft_sand",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 24,
+						"h": 20
+					},
+					"frame": {
+						"x": 236,
+						"y": 116,
+						"w": 24,
+						"h": 20
+					}
+				},
+				{
+					"filename": "auspicious_armor",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 23,
+						"h": 21
+					},
+					"frame": {
+						"x": 260,
+						"y": 116,
+						"w": 23,
+						"h": 21
 					}
 				},
 				{
@@ -3132,8 +2586,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 243,
-						"y": 88,
+						"x": 283,
+						"y": 116,
 						"w": 23,
 						"h": 22
 					}
@@ -3153,8 +2607,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 266,
-						"y": 88,
+						"x": 306,
+						"y": 116,
 						"w": 23,
 						"h": 23
 					}
@@ -3174,8 +2628,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 289,
-						"y": 88,
+						"x": 329,
+						"y": 117,
 						"w": 23,
 						"h": 23
 					}
@@ -3195,35 +2649,14 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 312,
-						"y": 88,
+						"x": 352,
+						"y": 117,
 						"w": 23,
 						"h": 23
 					}
 				},
 				{
-					"filename": "rusted_sword",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 23,
-						"h": 22
-					},
-					"frame": {
-						"x": 335,
-						"y": 89,
-						"w": 23,
-						"h": 22
-					}
-				},
-				{
-					"filename": "abomasite",
+					"filename": "iron",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3232,19 +2665,19 @@
 					},
 					"spriteSourceSize": {
 						"x": 8,
-						"y": 8,
+						"y": 4,
 						"w": 16,
-						"h": 16
+						"h": 24
 					},
 					"frame": {
-						"x": 120,
-						"y": 96,
+						"x": 375,
+						"y": 117,
 						"w": 16,
-						"h": 16
+						"h": 24
 					}
 				},
 				{
-					"filename": "bug_memory",
+					"filename": "binding_band",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3253,19 +2686,82 @@
 					},
 					"spriteSourceSize": {
 						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
+						"y": 6,
+						"w": 23,
+						"h": 20
 					},
 					"frame": {
-						"x": 117,
-						"y": 112,
-						"w": 22,
-						"h": 22
+						"x": 391,
+						"y": 125,
+						"w": 23,
+						"h": 20
 					}
 				},
 				{
-					"filename": "flying_tera_shard",
+					"filename": "hyper_potion",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 5,
+						"w": 17,
+						"h": 23
+					},
+					"frame": {
+						"x": 414,
+						"y": 143,
+						"w": 17,
+						"h": 23
+					}
+				},
+				{
+					"filename": "max_revive",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 4,
+						"w": 22,
+						"h": 24
+					},
+					"frame": {
+						"x": 39,
+						"y": 119,
+						"w": 22,
+						"h": 24
+					}
+				},
+				{
+					"filename": "black_belt",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 61,
+						"y": 119,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "bug_tera_shard",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3279,12 +2775,306 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 116,
-						"y": 134,
+						"x": 39,
+						"y": 143,
 						"w": 22,
 						"h": 23
 					}
 				},
+				{
+					"filename": "dark_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 39,
+						"y": 166,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "dragon_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 61,
+						"y": 142,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "electric_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 39,
+						"y": 189,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "fairy_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 61,
+						"y": 165,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "fighting_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 39,
+						"y": 212,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "fire_stone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 61,
+						"y": 188,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "fire_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 61,
+						"y": 211,
+						"w": 22,
+						"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": 44,
+						"y": 235,
+						"w": 18,
+						"h": 24
+					}
+				},
+				{
+					"filename": "oval_charm",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 21,
+						"h": 24
+					},
+					"frame": {
+						"x": 62,
+						"y": 234,
+						"w": 21,
+						"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": 44,
+						"y": 259,
+						"w": 18,
+						"h": 24
+					}
+				},
+				{
+					"filename": "shiny_charm",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 21,
+						"h": 24
+					},
+					"frame": {
+						"x": 62,
+						"y": 258,
+						"w": 21,
+						"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": 44,
+						"y": 283,
+						"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": 62,
+						"y": 282,
+						"w": 21,
+						"h": 23
+					}
+				},
+				{
+					"filename": "red_orb",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 20,
+						"h": 24
+					},
+					"frame": {
+						"x": 44,
+						"y": 307,
+						"w": 20,
+						"h": 24
+					}
+				},
 				{
 					"filename": "focus_sash",
 					"rotated": false,
@@ -3300,12 +3090,33 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 116,
-						"y": 157,
+						"x": 64,
+						"y": 305,
 						"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": 44,
+						"y": 331,
+						"w": 24,
+						"h": 15
+					}
+				},
 				{
 					"filename": "ghost_tera_shard",
 					"rotated": false,
@@ -3321,8 +3132,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 116,
-						"y": 180,
+						"x": 45,
+						"y": 346,
 						"w": 22,
 						"h": 23
 					}
@@ -3342,12 +3153,75 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 139,
-						"y": 100,
+						"x": 46,
+						"y": 369,
 						"w": 22,
 						"h": 23
 					}
 				},
+				{
+					"filename": "bug_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 48,
+						"y": 392,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "douse_drive",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 8,
+						"w": 23,
+						"h": 17
+					},
+					"frame": {
+						"x": 69,
+						"y": 414,
+						"w": 23,
+						"h": 17
+					}
+				},
+				{
+					"filename": "apicot_berry",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 6,
+						"w": 19,
+						"h": 20
+					},
+					"frame": {
+						"x": 68,
+						"y": 328,
+						"w": 19,
+						"h": 20
+					}
+				},
 				{
 					"filename": "berry_juice",
 					"rotated": false,
@@ -3363,8 +3237,8 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 139,
-						"y": 123,
+						"x": 67,
+						"y": 348,
 						"w": 22,
 						"h": 21
 					}
@@ -3384,12 +3258,33 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 138,
-						"y": 144,
+						"x": 68,
+						"y": 369,
 						"w": 22,
 						"h": 23
 					}
 				},
+				{
+					"filename": "charcoal",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 70,
+						"y": 392,
+						"w": 22,
+						"h": 22
+					}
+				},
 				{
 					"filename": "ice_tera_shard",
 					"rotated": false,
@@ -3405,33 +3300,12 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 138,
-						"y": 167,
+						"x": 83,
+						"y": 121,
 						"w": 22,
 						"h": 23
 					}
 				},
-				{
-					"filename": "black_sludge",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 7,
-						"w": 22,
-						"h": 19
-					},
-					"frame": {
-						"x": 138,
-						"y": 190,
-						"w": 22,
-						"h": 19
-					}
-				},
 				{
 					"filename": "never_melt_ice",
 					"rotated": false,
@@ -3447,8 +3321,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 161,
-						"y": 104,
+						"x": 83,
+						"y": 144,
 						"w": 22,
 						"h": 23
 					}
@@ -3468,8 +3342,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 183,
-						"y": 104,
+						"x": 83,
+						"y": 167,
 						"w": 22,
 						"h": 23
 					}
@@ -3489,159 +3363,12 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 205,
-						"y": 104,
+						"x": 83,
+						"y": 190,
 						"w": 22,
 						"h": 23
 					}
 				},
-				{
-					"filename": "repel",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 227,
-						"y": 104,
-						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "moon_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 23,
-						"h": 21
-					},
-					"frame": {
-						"x": 243,
-						"y": 110,
-						"w": 23,
-						"h": 21
-					}
-				},
-				{
-					"filename": "n_lunarizer",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 23,
-						"h": 21
-					},
-					"frame": {
-						"x": 266,
-						"y": 111,
-						"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": 289,
-						"y": 111,
-						"w": 23,
-						"h": 21
-					}
-				},
-				{
-					"filename": "wellspring_mask",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 23,
-						"h": 21
-					},
-					"frame": {
-						"x": 312,
-						"y": 111,
-						"w": 23,
-						"h": 21
-					}
-				},
-				{
-					"filename": "charcoal",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 335,
-						"y": 111,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "mystic_ticket",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 23,
-						"h": 19
-					},
-					"frame": {
-						"x": 161,
-						"y": 127,
-						"w": 23,
-						"h": 19
-					}
-				},
 				{
 					"filename": "poison_tera_shard",
 					"rotated": false,
@@ -3657,8 +3384,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 160,
-						"y": 146,
+						"x": 83,
+						"y": 213,
 						"w": 22,
 						"h": 23
 					}
@@ -3678,33 +3405,12 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 160,
-						"y": 169,
+						"x": 83,
+						"y": 236,
 						"w": 22,
 						"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": 184,
-						"y": 127,
-						"w": 23,
-						"h": 19
-					}
-				},
 				{
 					"filename": "reaper_cloth",
 					"rotated": false,
@@ -3720,8 +3426,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 182,
-						"y": 146,
+						"x": 83,
+						"y": 259,
 						"w": 22,
 						"h": 23
 					}
@@ -3741,14 +3447,35 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 182,
-						"y": 169,
+						"x": 83,
+						"y": 282,
 						"w": 22,
 						"h": 23
 					}
 				},
 				{
-					"filename": "blue_orb",
+					"filename": "lansat_berry",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 4,
+						"w": 21,
+						"h": 23
+					},
+					"frame": {
+						"x": 86,
+						"y": 305,
+						"w": 21,
+						"h": 23
+					}
+				},
+				{
+					"filename": "big_nugget",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3762,96 +3489,12 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 207,
-						"y": 127,
+						"x": 87,
+						"y": 328,
 						"w": 20,
 						"h": 20
 					}
 				},
-				{
-					"filename": "steel_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 204,
-						"y": 147,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "dark_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 204,
-						"y": 170,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "reviver_seed",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 8,
-						"w": 23,
-						"h": 20
-					},
-					"frame": {
-						"x": 160,
-						"y": 192,
-						"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": 183,
-						"y": 192,
-						"w": 23,
-						"h": 20
-					}
-				},
 				{
 					"filename": "dawn_stone",
 					"rotated": false,
@@ -3867,642 +3510,12 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 206,
-						"y": 192,
+						"x": 89,
+						"y": 348,
 						"w": 20,
 						"h": 21
 					}
 				},
-				{
-					"filename": "super_repel",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 227,
-						"y": 128,
-						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "deep_sea_tooth",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 22,
-						"h": 21
-					},
-					"frame": {
-						"x": 243,
-						"y": 131,
-						"w": 22,
-						"h": 21
-					}
-				},
-				{
-					"filename": "stellar_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 226,
-						"y": 152,
-						"w": 22,
-						"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": 226,
-						"y": 175,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "deep_sea_scale",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 22,
-						"h": 20
-					},
-					"frame": {
-						"x": 265,
-						"y": 132,
-						"w": 22,
-						"h": 20
-					}
-				},
-				{
-					"filename": "wide_lens",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 248,
-						"y": 152,
-						"w": 22,
-						"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": 248,
-						"y": 175,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "dna_splicers",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 287,
-						"y": 132,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "dragon_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 309,
-						"y": 132,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "super_lure",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 17,
-						"h": 24
-					},
-					"frame": {
-						"x": 270,
-						"y": 152,
-						"w": 17,
-						"h": 24
-					}
-				},
-				{
-					"filename": "electirizer",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 287,
-						"y": 154,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "electric_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 309,
-						"y": 154,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "enigma_berry",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 270,
-						"y": 176,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "fairy_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 292,
-						"y": 176,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "fighting_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 331,
-						"y": 133,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "fire_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 331,
-						"y": 155,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "hyper_potion",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 17,
-						"h": 23
-					},
-					"frame": {
-						"x": 314,
-						"y": 176,
-						"w": 17,
-						"h": 23
-					}
-				},
-				{
-					"filename": "flying_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 331,
-						"y": 177,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "blunder_policy",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 22,
-						"h": 19
-					},
-					"frame": {
-						"x": 226,
-						"y": 198,
-						"w": 22,
-						"h": 19
-					}
-				},
-				{
-					"filename": "fairy_feather",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 7,
-						"w": 22,
-						"h": 20
-					},
-					"frame": {
-						"x": 248,
-						"y": 197,
-						"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": 270,
-						"y": 198,
-						"w": 22,
-						"h": 19
-					}
-				},
-				{
-					"filename": "ganlon_berry",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 292,
-						"y": 198,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "ghost_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 314,
-						"y": 199,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "berry_pot",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 18,
-						"h": 22
-					},
-					"frame": {
-						"x": 336,
-						"y": 199,
-						"w": 18,
-						"h": 22
-					}
-				},
-				{
-					"filename": "grass_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 116,
-						"y": 203,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "ground_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 115,
-						"y": 225,
-						"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": 115,
-						"y": 247,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "ice_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 115,
-						"y": 269,
-						"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": 138,
-						"y": 209,
-						"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": 137,
-						"y": 231,
-						"w": 21,
-						"h": 23
-					}
-				},
 				{
 					"filename": "leaf_stone",
 					"rotated": false,
@@ -4518,617 +3531,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 137,
-						"y": 254,
-						"w": 21,
-						"h": 23
-					}
-				},
-				{
-					"filename": "liechi_berry",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 22,
-						"h": 21
-					},
-					"frame": {
-						"x": 160,
-						"y": 212,
-						"w": 22,
-						"h": 21
-					}
-				},
-				{
-					"filename": "magmarizer",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 182,
-						"y": 212,
-						"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": 204,
-						"y": 213,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "moon_flute",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 158,
-						"y": 233,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "normal_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 158,
-						"y": 255,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "poison_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 180,
-						"y": 234,
-						"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": 180,
-						"y": 256,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "psychic_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 202,
-						"y": 235,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "rock_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 202,
-						"y": 257,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "malicious_armor",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 22,
-						"h": 20
-					},
-					"frame": {
-						"x": 226,
-						"y": 217,
-						"w": 22,
-						"h": 20
-					}
-				},
-				{
-					"filename": "scroll_of_darkness",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 248,
-						"y": 217,
-						"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": 270,
-						"y": 217,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "sharp_beak",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 21,
-						"h": 23
-					},
-					"frame": {
-						"x": 224,
-						"y": 237,
-						"w": 21,
-						"h": 23
-					}
-				},
-				{
-					"filename": "shed_shell",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 292,
-						"y": 220,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "starf_berry",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 314,
-						"y": 221,
-						"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": 224,
-						"y": 260,
-						"w": 21,
-						"h": 21
-					}
-				},
-				{
-					"filename": "steel_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 245,
-						"y": 239,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "sun_flute",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 267,
-						"y": 239,
-						"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": 245,
-						"y": 261,
-						"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": 267,
-						"y": 261,
-						"w": 22,
-						"h": 21
-					}
-				},
-				{
-					"filename": "thick_club",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 289,
-						"y": 242,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "hard_meteorite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 20,
-						"h": 22
-					},
-					"frame": {
-						"x": 336,
-						"y": 221,
-						"w": 20,
-						"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": 289,
-						"y": 264,
-						"w": 22,
-						"h": 21
-					}
-				},
-				{
-					"filename": "thunder_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 311,
-						"y": 243,
-						"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": 333,
-						"y": 243,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "tera_orb",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 22,
-						"h": 20
-					},
-					"frame": {
-						"x": 311,
-						"y": 265,
-						"w": 22,
-						"h": 20
-					}
-				},
-				{
-					"filename": "tm_dark",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 333,
-						"y": 265,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "shock_drive",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 8,
-						"w": 23,
-						"h": 17
-					},
-					"frame": {
-						"x": 137,
-						"y": 277,
-						"w": 23,
-						"h": 17
-					}
-				},
-				{
-					"filename": "whipped_dream",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 21,
-						"h": 23
-					},
-					"frame": {
-						"x": 116,
-						"y": 291,
+						"x": 90,
+						"y": 369,
 						"w": 21,
 						"h": 23
 					}
@@ -5148,14 +3552,14 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 116,
-						"y": 314,
+						"x": 92,
+						"y": 392,
 						"w": 20,
 						"h": 23
 					}
 				},
 				{
-					"filename": "sitrus_berry",
+					"filename": "mega_bracelet",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5164,19 +3568,124 @@
 					},
 					"spriteSourceSize": {
 						"x": 6,
-						"y": 5,
+						"y": 8,
 						"w": 20,
-						"h": 22
+						"h": 16
 					},
 					"frame": {
-						"x": 116,
-						"y": 337,
+						"x": 92,
+						"y": 415,
 						"w": 20,
+						"h": 16
+					}
+				},
+				{
+					"filename": "rusted_sword",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 23,
+						"h": 22
+					},
+					"frame": {
+						"x": 105,
+						"y": 129,
+						"w": 23,
 						"h": 22
 					}
 				},
 				{
-					"filename": "tm_dragon",
+					"filename": "steel_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 105,
+						"y": 151,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "stellar_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 105,
+						"y": 174,
+						"w": 22,
+						"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": 105,
+						"y": 197,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "wide_lens",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 105,
+						"y": 220,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "dark_memory",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5190,14 +3699,14 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 137,
-						"y": 294,
+						"x": 105,
+						"y": 243,
 						"w": 22,
 						"h": 22
 					}
 				},
 				{
-					"filename": "tm_electric",
+					"filename": "dire_hit",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5211,14 +3720,119 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 136,
-						"y": 316,
+						"x": 105,
+						"y": 265,
 						"w": 22,
 						"h": 22
 					}
 				},
 				{
-					"filename": "tm_fairy",
+					"filename": "relic_crown",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 23,
+						"h": 18
+					},
+					"frame": {
+						"x": 105,
+						"y": 287,
+						"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": 107,
+						"y": 305,
+						"w": 21,
+						"h": 23
+					}
+				},
+				{
+					"filename": "deep_sea_scale",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 22,
+						"h": 20
+					},
+					"frame": {
+						"x": 107,
+						"y": 328,
+						"w": 22,
+						"h": 20
+					}
+				},
+				{
+					"filename": "deep_sea_tooth",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 22,
+						"h": 21
+					},
+					"frame": {
+						"x": 109,
+						"y": 348,
+						"w": 22,
+						"h": 21
+					}
+				},
+				{
+					"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": 369,
+						"w": 21,
+						"h": 23
+					}
+				},
+				{
+					"filename": "dna_splicers",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5232,14 +3846,224 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 136,
-						"y": 338,
+						"x": 112,
+						"y": 392,
 						"w": 22,
 						"h": 22
 					}
 				},
 				{
-					"filename": "gb",
+					"filename": "shock_drive",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 8,
+						"w": 23,
+						"h": 17
+					},
+					"frame": {
+						"x": 112,
+						"y": 414,
+						"w": 23,
+						"h": 17
+					}
+				},
+				{
+					"filename": "moon_stone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 6,
+						"w": 23,
+						"h": 21
+					},
+					"frame": {
+						"x": 128,
+						"y": 130,
+						"w": 23,
+						"h": 21
+					}
+				},
+				{
+					"filename": "dragon_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 127,
+						"y": 151,
+						"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": 127,
+						"y": 173,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "electric_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 127,
+						"y": 195,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "enigma_berry",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 127,
+						"y": 217,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "fairy_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 127,
+						"y": 239,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "fighting_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 127,
+						"y": 261,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "fire_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 128,
+						"y": 283,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "flying_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 128,
+						"y": 305,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "dusk_stone",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5249,18 +4073,60 @@
 					"spriteSourceSize": {
 						"x": 6,
 						"y": 6,
-						"w": 20,
-						"h": 20
+						"w": 21,
+						"h": 21
 					},
 					"frame": {
-						"x": 116,
-						"y": 359,
-						"w": 20,
-						"h": 20
+						"x": 129,
+						"y": 327,
+						"w": 21,
+						"h": 21
 					}
 				},
 				{
-					"filename": "tm_fighting",
+					"filename": "flying_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 5,
+						"w": 20,
+						"h": 21
+					},
+					"frame": {
+						"x": 131,
+						"y": 348,
+						"w": 20,
+						"h": 21
+					}
+				},
+				{
+					"filename": "sachet",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 18,
+						"h": 23
+					},
+					"frame": {
+						"x": 132,
+						"y": 369,
+						"w": 18,
+						"h": 23
+					}
+				},
+				{
+					"filename": "ganlon_berry",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5274,14 +4140,14 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 116,
-						"y": 379,
+						"x": 134,
+						"y": 392,
 						"w": 22,
 						"h": 22
 					}
 				},
 				{
-					"filename": "upgrade",
+					"filename": "wise_glasses",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5289,20 +4155,41 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 5,
-						"y": 7,
-						"w": 22,
-						"h": 19
+						"x": 4,
+						"y": 8,
+						"w": 23,
+						"h": 17
 					},
 					"frame": {
-						"x": 136,
-						"y": 360,
-						"w": 22,
-						"h": 19
+						"x": 135,
+						"y": 414,
+						"w": 23,
+						"h": 17
 					}
 				},
 				{
-					"filename": "tm_fire",
+					"filename": "potion",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 5,
+						"w": 17,
+						"h": 23
+					},
+					"frame": {
+						"x": 150,
+						"y": 369,
+						"w": 17,
+						"h": 23
+					}
+				},
+				{
+					"filename": "ghost_memory",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5316,8 +4203,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 138,
-						"y": 379,
+						"x": 156,
+						"y": 392,
 						"w": 22,
 						"h": 22
 					}
@@ -5337,14 +4224,14 @@
 						"h": 17
 					},
 					"frame": {
-						"x": 160,
-						"y": 277,
+						"x": 158,
+						"y": 414,
 						"w": 20,
 						"h": 17
 					}
 				},
 				{
-					"filename": "tm_flying",
+					"filename": "coupon",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5352,146 +4239,20 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 159,
-						"y": 294,
-						"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": 158,
-						"y": 316,
-						"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": 158,
-						"y": 338,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "metal_alloy",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
+						"x": 4,
 						"y": 7,
-						"w": 21,
+						"w": 23,
 						"h": 19
 					},
 					"frame": {
-						"x": 158,
-						"y": 360,
-						"w": 21,
+						"x": 151,
+						"y": 134,
+						"w": 23,
 						"h": 19
 					}
 				},
 				{
-					"filename": "lock_capsule",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 19,
-						"h": 22
-					},
-					"frame": {
-						"x": 160,
-						"y": 379,
-						"w": 19,
-						"h": 22
-					}
-				},
-				{
-					"filename": "relic_band",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 9,
-						"w": 17,
-						"h": 16
-					},
-					"frame": {
-						"x": 180,
-						"y": 278,
-						"w": 17,
-						"h": 16
-					}
-				},
-				{
-					"filename": "metal_coat",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
-						"w": 19,
-						"h": 22
-					},
-					"frame": {
-						"x": 181,
-						"y": 294,
-						"w": 19,
-						"h": 22
-					}
-				},
-				{
-					"filename": "tm_ground",
+					"filename": "grass_memory",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5505,14 +4266,14 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 180,
-						"y": 316,
+						"x": 149,
+						"y": 153,
 						"w": 22,
 						"h": 22
 					}
 				},
 				{
-					"filename": "tm_ice",
+					"filename": "ground_memory",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5526,14 +4287,14 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 180,
-						"y": 338,
+						"x": 149,
+						"y": 175,
 						"w": 22,
 						"h": 22
 					}
 				},
 				{
-					"filename": "tm_normal",
+					"filename": "guard_spec",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5547,14 +4308,14 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 179,
-						"y": 360,
+						"x": 149,
+						"y": 197,
 						"w": 22,
 						"h": 22
 					}
 				},
 				{
-					"filename": "tm_poison",
+					"filename": "ice_memory",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5568,14 +4329,14 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 179,
-						"y": 382,
+						"x": 149,
+						"y": 219,
 						"w": 22,
 						"h": 22
 					}
 				},
 				{
-					"filename": "tm_psychic",
+					"filename": "ice_stone",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5589,14 +4350,35 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 117,
-						"y": 401,
+						"x": 149,
+						"y": 241,
 						"w": 22,
 						"h": 22
 					}
 				},
 				{
-					"filename": "tm_rock",
+					"filename": "fairy_feather",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 7,
+						"w": 22,
+						"h": 20
+					},
+					"frame": {
+						"x": 149,
+						"y": 263,
+						"w": 22,
+						"h": 20
+					}
+				},
+				{
+					"filename": "magmarizer",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5610,35 +4392,14 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 139,
-						"y": 401,
+						"x": 150,
+						"y": 283,
 						"w": 22,
 						"h": 22
 					}
 				},
 				{
-					"filename": "sachet",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 18,
-						"h": 23
-					},
-					"frame": {
-						"x": 161,
-						"y": 401,
-						"w": 18,
-						"h": 23
-					}
-				},
-				{
-					"filename": "tm_steel",
+					"filename": "mini_black_hole",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5652,14 +4413,56 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 179,
-						"y": 404,
+						"x": 150,
+						"y": 305,
 						"w": 22,
 						"h": 22
 					}
 				},
 				{
-					"filename": "leftovers",
+					"filename": "liechi_berry",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 22,
+						"h": 21
+					},
+					"frame": {
+						"x": 150,
+						"y": 327,
+						"w": 22,
+						"h": 21
+					}
+				},
+				{
+					"filename": "n_lunarizer",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 6,
+						"w": 23,
+						"h": 21
+					},
+					"frame": {
+						"x": 151,
+						"y": 348,
+						"w": 23,
+						"h": 21
+					}
+				},
+				{
+					"filename": "super_potion",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5669,13 +4472,559 @@
 					"spriteSourceSize": {
 						"x": 8,
 						"y": 5,
-						"w": 15,
+						"w": 17,
+						"h": 23
+					},
+					"frame": {
+						"x": 167,
+						"y": 369,
+						"w": 17,
+						"h": 23
+					}
+				},
+				{
+					"filename": "max_repel",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 178,
+						"y": 392,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "candy_overlay",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 12,
+						"w": 16,
+						"h": 15
+					},
+					"frame": {
+						"x": 178,
+						"y": 416,
+						"w": 16,
+						"h": 15
+					}
+				},
+				{
+					"filename": "pp_max",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 171,
+						"y": 153,
+						"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": 171,
+						"y": 177,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "protein",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 171,
+						"y": 201,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "repel",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 171,
+						"y": 225,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "super_repel",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 171,
+						"y": 249,
+						"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": 174,
+						"y": 137,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "golden_mystic_ticket",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 23,
+						"h": 19
+					},
+					"frame": {
+						"x": 190,
+						"y": 136,
+						"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": 213,
+						"y": 136,
+						"w": 23,
+						"h": 19
+					}
+				},
+				{
+					"filename": "n_solarizer",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 6,
+						"w": 23,
+						"h": 21
+					},
+					"frame": {
+						"x": 236,
+						"y": 136,
+						"w": 23,
+						"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": 259,
+						"y": 137,
+						"w": 23,
+						"h": 20
+					}
+				},
+				{
+					"filename": "moon_flute",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
 						"h": 22
 					},
 					"frame": {
-						"x": 358,
-						"y": 89,
-						"w": 15,
+						"x": 187,
+						"y": 155,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "normal_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 187,
+						"y": 177,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "poison_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 209,
+						"y": 155,
+						"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": 187,
+						"y": 199,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "psychic_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 209,
+						"y": 177,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "rock_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 187,
+						"y": 221,
+						"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": 209,
+						"y": 199,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "scroll_of_waters",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 187,
+						"y": 243,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "shed_shell",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 209,
+						"y": 221,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "starf_berry",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 209,
+						"y": 243,
+						"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": 282,
+						"y": 138,
+						"w": 23,
+						"h": 19
+					}
+				},
+				{
+					"filename": "shell_bell",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 7,
+						"w": 23,
+						"h": 20
+					},
+					"frame": {
+						"x": 305,
+						"y": 139,
+						"w": 23,
+						"h": 20
+					}
+				},
+				{
+					"filename": "wellspring_mask",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 23,
+						"h": 21
+					},
+					"frame": {
+						"x": 328,
+						"y": 140,
+						"w": 23,
+						"h": 21
+					}
+				},
+				{
+					"filename": "steel_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 351,
+						"y": 140,
+						"w": 22,
 						"h": 22
 					}
 				},
@@ -5695,13 +5044,13 @@
 					},
 					"frame": {
 						"x": 373,
-						"y": 88,
+						"y": 141,
 						"w": 18,
 						"h": 20
 					}
 				},
 				{
-					"filename": "metronome",
+					"filename": "sun_flute",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5709,18 +5058,543 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 7,
+						"x": 5,
 						"y": 5,
-						"w": 17,
+						"w": 22,
 						"h": 22
 					},
 					"frame": {
-						"x": 357,
-						"y": 111,
-						"w": 17,
+						"x": 231,
+						"y": 157,
+						"w": 22,
 						"h": 22
 					}
 				},
+				{
+					"filename": "thick_club",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 231,
+						"y": 179,
+						"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": 253,
+						"y": 157,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "tm_bug",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 231,
+						"y": 201,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "tm_dark",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 253,
+						"y": 179,
+						"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": 275,
+						"y": 157,
+						"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": 231,
+						"y": 223,
+						"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": 253,
+						"y": 201,
+						"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": 275,
+						"y": 179,
+						"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": 253,
+						"y": 223,
+						"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": 275,
+						"y": 201,
+						"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": 275,
+						"y": 223,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "sweet_apple",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 22,
+						"h": 21
+					},
+					"frame": {
+						"x": 231,
+						"y": 245,
+						"w": 22,
+						"h": 21
+					}
+				},
+				{
+					"filename": "syrupy_apple",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 22,
+						"h": 21
+					},
+					"frame": {
+						"x": 253,
+						"y": 245,
+						"w": 22,
+						"h": 21
+					}
+				},
+				{
+					"filename": "tart_apple",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 22,
+						"h": 21
+					},
+					"frame": {
+						"x": 275,
+						"y": 245,
+						"w": 22,
+						"h": 21
+					}
+				},
+				{
+					"filename": "black_sludge",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 7,
+						"w": 22,
+						"h": 19
+					},
+					"frame": {
+						"x": 391,
+						"y": 145,
+						"w": 22,
+						"h": 19
+					}
+				},
+				{
+					"filename": "tm_grass",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 297,
+						"y": 159,
+						"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": 297,
+						"y": 181,
+						"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": 297,
+						"y": 203,
+						"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": 297,
+						"y": 225,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "blunder_policy",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 22,
+						"h": 19
+					},
+					"frame": {
+						"x": 297,
+						"y": 247,
+						"w": 22,
+						"h": 19
+					}
+				},
+				{
+					"filename": "tm_poison",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 319,
+						"y": 161,
+						"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": 319,
+						"y": 183,
+						"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": 319,
+						"y": 205,
+						"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": 319,
+						"y": 227,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "dubious_disc",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 7,
+						"w": 22,
+						"h": 19
+					},
+					"frame": {
+						"x": 319,
+						"y": 249,
+						"w": 22,
+						"h": 19
+					}
+				},
 				{
 					"filename": "tm_water",
 					"rotated": false,
@@ -5736,8 +5610,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 353,
-						"y": 133,
+						"x": 341,
+						"y": 162,
 						"w": 22,
 						"h": 22
 					}
@@ -5757,8 +5631,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 353,
-						"y": 155,
+						"x": 341,
+						"y": 184,
 						"w": 22,
 						"h": 22
 					}
@@ -5778,8 +5652,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 353,
-						"y": 177,
+						"x": 341,
+						"y": 206,
 						"w": 22,
 						"h": 22
 					}
@@ -5799,12 +5673,138 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 354,
-						"y": 199,
+						"x": 341,
+						"y": 228,
 						"w": 22,
 						"h": 22
 					}
 				},
+				{
+					"filename": "tera_orb",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 22,
+						"h": 20
+					},
+					"frame": {
+						"x": 341,
+						"y": 250,
+						"w": 22,
+						"h": 20
+					}
+				},
+				{
+					"filename": "unknown",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 363,
+						"y": 162,
+						"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": 363,
+						"y": 186,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "hard_meteorite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 5,
+						"w": 20,
+						"h": 22
+					},
+					"frame": {
+						"x": 363,
+						"y": 210,
+						"w": 20,
+						"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": 363,
+						"y": 232,
+						"w": 20,
+						"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": 363,
+						"y": 254,
+						"w": 20,
+						"h": 20
+					}
+				},
 				{
 					"filename": "x_attack",
 					"rotated": false,
@@ -5820,8 +5820,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 356,
-						"y": 221,
+						"x": 379,
+						"y": 164,
 						"w": 22,
 						"h": 22
 					}
@@ -5841,12 +5841,54 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 355,
-						"y": 243,
+						"x": 379,
+						"y": 186,
 						"w": 22,
 						"h": 22
 					}
 				},
+				{
+					"filename": "lock_capsule",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 5,
+						"w": 19,
+						"h": 22
+					},
+					"frame": {
+						"x": 383,
+						"y": 208,
+						"w": 19,
+						"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": 383,
+						"y": 230,
+						"w": 19,
+						"h": 22
+					}
+				},
 				{
 					"filename": "x_sp_atk",
 					"rotated": false,
@@ -5862,54 +5904,12 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 355,
-						"y": 265,
+						"x": 383,
+						"y": 252,
 						"w": 22,
 						"h": 22
 					}
 				},
-				{
-					"filename": "potion",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 17,
-						"h": 23
-					},
-					"frame": {
-						"x": 374,
-						"y": 108,
-						"w": 17,
-						"h": 23
-					}
-				},
-				{
-					"filename": "unknown",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 391,
-						"y": 91,
-						"w": 16,
-						"h": 24
-					}
-				},
 				{
 					"filename": "x_sp_def",
 					"rotated": false,
@@ -5925,14 +5925,14 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 407,
-						"y": 92,
+						"x": 401,
+						"y": 166,
 						"w": 22,
 						"h": 22
 					}
 				},
 				{
-					"filename": "zinc",
+					"filename": "gb",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5940,79 +5940,16 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
+						"x": 6,
+						"y": 6,
+						"w": 20,
+						"h": 20
 					},
 					"frame": {
-						"x": 375,
-						"y": 131,
-						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "super_potion",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 17,
-						"h": 23
-					},
-					"frame": {
-						"x": 391,
-						"y": 115,
-						"w": 17,
-						"h": 23
-					}
-				},
-				{
-					"filename": "wise_glasses",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 8,
-						"w": 23,
-						"h": 17
-					},
-					"frame": {
-						"x": 408,
-						"y": 114,
-						"w": 23,
-						"h": 17
-					}
-				},
-				{
-					"filename": "soothe_bell",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 17,
-						"h": 22
-					},
-					"frame": {
-						"x": 375,
-						"y": 155,
-						"w": 17,
-						"h": 22
+						"x": 401,
+						"y": 188,
+						"w": 20,
+						"h": 20
 					}
 				},
 				{
@@ -6030,98 +5967,14 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 375,
-						"y": 177,
+						"x": 402,
+						"y": 208,
 						"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": 376,
-						"y": 199,
-						"w": 21,
-						"h": 21
-					}
-				},
-				{
-					"filename": "quick_claw",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 19,
-						"h": 21
-					},
-					"frame": {
-						"x": 378,
-						"y": 220,
-						"w": 19,
-						"h": 21
-					}
-				},
-				{
-					"filename": "absolite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 391,
-						"y": 138,
-						"w": 16,
-						"h": 16
-					}
-				},
-				{
-					"filename": "shiny_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 21,
-						"h": 21
-					},
-					"frame": {
-						"x": 392,
-						"y": 154,
-						"w": 21,
-						"h": 21
-					}
-				},
-				{
-					"filename": "oval_stone",
+					"filename": "metronome",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6130,250 +5983,61 @@
 					},
 					"spriteSourceSize": {
 						"x": 7,
+						"y": 5,
+						"w": 17,
+						"h": 22
+					},
+					"frame": {
+						"x": 402,
+						"y": 230,
+						"w": 17,
+						"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": 405,
+						"y": 252,
+						"w": 17,
+						"h": 22
+					}
+				},
+				{
+					"filename": "upgrade",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
 						"y": 7,
-						"w": 18,
+						"w": 22,
 						"h": 19
 					},
 					"frame": {
-						"x": 413,
-						"y": 131,
-						"w": 18,
+						"x": 187,
+						"y": 265,
+						"w": 22,
 						"h": 19
 					}
 				},
 				{
-					"filename": "baton",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 413,
-						"y": 150,
-						"w": 18,
-						"h": 18
-					}
-				},
-				{
-					"filename": "candy",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 11,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 413,
-						"y": 168,
-						"w": 18,
-						"h": 18
-					}
-				},
-				{
-					"filename": "mystery_egg",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 18
-					},
-					"frame": {
-						"x": 397,
-						"y": 175,
-						"w": 16,
-						"h": 18
-					}
-				},
-				{
-					"filename": "dark_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 413,
-						"y": 186,
-						"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": 397,
-						"y": 193,
-						"w": 16,
-						"h": 16
-					}
-				},
-				{
-					"filename": "flame_orb",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 413,
-						"y": 204,
-						"w": 18,
-						"h": 18
-					}
-				},
-				{
-					"filename": "aggronite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 397,
-						"y": 209,
-						"w": 16,
-						"h": 16
-					}
-				},
-				{
-					"filename": "light_ball",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 413,
-						"y": 222,
-						"w": 18,
-						"h": 18
-					}
-				},
-				{
-					"filename": "alakazite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 397,
-						"y": 225,
-						"w": 16,
-						"h": 16
-					}
-				},
-				{
-					"filename": "light_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 413,
-						"y": 240,
-						"w": 18,
-						"h": 18
-					}
-				},
-				{
-					"filename": "zoom_lens",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 21,
-						"h": 21
-					},
-					"frame": {
-						"x": 200,
-						"y": 279,
-						"w": 21,
-						"h": 21
-					}
-				},
-				{
-					"filename": "lum_berry",
+					"filename": "metal_alloy",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6383,13 +6047,13 @@
 					"spriteSourceSize": {
 						"x": 6,
 						"y": 7,
-						"w": 20,
+						"w": 21,
 						"h": 19
 					},
 					"frame": {
-						"x": 221,
-						"y": 281,
-						"w": 20,
+						"x": 209,
+						"y": 265,
+						"w": 21,
 						"h": 19
 					}
 				},
@@ -6408,8 +6072,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 241,
-						"y": 282,
+						"x": 230,
+						"y": 266,
 						"w": 21,
 						"h": 18
 					}
@@ -6429,14 +6093,14 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 262,
-						"y": 282,
+						"x": 251,
+						"y": 266,
 						"w": 21,
 						"h": 18
 					}
 				},
 				{
-					"filename": "altarianite",
+					"filename": "poison_barb",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6444,16 +6108,79 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
+						"x": 5,
+						"y": 6,
+						"w": 21,
+						"h": 21
 					},
 					"frame": {
-						"x": 200,
-						"y": 300,
-						"w": 16,
-						"h": 16
+						"x": 272,
+						"y": 266,
+						"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": 293,
+						"y": 266,
+						"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": 314,
+						"y": 268,
+						"w": 21,
+						"h": 21
+					}
+				},
+				{
+					"filename": "lum_berry",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 7,
+						"w": 20,
+						"h": 19
+					},
+					"frame": {
+						"x": 335,
+						"y": 270,
+						"w": 20,
+						"h": 19
 					}
 				},
 				{
@@ -6471,8 +6198,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 216,
-						"y": 300,
+						"x": 355,
+						"y": 274,
 						"w": 21,
 						"h": 18
 					}
@@ -6492,8 +6219,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 237,
-						"y": 300,
+						"x": 376,
+						"y": 274,
 						"w": 21,
 						"h": 18
 					}
@@ -6513,12 +6240,33 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 258,
-						"y": 300,
+						"x": 397,
+						"y": 274,
 						"w": 20,
 						"h": 20
 					}
 				},
+				{
+					"filename": "relic_gold",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 11,
+						"w": 15,
+						"h": 11
+					},
+					"frame": {
+						"x": 172,
+						"y": 273,
+						"w": 15,
+						"h": 11
+					}
+				},
 				{
 					"filename": "mb",
 					"rotated": false,
@@ -6534,8 +6282,8 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 283,
-						"y": 285,
+						"x": 172,
+						"y": 284,
 						"w": 20,
 						"h": 20
 					}
@@ -6555,8 +6303,8 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 303,
-						"y": 285,
+						"x": 192,
+						"y": 284,
 						"w": 20,
 						"h": 20
 					}
@@ -6576,8 +6324,8 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 278,
-						"y": 305,
+						"x": 172,
+						"y": 304,
 						"w": 20,
 						"h": 20
 					}
@@ -6597,35 +6345,14 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 298,
-						"y": 305,
+						"x": 212,
+						"y": 284,
 						"w": 20,
 						"h": 20
 					}
 				},
 				{
-					"filename": "revive",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 8,
-						"w": 12,
-						"h": 17
-					},
-					"frame": {
-						"x": 202,
-						"y": 316,
-						"w": 12,
-						"h": 17
-					}
-				},
-				{
-					"filename": "power_herb",
+					"filename": "quick_claw",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6634,36 +6361,15 @@
 					},
 					"spriteSourceSize": {
 						"x": 6,
-						"y": 7,
-						"w": 20,
-						"h": 19
+						"y": 6,
+						"w": 19,
+						"h": 21
 					},
 					"frame": {
-						"x": 214,
-						"y": 318,
-						"w": 20,
-						"h": 19
-					}
-				},
-				{
-					"filename": "razor_claw",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 7,
-						"w": 20,
-						"h": 19
-					},
-					"frame": {
-						"x": 234,
-						"y": 318,
-						"w": 20,
-						"h": 19
+						"x": 172,
+						"y": 324,
+						"w": 19,
+						"h": 21
 					}
 				},
 				{
@@ -6681,8 +6387,8 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 254,
-						"y": 320,
+						"x": 192,
+						"y": 304,
 						"w": 20,
 						"h": 20
 					}
@@ -6702,8 +6408,8 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 274,
-						"y": 325,
+						"x": 232,
+						"y": 284,
 						"w": 20,
 						"h": 20
 					}
@@ -6723,8 +6429,8 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 294,
-						"y": 325,
+						"x": 252,
+						"y": 284,
 						"w": 20,
 						"h": 20
 					}
@@ -6744,8 +6450,8 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 202,
-						"y": 337,
+						"x": 191,
+						"y": 324,
 						"w": 19,
 						"h": 21
 					}
@@ -6765,54 +6471,12 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 221,
-						"y": 337,
+						"x": 212,
+						"y": 304,
 						"w": 20,
 						"h": 20
 					}
 				},
-				{
-					"filename": "white_herb",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 7,
-						"w": 20,
-						"h": 19
-					},
-					"frame": {
-						"x": 323,
-						"y": 287,
-						"w": 20,
-						"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": 343,
-						"y": 287,
-						"w": 19,
-						"h": 20
-					}
-				},
 				{
 					"filename": "candy_jar",
 					"rotated": false,
@@ -6828,33 +6492,12 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 362,
-						"y": 287,
+						"x": 210,
+						"y": 324,
 						"w": 19,
 						"h": 20
 					}
 				},
-				{
-					"filename": "big_mushroom",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 19,
-						"h": 19
-					},
-					"frame": {
-						"x": 318,
-						"y": 306,
-						"w": 19,
-						"h": 19
-					}
-				},
 				{
 					"filename": "hard_stone",
 					"rotated": false,
@@ -6870,12 +6513,96 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 314,
-						"y": 325,
+						"x": 232,
+						"y": 304,
 						"w": 19,
 						"h": 20
 					}
 				},
+				{
+					"filename": "power_herb",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 7,
+						"w": 20,
+						"h": 19
+					},
+					"frame": {
+						"x": 229,
+						"y": 324,
+						"w": 20,
+						"h": 19
+					}
+				},
+				{
+					"filename": "razor_claw",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 7,
+						"w": 20,
+						"h": 19
+					},
+					"frame": {
+						"x": 251,
+						"y": 304,
+						"w": 20,
+						"h": 19
+					}
+				},
+				{
+					"filename": "malicious_armor",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 7,
+						"w": 20,
+						"h": 18
+					},
+					"frame": {
+						"x": 272,
+						"y": 287,
+						"w": 20,
+						"h": 18
+					}
+				},
+				{
+					"filename": "white_herb",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 7,
+						"w": 20,
+						"h": 19
+					},
+					"frame": {
+						"x": 292,
+						"y": 287,
+						"w": 20,
+						"h": 19
+					}
+				},
 				{
 					"filename": "wl_ability_urge",
 					"rotated": false,
@@ -6891,33 +6618,12 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 337,
-						"y": 307,
+						"x": 271,
+						"y": 305,
 						"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": 333,
-						"y": 325,
-						"w": 19,
-						"h": 19
-					}
-				},
 				{
 					"filename": "wl_antidote",
 					"rotated": false,
@@ -6933,12 +6639,75 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 357,
-						"y": 307,
+						"x": 291,
+						"y": 306,
 						"w": 20,
 						"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": 174,
+						"y": 345,
+						"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": 193,
+						"y": 345,
+						"w": 17,
+						"h": 20
+					}
+				},
+				{
+					"filename": "miracle_seed",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 7,
+						"w": 19,
+						"h": 19
+					},
+					"frame": {
+						"x": 210,
+						"y": 344,
+						"w": 19,
+						"h": 19
+					}
+				},
 				{
 					"filename": "wl_awakening",
 					"rotated": false,
@@ -6954,8 +6723,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 352,
-						"y": 325,
+						"x": 229,
+						"y": 343,
 						"w": 20,
 						"h": 18
 					}
@@ -6975,75 +6744,12 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 241,
-						"y": 340,
+						"x": 312,
+						"y": 289,
 						"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": 372,
-						"y": 325,
-						"w": 17,
-						"h": 20
-					}
-				},
-				{
-					"filename": "toxic_orb",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 377,
-						"y": 307,
-						"w": 18,
-						"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": 389,
-						"y": 325,
-						"w": 17,
-						"h": 20
-					}
-				},
 				{
 					"filename": "wl_custom_spliced",
 					"rotated": false,
@@ -7059,8 +6765,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 352,
-						"y": 343,
+						"x": 332,
+						"y": 289,
 						"w": 20,
 						"h": 18
 					}
@@ -7080,8 +6786,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 372,
-						"y": 345,
+						"x": 311,
+						"y": 307,
 						"w": 20,
 						"h": 18
 					}
@@ -7101,8 +6807,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 392,
-						"y": 345,
+						"x": 331,
+						"y": 307,
 						"w": 20,
 						"h": 18
 					}
@@ -7122,33 +6828,12 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 378,
-						"y": 241,
+						"x": 352,
+						"y": 292,
 						"w": 20,
 						"h": 18
 					}
 				},
-				{
-					"filename": "relic_gold",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 11,
-						"w": 15,
-						"h": 11
-					},
-					"frame": {
-						"x": 398,
-						"y": 241,
-						"w": 15,
-						"h": 11
-					}
-				},
 				{
 					"filename": "wl_full_heal",
 					"rotated": false,
@@ -7164,8 +6849,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 377,
-						"y": 259,
+						"x": 372,
+						"y": 292,
 						"w": 20,
 						"h": 18
 					}
@@ -7185,8 +6870,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 381,
-						"y": 277,
+						"x": 351,
+						"y": 310,
 						"w": 20,
 						"h": 18
 					}
@@ -7206,8 +6891,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 397,
-						"y": 259,
+						"x": 371,
+						"y": 310,
 						"w": 20,
 						"h": 18
 					}
@@ -7227,8 +6912,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 401,
-						"y": 277,
+						"x": 392,
+						"y": 294,
 						"w": 20,
 						"h": 18
 					}
@@ -7248,54 +6933,12 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 395,
-						"y": 295,
+						"x": 391,
+						"y": 312,
 						"w": 20,
 						"h": 18
 					}
 				},
-				{
-					"filename": "ampharosite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 415,
-						"y": 295,
-						"w": 16,
-						"h": 16
-					}
-				},
-				{
-					"filename": "audinite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 415,
-						"y": 311,
-						"w": 16,
-						"h": 16
-					}
-				},
 				{
 					"filename": "wl_item_drop",
 					"rotated": false,
@@ -7311,14 +6954,14 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 406,
-						"y": 327,
+						"x": 411,
+						"y": 312,
 						"w": 20,
 						"h": 18
 					}
 				},
 				{
-					"filename": "banettite",
+					"filename": "baton",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -7326,16 +6969,16 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
+						"x": 7,
+						"y": 7,
+						"w": 18,
+						"h": 18
 					},
 					"frame": {
 						"x": 412,
-						"y": 345,
-						"w": 16,
-						"h": 16
+						"y": 294,
+						"w": 18,
+						"h": 18
 					}
 				},
 				{
@@ -7353,12 +6996,33 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 221,
-						"y": 357,
+						"x": 184,
+						"y": 365,
 						"w": 20,
 						"h": 18
 					}
 				},
+				{
+					"filename": "candy",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 11,
+						"w": 18,
+						"h": 18
+					},
+					"frame": {
+						"x": 204,
+						"y": 365,
+						"w": 18,
+						"h": 18
+					}
+				},
 				{
 					"filename": "wl_max_elixir",
 					"rotated": false,
@@ -7374,8 +7038,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 241,
-						"y": 358,
+						"x": 194,
+						"y": 383,
 						"w": 20,
 						"h": 18
 					}
@@ -7395,12 +7059,222 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 201,
-						"y": 360,
+						"x": 194,
+						"y": 401,
 						"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": 214,
+						"y": 383,
+						"w": 17,
+						"h": 20
+					}
+				},
+				{
+					"filename": "dark_stone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 7,
+						"w": 18,
+						"h": 18
+					},
+					"frame": {
+						"x": 214,
+						"y": 403,
+						"w": 18,
+						"h": 18
+					}
+				},
+				{
+					"filename": "oval_stone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 7,
+						"w": 18,
+						"h": 19
+					},
+					"frame": {
+						"x": 222,
+						"y": 363,
+						"w": 18,
+						"h": 19
+					}
+				},
+				{
+					"filename": "flame_orb",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 7,
+						"w": 18,
+						"h": 18
+					},
+					"frame": {
+						"x": 231,
+						"y": 382,
+						"w": 18,
+						"h": 18
+					}
+				},
+				{
+					"filename": "light_ball",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 7,
+						"w": 18,
+						"h": 18
+					},
+					"frame": {
+						"x": 232,
+						"y": 400,
+						"w": 18,
+						"h": 18
+					}
+				},
+				{
+					"filename": "light_stone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 7,
+						"w": 18,
+						"h": 18
+					},
+					"frame": {
+						"x": 240,
+						"y": 361,
+						"w": 18,
+						"h": 18
+					}
+				},
+				{
+					"filename": "mystery_egg",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 18
+					},
+					"frame": {
+						"x": 249,
+						"y": 379,
+						"w": 16,
+						"h": 18
+					}
+				},
+				{
+					"filename": "toxic_orb",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 7,
+						"w": 18,
+						"h": 18
+					},
+					"frame": {
+						"x": 250,
+						"y": 397,
+						"w": 18,
+						"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": 250,
+						"y": 415,
+						"w": 17,
+						"h": 16
+					}
+				},
+				{
+					"filename": "absolite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 267,
+						"y": 415,
+						"w": 16,
+						"h": 16
+					}
+				},
 				{
 					"filename": "wl_max_potion",
 					"rotated": false,
@@ -7416,8 +7290,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 201,
-						"y": 378,
+						"x": 251,
+						"y": 323,
 						"w": 20,
 						"h": 18
 					}
@@ -7437,8 +7311,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 221,
-						"y": 375,
+						"x": 271,
+						"y": 323,
 						"w": 20,
 						"h": 18
 					}
@@ -7458,8 +7332,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 201,
-						"y": 396,
+						"x": 291,
+						"y": 324,
 						"w": 20,
 						"h": 18
 					}
@@ -7479,8 +7353,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 221,
-						"y": 393,
+						"x": 311,
+						"y": 325,
 						"w": 20,
 						"h": 18
 					}
@@ -7500,8 +7374,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 241,
-						"y": 376,
+						"x": 331,
+						"y": 325,
 						"w": 20,
 						"h": 18
 					}
@@ -7521,33 +7395,12 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 241,
-						"y": 394,
+						"x": 249,
+						"y": 341,
 						"w": 20,
 						"h": 18
 					}
 				},
-				{
-					"filename": "beedrillite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 201,
-						"y": 414,
-						"w": 16,
-						"h": 16
-					}
-				},
 				{
 					"filename": "wl_super_potion",
 					"rotated": false,
@@ -7563,12 +7416,180 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 261,
-						"y": 345,
+						"x": 269,
+						"y": 341,
 						"w": 20,
 						"h": 18
 					}
 				},
+				{
+					"filename": "aerodactylite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 351,
+						"y": 328,
+						"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": 367,
+						"y": 328,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "alakazite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 258,
+						"y": 359,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "altarianite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 274,
+						"y": 359,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "ampharosite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 289,
+						"y": 342,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "audinite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 290,
+						"y": 358,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "banettite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 265,
+						"y": 375,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "beedrillite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 281,
+						"y": 375,
+						"w": 16,
+						"h": 16
+					}
+				},
 				{
 					"filename": "blastoisinite",
 					"rotated": false,
@@ -7584,8 +7605,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 261,
-						"y": 363,
+						"x": 268,
+						"y": 391,
 						"w": 16,
 						"h": 16
 					}
@@ -7605,8 +7626,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 281,
-						"y": 345,
+						"x": 284,
+						"y": 391,
 						"w": 16,
 						"h": 16
 					}
@@ -7626,8 +7647,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 261,
-						"y": 379,
+						"x": 283,
+						"y": 407,
 						"w": 16,
 						"h": 16
 					}
@@ -7648,7 +7669,7 @@
 					},
 					"frame": {
 						"x": 297,
-						"y": 345,
+						"y": 374,
 						"w": 16,
 						"h": 16
 					}
@@ -7668,8 +7689,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 261,
-						"y": 395,
+						"x": 300,
+						"y": 390,
 						"w": 16,
 						"h": 16
 					}
@@ -7689,8 +7710,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 313,
-						"y": 345,
+						"x": 383,
+						"y": 330,
 						"w": 16,
 						"h": 16
 					}
@@ -7710,8 +7731,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 217,
-						"y": 414,
+						"x": 399,
+						"y": 330,
 						"w": 16,
 						"h": 16
 					}
@@ -7731,8 +7752,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 233,
-						"y": 412,
+						"x": 415,
+						"y": 330,
 						"w": 16,
 						"h": 16
 					}
@@ -7752,8 +7773,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 249,
-						"y": 412,
+						"x": 299,
+						"y": 407,
 						"w": 16,
 						"h": 16
 					}
@@ -7773,8 +7794,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 265,
-						"y": 411,
+						"x": 313,
+						"y": 343,
 						"w": 16,
 						"h": 16
 					}
@@ -7795,7 +7816,7 @@
 					},
 					"frame": {
 						"x": 329,
-						"y": 345,
+						"y": 343,
 						"w": 16,
 						"h": 16
 					}
@@ -7815,8 +7836,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 277,
-						"y": 363,
+						"x": 345,
+						"y": 344,
 						"w": 16,
 						"h": 16
 					}
@@ -7836,8 +7857,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 277,
-						"y": 379,
+						"x": 361,
+						"y": 344,
 						"w": 16,
 						"h": 16
 					}
@@ -7857,8 +7878,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 277,
-						"y": 395,
+						"x": 377,
+						"y": 346,
 						"w": 16,
 						"h": 16
 					}
@@ -7878,8 +7899,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 293,
-						"y": 361,
+						"x": 393,
+						"y": 346,
 						"w": 16,
 						"h": 16
 					}
@@ -7899,8 +7920,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 309,
-						"y": 361,
+						"x": 409,
+						"y": 346,
 						"w": 16,
 						"h": 16
 					}
@@ -7920,8 +7941,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 293,
-						"y": 377,
+						"x": 313,
+						"y": 359,
 						"w": 16,
 						"h": 16
 					}
@@ -7941,8 +7962,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 325,
-						"y": 361,
+						"x": 329,
+						"y": 359,
 						"w": 16,
 						"h": 16
 					}
@@ -7962,8 +7983,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 293,
-						"y": 393,
+						"x": 345,
+						"y": 360,
 						"w": 16,
 						"h": 16
 					}
@@ -7983,8 +8004,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 309,
-						"y": 377,
+						"x": 361,
+						"y": 360,
 						"w": 16,
 						"h": 16
 					}
@@ -8004,8 +8025,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 309,
-						"y": 393,
+						"x": 377,
+						"y": 362,
 						"w": 16,
 						"h": 16
 					}
@@ -8025,8 +8046,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 325,
-						"y": 377,
+						"x": 393,
+						"y": 362,
 						"w": 16,
 						"h": 16
 					}
@@ -8046,8 +8067,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 325,
-						"y": 393,
+						"x": 409,
+						"y": 362,
 						"w": 16,
 						"h": 16
 					}
@@ -8067,8 +8088,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 281,
-						"y": 411,
+						"x": 316,
+						"y": 375,
 						"w": 16,
 						"h": 16
 					}
@@ -8088,8 +8109,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 297,
-						"y": 409,
+						"x": 316,
+						"y": 391,
 						"w": 16,
 						"h": 16
 					}
@@ -8109,8 +8130,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 313,
-						"y": 409,
+						"x": 315,
+						"y": 407,
 						"w": 16,
 						"h": 16
 					}
@@ -8130,8 +8151,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 329,
-						"y": 409,
+						"x": 332,
+						"y": 376,
 						"w": 16,
 						"h": 16
 					}
@@ -8151,8 +8172,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 341,
-						"y": 361,
+						"x": 348,
+						"y": 376,
 						"w": 16,
 						"h": 16
 					}
@@ -8172,8 +8193,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 341,
-						"y": 377,
+						"x": 332,
+						"y": 392,
 						"w": 16,
 						"h": 16
 					}
@@ -8193,8 +8214,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 341,
-						"y": 393,
+						"x": 348,
+						"y": 392,
 						"w": 16,
 						"h": 16
 					}
@@ -8214,8 +8235,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 345,
-						"y": 409,
+						"x": 331,
+						"y": 408,
 						"w": 16,
 						"h": 16
 					}
@@ -8235,8 +8256,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 412,
-						"y": 361,
+						"x": 347,
+						"y": 408,
 						"w": 16,
 						"h": 16
 					}
@@ -8256,8 +8277,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 357,
-						"y": 363,
+						"x": 364,
+						"y": 378,
 						"w": 16,
 						"h": 16
 					}
@@ -8277,8 +8298,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 357,
-						"y": 379,
+						"x": 380,
+						"y": 378,
 						"w": 16,
 						"h": 16
 					}
@@ -8298,8 +8319,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 373,
-						"y": 363,
+						"x": 396,
+						"y": 378,
 						"w": 16,
 						"h": 16
 					}
@@ -8319,8 +8340,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 373,
-						"y": 379,
+						"x": 364,
+						"y": 394,
 						"w": 16,
 						"h": 16
 					}
@@ -8340,8 +8361,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 389,
-						"y": 363,
+						"x": 380,
+						"y": 394,
 						"w": 16,
 						"h": 16
 					}
@@ -8361,8 +8382,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 389,
-						"y": 379,
+						"x": 396,
+						"y": 394,
 						"w": 16,
 						"h": 16
 					}
@@ -8382,8 +8403,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 405,
-						"y": 377,
+						"x": 412,
+						"y": 378,
 						"w": 16,
 						"h": 16
 					}
@@ -8403,8 +8424,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 361,
-						"y": 395,
+						"x": 412,
+						"y": 394,
 						"w": 16,
 						"h": 16
 					}
@@ -8424,8 +8445,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 377,
-						"y": 395,
+						"x": 363,
+						"y": 410,
 						"w": 16,
 						"h": 16
 					}
@@ -8436,6 +8457,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:d91a46c431ace3f09f5ca68916a2171e:1e84369d9a13e1416fa58028d629d116:110e074689c9edd2c54833ce2e4d9270$"
+		"smartupdate": "$TexturePacker:SmartUpdate:22a2cc3d3e531d383cfd9c9c6d0ae90e:cf2116762e9ba52acbac985ed04a7bd6:110e074689c9edd2c54833ce2e4d9270$"
 	}
 }
diff --git a/public/images/items.png b/public/images/items.png
index 191766f520e..c510ecebd14 100644
Binary files a/public/images/items.png and b/public/images/items.png differ
diff --git a/public/images/items/ability_capsule.png b/public/images/items/ability_capsule.png
index 06b6b3e173d..ee8aec6b346 100644
Binary files a/public/images/items/ability_capsule.png and b/public/images/items/ability_capsule.png differ
diff --git a/public/images/items/ability_charm.png b/public/images/items/ability_charm.png
index 943783ba348..2e9e0368667 100644
Binary files a/public/images/items/ability_charm.png and b/public/images/items/ability_charm.png differ
diff --git a/public/images/items/abomasite.png b/public/images/items/abomasite.png
index 09177d97a44..0758786bb0f 100644
Binary files a/public/images/items/abomasite.png and b/public/images/items/abomasite.png differ
diff --git a/public/images/items/absolite.png b/public/images/items/absolite.png
index 617969f6037..f7fe8b7ac12 100644
Binary files a/public/images/items/absolite.png and b/public/images/items/absolite.png differ
diff --git a/public/images/items/adamant_crystal.png b/public/images/items/adamant_crystal.png
index d729c40ce25..eb35af1540e 100644
Binary files a/public/images/items/adamant_crystal.png and b/public/images/items/adamant_crystal.png differ
diff --git a/public/images/items/aerodactylite.png b/public/images/items/aerodactylite.png
index 1cf5e028d6f..4feb04f3702 100644
Binary files a/public/images/items/aerodactylite.png and b/public/images/items/aerodactylite.png differ
diff --git a/public/images/items/aggronite.png b/public/images/items/aggronite.png
index 18eb9d86270..8feb64633ec 100644
Binary files a/public/images/items/aggronite.png and b/public/images/items/aggronite.png differ
diff --git a/public/images/items/alakazite.png b/public/images/items/alakazite.png
index 02d8ff580f4..ed6acab02ca 100644
Binary files a/public/images/items/alakazite.png and b/public/images/items/alakazite.png differ
diff --git a/public/images/items/altarianite.png b/public/images/items/altarianite.png
index 8d2436bc24a..0bb6be23819 100644
Binary files a/public/images/items/altarianite.png and b/public/images/items/altarianite.png differ
diff --git a/public/images/items/ampharosite.png b/public/images/items/ampharosite.png
index 5ff26217d23..3084c05c1a9 100644
Binary files a/public/images/items/ampharosite.png and b/public/images/items/ampharosite.png differ
diff --git a/public/images/items/amulet_coin.png b/public/images/items/amulet_coin.png
index 88ce369def5..3cda2b2a53b 100644
Binary files a/public/images/items/amulet_coin.png and b/public/images/items/amulet_coin.png differ
diff --git a/public/images/items/apicot_berry.png b/public/images/items/apicot_berry.png
index 2cfa66acdfa..4719671eaf3 100644
Binary files a/public/images/items/apicot_berry.png and b/public/images/items/apicot_berry.png differ
diff --git a/public/images/items/audinite.png b/public/images/items/audinite.png
index 51fdc9310b0..f7c21bf8e3b 100644
Binary files a/public/images/items/audinite.png and b/public/images/items/audinite.png differ
diff --git a/public/images/items/auspicious_armor.png b/public/images/items/auspicious_armor.png
index e3620bb6054..27c40ae0bd0 100644
Binary files a/public/images/items/auspicious_armor.png and b/public/images/items/auspicious_armor.png differ
diff --git a/public/images/items/banettite.png b/public/images/items/banettite.png
index 20704d624c2..b6bcadd72fc 100644
Binary files a/public/images/items/banettite.png and b/public/images/items/banettite.png differ
diff --git a/public/images/items/baton.png b/public/images/items/baton.png
index 8e9ebfae06d..ece81f82b2f 100644
Binary files a/public/images/items/baton.png and b/public/images/items/baton.png differ
diff --git a/public/images/items/beedrillite.png b/public/images/items/beedrillite.png
index 3dd1444bf76..99e516446d7 100644
Binary files a/public/images/items/beedrillite.png and b/public/images/items/beedrillite.png differ
diff --git a/public/images/items/berry_juice.png b/public/images/items/berry_juice.png
index 127fa458906..2f6272eca7c 100644
Binary files a/public/images/items/berry_juice.png and b/public/images/items/berry_juice.png differ
diff --git a/public/images/items/berry_pot.png b/public/images/items/berry_pot.png
index 5841ef1c324..3cb9b90dc53 100644
Binary files a/public/images/items/berry_pot.png and b/public/images/items/berry_pot.png differ
diff --git a/public/images/items/berry_pouch.png b/public/images/items/berry_pouch.png
index 878ef600239..d14d71358a9 100644
Binary files a/public/images/items/berry_pouch.png and b/public/images/items/berry_pouch.png differ
diff --git a/public/images/items/big_mushroom.png b/public/images/items/big_mushroom.png
index 4384c7933b3..eb203a7374c 100644
Binary files a/public/images/items/big_mushroom.png and b/public/images/items/big_mushroom.png differ
diff --git a/public/images/items/big_nugget.png b/public/images/items/big_nugget.png
index 54a5456ad60..e8839daa0b6 100644
Binary files a/public/images/items/big_nugget.png and b/public/images/items/big_nugget.png differ
diff --git a/public/images/items/big_root.png b/public/images/items/big_root.png
index 37eeb5c2f93..24b863ee238 100644
Binary files a/public/images/items/big_root.png and b/public/images/items/big_root.png differ
diff --git a/public/images/items/binding_band.png b/public/images/items/binding_band.png
index f634b02053d..b33256b7b8c 100644
Binary files a/public/images/items/binding_band.png and b/public/images/items/binding_band.png differ
diff --git a/public/images/items/black_augurite.png b/public/images/items/black_augurite.png
index e8531a1a8cf..b34127e2942 100644
Binary files a/public/images/items/black_augurite.png and b/public/images/items/black_augurite.png differ
diff --git a/public/images/items/black_belt.png b/public/images/items/black_belt.png
index 70d13097882..9dde3ff83cd 100644
Binary files a/public/images/items/black_belt.png and b/public/images/items/black_belt.png differ
diff --git a/public/images/items/black_glasses.png b/public/images/items/black_glasses.png
index 52fe0e60a1e..4b18d828964 100644
Binary files a/public/images/items/black_glasses.png and b/public/images/items/black_glasses.png differ
diff --git a/public/images/items/black_sludge.png b/public/images/items/black_sludge.png
index 37aa31de43e..fe308586dd3 100644
Binary files a/public/images/items/black_sludge.png and b/public/images/items/black_sludge.png differ
diff --git a/public/images/items/blank_plate.png b/public/images/items/blank_plate.png
index ec82203340c..c08d25aa3c3 100644
Binary files a/public/images/items/blank_plate.png and b/public/images/items/blank_plate.png differ
diff --git a/public/images/items/blastoisinite.png b/public/images/items/blastoisinite.png
index 6b8310610e8..ea2ddef0640 100644
Binary files a/public/images/items/blastoisinite.png and b/public/images/items/blastoisinite.png differ
diff --git a/public/images/items/blazikenite.png b/public/images/items/blazikenite.png
index f14b108de60..9b6e9e59212 100644
Binary files a/public/images/items/blazikenite.png and b/public/images/items/blazikenite.png differ
diff --git a/public/images/items/blue_orb.png b/public/images/items/blue_orb.png
index 91094d82147..34c19c8aea8 100644
Binary files a/public/images/items/blue_orb.png and b/public/images/items/blue_orb.png differ
diff --git a/public/images/items/blunder_policy.png b/public/images/items/blunder_policy.png
index c1e2e380648..8d5b11cb3f6 100644
Binary files a/public/images/items/blunder_policy.png and b/public/images/items/blunder_policy.png differ
diff --git a/public/images/items/bronze_ribbon.png b/public/images/items/bronze_ribbon.png
index eb9b926c50c..cab218e09f5 100644
Binary files a/public/images/items/bronze_ribbon.png and b/public/images/items/bronze_ribbon.png differ
diff --git a/public/images/items/bug_memory.png b/public/images/items/bug_memory.png
index e166636c780..004b499ba7a 100644
Binary files a/public/images/items/bug_memory.png and b/public/images/items/bug_memory.png differ
diff --git a/public/images/items/bug_tera_shard.png b/public/images/items/bug_tera_shard.png
index c08a3f29ffd..5711fe193bd 100644
Binary files a/public/images/items/bug_tera_shard.png and b/public/images/items/bug_tera_shard.png differ
diff --git a/public/images/items/burn_drive.png b/public/images/items/burn_drive.png
index 47ad9cc8f38..02ee18c02bd 100644
Binary files a/public/images/items/burn_drive.png and b/public/images/items/burn_drive.png differ
diff --git a/public/images/items/calcium.png b/public/images/items/calcium.png
index e98416f6280..4c42228d724 100644
Binary files a/public/images/items/calcium.png and b/public/images/items/calcium.png differ
diff --git a/public/images/items/cameruptite.png b/public/images/items/cameruptite.png
index 5410fc85a39..9eda37e14e1 100644
Binary files a/public/images/items/cameruptite.png and b/public/images/items/cameruptite.png differ
diff --git a/public/images/items/candy.png b/public/images/items/candy.png
index 9a68bdab606..81cf5e19ee2 100644
Binary files a/public/images/items/candy.png and b/public/images/items/candy.png differ
diff --git a/public/images/items/candy_jar.png b/public/images/items/candy_jar.png
index 2718b9fa083..0338b64a86d 100644
Binary files a/public/images/items/candy_jar.png and b/public/images/items/candy_jar.png differ
diff --git a/public/images/items/candy_overlay.png b/public/images/items/candy_overlay.png
index 67df546a633..a1cb428cdee 100644
Binary files a/public/images/items/candy_overlay.png and b/public/images/items/candy_overlay.png differ
diff --git a/public/images/items/carbos.png b/public/images/items/carbos.png
index beb31dcea9e..7dd09f2ec12 100644
Binary files a/public/images/items/carbos.png and b/public/images/items/carbos.png differ
diff --git a/public/images/items/catching_charm.png b/public/images/items/catching_charm.png
index c220ff70c03..57545622131 100644
Binary files a/public/images/items/catching_charm.png and b/public/images/items/catching_charm.png differ
diff --git a/public/images/items/charcoal.png b/public/images/items/charcoal.png
index 4d2511773ef..e10f8f20fd6 100644
Binary files a/public/images/items/charcoal.png and b/public/images/items/charcoal.png differ
diff --git a/public/images/items/charizardite_x.png b/public/images/items/charizardite_x.png
index 81590bb86da..d238a77a9e2 100644
Binary files a/public/images/items/charizardite_x.png and b/public/images/items/charizardite_x.png differ
diff --git a/public/images/items/charizardite_y.png b/public/images/items/charizardite_y.png
index 784eed51ace..5a3ea59d091 100644
Binary files a/public/images/items/charizardite_y.png and b/public/images/items/charizardite_y.png differ
diff --git a/public/images/items/chill_drive.png b/public/images/items/chill_drive.png
index d5ef99b1686..fbf7462479a 100644
Binary files a/public/images/items/chill_drive.png and b/public/images/items/chill_drive.png differ
diff --git a/public/images/items/chipped_pot.png b/public/images/items/chipped_pot.png
index a2f35f9aed9..969c3dc3c16 100644
Binary files a/public/images/items/chipped_pot.png and b/public/images/items/chipped_pot.png differ
diff --git a/public/images/items/choice_scarf.png b/public/images/items/choice_scarf.png
index a83fd1f4b30..2ddf7d3be16 100644
Binary files a/public/images/items/choice_scarf.png and b/public/images/items/choice_scarf.png differ
diff --git a/public/images/items/choice_specs.png b/public/images/items/choice_specs.png
index 513986c524e..09b58f64381 100644
Binary files a/public/images/items/choice_specs.png and b/public/images/items/choice_specs.png differ
diff --git a/public/images/items/clefairy_doll.png b/public/images/items/clefairy_doll.png
index 8e1691dddfa..3b54c83df47 100644
Binary files a/public/images/items/clefairy_doll.png and b/public/images/items/clefairy_doll.png differ
diff --git a/public/images/items/coin_case.png b/public/images/items/coin_case.png
index 14f9878e5c4..3c17c2b13f8 100644
Binary files a/public/images/items/coin_case.png and b/public/images/items/coin_case.png differ
diff --git a/public/images/items/cornerstone_mask.png b/public/images/items/cornerstone_mask.png
index 441af6607a5..205bdef9805 100644
Binary files a/public/images/items/cornerstone_mask.png and b/public/images/items/cornerstone_mask.png differ
diff --git a/public/images/items/coupon.png b/public/images/items/coupon.png
index b1e8089b485..b08fa65fecc 100644
Binary files a/public/images/items/coupon.png and b/public/images/items/coupon.png differ
diff --git a/public/images/items/cracked_pot.png b/public/images/items/cracked_pot.png
index 61cad0d85b7..4afc2caf2c8 100644
Binary files a/public/images/items/cracked_pot.png and b/public/images/items/cracked_pot.png differ
diff --git a/public/images/items/dark_memory.png b/public/images/items/dark_memory.png
index 4349ba8f8cd..e1e503bd036 100644
Binary files a/public/images/items/dark_memory.png and b/public/images/items/dark_memory.png differ
diff --git a/public/images/items/dark_stone.png b/public/images/items/dark_stone.png
index eb8eaa13ba8..c28a93ecabc 100644
Binary files a/public/images/items/dark_stone.png and b/public/images/items/dark_stone.png differ
diff --git a/public/images/items/dark_tera_shard.png b/public/images/items/dark_tera_shard.png
index 4060f9142f6..ca24664b74e 100644
Binary files a/public/images/items/dark_tera_shard.png and b/public/images/items/dark_tera_shard.png differ
diff --git a/public/images/items/dawn_stone.png b/public/images/items/dawn_stone.png
index 0e3da086649..b29d2016a56 100644
Binary files a/public/images/items/dawn_stone.png and b/public/images/items/dawn_stone.png differ
diff --git a/public/images/items/deep_sea_scale.png b/public/images/items/deep_sea_scale.png
index 6a84b01c99e..cf40e652319 100644
Binary files a/public/images/items/deep_sea_scale.png and b/public/images/items/deep_sea_scale.png differ
diff --git a/public/images/items/deep_sea_tooth.png b/public/images/items/deep_sea_tooth.png
index 448c8406867..2cd1980aeb4 100644
Binary files a/public/images/items/deep_sea_tooth.png and b/public/images/items/deep_sea_tooth.png differ
diff --git a/public/images/items/diancite.png b/public/images/items/diancite.png
index 6fff5008673..293d327524e 100644
Binary files a/public/images/items/diancite.png and b/public/images/items/diancite.png differ
diff --git a/public/images/items/dire_hit.png b/public/images/items/dire_hit.png
index 5917fd02d99..0c060710ff2 100644
Binary files a/public/images/items/dire_hit.png and b/public/images/items/dire_hit.png differ
diff --git a/public/images/items/dna_splicers.png b/public/images/items/dna_splicers.png
index 5a3c7fed75b..51c1524076e 100644
Binary files a/public/images/items/dna_splicers.png and b/public/images/items/dna_splicers.png differ
diff --git a/public/images/items/douse_drive.png b/public/images/items/douse_drive.png
index 0f9f780e5cb..fb8e7623184 100644
Binary files a/public/images/items/douse_drive.png and b/public/images/items/douse_drive.png differ
diff --git a/public/images/items/draco_plate.png b/public/images/items/draco_plate.png
index b25df530171..b4702aadba3 100644
Binary files a/public/images/items/draco_plate.png and b/public/images/items/draco_plate.png differ
diff --git a/public/images/items/dragon_fang.png b/public/images/items/dragon_fang.png
index 33659e50307..4a9904e0ef3 100644
Binary files a/public/images/items/dragon_fang.png and b/public/images/items/dragon_fang.png differ
diff --git a/public/images/items/dragon_memory.png b/public/images/items/dragon_memory.png
index 15a3cd170cd..01a14cadf3e 100644
Binary files a/public/images/items/dragon_memory.png and b/public/images/items/dragon_memory.png differ
diff --git a/public/images/items/dragon_scale.png b/public/images/items/dragon_scale.png
index bb8bb028db7..9cec39b22f6 100644
Binary files a/public/images/items/dragon_scale.png and b/public/images/items/dragon_scale.png differ
diff --git a/public/images/items/dragon_tera_shard.png b/public/images/items/dragon_tera_shard.png
index 8c16e2f8eb6..51f20d9f5cb 100644
Binary files a/public/images/items/dragon_tera_shard.png and b/public/images/items/dragon_tera_shard.png differ
diff --git a/public/images/items/dread_plate.png b/public/images/items/dread_plate.png
index 4cdbb76f180..6537320bc0a 100644
Binary files a/public/images/items/dread_plate.png and b/public/images/items/dread_plate.png differ
diff --git a/public/images/items/dubious_disc.png b/public/images/items/dubious_disc.png
index 8bb23497462..122958f9550 100644
Binary files a/public/images/items/dubious_disc.png and b/public/images/items/dubious_disc.png differ
diff --git a/public/images/items/dusk_stone.png b/public/images/items/dusk_stone.png
index 12ad19505d0..e2cf73d04f3 100644
Binary files a/public/images/items/dusk_stone.png and b/public/images/items/dusk_stone.png differ
diff --git a/public/images/items/dynamax_band.png b/public/images/items/dynamax_band.png
index 633da7bdc90..57b9a0caef5 100644
Binary files a/public/images/items/dynamax_band.png and b/public/images/items/dynamax_band.png differ
diff --git a/public/images/items/earth_plate.png b/public/images/items/earth_plate.png
index d40da06f6b6..79fbbad5a84 100644
Binary files a/public/images/items/earth_plate.png and b/public/images/items/earth_plate.png differ
diff --git a/public/images/items/electirizer.png b/public/images/items/electirizer.png
index 7d4488d0ff3..a5589a27e42 100644
Binary files a/public/images/items/electirizer.png and b/public/images/items/electirizer.png differ
diff --git a/public/images/items/electric_memory.png b/public/images/items/electric_memory.png
index 494b0d0d653..d0595356482 100644
Binary files a/public/images/items/electric_memory.png and b/public/images/items/electric_memory.png differ
diff --git a/public/images/items/electric_tera_shard.png b/public/images/items/electric_tera_shard.png
index e4e1003edbc..2195be32929 100644
Binary files a/public/images/items/electric_tera_shard.png and b/public/images/items/electric_tera_shard.png differ
diff --git a/public/images/items/elixir.png b/public/images/items/elixir.png
index 694b07f34b6..b4bf7834e17 100644
Binary files a/public/images/items/elixir.png and b/public/images/items/elixir.png differ
diff --git a/public/images/items/enigma_berry.png b/public/images/items/enigma_berry.png
index 26c7f11ee9c..1a1a20854ed 100644
Binary files a/public/images/items/enigma_berry.png and b/public/images/items/enigma_berry.png differ
diff --git a/public/images/items/ether.png b/public/images/items/ether.png
index 970c9a27778..44a6e79de8e 100644
Binary files a/public/images/items/ether.png and b/public/images/items/ether.png differ
diff --git a/public/images/items/everstone.png b/public/images/items/everstone.png
index 07b32e8850e..194f7b63baf 100644
Binary files a/public/images/items/everstone.png and b/public/images/items/everstone.png differ
diff --git a/public/images/items/eviolite.png b/public/images/items/eviolite.png
index 8eb195ece2a..8591791a5a1 100644
Binary files a/public/images/items/eviolite.png and b/public/images/items/eviolite.png differ
diff --git a/public/images/items/exp_balance.png b/public/images/items/exp_balance.png
index 56c645b70fc..6a03556a3a2 100644
Binary files a/public/images/items/exp_balance.png and b/public/images/items/exp_balance.png differ
diff --git a/public/images/items/exp_charm.png b/public/images/items/exp_charm.png
index b42da73301e..2635e4d8020 100644
Binary files a/public/images/items/exp_charm.png and b/public/images/items/exp_charm.png differ
diff --git a/public/images/items/exp_share.png b/public/images/items/exp_share.png
index d7f4e4d04fb..6b866c63427 100644
Binary files a/public/images/items/exp_share.png and b/public/images/items/exp_share.png differ
diff --git a/public/images/items/expert_belt.png b/public/images/items/expert_belt.png
index 225756626da..86cfd7170de 100644
Binary files a/public/images/items/expert_belt.png and b/public/images/items/expert_belt.png differ
diff --git a/public/images/items/fairy_feather.png b/public/images/items/fairy_feather.png
index 64cabec7500..44923a1db94 100644
Binary files a/public/images/items/fairy_feather.png and b/public/images/items/fairy_feather.png differ
diff --git a/public/images/items/fairy_memory.png b/public/images/items/fairy_memory.png
index 598f3c804ce..b5d0b32ff95 100644
Binary files a/public/images/items/fairy_memory.png and b/public/images/items/fairy_memory.png differ
diff --git a/public/images/items/fairy_tera_shard.png b/public/images/items/fairy_tera_shard.png
index 83e19aeaeba..36fb5e88f1c 100644
Binary files a/public/images/items/fairy_tera_shard.png and b/public/images/items/fairy_tera_shard.png differ
diff --git a/public/images/items/fighting_memory.png b/public/images/items/fighting_memory.png
index 3c152f43900..13789836880 100644
Binary files a/public/images/items/fighting_memory.png and b/public/images/items/fighting_memory.png differ
diff --git a/public/images/items/fighting_tera_shard.png b/public/images/items/fighting_tera_shard.png
index 4241a901902..8423a41cbe8 100644
Binary files a/public/images/items/fighting_tera_shard.png and b/public/images/items/fighting_tera_shard.png differ
diff --git a/public/images/items/fire_memory.png b/public/images/items/fire_memory.png
index 8778baa5f56..4f341417b6e 100644
Binary files a/public/images/items/fire_memory.png and b/public/images/items/fire_memory.png differ
diff --git a/public/images/items/fire_stone.png b/public/images/items/fire_stone.png
index 7fc77cd5975..3db1942dfed 100644
Binary files a/public/images/items/fire_stone.png and b/public/images/items/fire_stone.png differ
diff --git a/public/images/items/fire_tera_shard.png b/public/images/items/fire_tera_shard.png
index 74a04df1680..5783a5e9720 100644
Binary files a/public/images/items/fire_tera_shard.png and b/public/images/items/fire_tera_shard.png differ
diff --git a/public/images/items/fist_plate.png b/public/images/items/fist_plate.png
index 6892d821da6..d992e4ab1c2 100644
Binary files a/public/images/items/fist_plate.png and b/public/images/items/fist_plate.png differ
diff --git a/public/images/items/flame_orb.png b/public/images/items/flame_orb.png
index 32f11719a5d..5132bbb6153 100644
Binary files a/public/images/items/flame_orb.png and b/public/images/items/flame_orb.png differ
diff --git a/public/images/items/flame_plate.png b/public/images/items/flame_plate.png
index 26a56f18462..7633773eee1 100644
Binary files a/public/images/items/flame_plate.png and b/public/images/items/flame_plate.png differ
diff --git a/public/images/items/flying_memory.png b/public/images/items/flying_memory.png
index d4b31e2c240..8d3efbf1401 100644
Binary files a/public/images/items/flying_memory.png and b/public/images/items/flying_memory.png differ
diff --git a/public/images/items/flying_tera_shard.png b/public/images/items/flying_tera_shard.png
index bee18637918..97d3013f70b 100644
Binary files a/public/images/items/flying_tera_shard.png and b/public/images/items/flying_tera_shard.png differ
diff --git a/public/images/items/focus_band.png b/public/images/items/focus_band.png
index 830e1294213..3a04ae17023 100644
Binary files a/public/images/items/focus_band.png and b/public/images/items/focus_band.png differ
diff --git a/public/images/items/focus_sash.png b/public/images/items/focus_sash.png
index 6dcd0f2f146..7700ceecf6b 100644
Binary files a/public/images/items/focus_sash.png and b/public/images/items/focus_sash.png differ
diff --git a/public/images/items/full_heal.png b/public/images/items/full_heal.png
index 61663fd5e2d..4e59dcf44fa 100644
Binary files a/public/images/items/full_heal.png and b/public/images/items/full_heal.png differ
diff --git a/public/images/items/full_restore.png b/public/images/items/full_restore.png
index bd3ebfd3022..ba64f2edad8 100644
Binary files a/public/images/items/full_restore.png and b/public/images/items/full_restore.png differ
diff --git a/public/images/items/galarica_cuff.png b/public/images/items/galarica_cuff.png
index 1b3f9c69296..56523da5230 100644
Binary files a/public/images/items/galarica_cuff.png 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
index 7fe319f20cf..20356bafd8a 100644
Binary files a/public/images/items/galarica_wreath.png and b/public/images/items/galarica_wreath.png differ
diff --git a/public/images/items/galladite.png b/public/images/items/galladite.png
index b204209a91c..15c93cd9c7e 100644
Binary files a/public/images/items/galladite.png and b/public/images/items/galladite.png differ
diff --git a/public/images/items/ganlon_berry.png b/public/images/items/ganlon_berry.png
index 81aecd83011..f9b88fc563a 100644
Binary files a/public/images/items/ganlon_berry.png and b/public/images/items/ganlon_berry.png differ
diff --git a/public/images/items/garchompite.png b/public/images/items/garchompite.png
index 045fc815b27..4276146a858 100644
Binary files a/public/images/items/garchompite.png and b/public/images/items/garchompite.png differ
diff --git a/public/images/items/gardevoirite.png b/public/images/items/gardevoirite.png
index d29ee3eab03..66a90b93bce 100644
Binary files a/public/images/items/gardevoirite.png and b/public/images/items/gardevoirite.png differ
diff --git a/public/images/items/gb.png b/public/images/items/gb.png
index 5a69585f5cd..4b437277849 100644
Binary files a/public/images/items/gb.png and b/public/images/items/gb.png differ
diff --git a/public/images/items/gengarite.png b/public/images/items/gengarite.png
index dcbaf4bf13a..4ccaae6ee8d 100644
Binary files a/public/images/items/gengarite.png and b/public/images/items/gengarite.png differ
diff --git a/public/images/items/ghost_memory.png b/public/images/items/ghost_memory.png
index d3f174de758..cb3c31ea4de 100644
Binary files a/public/images/items/ghost_memory.png and b/public/images/items/ghost_memory.png differ
diff --git a/public/images/items/ghost_tera_shard.png b/public/images/items/ghost_tera_shard.png
index fd3557e5534..8b9c6e750a9 100644
Binary files a/public/images/items/ghost_tera_shard.png and b/public/images/items/ghost_tera_shard.png differ
diff --git a/public/images/items/glalitite.png b/public/images/items/glalitite.png
index 83e05f132fa..ed7858c631c 100644
Binary files a/public/images/items/glalitite.png and b/public/images/items/glalitite.png differ
diff --git a/public/images/items/golden_egg.png b/public/images/items/golden_egg.png
index bfc517c6632..5727b4cb513 100644
Binary files a/public/images/items/golden_egg.png and b/public/images/items/golden_egg.png differ
diff --git a/public/images/items/golden_exp_charm.png b/public/images/items/golden_exp_charm.png
index 199832159d6..1895bfaa6b9 100644
Binary files a/public/images/items/golden_exp_charm.png and b/public/images/items/golden_exp_charm.png differ
diff --git a/public/images/items/golden_mystic_ticket.png b/public/images/items/golden_mystic_ticket.png
index ff44d3307b6..57f5b9efca6 100644
Binary files a/public/images/items/golden_mystic_ticket.png and b/public/images/items/golden_mystic_ticket.png differ
diff --git a/public/images/items/golden_net.png b/public/images/items/golden_net.png
index 5fea1ee7dba..3205d545e27 100644
Binary files a/public/images/items/golden_net.png and b/public/images/items/golden_net.png differ
diff --git a/public/images/items/golden_punch.png b/public/images/items/golden_punch.png
index 25c2233e714..291ff7e248f 100644
Binary files a/public/images/items/golden_punch.png and b/public/images/items/golden_punch.png differ
diff --git a/public/images/items/gracidea.png b/public/images/items/gracidea.png
index 0552d11b01b..6e464390f17 100644
Binary files a/public/images/items/gracidea.png and b/public/images/items/gracidea.png differ
diff --git a/public/images/items/grass_memory.png b/public/images/items/grass_memory.png
index 28ffc343c66..9d7d27de770 100644
Binary files a/public/images/items/grass_memory.png and b/public/images/items/grass_memory.png differ
diff --git a/public/images/items/grass_tera_shard.png b/public/images/items/grass_tera_shard.png
index 01bf4bde640..30e8762b5b6 100644
Binary files a/public/images/items/grass_tera_shard.png and b/public/images/items/grass_tera_shard.png differ
diff --git a/public/images/items/great_ribbon.png b/public/images/items/great_ribbon.png
index 720c0d85366..e7d7e452122 100644
Binary files a/public/images/items/great_ribbon.png and b/public/images/items/great_ribbon.png differ
diff --git a/public/images/items/grip_claw.png b/public/images/items/grip_claw.png
index e37e2a2eaf3..61cbb89e9b2 100644
Binary files a/public/images/items/grip_claw.png and b/public/images/items/grip_claw.png differ
diff --git a/public/images/items/griseous_core.png b/public/images/items/griseous_core.png
index fa131cccfda..7f3f683eda8 100644
Binary files a/public/images/items/griseous_core.png and b/public/images/items/griseous_core.png differ
diff --git a/public/images/items/ground_memory.png b/public/images/items/ground_memory.png
index 8ab042c02ff..808a4e13eeb 100644
Binary files a/public/images/items/ground_memory.png and b/public/images/items/ground_memory.png differ
diff --git a/public/images/items/ground_tera_shard.png b/public/images/items/ground_tera_shard.png
index 153bbd9058c..d7760f7dc1b 100644
Binary files a/public/images/items/ground_tera_shard.png and b/public/images/items/ground_tera_shard.png differ
diff --git a/public/images/items/guard_spec.png b/public/images/items/guard_spec.png
index 3efc9448404..95a37d0d28e 100644
Binary files a/public/images/items/guard_spec.png and b/public/images/items/guard_spec.png differ
diff --git a/public/images/items/gyaradosite.png b/public/images/items/gyaradosite.png
index bc8e6d6b115..e4cae1366ab 100644
Binary files a/public/images/items/gyaradosite.png and b/public/images/items/gyaradosite.png differ
diff --git a/public/images/items/hard_meteorite.png b/public/images/items/hard_meteorite.png
index d8f3490c581..8e8a2b5688b 100644
Binary files a/public/images/items/hard_meteorite.png and b/public/images/items/hard_meteorite.png differ
diff --git a/public/images/items/hard_stone.png b/public/images/items/hard_stone.png
index 604b44f9915..571d96afaa8 100644
Binary files a/public/images/items/hard_stone.png and b/public/images/items/hard_stone.png differ
diff --git a/public/images/items/healing_charm.png b/public/images/items/healing_charm.png
index b6f4c593c53..4601eeef593 100644
Binary files a/public/images/items/healing_charm.png and b/public/images/items/healing_charm.png differ
diff --git a/public/images/items/hearthflame_mask.png b/public/images/items/hearthflame_mask.png
index cd2ecdf1949..deed3d0cde8 100644
Binary files a/public/images/items/hearthflame_mask.png and b/public/images/items/hearthflame_mask.png differ
diff --git a/public/images/items/heracronite.png b/public/images/items/heracronite.png
index 164da1c9d30..ffcfc440c19 100644
Binary files a/public/images/items/heracronite.png and b/public/images/items/heracronite.png differ
diff --git a/public/images/items/houndoominite.png b/public/images/items/houndoominite.png
index 9e2e5f2eacd..c9ea1954dfa 100644
Binary files a/public/images/items/houndoominite.png and b/public/images/items/houndoominite.png differ
diff --git a/public/images/items/hp_up.png b/public/images/items/hp_up.png
index ff456d25289..5c6baff0673 100644
Binary files a/public/images/items/hp_up.png and b/public/images/items/hp_up.png differ
diff --git a/public/images/items/hyper_potion.png b/public/images/items/hyper_potion.png
index fa1c1432795..197aaac690c 100644
Binary files a/public/images/items/hyper_potion.png and b/public/images/items/hyper_potion.png differ
diff --git a/public/images/items/ice_memory.png b/public/images/items/ice_memory.png
index 01e68c08f82..812548cf36c 100644
Binary files a/public/images/items/ice_memory.png and b/public/images/items/ice_memory.png differ
diff --git a/public/images/items/ice_stone.png b/public/images/items/ice_stone.png
index a0fc0c12c5d..945714b759c 100644
Binary files a/public/images/items/ice_stone.png and b/public/images/items/ice_stone.png differ
diff --git a/public/images/items/ice_tera_shard.png b/public/images/items/ice_tera_shard.png
index 3e07acee397..5644d647c2b 100644
Binary files a/public/images/items/ice_tera_shard.png and b/public/images/items/ice_tera_shard.png differ
diff --git a/public/images/items/icicle_plate.png b/public/images/items/icicle_plate.png
index 67b5138e3e6..f9797d91f6a 100644
Binary files a/public/images/items/icicle_plate.png and b/public/images/items/icicle_plate.png differ
diff --git a/public/images/items/icy_reins_of_unity.png b/public/images/items/icy_reins_of_unity.png
index 84ec94a1d87..b7af48d6a81 100644
Binary files a/public/images/items/icy_reins_of_unity.png and b/public/images/items/icy_reins_of_unity.png differ
diff --git a/public/images/items/insect_plate.png b/public/images/items/insect_plate.png
index 75b44640a1b..5bcc0eebaf5 100644
Binary files a/public/images/items/insect_plate.png and b/public/images/items/insect_plate.png differ
diff --git a/public/images/items/inverse.png b/public/images/items/inverse.png
index b1ad5d2c00e..0d77ce77dde 100644
Binary files a/public/images/items/inverse.png and b/public/images/items/inverse.png differ
diff --git a/public/images/items/iron.png b/public/images/items/iron.png
index 3bb8ab15a8f..5cfff11b059 100644
Binary files a/public/images/items/iron.png and b/public/images/items/iron.png differ
diff --git a/public/images/items/iron_plate.png b/public/images/items/iron_plate.png
index ee892755660..65d660e34eb 100644
Binary files a/public/images/items/iron_plate.png and b/public/images/items/iron_plate.png differ
diff --git a/public/images/items/kangaskhanite.png b/public/images/items/kangaskhanite.png
index b7eb6849729..3d65d2cc5ca 100644
Binary files a/public/images/items/kangaskhanite.png and b/public/images/items/kangaskhanite.png differ
diff --git a/public/images/items/kings_rock.png b/public/images/items/kings_rock.png
index 0ea43c267bc..bfda9d559d3 100644
Binary files a/public/images/items/kings_rock.png and b/public/images/items/kings_rock.png differ
diff --git a/public/images/items/lansat_berry.png b/public/images/items/lansat_berry.png
index 6b2a8fb4760..223bff3eb26 100644
Binary files a/public/images/items/lansat_berry.png and b/public/images/items/lansat_berry.png differ
diff --git a/public/images/items/latiasite.png b/public/images/items/latiasite.png
index 6b92d1851cc..486a542576f 100644
Binary files a/public/images/items/latiasite.png and b/public/images/items/latiasite.png differ
diff --git a/public/images/items/latiosite.png b/public/images/items/latiosite.png
index 0d2af34781f..69708835c7b 100644
Binary files a/public/images/items/latiosite.png and b/public/images/items/latiosite.png differ
diff --git a/public/images/items/leaders_crest.png b/public/images/items/leaders_crest.png
index 45cf1656374..86b71f1eb6d 100644
Binary files a/public/images/items/leaders_crest.png and b/public/images/items/leaders_crest.png differ
diff --git a/public/images/items/leaf_stone.png b/public/images/items/leaf_stone.png
index a384af2a9c7..dc68e916bcf 100644
Binary files a/public/images/items/leaf_stone.png and b/public/images/items/leaf_stone.png differ
diff --git a/public/images/items/leek.png b/public/images/items/leek.png
index 7ef3fb989a4..1cb136aa78c 100644
Binary files a/public/images/items/leek.png and b/public/images/items/leek.png differ
diff --git a/public/images/items/leftovers.png b/public/images/items/leftovers.png
index 48ff07fbed3..4732d149b64 100644
Binary files a/public/images/items/leftovers.png and b/public/images/items/leftovers.png differ
diff --git a/public/images/items/legend_plate.png b/public/images/items/legend_plate.png
index 5b8681ebfe7..e96f12b45f5 100644
Binary files a/public/images/items/legend_plate.png and b/public/images/items/legend_plate.png differ
diff --git a/public/images/items/leppa_berry.png b/public/images/items/leppa_berry.png
index 4bc1349fe94..7a0f13b5199 100644
Binary files a/public/images/items/leppa_berry.png and b/public/images/items/leppa_berry.png differ
diff --git a/public/images/items/liechi_berry.png b/public/images/items/liechi_berry.png
index 492ef7e86f1..192d8f001ef 100644
Binary files a/public/images/items/liechi_berry.png and b/public/images/items/liechi_berry.png differ
diff --git a/public/images/items/light_ball.png b/public/images/items/light_ball.png
index cd421446608..7748f735d37 100644
Binary files a/public/images/items/light_ball.png and b/public/images/items/light_ball.png differ
diff --git a/public/images/items/light_stone.png b/public/images/items/light_stone.png
index 2b2be824020..97258cf3970 100644
Binary files a/public/images/items/light_stone.png and b/public/images/items/light_stone.png differ
diff --git a/public/images/items/linking_cord.png b/public/images/items/linking_cord.png
index ab695ae1fc8..4cde9da3f14 100644
Binary files a/public/images/items/linking_cord.png and b/public/images/items/linking_cord.png differ
diff --git a/public/images/items/lock_capsule.png b/public/images/items/lock_capsule.png
index b2e64dfdbfd..25d0cc14cff 100644
Binary files a/public/images/items/lock_capsule.png and b/public/images/items/lock_capsule.png differ
diff --git a/public/images/items/lopunnite.png b/public/images/items/lopunnite.png
index 416807c0c81..bd67cf159ed 100644
Binary files a/public/images/items/lopunnite.png and b/public/images/items/lopunnite.png differ
diff --git a/public/images/items/lucarionite.png b/public/images/items/lucarionite.png
index 82d3b19129d..b97161df68c 100644
Binary files a/public/images/items/lucarionite.png and b/public/images/items/lucarionite.png differ
diff --git a/public/images/items/lucky_egg.png b/public/images/items/lucky_egg.png
index 2760c303d37..fa9a1e4b390 100644
Binary files a/public/images/items/lucky_egg.png and b/public/images/items/lucky_egg.png differ
diff --git a/public/images/items/lucky_punch.png b/public/images/items/lucky_punch.png
index ed783c43e9a..97887631d9a 100644
Binary files a/public/images/items/lucky_punch.png and b/public/images/items/lucky_punch.png differ
diff --git a/public/images/items/lucky_punch_great.png b/public/images/items/lucky_punch_great.png
index c66df778210..77c77daf535 100644
Binary files a/public/images/items/lucky_punch_great.png and b/public/images/items/lucky_punch_great.png differ
diff --git a/public/images/items/lucky_punch_master.png b/public/images/items/lucky_punch_master.png
index d48fdf04bae..89fc1b67cf4 100644
Binary files a/public/images/items/lucky_punch_master.png and b/public/images/items/lucky_punch_master.png differ
diff --git a/public/images/items/lucky_punch_ultra.png b/public/images/items/lucky_punch_ultra.png
index aee27600f5c..a95c23666bb 100644
Binary files a/public/images/items/lucky_punch_ultra.png and b/public/images/items/lucky_punch_ultra.png differ
diff --git a/public/images/items/lum_berry.png b/public/images/items/lum_berry.png
index 8feb811e411..d19c4fba583 100644
Binary files a/public/images/items/lum_berry.png and b/public/images/items/lum_berry.png differ
diff --git a/public/images/items/lure.png b/public/images/items/lure.png
index a148aa70db9..1c3ea6cc8e8 100644
Binary files a/public/images/items/lure.png and b/public/images/items/lure.png differ
diff --git a/public/images/items/lustrous_globe.png b/public/images/items/lustrous_globe.png
index a16cf80c350..2a854db742b 100644
Binary files a/public/images/items/lustrous_globe.png and b/public/images/items/lustrous_globe.png differ
diff --git a/public/images/items/macho_brace.png b/public/images/items/macho_brace.png
index 2085829e1ce..760139cf7f8 100644
Binary files a/public/images/items/macho_brace.png and b/public/images/items/macho_brace.png differ
diff --git a/public/images/items/magmarizer.png b/public/images/items/magmarizer.png
index 0fca34c1e28..4f4d5f45851 100644
Binary files a/public/images/items/magmarizer.png and b/public/images/items/magmarizer.png differ
diff --git a/public/images/items/magnet.png b/public/images/items/magnet.png
index 7a07f557ec4..9ce8b686e9f 100644
Binary files a/public/images/items/magnet.png and b/public/images/items/magnet.png differ
diff --git a/public/images/items/malicious_armor.png b/public/images/items/malicious_armor.png
index 495024ced20..a37e21db2f1 100644
Binary files a/public/images/items/malicious_armor.png and b/public/images/items/malicious_armor.png differ
diff --git a/public/images/items/manectite.png b/public/images/items/manectite.png
index 0dd7406cdc4..c9df61669bc 100644
Binary files a/public/images/items/manectite.png and b/public/images/items/manectite.png differ
diff --git a/public/images/items/map.png b/public/images/items/map.png
index a641a7e8a69..dc2fc6b95d8 100644
Binary files a/public/images/items/map.png and b/public/images/items/map.png differ
diff --git a/public/images/items/master_ribbon.png b/public/images/items/master_ribbon.png
index 86be493b74a..0443215c1f9 100644
Binary files a/public/images/items/master_ribbon.png and b/public/images/items/master_ribbon.png differ
diff --git a/public/images/items/masterpiece_teacup.png b/public/images/items/masterpiece_teacup.png
index 36b8c39dcc7..ec2455c0763 100644
Binary files a/public/images/items/masterpiece_teacup.png and b/public/images/items/masterpiece_teacup.png differ
diff --git a/public/images/items/mawilite.png b/public/images/items/mawilite.png
index 95ddf987f12..60ea4017f56 100644
Binary files a/public/images/items/mawilite.png and b/public/images/items/mawilite.png differ
diff --git a/public/images/items/max_elixir.png b/public/images/items/max_elixir.png
index a4f134dd13c..1f528c2bb61 100644
Binary files a/public/images/items/max_elixir.png and b/public/images/items/max_elixir.png differ
diff --git a/public/images/items/max_ether.png b/public/images/items/max_ether.png
index 0ecdf09397a..8cee7152a86 100644
Binary files a/public/images/items/max_ether.png and b/public/images/items/max_ether.png differ
diff --git a/public/images/items/max_lure.png b/public/images/items/max_lure.png
index 384db7d7df8..812229d140a 100644
Binary files a/public/images/items/max_lure.png and b/public/images/items/max_lure.png differ
diff --git a/public/images/items/max_mushrooms.png b/public/images/items/max_mushrooms.png
index 443f1d5c369..8d5c015c963 100644
Binary files a/public/images/items/max_mushrooms.png and b/public/images/items/max_mushrooms.png differ
diff --git a/public/images/items/max_potion.png b/public/images/items/max_potion.png
index f51e7bde976..d8fadc9cb93 100644
Binary files a/public/images/items/max_potion.png and b/public/images/items/max_potion.png differ
diff --git a/public/images/items/max_repel.png b/public/images/items/max_repel.png
index d8bef707913..4d88ae6d0b5 100644
Binary files a/public/images/items/max_repel.png and b/public/images/items/max_repel.png differ
diff --git a/public/images/items/max_revive.png b/public/images/items/max_revive.png
index 25849a3b940..609fd17c3b9 100644
Binary files a/public/images/items/max_revive.png and b/public/images/items/max_revive.png differ
diff --git a/public/images/items/mb.png b/public/images/items/mb.png
index cfa421d6219..d80b3b89108 100644
Binary files a/public/images/items/mb.png and b/public/images/items/mb.png differ
diff --git a/public/images/items/meadow_plate.png b/public/images/items/meadow_plate.png
index a687cb7920d..e2b991776ba 100644
Binary files a/public/images/items/meadow_plate.png and b/public/images/items/meadow_plate.png differ
diff --git a/public/images/items/medichamite.png b/public/images/items/medichamite.png
index 4dd57f10bed..42f22ed6cd6 100644
Binary files a/public/images/items/medichamite.png and b/public/images/items/medichamite.png differ
diff --git a/public/images/items/mega_bracelet.png b/public/images/items/mega_bracelet.png
index e593b907631..5e8ff02be8c 100644
Binary files a/public/images/items/mega_bracelet.png and b/public/images/items/mega_bracelet.png differ
diff --git a/public/images/items/metagrossite.png b/public/images/items/metagrossite.png
index 445deff40c1..c245368758d 100644
Binary files a/public/images/items/metagrossite.png and b/public/images/items/metagrossite.png differ
diff --git a/public/images/items/metal_alloy.png b/public/images/items/metal_alloy.png
index 1201f58b463..41f22df4254 100644
Binary files a/public/images/items/metal_alloy.png and b/public/images/items/metal_alloy.png differ
diff --git a/public/images/items/metal_coat.png b/public/images/items/metal_coat.png
index f016d48bd2e..88f055c3fb3 100644
Binary files a/public/images/items/metal_coat.png and b/public/images/items/metal_coat.png differ
diff --git a/public/images/items/metal_powder.png b/public/images/items/metal_powder.png
index 11c3a39314c..64af0b144fe 100644
Binary files a/public/images/items/metal_powder.png and b/public/images/items/metal_powder.png differ
diff --git a/public/images/items/metronome.png b/public/images/items/metronome.png
index dfde7e365eb..837d75b4c03 100644
Binary files a/public/images/items/metronome.png and b/public/images/items/metronome.png differ
diff --git a/public/images/items/mewtwonite_x.png b/public/images/items/mewtwonite_x.png
index 3ec18a1c683..507d17e54e8 100644
Binary files a/public/images/items/mewtwonite_x.png and b/public/images/items/mewtwonite_x.png differ
diff --git a/public/images/items/mewtwonite_y.png b/public/images/items/mewtwonite_y.png
index eb9b1d0dc55..ff0c53396d2 100644
Binary files a/public/images/items/mewtwonite_y.png and b/public/images/items/mewtwonite_y.png differ
diff --git a/public/images/items/mind_plate.png b/public/images/items/mind_plate.png
index 04001796831..ff6fcc4f3af 100644
Binary files a/public/images/items/mind_plate.png and b/public/images/items/mind_plate.png differ
diff --git a/public/images/items/mini_black_hole.png b/public/images/items/mini_black_hole.png
index dd7458b8b2a..6edcaad16e3 100644
Binary files a/public/images/items/mini_black_hole.png and b/public/images/items/mini_black_hole.png differ
diff --git a/public/images/items/mint_atk.png b/public/images/items/mint_atk.png
index 727a7b3f792..88315c0cd07 100644
Binary files a/public/images/items/mint_atk.png and b/public/images/items/mint_atk.png differ
diff --git a/public/images/items/mint_def.png b/public/images/items/mint_def.png
index 9cd92eac07e..584c610ffd7 100644
Binary files a/public/images/items/mint_def.png and b/public/images/items/mint_def.png differ
diff --git a/public/images/items/mint_neutral.png b/public/images/items/mint_neutral.png
index e2e556d475b..f5287539e78 100644
Binary files a/public/images/items/mint_neutral.png and b/public/images/items/mint_neutral.png differ
diff --git a/public/images/items/mint_spatk.png b/public/images/items/mint_spatk.png
index 191ba6c4a1a..90a57c5608b 100644
Binary files a/public/images/items/mint_spatk.png and b/public/images/items/mint_spatk.png differ
diff --git a/public/images/items/mint_spd.png b/public/images/items/mint_spd.png
index 687119f2502..5420b0997b3 100644
Binary files a/public/images/items/mint_spd.png and b/public/images/items/mint_spd.png differ
diff --git a/public/images/items/mint_spdef.png b/public/images/items/mint_spdef.png
index cd902ce0984..54a1b4ed21d 100644
Binary files a/public/images/items/mint_spdef.png and b/public/images/items/mint_spdef.png differ
diff --git a/public/images/items/miracle_seed.png b/public/images/items/miracle_seed.png
index f5bc766545a..8be7ba72d33 100644
Binary files a/public/images/items/miracle_seed.png and b/public/images/items/miracle_seed.png differ
diff --git a/public/images/items/moon_flute.png b/public/images/items/moon_flute.png
index 893cb6a7579..5d3c0caf5f2 100644
Binary files a/public/images/items/moon_flute.png and b/public/images/items/moon_flute.png differ
diff --git a/public/images/items/moon_stone.png b/public/images/items/moon_stone.png
index b4af61969a2..f002fb18073 100644
Binary files a/public/images/items/moon_stone.png and b/public/images/items/moon_stone.png differ
diff --git a/public/images/items/muscle_band.png b/public/images/items/muscle_band.png
index 011716e7124..0be9d010767 100644
Binary files a/public/images/items/muscle_band.png and b/public/images/items/muscle_band.png differ
diff --git a/public/images/items/mystery_egg.png b/public/images/items/mystery_egg.png
index bb117a137b0..ac631cec7c8 100644
Binary files a/public/images/items/mystery_egg.png and b/public/images/items/mystery_egg.png differ
diff --git a/public/images/items/mystic_ticket.png b/public/images/items/mystic_ticket.png
index bd206998fed..cab03fa5470 100644
Binary files a/public/images/items/mystic_ticket.png and b/public/images/items/mystic_ticket.png differ
diff --git a/public/images/items/mystic_water.png b/public/images/items/mystic_water.png
index f944fac1a9c..2128895b385 100644
Binary files a/public/images/items/mystic_water.png and b/public/images/items/mystic_water.png differ
diff --git a/public/images/items/mystical_rock.png b/public/images/items/mystical_rock.png
new file mode 100644
index 00000000000..8cde22bd16c
Binary files /dev/null and b/public/images/items/mystical_rock.png differ
diff --git a/public/images/items/n_lunarizer.png b/public/images/items/n_lunarizer.png
index e45fb8ecf8d..a03b48ad387 100644
Binary files a/public/images/items/n_lunarizer.png and b/public/images/items/n_lunarizer.png differ
diff --git a/public/images/items/n_solarizer.png b/public/images/items/n_solarizer.png
index e706a42c973..69153fd38dd 100644
Binary files a/public/images/items/n_solarizer.png and b/public/images/items/n_solarizer.png differ
diff --git a/public/images/items/never_melt_ice.png b/public/images/items/never_melt_ice.png
index bec7cc0e5d4..35b1ada771d 100644
Binary files a/public/images/items/never_melt_ice.png and b/public/images/items/never_melt_ice.png differ
diff --git a/public/images/items/normal_memory.png b/public/images/items/normal_memory.png
index ddc22d1d4ab..e1ff89a9993 100644
Binary files a/public/images/items/normal_memory.png and b/public/images/items/normal_memory.png differ
diff --git a/public/images/items/normal_tera_shard.png b/public/images/items/normal_tera_shard.png
index fe2b9b93fd6..1c7a41ea0ec 100644
Binary files a/public/images/items/normal_tera_shard.png and b/public/images/items/normal_tera_shard.png differ
diff --git a/public/images/items/nugget.png b/public/images/items/nugget.png
index e8d39912349..0340f5d4000 100644
Binary files a/public/images/items/nugget.png and b/public/images/items/nugget.png differ
diff --git a/public/images/items/old_gateau.png b/public/images/items/old_gateau.png
index c910e90f101..dd5f0e05a94 100644
Binary files a/public/images/items/old_gateau.png and b/public/images/items/old_gateau.png differ
diff --git a/public/images/items/oval_charm.png b/public/images/items/oval_charm.png
index dc791175588..fcdb914ec22 100644
Binary files a/public/images/items/oval_charm.png and b/public/images/items/oval_charm.png differ
diff --git a/public/images/items/oval_stone.png b/public/images/items/oval_stone.png
index d48b0688821..d58ffde18e3 100644
Binary files a/public/images/items/oval_stone.png and b/public/images/items/oval_stone.png differ
diff --git a/public/images/items/pair_of_tickets.png b/public/images/items/pair_of_tickets.png
index b4b6ececbd2..b06c9a8727f 100644
Binary files a/public/images/items/pair_of_tickets.png and b/public/images/items/pair_of_tickets.png differ
diff --git a/public/images/items/pb.png b/public/images/items/pb.png
index ec4fe69c86f..37c37edb8c1 100644
Binary files a/public/images/items/pb.png and b/public/images/items/pb.png differ
diff --git a/public/images/items/pb_gold.png b/public/images/items/pb_gold.png
index fd71feb8e55..6dff6824158 100644
Binary files a/public/images/items/pb_gold.png and b/public/images/items/pb_gold.png differ
diff --git a/public/images/items/pb_silver.png b/public/images/items/pb_silver.png
index f60a8348a94..9528517a77a 100644
Binary files a/public/images/items/pb_silver.png and b/public/images/items/pb_silver.png differ
diff --git a/public/images/items/peat_block.png b/public/images/items/peat_block.png
index b62e94d523f..f3c65449b87 100644
Binary files a/public/images/items/peat_block.png and b/public/images/items/peat_block.png differ
diff --git a/public/images/items/petaya_berry.png b/public/images/items/petaya_berry.png
index e1dae467187..0fba884c2e2 100644
Binary files a/public/images/items/petaya_berry.png and b/public/images/items/petaya_berry.png differ
diff --git a/public/images/items/pidgeotite.png b/public/images/items/pidgeotite.png
index 86d1b23558c..52cb40852d6 100644
Binary files a/public/images/items/pidgeotite.png and b/public/images/items/pidgeotite.png differ
diff --git a/public/images/items/pinsirite.png b/public/images/items/pinsirite.png
index 2616cf6dfe1..88ecc8e9ea9 100644
Binary files a/public/images/items/pinsirite.png and b/public/images/items/pinsirite.png differ
diff --git a/public/images/items/pixie_plate.png b/public/images/items/pixie_plate.png
index dcc829c107f..e123ae6a49a 100644
Binary files a/public/images/items/pixie_plate.png and b/public/images/items/pixie_plate.png differ
diff --git a/public/images/items/poison_barb.png b/public/images/items/poison_barb.png
index 913ede4d819..3f9d714b08c 100644
Binary files a/public/images/items/poison_barb.png and b/public/images/items/poison_barb.png differ
diff --git a/public/images/items/poison_memory.png b/public/images/items/poison_memory.png
index 2b0036201d9..6c2b0aea77b 100644
Binary files a/public/images/items/poison_memory.png and b/public/images/items/poison_memory.png differ
diff --git a/public/images/items/poison_tera_shard.png b/public/images/items/poison_tera_shard.png
index b124fa051b9..4f21d158a41 100644
Binary files a/public/images/items/poison_tera_shard.png and b/public/images/items/poison_tera_shard.png differ
diff --git a/public/images/items/potion.png b/public/images/items/potion.png
index 10a7d5848db..f69c3210f03 100644
Binary files a/public/images/items/potion.png and b/public/images/items/potion.png differ
diff --git a/public/images/items/power_herb.png b/public/images/items/power_herb.png
index 15a581490a0..ba156c62122 100644
Binary files a/public/images/items/power_herb.png and b/public/images/items/power_herb.png differ
diff --git a/public/images/items/pp_max.png b/public/images/items/pp_max.png
index 48752829557..787641e26ac 100644
Binary files a/public/images/items/pp_max.png and b/public/images/items/pp_max.png differ
diff --git a/public/images/items/pp_up.png b/public/images/items/pp_up.png
index 1334d228bc3..463c3a0578d 100644
Binary files a/public/images/items/pp_up.png and b/public/images/items/pp_up.png differ
diff --git a/public/images/items/prism_scale.png b/public/images/items/prism_scale.png
index 5a0d45c686b..2436e96bf73 100644
Binary files a/public/images/items/prism_scale.png and b/public/images/items/prism_scale.png differ
diff --git a/public/images/items/prison_bottle.png b/public/images/items/prison_bottle.png
index da733bb14bb..06217988364 100644
Binary files a/public/images/items/prison_bottle.png and b/public/images/items/prison_bottle.png differ
diff --git a/public/images/items/protector.png b/public/images/items/protector.png
index a7b01a8c53d..8f65be09b2f 100644
Binary files a/public/images/items/protector.png and b/public/images/items/protector.png differ
diff --git a/public/images/items/protein.png b/public/images/items/protein.png
index b3386a8841b..54df13c6753 100644
Binary files a/public/images/items/protein.png and b/public/images/items/protein.png differ
diff --git a/public/images/items/psychic_memory.png b/public/images/items/psychic_memory.png
index a17afa4a617..21d62daa483 100644
Binary files a/public/images/items/psychic_memory.png and b/public/images/items/psychic_memory.png differ
diff --git a/public/images/items/psychic_tera_shard.png b/public/images/items/psychic_tera_shard.png
index 0a5656ccea1..f4b1cf7b259 100644
Binary files a/public/images/items/psychic_tera_shard.png and b/public/images/items/psychic_tera_shard.png differ
diff --git a/public/images/items/quick_claw.png b/public/images/items/quick_claw.png
index e6317898e2a..ff4f76d0576 100644
Binary files a/public/images/items/quick_claw.png and b/public/images/items/quick_claw.png differ
diff --git a/public/images/items/quick_powder.png b/public/images/items/quick_powder.png
index c73ec09eb05..58a8a1187a9 100644
Binary files a/public/images/items/quick_powder.png and b/public/images/items/quick_powder.png differ
diff --git a/public/images/items/rare_candy.png b/public/images/items/rare_candy.png
index d81e7ad0844..a860a116905 100644
Binary files a/public/images/items/rare_candy.png and b/public/images/items/rare_candy.png differ
diff --git a/public/images/items/rarer_candy.png b/public/images/items/rarer_candy.png
index b8432bd8216..4424caa659a 100644
Binary files a/public/images/items/rarer_candy.png and b/public/images/items/rarer_candy.png differ
diff --git a/public/images/items/rayquazite.png b/public/images/items/rayquazite.png
index 068f02936be..b39957b857d 100644
Binary files a/public/images/items/rayquazite.png and b/public/images/items/rayquazite.png differ
diff --git a/public/images/items/razor_claw.png b/public/images/items/razor_claw.png
index a9541c4d251..0ba506e8706 100644
Binary files a/public/images/items/razor_claw.png and b/public/images/items/razor_claw.png differ
diff --git a/public/images/items/razor_fang.png b/public/images/items/razor_fang.png
index 77c3da44c92..75306db5c4c 100644
Binary files a/public/images/items/razor_fang.png and b/public/images/items/razor_fang.png differ
diff --git a/public/images/items/rb.png b/public/images/items/rb.png
index 440ab8bf1b4..020f2ff878b 100644
Binary files a/public/images/items/rb.png and b/public/images/items/rb.png differ
diff --git a/public/images/items/reaper_cloth.png b/public/images/items/reaper_cloth.png
index a86714bfc4f..9caf7665e95 100644
Binary files a/public/images/items/reaper_cloth.png and b/public/images/items/reaper_cloth.png differ
diff --git a/public/images/items/red_orb.png b/public/images/items/red_orb.png
index b982649c9b3..cee83740ca5 100644
Binary files a/public/images/items/red_orb.png and b/public/images/items/red_orb.png differ
diff --git a/public/images/items/relic_band.png b/public/images/items/relic_band.png
index 634b91e41b3..adbd73bc46b 100644
Binary files a/public/images/items/relic_band.png and b/public/images/items/relic_band.png differ
diff --git a/public/images/items/relic_crown.png b/public/images/items/relic_crown.png
index d8c4552ea3c..de090041c1c 100644
Binary files a/public/images/items/relic_crown.png and b/public/images/items/relic_crown.png differ
diff --git a/public/images/items/relic_gold.png b/public/images/items/relic_gold.png
index da3f33fdfa1..af5b1797938 100644
Binary files a/public/images/items/relic_gold.png and b/public/images/items/relic_gold.png differ
diff --git a/public/images/items/repel.png b/public/images/items/repel.png
index 3d1359e688e..80c7738e9ff 100644
Binary files a/public/images/items/repel.png and b/public/images/items/repel.png differ
diff --git a/public/images/items/reveal_glass.png b/public/images/items/reveal_glass.png
index 3fae3bdf934..469d20a2752 100644
Binary files a/public/images/items/reveal_glass.png and b/public/images/items/reveal_glass.png differ
diff --git a/public/images/items/revive.png b/public/images/items/revive.png
index d7952b7653f..e84659867d8 100644
Binary files a/public/images/items/revive.png and b/public/images/items/revive.png differ
diff --git a/public/images/items/reviver_seed.png b/public/images/items/reviver_seed.png
index 31cfae46f94..10bc5c32451 100644
Binary files a/public/images/items/reviver_seed.png and b/public/images/items/reviver_seed.png differ
diff --git a/public/images/items/ribbon_gen1.png b/public/images/items/ribbon_gen1.png
index a9774d18ad0..1d731cf2e98 100644
Binary files a/public/images/items/ribbon_gen1.png and b/public/images/items/ribbon_gen1.png differ
diff --git a/public/images/items/ribbon_gen2.png b/public/images/items/ribbon_gen2.png
index a04f6a32a62..2ff54112105 100644
Binary files a/public/images/items/ribbon_gen2.png and b/public/images/items/ribbon_gen2.png differ
diff --git a/public/images/items/ribbon_gen3.png b/public/images/items/ribbon_gen3.png
index 0cf20ed92ee..14a5eb09f7d 100644
Binary files a/public/images/items/ribbon_gen3.png and b/public/images/items/ribbon_gen3.png differ
diff --git a/public/images/items/ribbon_gen4.png b/public/images/items/ribbon_gen4.png
index aa24433b71b..c482ac1d04a 100644
Binary files a/public/images/items/ribbon_gen4.png and b/public/images/items/ribbon_gen4.png differ
diff --git a/public/images/items/ribbon_gen5.png b/public/images/items/ribbon_gen5.png
index 7bb7800671f..52560cde636 100644
Binary files a/public/images/items/ribbon_gen5.png and b/public/images/items/ribbon_gen5.png differ
diff --git a/public/images/items/ribbon_gen6.png b/public/images/items/ribbon_gen6.png
index e466eb78842..3dd04927acd 100644
Binary files a/public/images/items/ribbon_gen6.png and b/public/images/items/ribbon_gen6.png differ
diff --git a/public/images/items/ribbon_gen7.png b/public/images/items/ribbon_gen7.png
index 9c156ebd1c6..225b40da419 100644
Binary files a/public/images/items/ribbon_gen7.png and b/public/images/items/ribbon_gen7.png differ
diff --git a/public/images/items/ribbon_gen8.png b/public/images/items/ribbon_gen8.png
index 86b3748e348..32aaa803699 100644
Binary files a/public/images/items/ribbon_gen8.png and b/public/images/items/ribbon_gen8.png differ
diff --git a/public/images/items/ribbon_gen9.png b/public/images/items/ribbon_gen9.png
index e9609daf3cd..ad489005e23 100644
Binary files a/public/images/items/ribbon_gen9.png and b/public/images/items/ribbon_gen9.png differ
diff --git a/public/images/items/rock_memory.png b/public/images/items/rock_memory.png
index 01f436dd461..cfa71c851c0 100644
Binary files a/public/images/items/rock_memory.png and b/public/images/items/rock_memory.png differ
diff --git a/public/images/items/rock_tera_shard.png b/public/images/items/rock_tera_shard.png
index b4e6f8a29cf..a07ca7955a4 100644
Binary files a/public/images/items/rock_tera_shard.png and b/public/images/items/rock_tera_shard.png differ
diff --git a/public/images/items/rogue_ribbon.png b/public/images/items/rogue_ribbon.png
index 85986d93c8a..c3cfdcd85f3 100644
Binary files a/public/images/items/rogue_ribbon.png and b/public/images/items/rogue_ribbon.png differ
diff --git a/public/images/items/rusted_shield.png b/public/images/items/rusted_shield.png
index 569f86c15c7..3748f13dc4b 100644
Binary files a/public/images/items/rusted_shield.png and b/public/images/items/rusted_shield.png differ
diff --git a/public/images/items/rusted_sword.png b/public/images/items/rusted_sword.png
index c42e669441c..249233374e0 100644
Binary files a/public/images/items/rusted_sword.png and b/public/images/items/rusted_sword.png differ
diff --git a/public/images/items/sablenite.png b/public/images/items/sablenite.png
index 904abea5ce4..48eac2d5875 100644
Binary files a/public/images/items/sablenite.png and b/public/images/items/sablenite.png differ
diff --git a/public/images/items/sachet.png b/public/images/items/sachet.png
index 1ec6010f1af..6d91fa210fc 100644
Binary files a/public/images/items/sachet.png and b/public/images/items/sachet.png differ
diff --git a/public/images/items/sacred_ash.png b/public/images/items/sacred_ash.png
index 389b2605b93..4fab9dc0dc7 100644
Binary files a/public/images/items/sacred_ash.png and b/public/images/items/sacred_ash.png differ
diff --git a/public/images/items/salac_berry.png b/public/images/items/salac_berry.png
index ac0d29f2159..846dbb4f160 100644
Binary files a/public/images/items/salac_berry.png and b/public/images/items/salac_berry.png differ
diff --git a/public/images/items/salamencite.png b/public/images/items/salamencite.png
index 1a0096b4de5..f175f39d351 100644
Binary files a/public/images/items/salamencite.png and b/public/images/items/salamencite.png differ
diff --git a/public/images/items/scanner.png b/public/images/items/scanner.png
index 27a67484f19..a291d3f43f8 100644
Binary files a/public/images/items/scanner.png and b/public/images/items/scanner.png differ
diff --git a/public/images/items/sceptilite.png b/public/images/items/sceptilite.png
index 123e79d9893..ff81c4a55fe 100644
Binary files a/public/images/items/sceptilite.png and b/public/images/items/sceptilite.png differ
diff --git a/public/images/items/scizorite.png b/public/images/items/scizorite.png
index ce86b80701c..8ffca143835 100644
Binary files a/public/images/items/scizorite.png and b/public/images/items/scizorite.png differ
diff --git a/public/images/items/scope_lens.png b/public/images/items/scope_lens.png
index 57ec2c4148e..d3b1f354313 100644
Binary files a/public/images/items/scope_lens.png and b/public/images/items/scope_lens.png differ
diff --git a/public/images/items/scroll_of_darkness.png b/public/images/items/scroll_of_darkness.png
index 19be0feb6dc..ff6a6065e40 100644
Binary files a/public/images/items/scroll_of_darkness.png 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
index d1e6a0388b6..e4a0cb725eb 100644
Binary files a/public/images/items/scroll_of_waters.png and b/public/images/items/scroll_of_waters.png differ
diff --git a/public/images/items/shadow_reins_of_unity.png b/public/images/items/shadow_reins_of_unity.png
index 929aeac6fb4..85cbc446851 100644
Binary files a/public/images/items/shadow_reins_of_unity.png and b/public/images/items/shadow_reins_of_unity.png differ
diff --git a/public/images/items/sharp_beak.png b/public/images/items/sharp_beak.png
index 3ce8d83e3aa..f22019e658b 100644
Binary files a/public/images/items/sharp_beak.png and b/public/images/items/sharp_beak.png differ
diff --git a/public/images/items/sharp_meteorite.png b/public/images/items/sharp_meteorite.png
index 1a135b64980..61a139fab05 100644
Binary files a/public/images/items/sharp_meteorite.png and b/public/images/items/sharp_meteorite.png differ
diff --git a/public/images/items/sharpedonite.png b/public/images/items/sharpedonite.png
index 3a71f7258ce..b3eabd5650f 100644
Binary files a/public/images/items/sharpedonite.png and b/public/images/items/sharpedonite.png differ
diff --git a/public/images/items/shed_shell.png b/public/images/items/shed_shell.png
index a0570cf29c4..17981864897 100644
Binary files a/public/images/items/shed_shell.png and b/public/images/items/shed_shell.png differ
diff --git a/public/images/items/shell_bell.png b/public/images/items/shell_bell.png
index a185be50188..6367d134672 100644
Binary files a/public/images/items/shell_bell.png and b/public/images/items/shell_bell.png differ
diff --git a/public/images/items/shiny_charm.png b/public/images/items/shiny_charm.png
index d0c8197f7c4..9f692828d04 100644
Binary files a/public/images/items/shiny_charm.png and b/public/images/items/shiny_charm.png differ
diff --git a/public/images/items/shiny_stone.png b/public/images/items/shiny_stone.png
index d9d1e8b77ca..d2fabe6ec8b 100644
Binary files a/public/images/items/shiny_stone.png and b/public/images/items/shiny_stone.png differ
diff --git a/public/images/items/shock_drive.png b/public/images/items/shock_drive.png
index e0bcc66f202..592b0085a8f 100644
Binary files a/public/images/items/shock_drive.png and b/public/images/items/shock_drive.png differ
diff --git a/public/images/items/silk_scarf.png b/public/images/items/silk_scarf.png
index 2eaea7aa435..83f056c8b41 100644
Binary files a/public/images/items/silk_scarf.png and b/public/images/items/silk_scarf.png differ
diff --git a/public/images/items/silver_powder.png b/public/images/items/silver_powder.png
index 03f62b45250..eb717fc6776 100644
Binary files a/public/images/items/silver_powder.png and b/public/images/items/silver_powder.png differ
diff --git a/public/images/items/sitrus_berry.png b/public/images/items/sitrus_berry.png
index 8e9463a80c2..703657ad8dd 100644
Binary files a/public/images/items/sitrus_berry.png and b/public/images/items/sitrus_berry.png differ
diff --git a/public/images/items/sky_plate.png b/public/images/items/sky_plate.png
index 1fed973142b..293bb8f5dc2 100644
Binary files a/public/images/items/sky_plate.png and b/public/images/items/sky_plate.png differ
diff --git a/public/images/items/slowbronite.png b/public/images/items/slowbronite.png
index 7eac1fb82d5..3dc21ffb550 100644
Binary files a/public/images/items/slowbronite.png and b/public/images/items/slowbronite.png differ
diff --git a/public/images/items/smooth_meteorite.png b/public/images/items/smooth_meteorite.png
index 4c2e5e07978..059e8e91a30 100644
Binary files a/public/images/items/smooth_meteorite.png and b/public/images/items/smooth_meteorite.png differ
diff --git a/public/images/items/soft_sand.png b/public/images/items/soft_sand.png
index c627bc10a8e..feda8cd3858 100644
Binary files a/public/images/items/soft_sand.png and b/public/images/items/soft_sand.png differ
diff --git a/public/images/items/soothe_bell.png b/public/images/items/soothe_bell.png
index 62fd6ff26c5..fbceb808c56 100644
Binary files a/public/images/items/soothe_bell.png and b/public/images/items/soothe_bell.png differ
diff --git a/public/images/items/soul_dew.png b/public/images/items/soul_dew.png
index 9c0abfdef9a..56b9655714b 100644
Binary files a/public/images/items/soul_dew.png and b/public/images/items/soul_dew.png differ
diff --git a/public/images/items/spell_tag.png b/public/images/items/spell_tag.png
index ccf071e122d..f9270c6e0a6 100644
Binary files a/public/images/items/spell_tag.png and b/public/images/items/spell_tag.png differ
diff --git a/public/images/items/splash_plate.png b/public/images/items/splash_plate.png
index a832f3dbf8a..d86ae5eab57 100644
Binary files a/public/images/items/splash_plate.png and b/public/images/items/splash_plate.png differ
diff --git a/public/images/items/spooky_plate.png b/public/images/items/spooky_plate.png
index b5794713d0d..d7df7d25e32 100644
Binary files a/public/images/items/spooky_plate.png and b/public/images/items/spooky_plate.png differ
diff --git a/public/images/items/starf_berry.png b/public/images/items/starf_berry.png
index 71fe1ac116f..cbf423e8343 100644
Binary files a/public/images/items/starf_berry.png and b/public/images/items/starf_berry.png differ
diff --git a/public/images/items/steel_memory.png b/public/images/items/steel_memory.png
index fbc13016c00..8c45bc8b640 100644
Binary files a/public/images/items/steel_memory.png and b/public/images/items/steel_memory.png differ
diff --git a/public/images/items/steel_tera_shard.png b/public/images/items/steel_tera_shard.png
index b0b2ccb1737..c93f8c52f60 100644
Binary files a/public/images/items/steel_tera_shard.png and b/public/images/items/steel_tera_shard.png differ
diff --git a/public/images/items/steelixite.png b/public/images/items/steelixite.png
index 62f688f0842..429c668e656 100644
Binary files a/public/images/items/steelixite.png and b/public/images/items/steelixite.png differ
diff --git a/public/images/items/stellar_tera_shard.png b/public/images/items/stellar_tera_shard.png
index b6625066e16..1d5982f5b94 100644
Binary files a/public/images/items/stellar_tera_shard.png and b/public/images/items/stellar_tera_shard.png differ
diff --git a/public/images/items/stone_plate.png b/public/images/items/stone_plate.png
index 44653583e60..dfc3a0cd132 100644
Binary files a/public/images/items/stone_plate.png and b/public/images/items/stone_plate.png differ
diff --git a/public/images/items/strange_ball.png b/public/images/items/strange_ball.png
index 64246f031ee..2ddce33d7ac 100644
Binary files a/public/images/items/strange_ball.png and b/public/images/items/strange_ball.png differ
diff --git a/public/images/items/strawberry_sweet.png b/public/images/items/strawberry_sweet.png
index b08fece34cc..5df6e1cd8be 100644
Binary files a/public/images/items/strawberry_sweet.png and b/public/images/items/strawberry_sweet.png differ
diff --git a/public/images/items/sun_flute.png b/public/images/items/sun_flute.png
index 7010c9fefbd..f81d35fde9c 100644
Binary files a/public/images/items/sun_flute.png and b/public/images/items/sun_flute.png differ
diff --git a/public/images/items/sun_stone.png b/public/images/items/sun_stone.png
index d22b24792fb..33a7e8f8387 100644
Binary files a/public/images/items/sun_stone.png and b/public/images/items/sun_stone.png differ
diff --git a/public/images/items/super_exp_charm.png b/public/images/items/super_exp_charm.png
index 8697edf4be6..ccd73f558cc 100644
Binary files a/public/images/items/super_exp_charm.png and b/public/images/items/super_exp_charm.png differ
diff --git a/public/images/items/super_lure.png b/public/images/items/super_lure.png
index 1a80c8ea309..9c2213cd964 100644
Binary files a/public/images/items/super_lure.png and b/public/images/items/super_lure.png differ
diff --git a/public/images/items/super_potion.png b/public/images/items/super_potion.png
index bfd1868b545..16205cb0fff 100644
Binary files a/public/images/items/super_potion.png and b/public/images/items/super_potion.png differ
diff --git a/public/images/items/super_repel.png b/public/images/items/super_repel.png
index db09ded8a26..628cdbc5c1d 100644
Binary files a/public/images/items/super_repel.png and b/public/images/items/super_repel.png differ
diff --git a/public/images/items/swampertite.png b/public/images/items/swampertite.png
index bfcdd99606b..d4d6415f6f4 100644
Binary files a/public/images/items/swampertite.png and b/public/images/items/swampertite.png differ
diff --git a/public/images/items/sweet_apple.png b/public/images/items/sweet_apple.png
index 5070af6ae64..cfdf79a9eac 100644
Binary files a/public/images/items/sweet_apple.png 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
index 99a0b7b5627..9c9d05e2e0a 100644
Binary files a/public/images/items/syrupy_apple.png 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
index 8f9cf89da9f..ad9a1728bb5 100644
Binary files a/public/images/items/tart_apple.png and b/public/images/items/tart_apple.png differ
diff --git a/public/images/items/tera_orb.png b/public/images/items/tera_orb.png
index f4b6e47398e..d8720e41669 100644
Binary files a/public/images/items/tera_orb.png and b/public/images/items/tera_orb.png differ
diff --git a/public/images/items/thick_club.png b/public/images/items/thick_club.png
index a4459aa7701..f15885f0190 100644
Binary files a/public/images/items/thick_club.png and b/public/images/items/thick_club.png differ
diff --git a/public/images/items/thunder_stone.png b/public/images/items/thunder_stone.png
index 8b853b2f758..9e87909516b 100644
Binary files a/public/images/items/thunder_stone.png and b/public/images/items/thunder_stone.png differ
diff --git a/public/images/items/tm_bug.png b/public/images/items/tm_bug.png
index 56278cf2f66..229230198c4 100644
Binary files a/public/images/items/tm_bug.png and b/public/images/items/tm_bug.png differ
diff --git a/public/images/items/tm_dark.png b/public/images/items/tm_dark.png
index 6168cd2f070..6856b1d5444 100644
Binary files a/public/images/items/tm_dark.png and b/public/images/items/tm_dark.png differ
diff --git a/public/images/items/tm_dragon.png b/public/images/items/tm_dragon.png
index 9e1866cc2d6..62405519132 100644
Binary files a/public/images/items/tm_dragon.png and b/public/images/items/tm_dragon.png differ
diff --git a/public/images/items/tm_electric.png b/public/images/items/tm_electric.png
index 0610c3f3337..34e4fe8de7b 100644
Binary files a/public/images/items/tm_electric.png and b/public/images/items/tm_electric.png differ
diff --git a/public/images/items/tm_fairy.png b/public/images/items/tm_fairy.png
index de6335acbc8..056783a8d63 100644
Binary files a/public/images/items/tm_fairy.png and b/public/images/items/tm_fairy.png differ
diff --git a/public/images/items/tm_fighting.png b/public/images/items/tm_fighting.png
index b9f812767e3..144d75826cd 100644
Binary files a/public/images/items/tm_fighting.png and b/public/images/items/tm_fighting.png differ
diff --git a/public/images/items/tm_fire.png b/public/images/items/tm_fire.png
index 1de4b7a4a64..ae19e381873 100644
Binary files a/public/images/items/tm_fire.png and b/public/images/items/tm_fire.png differ
diff --git a/public/images/items/tm_flying.png b/public/images/items/tm_flying.png
index 4d738edb57f..3db06a69e68 100644
Binary files a/public/images/items/tm_flying.png and b/public/images/items/tm_flying.png differ
diff --git a/public/images/items/tm_ghost.png b/public/images/items/tm_ghost.png
index 71a6b558fae..a7e8928aa7e 100644
Binary files a/public/images/items/tm_ghost.png and b/public/images/items/tm_ghost.png differ
diff --git a/public/images/items/tm_grass.png b/public/images/items/tm_grass.png
index 6811d354fd9..42f11f590eb 100644
Binary files a/public/images/items/tm_grass.png and b/public/images/items/tm_grass.png differ
diff --git a/public/images/items/tm_ground.png b/public/images/items/tm_ground.png
index 0408eb71125..ff9dc7c7384 100644
Binary files a/public/images/items/tm_ground.png and b/public/images/items/tm_ground.png differ
diff --git a/public/images/items/tm_ice.png b/public/images/items/tm_ice.png
index b628d39f801..4edbb447a3e 100644
Binary files a/public/images/items/tm_ice.png and b/public/images/items/tm_ice.png differ
diff --git a/public/images/items/tm_normal.png b/public/images/items/tm_normal.png
index ab6e5e82729..19afe85d442 100644
Binary files a/public/images/items/tm_normal.png and b/public/images/items/tm_normal.png differ
diff --git a/public/images/items/tm_poison.png b/public/images/items/tm_poison.png
index f9f31b015dc..83cb4488f33 100644
Binary files a/public/images/items/tm_poison.png and b/public/images/items/tm_poison.png differ
diff --git a/public/images/items/tm_psychic.png b/public/images/items/tm_psychic.png
index 3c3becc0af2..4296914eda2 100644
Binary files a/public/images/items/tm_psychic.png and b/public/images/items/tm_psychic.png differ
diff --git a/public/images/items/tm_rock.png b/public/images/items/tm_rock.png
index d05ee8c1a7c..6e13a1835e7 100644
Binary files a/public/images/items/tm_rock.png and b/public/images/items/tm_rock.png differ
diff --git a/public/images/items/tm_steel.png b/public/images/items/tm_steel.png
index 840caff9ace..32071b0843b 100644
Binary files a/public/images/items/tm_steel.png and b/public/images/items/tm_steel.png differ
diff --git a/public/images/items/tm_water.png b/public/images/items/tm_water.png
index 2082766777d..85403f20be7 100644
Binary files a/public/images/items/tm_water.png and b/public/images/items/tm_water.png differ
diff --git a/public/images/items/toxic_orb.png b/public/images/items/toxic_orb.png
index 7fb36db516e..3483c13ba2b 100644
Binary files a/public/images/items/toxic_orb.png and b/public/images/items/toxic_orb.png differ
diff --git a/public/images/items/toxic_plate.png b/public/images/items/toxic_plate.png
index 8538e9fce2a..efb2cff129c 100644
Binary files a/public/images/items/toxic_plate.png and b/public/images/items/toxic_plate.png differ
diff --git a/public/images/items/twisted_spoon.png b/public/images/items/twisted_spoon.png
index 54a96de7d03..9bb23b04386 100644
Binary files a/public/images/items/twisted_spoon.png and b/public/images/items/twisted_spoon.png differ
diff --git a/public/images/items/tyranitarite.png b/public/images/items/tyranitarite.png
index 3d94f05c35f..691f8c6123d 100644
Binary files a/public/images/items/tyranitarite.png and b/public/images/items/tyranitarite.png differ
diff --git a/public/images/items/ub.png b/public/images/items/ub.png
index 964fb6b25c3..6ad0702223a 100644
Binary files a/public/images/items/ub.png and b/public/images/items/ub.png differ
diff --git a/public/images/items/ultra_ribbon.png b/public/images/items/ultra_ribbon.png
index 69dc7365bb4..a63ec63e394 100644
Binary files a/public/images/items/ultra_ribbon.png and b/public/images/items/ultra_ribbon.png differ
diff --git a/public/images/items/ultranecrozium_z.png b/public/images/items/ultranecrozium_z.png
index 208f3fb173d..cdcb29e6c26 100644
Binary files a/public/images/items/ultranecrozium_z.png and b/public/images/items/ultranecrozium_z.png differ
diff --git a/public/images/items/unknown.png b/public/images/items/unknown.png
index 4e01608daed..2d0637048ae 100644
Binary files a/public/images/items/unknown.png and b/public/images/items/unknown.png differ
diff --git a/public/images/items/unremarkable_teacup.png b/public/images/items/unremarkable_teacup.png
index fd4298b6a59..340214b6a5c 100644
Binary files a/public/images/items/unremarkable_teacup.png and b/public/images/items/unremarkable_teacup.png differ
diff --git a/public/images/items/upgrade.png b/public/images/items/upgrade.png
index 38db96a1792..11a7ade4d6a 100644
Binary files a/public/images/items/upgrade.png and b/public/images/items/upgrade.png differ
diff --git a/public/images/items/venusaurite.png b/public/images/items/venusaurite.png
index b8118a6c02d..845d1cef75a 100644
Binary files a/public/images/items/venusaurite.png and b/public/images/items/venusaurite.png differ
diff --git a/public/images/items/water_memory.png b/public/images/items/water_memory.png
index 4586a618836..a0cf8b3c5c9 100644
Binary files a/public/images/items/water_memory.png and b/public/images/items/water_memory.png differ
diff --git a/public/images/items/water_stone.png b/public/images/items/water_stone.png
index ab4543ee61a..fa3d924960b 100644
Binary files a/public/images/items/water_stone.png and b/public/images/items/water_stone.png differ
diff --git a/public/images/items/water_tera_shard.png b/public/images/items/water_tera_shard.png
index c00c1b5c1cb..eec8caf1245 100644
Binary files a/public/images/items/water_tera_shard.png and b/public/images/items/water_tera_shard.png differ
diff --git a/public/images/items/wellspring_mask.png b/public/images/items/wellspring_mask.png
index d5546cdb8da..921c71e1493 100644
Binary files a/public/images/items/wellspring_mask.png and b/public/images/items/wellspring_mask.png differ
diff --git a/public/images/items/whipped_dream.png b/public/images/items/whipped_dream.png
index 94628a443d1..16090ccaac0 100644
Binary files a/public/images/items/whipped_dream.png and b/public/images/items/whipped_dream.png differ
diff --git a/public/images/items/white_herb.png b/public/images/items/white_herb.png
index 56ca7c6aeb2..829c64f188e 100644
Binary files a/public/images/items/white_herb.png and b/public/images/items/white_herb.png differ
diff --git a/public/images/items/wide_lens.png b/public/images/items/wide_lens.png
index bf622521a9a..f7dbe9843fa 100644
Binary files a/public/images/items/wide_lens.png and b/public/images/items/wide_lens.png differ
diff --git a/public/images/items/wise_glasses.png b/public/images/items/wise_glasses.png
index 49a95761afd..b48d2cb3ffd 100644
Binary files a/public/images/items/wise_glasses.png and b/public/images/items/wise_glasses.png differ
diff --git a/public/images/items/wl_ability_urge.png b/public/images/items/wl_ability_urge.png
index a9eaa834313..b6b2c8bd398 100644
Binary files a/public/images/items/wl_ability_urge.png and b/public/images/items/wl_ability_urge.png differ
diff --git a/public/images/items/wl_antidote.png b/public/images/items/wl_antidote.png
index dbe0d5b94ea..93e4757938b 100644
Binary files a/public/images/items/wl_antidote.png and b/public/images/items/wl_antidote.png differ
diff --git a/public/images/items/wl_awakening.png b/public/images/items/wl_awakening.png
index 9a0adcda904..57e83b30cda 100644
Binary files a/public/images/items/wl_awakening.png and b/public/images/items/wl_awakening.png differ
diff --git a/public/images/items/wl_burn_heal.png b/public/images/items/wl_burn_heal.png
index d2f65e7da4c..3565af12d62 100644
Binary files a/public/images/items/wl_burn_heal.png and b/public/images/items/wl_burn_heal.png differ
diff --git a/public/images/items/wl_custom_spliced.png b/public/images/items/wl_custom_spliced.png
index 6a0ad4f8349..8aef30edb27 100644
Binary files a/public/images/items/wl_custom_spliced.png and b/public/images/items/wl_custom_spliced.png differ
diff --git a/public/images/items/wl_custom_thief.png b/public/images/items/wl_custom_thief.png
index cc1302ffb35..de6d62a48bc 100644
Binary files a/public/images/items/wl_custom_thief.png and b/public/images/items/wl_custom_thief.png differ
diff --git a/public/images/items/wl_elixir.png b/public/images/items/wl_elixir.png
index 29e413aa634..05eb590c484 100644
Binary files a/public/images/items/wl_elixir.png and b/public/images/items/wl_elixir.png differ
diff --git a/public/images/items/wl_ether.png b/public/images/items/wl_ether.png
index d3c0fe85918..114e8ffc941 100644
Binary files a/public/images/items/wl_ether.png and b/public/images/items/wl_ether.png differ
diff --git a/public/images/items/wl_full_heal.png b/public/images/items/wl_full_heal.png
index 68b8272c08f..215f9801d65 100644
Binary files a/public/images/items/wl_full_heal.png and b/public/images/items/wl_full_heal.png differ
diff --git a/public/images/items/wl_guard_spec.png b/public/images/items/wl_guard_spec.png
index b494123e92e..9d22029e927 100644
Binary files a/public/images/items/wl_guard_spec.png and b/public/images/items/wl_guard_spec.png differ
diff --git a/public/images/items/wl_hyper_potion.png b/public/images/items/wl_hyper_potion.png
index 51e81461da9..1eb075445e4 100644
Binary files a/public/images/items/wl_hyper_potion.png and b/public/images/items/wl_hyper_potion.png differ
diff --git a/public/images/items/wl_ice_heal.png b/public/images/items/wl_ice_heal.png
index e28f3205a80..9ac297c0e7c 100644
Binary files a/public/images/items/wl_ice_heal.png and b/public/images/items/wl_ice_heal.png differ
diff --git a/public/images/items/wl_item_drop.png b/public/images/items/wl_item_drop.png
index fe7ffdbdc1f..73425749670 100644
Binary files a/public/images/items/wl_item_drop.png and b/public/images/items/wl_item_drop.png differ
diff --git a/public/images/items/wl_item_urge.png b/public/images/items/wl_item_urge.png
index 5c291188dee..17a6343058f 100644
Binary files a/public/images/items/wl_item_urge.png and b/public/images/items/wl_item_urge.png differ
diff --git a/public/images/items/wl_max_elixir.png b/public/images/items/wl_max_elixir.png
index ba900bc2e97..4a33dc853fd 100644
Binary files a/public/images/items/wl_max_elixir.png and b/public/images/items/wl_max_elixir.png differ
diff --git a/public/images/items/wl_max_ether.png b/public/images/items/wl_max_ether.png
index 3cd58498fa7..d3f69ce053d 100644
Binary files a/public/images/items/wl_max_ether.png and b/public/images/items/wl_max_ether.png differ
diff --git a/public/images/items/wl_max_potion.png b/public/images/items/wl_max_potion.png
index cf92810943c..6b58c07e86a 100644
Binary files a/public/images/items/wl_max_potion.png and b/public/images/items/wl_max_potion.png differ
diff --git a/public/images/items/wl_max_revive.png b/public/images/items/wl_max_revive.png
index 12e3b263c21..f2eabaa8d5b 100644
Binary files a/public/images/items/wl_max_revive.png and b/public/images/items/wl_max_revive.png differ
diff --git a/public/images/items/wl_paralyze_heal.png b/public/images/items/wl_paralyze_heal.png
index 9a741c705d4..8e89e54c156 100644
Binary files a/public/images/items/wl_paralyze_heal.png and b/public/images/items/wl_paralyze_heal.png differ
diff --git a/public/images/items/wl_potion.png b/public/images/items/wl_potion.png
index 42086fc20ba..619c5d2b014 100644
Binary files a/public/images/items/wl_potion.png and b/public/images/items/wl_potion.png differ
diff --git a/public/images/items/wl_reset_urge.png b/public/images/items/wl_reset_urge.png
index 25ba0dfcdb9..0d2f94504f0 100644
Binary files a/public/images/items/wl_reset_urge.png and b/public/images/items/wl_reset_urge.png differ
diff --git a/public/images/items/wl_revive.png b/public/images/items/wl_revive.png
index c0881125c52..c01b5f68853 100644
Binary files a/public/images/items/wl_revive.png and b/public/images/items/wl_revive.png differ
diff --git a/public/images/items/wl_super_potion.png b/public/images/items/wl_super_potion.png
index da9ccec78ce..eaf60d6c882 100644
Binary files a/public/images/items/wl_super_potion.png and b/public/images/items/wl_super_potion.png differ
diff --git a/public/images/items/x_accuracy.png b/public/images/items/x_accuracy.png
index d119a75f1bb..e7af52fc684 100644
Binary files a/public/images/items/x_accuracy.png and b/public/images/items/x_accuracy.png differ
diff --git a/public/images/items/x_attack.png b/public/images/items/x_attack.png
index 36c76da9486..711aca7269c 100644
Binary files a/public/images/items/x_attack.png and b/public/images/items/x_attack.png differ
diff --git a/public/images/items/x_defense.png b/public/images/items/x_defense.png
index 2eb14b06ffb..ee8d3fa5e2d 100644
Binary files a/public/images/items/x_defense.png and b/public/images/items/x_defense.png differ
diff --git a/public/images/items/x_sp_atk.png b/public/images/items/x_sp_atk.png
index 772f9fe3315..f0e674e4d45 100644
Binary files a/public/images/items/x_sp_atk.png and b/public/images/items/x_sp_atk.png differ
diff --git a/public/images/items/x_sp_def.png b/public/images/items/x_sp_def.png
index 8c9baf03a4c..2ab43574af9 100644
Binary files a/public/images/items/x_sp_def.png and b/public/images/items/x_sp_def.png differ
diff --git a/public/images/items/x_speed.png b/public/images/items/x_speed.png
index cbd1747142f..daebb295d77 100644
Binary files a/public/images/items/x_speed.png and b/public/images/items/x_speed.png differ
diff --git a/public/images/items/zap_plate.png b/public/images/items/zap_plate.png
index e582b41937f..a966fb76cd3 100644
Binary files a/public/images/items/zap_plate.png and b/public/images/items/zap_plate.png differ
diff --git a/public/images/items/zinc.png b/public/images/items/zinc.png
index d2602f43328..c1dfd47a9fc 100644
Binary files a/public/images/items/zinc.png and b/public/images/items/zinc.png differ
diff --git a/public/images/items/zoom_lens.png b/public/images/items/zoom_lens.png
index f46855135bf..30b3ed55bdf 100644
Binary files a/public/images/items/zoom_lens.png and b/public/images/items/zoom_lens.png differ
diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index a6c986d3d0f..544dbc40350 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -1371,6 +1371,7 @@ export default class BattleScene extends SceneBase {
     return Math.max(doubleChance.value, 1);
   }
 
+  // TODO: ...this never actually returns `null`, right?
   newBattle(
     waveIndex?: number,
     battleType?: BattleType,
diff --git a/src/data/ability.ts b/src/data/ability.ts
index 3a14ad1456d..5bf02cabf6c 100644
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@@ -308,7 +308,7 @@ export class ClearWeatherAbAttr extends AbAttr {
 
   public override apply(pokemon: Pokemon, passive: boolean, simulated:boolean, cancelled: Utils.BooleanHolder, args: any[]): void {
     if (!simulated) {
-      globalScene.arena.trySetWeather(WeatherType.NONE, true);
+      globalScene.arena.trySetWeather(WeatherType.NONE, pokemon);
     }
   }
 }
@@ -334,7 +334,7 @@ export class ClearTerrainAbAttr extends AbAttr {
 
   public override apply(pokemon: Pokemon, passive: boolean, simulated:boolean, cancelled: Utils.BooleanHolder, args: any[]): void {
     if (!simulated) {
-      globalScene.arena.trySetTerrain(TerrainType.NONE, true, true);
+      globalScene.arena.trySetTerrain(TerrainType.NONE, true, pokemon);
     }
   }
 }
@@ -954,7 +954,7 @@ export class PostDefendTerrainChangeAbAttr extends PostDefendAbAttr {
 
   override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, _args: any[]): void {
     if (!simulated) {
-      globalScene.arena.trySetTerrain(this.terrainType, true);
+      globalScene.arena.trySetTerrain(this.terrainType, false, pokemon);
     }
   }
 }
@@ -1126,7 +1126,7 @@ export class PostDefendWeatherChangeAbAttr extends PostDefendAbAttr {
 
   override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void {
     if (!simulated) {
-      globalScene.arena.trySetWeather(this.weatherType, true);
+      globalScene.arena.trySetWeather(this.weatherType, pokemon);
     }
   }
 }
@@ -1285,6 +1285,9 @@ export class MoveEffectChanceMultiplierAbAttr extends AbAttr {
  * @see {@linkcode applyPreDefend}
  */
 export class IgnoreMoveEffectsAbAttr extends PreDefendAbAttr {
+  constructor(showAbility: boolean = false) {
+    super(showAbility);
+  }
 
   override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move | null, cancelled: Utils.BooleanHolder | null, args: any[]): boolean {
     return (args[0] as Utils.NumberHolder).value > 0;
@@ -2483,7 +2486,7 @@ export class PostSummonWeatherChangeAbAttr extends PostSummonAbAttr {
 
   override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
     if (!simulated) {
-      globalScene.arena.trySetWeather(this.weatherType, true);
+      globalScene.arena.trySetWeather(this.weatherType, pokemon);
     }
   }
 }
@@ -2503,7 +2506,7 @@ export class PostSummonTerrainChangeAbAttr extends PostSummonAbAttr {
 
   override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
     if (!simulated) {
-      globalScene.arena.trySetTerrain(this.terrainType, true);
+      globalScene.arena.trySetTerrain(this.terrainType, false, pokemon);
     }
   }
 }
@@ -2886,7 +2889,7 @@ export class PreSwitchOutClearWeatherAbAttr extends PreSwitchOutAbAttr {
     }
 
     if (turnOffWeather) {
-      globalScene.arena.trySetWeather(WeatherType.NONE, false);
+      globalScene.arena.trySetWeather(WeatherType.NONE);
       return true;
     }
 
@@ -2986,7 +2989,7 @@ export class PreLeaveFieldClearWeatherAbAttr extends PreLeaveFieldAbAttr {
    */
   override applyPreLeaveField(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
     if (!simulated) {
-      globalScene.arena.trySetWeather(WeatherType.NONE, false);
+      globalScene.arena.trySetWeather(WeatherType.NONE);
     }
   }
 }
@@ -4137,7 +4140,7 @@ export class PostBiomeChangeWeatherChangeAbAttr extends PostBiomeChangeAbAttr {
 
   override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void {
     if (!simulated) {
-      globalScene.arena.trySetWeather(this.weatherType, true);
+      globalScene.arena.trySetWeather(this.weatherType, pokemon);
     }
   }
 }
@@ -4157,7 +4160,7 @@ export class PostBiomeChangeTerrainChangeAbAttr extends PostBiomeChangeAbAttr {
 
   override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): void {
     if (!simulated) {
-      globalScene.arena.trySetTerrain(this.terrainType, true);
+      globalScene.arena.trySetTerrain(this.terrainType, false, pokemon);
     }
   }
 }
@@ -4711,7 +4714,7 @@ export class ForceSwitchOutImmunityAbAttr extends AbAttr {
 
 export class ReduceBerryUseThresholdAbAttr extends AbAttr {
   constructor() {
-    super();
+    super(false);
   }
 
   override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
diff --git a/src/data/balance/pokemon-evolutions.ts b/src/data/balance/pokemon-evolutions.ts
index c34bc229bd7..e49bd049cd6 100644
--- a/src/data/balance/pokemon-evolutions.ts
+++ b/src/data/balance/pokemon-evolutions.ts
@@ -179,7 +179,7 @@ class TimeOfDayEvolutionCondition extends SpeciesEvolutionCondition {
 class MoveEvolutionCondition extends SpeciesEvolutionCondition {
   public move: Moves;
   constructor(move: Moves) {
-    super(p => p.moveset.filter(m => m?.moveId === move).length > 0);
+    super(p => p.moveset.filter(m => m.moveId === move).length > 0);
     this.move = move;
     const moveKey = Moves[this.move].split("_").filter(f => f).map((f, i) => i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()).join("");
     this.description = i18next.t("pokemonEvolutions:move", { move: i18next.t(`move:${moveKey}.name`) });
@@ -282,7 +282,7 @@ class TyrogueEvolutionCondition extends SpeciesEvolutionCondition {
   public move: Moves;
   constructor(move: Moves) {
     super(p =>
-      p.getMoveset(true).find(m => m && [ Moves.LOW_SWEEP, Moves.MACH_PUNCH, Moves.RAPID_SPIN ].includes(m?.moveId))?.moveId === move);
+      p.getMoveset(true).find(m => m && [ Moves.LOW_SWEEP, Moves.MACH_PUNCH, Moves.RAPID_SPIN ].includes(m.moveId))?.moveId === move);
     this.move = move;
     const moveKey = Moves[this.move].split("_").filter(f => f).map((f, i) => i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()).join("");
     this.description = i18next.t("pokemonEvolutions:move", { move: i18next.t(`move:${moveKey}.name`) });
@@ -303,11 +303,11 @@ class MoveTimeOfDayEvolutionCondition extends SpeciesEvolutionCondition {
   public timesOfDay: TimeOfDay[];
   constructor(move: Moves, tod: "day" | "night") {
     if (tod === "day") {
-      super(p => p.moveset.filter(m => m?.moveId === move).length > 0 && (globalScene.arena.getTimeOfDay() === TimeOfDay.DAWN || globalScene.arena.getTimeOfDay() === TimeOfDay.DAY));
+      super(p => p.moveset.filter(m => m.moveId === move).length > 0 && (globalScene.arena.getTimeOfDay() === TimeOfDay.DAWN || globalScene.arena.getTimeOfDay() === TimeOfDay.DAY));
       this.move = move;
       this.timesOfDay = [ TimeOfDay.DAWN, TimeOfDay.DAY ];
     } else if (tod === "night") {
-      super(p => p.moveset.filter(m => m?.moveId === move).length > 0 && (globalScene.arena.getTimeOfDay() === TimeOfDay.DUSK || globalScene.arena.getTimeOfDay() === TimeOfDay.NIGHT));
+      super(p => p.moveset.filter(m => m.moveId === move).length > 0 && (globalScene.arena.getTimeOfDay() === TimeOfDay.DUSK || globalScene.arena.getTimeOfDay() === TimeOfDay.NIGHT));
       this.move = move;
       this.timesOfDay = [ TimeOfDay.DUSK, TimeOfDay.NIGHT ];
     } else {
@@ -332,7 +332,7 @@ class DunsparceEvolutionCondition extends SpeciesEvolutionCondition {
   constructor() {
     super(p => {
       let ret = false;
-      if (p.moveset.filter(m => m?.moveId === Moves.HYPER_DRILL).length > 0) {
+      if (p.moveset.filter(m => m.moveId === Moves.HYPER_DRILL).length > 0) {
         globalScene.executeWithSeedOffset(() => ret = !Utils.randSeedInt(4), p.id);
       }
       return ret;
@@ -1540,13 +1540,13 @@ export const pokemonEvolutions: PokemonEvolutions = {
     new SpeciesEvolution(Species.TOGEKISS, 1, EvolutionItem.SHINY_STONE, null, SpeciesWildEvolutionDelay.VERY_LONG)
   ],
   [Species.AIPOM]: [
-    new SpeciesEvolution(Species.AMBIPOM, 32, null,  new MoveEvolutionCondition(Moves.DOUBLE_HIT), SpeciesWildEvolutionDelay.LONG)
+    new SpeciesEvolution(Species.AMBIPOM, 32, null, new MoveEvolutionCondition(Moves.DOUBLE_HIT), SpeciesWildEvolutionDelay.LONG)
   ],
   [Species.SUNKERN]: [
     new SpeciesEvolution(Species.SUNFLORA, 1, EvolutionItem.SUN_STONE, null, SpeciesWildEvolutionDelay.LONG)
   ],
   [Species.YANMA]: [
-    new SpeciesEvolution(Species.YANMEGA, 33, null,  new MoveEvolutionCondition(Moves.ANCIENT_POWER), SpeciesWildEvolutionDelay.LONG)
+    new SpeciesEvolution(Species.YANMEGA, 33, null, new MoveEvolutionCondition(Moves.ANCIENT_POWER), SpeciesWildEvolutionDelay.LONG)
   ],
   [Species.MURKROW]: [
     new SpeciesEvolution(Species.HONCHKROW, 1, EvolutionItem.DUSK_STONE, null, SpeciesWildEvolutionDelay.VERY_LONG)
@@ -1555,11 +1555,11 @@ export const pokemonEvolutions: PokemonEvolutions = {
     new SpeciesEvolution(Species.MISMAGIUS, 1, EvolutionItem.DUSK_STONE, null, SpeciesWildEvolutionDelay.VERY_LONG)
   ],
   [Species.GIRAFARIG]: [
-    new SpeciesEvolution(Species.FARIGIRAF, 32, null,  new MoveEvolutionCondition(Moves.TWIN_BEAM), SpeciesWildEvolutionDelay.LONG)
+    new SpeciesEvolution(Species.FARIGIRAF, 32, null, new MoveEvolutionCondition(Moves.TWIN_BEAM), SpeciesWildEvolutionDelay.LONG)
   ],
   [Species.DUNSPARCE]: [
     new SpeciesFormEvolution(Species.DUDUNSPARCE, "", "three-segment", 32, null, new DunsparceEvolutionCondition(), SpeciesWildEvolutionDelay.LONG),
-    new SpeciesFormEvolution(Species.DUDUNSPARCE, "", "two-segment", 32, null,  new MoveEvolutionCondition(Moves.HYPER_DRILL), SpeciesWildEvolutionDelay.LONG)
+    new SpeciesFormEvolution(Species.DUDUNSPARCE, "", "two-segment", 32, null, new MoveEvolutionCondition(Moves.HYPER_DRILL), SpeciesWildEvolutionDelay.LONG)
   ],
   [Species.GLIGAR]: [
     new SpeciesEvolution(Species.GLISCOR, 1, EvolutionItem.RAZOR_FANG, new TimeOfDayEvolutionCondition("night") /* Razor fang at night*/, SpeciesWildEvolutionDelay.VERY_LONG)
@@ -1571,10 +1571,10 @@ export const pokemonEvolutions: PokemonEvolutions = {
     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 MoveEvolutionCondition(Moves.ANCIENT_POWER), SpeciesWildEvolutionDelay.VERY_LONG)
+    new SpeciesEvolution(Species.MAMOSWINE, 1, null, new MoveEvolutionCondition(Moves.ANCIENT_POWER), SpeciesWildEvolutionDelay.VERY_LONG)
   ],
   [Species.STANTLER]: [
-    new SpeciesEvolution(Species.WYRDEER, 25, null,  new MoveEvolutionCondition(Moves.PSYSHIELD_BASH), SpeciesWildEvolutionDelay.VERY_LONG)
+    new SpeciesEvolution(Species.WYRDEER, 25, null, new MoveEvolutionCondition(Moves.PSYSHIELD_BASH), SpeciesWildEvolutionDelay.VERY_LONG)
   ],
   [Species.LOMBRE]: [
     new SpeciesEvolution(Species.LUDICOLO, 1, EvolutionItem.WATER_STONE, null, SpeciesWildEvolutionDelay.LONG)
@@ -1592,7 +1592,7 @@ export const pokemonEvolutions: PokemonEvolutions = {
     new SpeciesEvolution(Species.ROSERADE, 1, EvolutionItem.SHINY_STONE, null, SpeciesWildEvolutionDelay.VERY_LONG)
   ],
   [Species.BONSLY]: [
-    new SpeciesEvolution(Species.SUDOWOODO, 1, null,  new MoveEvolutionCondition(Moves.MIMIC), SpeciesWildEvolutionDelay.MEDIUM)
+    new SpeciesEvolution(Species.SUDOWOODO, 1, null, new MoveEvolutionCondition(Moves.MIMIC), SpeciesWildEvolutionDelay.MEDIUM)
   ],
   [Species.MIME_JR]: [
     new SpeciesEvolution(Species.GALAR_MR_MIME, 1, null, new MoveTimeOfDayEvolutionCondition(Moves.MIMIC, "night"), SpeciesWildEvolutionDelay.MEDIUM),
@@ -1651,10 +1651,10 @@ export const pokemonEvolutions: PokemonEvolutions = {
     new SpeciesFormEvolution(Species.LYCANROC, "", "midnight", 25, null, new TimeOfDayEvolutionCondition("night"))
   ],
   [Species.STEENEE]: [
-    new SpeciesEvolution(Species.TSAREENA, 28, null,  new MoveEvolutionCondition(Moves.STOMP), SpeciesWildEvolutionDelay.LONG)
+    new SpeciesEvolution(Species.TSAREENA, 28, null, new MoveEvolutionCondition(Moves.STOMP), SpeciesWildEvolutionDelay.LONG)
   ],
   [Species.POIPOLE]: [
-    new SpeciesEvolution(Species.NAGANADEL, 1, null,  new MoveEvolutionCondition(Moves.DRAGON_PULSE), SpeciesWildEvolutionDelay.LONG)
+    new SpeciesEvolution(Species.NAGANADEL, 1, null, new MoveEvolutionCondition(Moves.DRAGON_PULSE), SpeciesWildEvolutionDelay.LONG)
   ],
   [Species.ALOLA_SANDSHREW]: [
     new SpeciesEvolution(Species.ALOLA_SANDSLASH, 1, EvolutionItem.ICE_STONE, null, SpeciesWildEvolutionDelay.LONG)
@@ -1720,7 +1720,7 @@ export const pokemonEvolutions: PokemonEvolutions = {
     new SpeciesEvolution(Species.HISUI_ELECTRODE, 1, EvolutionItem.LEAF_STONE, null, SpeciesWildEvolutionDelay.LONG)
   ],
   [Species.HISUI_QWILFISH]: [
-    new SpeciesEvolution(Species.OVERQWIL, 28, null,  new MoveEvolutionCondition(Moves.BARB_BARRAGE), SpeciesWildEvolutionDelay.LONG)
+    new SpeciesEvolution(Species.OVERQWIL, 28, null, new MoveEvolutionCondition(Moves.BARB_BARRAGE), SpeciesWildEvolutionDelay.LONG)
   ],
   [Species.HISUI_SNEASEL]: [
     new SpeciesEvolution(Species.SNEASLER, 1, EvolutionItem.RAZOR_CLAW, new TimeOfDayEvolutionCondition("day") /* Razor claw at day*/, SpeciesWildEvolutionDelay.VERY_LONG)
diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index 4952488b48e..c4004e9c582 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -1174,13 +1174,13 @@ export class EncoreTag extends MoveRestrictionBattlerTag {
 
     const movePhase = globalScene.findPhase(m => m instanceof MovePhase && m.pokemon === pokemon);
     if (movePhase) {
-      const movesetMove = pokemon.getMoveset().find(m => m!.moveId === this.moveId); // TODO: is this bang correct?
+      const movesetMove = pokemon.getMoveset().find(m => m.moveId === this.moveId);
       if (movesetMove) {
         const lastMove = pokemon.getLastXMoves(1)[0];
         globalScene.tryReplacePhase(
           m => m instanceof MovePhase && m.pokemon === pokemon,
-          new MovePhase(pokemon, lastMove.targets!, movesetMove),
-        ); // TODO: is this bang correct?
+          new MovePhase(pokemon, lastMove.targets ?? [], movesetMove),
+        );
       }
     }
   }
@@ -1191,7 +1191,7 @@ export class EncoreTag extends MoveRestrictionBattlerTag {
    */
   override lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
     if (lapseType === BattlerTagLapseType.CUSTOM) {
-      const encoredMove = pokemon.getMoveset().find(m => m?.moveId === this.moveId);
+      const encoredMove = pokemon.getMoveset().find(m => m.moveId === this.moveId);
       if (encoredMove && encoredMove?.getPpRatio() > 0) {
         return true;
       }
@@ -3184,7 +3184,7 @@ export class ImprisonTag extends MoveRestrictionBattlerTag {
   public override isMoveRestricted(move: Moves, _user: Pokemon): boolean {
     const source = this.getSourcePokemon();
     if (source) {
-      const sourceMoveset = source.getMoveset().map(m => m!.moveId);
+      const sourceMoveset = source.getMoveset().map(m => m.moveId);
       return sourceMoveset?.includes(move) && source.isActive(true);
     }
     return false;
@@ -3354,7 +3354,7 @@ export class GrudgeTag extends BattlerTag {
     if (lapseType === BattlerTagLapseType.CUSTOM && sourcePokemon) {
       if (sourcePokemon.isActive() && pokemon.isOpponent(sourcePokemon)) {
         const lastMove = pokemon.turnData.attacksReceived[0];
-        const lastMoveData = sourcePokemon.getMoveset().find(m => m?.moveId === lastMove.move);
+        const lastMoveData = sourcePokemon.getMoveset().find(m => m.moveId === lastMove.move);
         if (lastMoveData && lastMove.move !== Moves.STRUGGLE) {
           lastMoveData.ppUsed = lastMoveData.getMovePp();
           globalScene.queueMessage(
diff --git a/src/data/berry.ts b/src/data/berry.ts
index ed8ae8d2b62..13820b1277b 100644
--- a/src/data/berry.ts
+++ b/src/data/berry.ts
@@ -65,7 +65,7 @@ export function getBerryPredicate(berryType: BerryType): BerryPredicate {
       return (pokemon: Pokemon) => {
         const threshold = new Utils.NumberHolder(0.25);
         applyAbAttrs(ReduceBerryUseThresholdAbAttr, pokemon, null, false, threshold);
-        return !!pokemon.getMoveset().find(m => !m?.getPpRatio());
+        return !!pokemon.getMoveset().find(m => !m.getPpRatio());
       };
   }
 }
@@ -147,9 +147,9 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc {
         if (pokemon.battleData) {
           pokemon.battleData.berriesEaten.push(berryType);
         }
-        const ppRestoreMove = pokemon.getMoveset().find(m => !m?.getPpRatio())
-          ? pokemon.getMoveset().find(m => !m?.getPpRatio())
-          : pokemon.getMoveset().find(m => m!.getPpRatio() < 1); // TODO: is this bang correct?
+        const ppRestoreMove = pokemon.getMoveset().find(m => !m.getPpRatio())
+          ? pokemon.getMoveset().find(m => !m.getPpRatio())
+          : pokemon.getMoveset().find(m => m.getPpRatio() < 1);
         if (ppRestoreMove !== undefined) {
           ppRestoreMove!.ppUsed = Math.max(ppRestoreMove!.ppUsed - 10, 0);
           globalScene.queueMessage(
diff --git a/src/data/challenge.ts b/src/data/challenge.ts
index a54f72aa7cc..1387732a773 100644
--- a/src/data/challenge.ts
+++ b/src/data/challenge.ts
@@ -450,7 +450,7 @@ export class SingleGenerationChallenge extends Challenge {
 
   applyPokemonInBattle(pokemon: Pokemon, valid: Utils.BooleanHolder): boolean {
     const baseGeneration = getPokemonSpecies(pokemon.species.speciesId).generation;
-    const fusionGeneration = pokemon.isFusion() ? getPokemonSpecies(pokemon.fusionSpecies!.speciesId).generation : 0; // TODO: is the bang on fusionSpecies correct?
+    const fusionGeneration = pokemon.isFusion() ? getPokemonSpecies(pokemon.fusionSpecies!.speciesId).generation : 0;
     if (
       pokemon.isPlayer() &&
       (baseGeneration !== this.value || (pokemon.isFusion() && fusionGeneration !== this.value))
diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts
index 1555967789c..1af872e0915 100644
--- a/src/data/moves/move.ts
+++ b/src/data/moves/move.ts
@@ -1881,14 +1881,14 @@ export class HealAttr extends MoveEffectAttr {
  */
 export class PartyStatusCureAttr extends MoveEffectAttr {
   /** Message to display after using move */
-  private message: string;
+  private message: string | null;
   /** Skips mons with this ability, ie. Soundproof */
   private abilityCondition: Abilities;
 
   constructor(message: string | null, abilityCondition: Abilities) {
     super();
 
-    this.message = message!; // TODO: is this bang correct?
+    this.message = message;
     this.abilityCondition = abilityCondition;
   }
 
@@ -2103,10 +2103,10 @@ export class BoostHealAttr extends HealAttr {
   /** The lambda expression to check against when boosting the healing value */
   private condition?: MoveConditionFunc;
 
-  constructor(normalHealRatio?: number, boostedHealRatio?: number, showAnim?: boolean, selfTarget?: boolean, condition?: MoveConditionFunc) {
+  constructor(normalHealRatio: number = 0.5, boostedHealRatio: number = 2 / 3, showAnim?: boolean, selfTarget?: boolean, condition?: MoveConditionFunc) {
     super(normalHealRatio, showAnim, selfTarget);
-    this.normalHealRatio = normalHealRatio!; // TODO: is this bang correct?
-    this.boostedHealRatio = boostedHealRatio!; // TODO: is this bang correct?
+    this.normalHealRatio = normalHealRatio;
+    this.boostedHealRatio = boostedHealRatio;
     this.condition = condition;
   }
 
@@ -2851,7 +2851,7 @@ export class WeatherChangeAttr extends MoveEffectAttr {
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    return globalScene.arena.trySetWeather(this.weatherType, true);
+    return globalScene.arena.trySetWeather(this.weatherType, user);
   }
 
   getCondition(): MoveConditionFunc {
@@ -2870,7 +2870,7 @@ export class ClearWeatherAttr extends MoveEffectAttr {
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     if (globalScene.arena.weather?.weatherType === this.weatherType) {
-      return globalScene.arena.trySetWeather(WeatherType.NONE, true);
+      return globalScene.arena.trySetWeather(WeatherType.NONE, user);
     }
 
     return false;
@@ -2887,7 +2887,7 @@ export class TerrainChangeAttr extends MoveEffectAttr {
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    return globalScene.arena.trySetTerrain(this.terrainType, true, true);
+    return globalScene.arena.trySetTerrain(this.terrainType, true, user);
   }
 
   getCondition(): MoveConditionFunc {
@@ -2906,7 +2906,7 @@ export class ClearTerrainAttr extends MoveEffectAttr {
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    return globalScene.arena.trySetTerrain(TerrainType.NONE, true, true);
+    return globalScene.arena.trySetTerrain(TerrainType.NONE, true, user);
   }
 }
 
@@ -3374,14 +3374,14 @@ export class SecretPowerAttr extends MoveEffectAttr {
 export class PostVictoryStatStageChangeAttr extends MoveAttr {
   private stats: BattleStat[];
   private stages: number;
-  private condition: MoveConditionFunc | null;
+  private condition?: MoveConditionFunc;
   private showMessage: boolean;
 
   constructor(stats: BattleStat[], stages: number, selfTarget?: boolean, condition?: MoveConditionFunc, showMessage: boolean = true, firstHitOnly: boolean = false) {
     super();
     this.stats = stats;
     this.stages = stages;
-    this.condition = condition!; // TODO: is this bang correct?
+    this.condition = condition;
     this.showMessage = showMessage;
   }
   applyPostVictory(user: Pokemon, target: Pokemon, move: Move): void {
@@ -3653,7 +3653,7 @@ export class LessPPMorePowerAttr extends VariablePowerAttr {
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const ppMax = move.pp;
-    const ppUsed = user.moveset.find((m) => m?.moveId === move.id)?.ppUsed!; // TODO: is the bang correct?
+    const ppUsed = user.moveset.find((m) => m.moveId === move.id)?.ppUsed ?? 0;
 
     let ppRemains = ppMax - ppUsed;
     /** Reduce to 0 to avoid negative numbers if user has 1PP before attack and target has Ability.PRESSURE */
@@ -3779,7 +3779,13 @@ export abstract class ConsecutiveUsePowerMultiplierAttr extends MovePowerMultipl
       let count = 0;
       let turnMove: TurnMove | undefined;
 
-      while (((turnMove = moveHistory.shift())?.move === move.id || (comboMoves.length && comboMoves.includes(turnMove?.move!))) && (!resetOnFail || turnMove?.result === MoveResult.SUCCESS)) { // TODO: is this bang correct?
+      while (
+        (
+          (turnMove = moveHistory.shift())?.move === move.id
+          || (comboMoves.length && comboMoves.includes(turnMove?.move ?? Moves.NONE))
+        )
+        && (!resetOnFail || turnMove?.result === MoveResult.SUCCESS)
+      ) {
         if (count < (limit - 1)) {
           count++;
         } else if (resetOnLimit) {
@@ -4365,8 +4371,8 @@ export class LastMoveDoublePowerAttr extends VariablePowerAttr {
 
     for (const p of pokemonActed) {
       const [ lastMove ] = p.getLastXMoves(1);
-      if (lastMove?.result !== MoveResult.FAIL) {
-        if ((lastMove?.result === MoveResult.SUCCESS) && (lastMove?.move === this.move)) {
+      if (lastMove.result !== MoveResult.FAIL) {
+        if ((lastMove.result === MoveResult.SUCCESS) && (lastMove.move === this.move)) {
           power.value *= 2;
           return true;
         } else {
@@ -5461,7 +5467,7 @@ export class AddBattlerTagAttr extends MoveEffectAttr {
       : null;
   }
 
-  getTagTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number | void {
+  getTagTargetBenefitScore(): number {
     switch (this.tagType) {
       case BattlerTagType.RECHARGING:
       case BattlerTagType.PERISH_SONG:
@@ -5506,6 +5512,9 @@ export class AddBattlerTagAttr extends MoveEffectAttr {
       case BattlerTagType.CRIT_BOOST:
       case BattlerTagType.ALWAYS_CRIT:
         return 5;
+      default:
+        console.warn(`BattlerTag ${BattlerTagType[this.tagType]} is missing a score!`);
+        return 0;
     }
   }
 
@@ -5514,7 +5523,7 @@ export class AddBattlerTagAttr extends MoveEffectAttr {
     if (moveChance < 0) {
       moveChance = 100;
     }
-    return Math.floor(this.getTagTargetBenefitScore(user, target, move)! * (moveChance / 100)); // TODO: is the bang correct?
+    return Math.floor(this.getTagTargetBenefitScore() * (moveChance / 100));
   }
 }
 
@@ -5769,7 +5778,7 @@ export class ProtectAttr extends AddBattlerTagAttr {
 
       while (moveHistory.length) {
         turnMove = moveHistory.shift();
-        if (!allMoves[turnMove?.move!].hasAttr(ProtectAttr) || turnMove?.result !== MoveResult.SUCCESS) { // TODO: is the bang correct?
+        if (!allMoves[turnMove?.move ?? Moves.NONE].hasAttr(ProtectAttr) || turnMove?.result !== MoveResult.SUCCESS) {
           break;
         }
         timesUsed++;
@@ -6445,7 +6454,7 @@ export class ForceSwitchOutAttr extends MoveEffectAttr {
 
 export class ChillyReceptionAttr extends ForceSwitchOutAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    globalScene.arena.trySetWeather(WeatherType.SNOW, true);
+    globalScene.arena.trySetWeather(WeatherType.SNOW, user);
     return super.apply(user, target, move, args);
   }
 
@@ -6688,7 +6697,7 @@ export class FirstMoveTypeAttr extends MoveEffectAttr {
       return false;
     }
 
-    const firstMoveType = target.getMoveset()[0]?.getMove().type!; // TODO: is this bang correct?
+    const firstMoveType = target.getMoveset()[0].getMove().type;
     user.summonData.types = [ firstMoveType ];
     globalScene.queueMessage(i18next.t("battle:transformedIntoType", { pokemonName: getPokemonNameWithAffix(user), type: i18next.t(`pokemonInfo:Type.${PokemonType[firstMoveType]}`) }));
 
@@ -7005,7 +7014,7 @@ export class RepeatMoveAttr extends MoveEffectAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     // get the last move used (excluding status based failures) as well as the corresponding moveset slot
     const lastMove = target.getLastXMoves(-1).find(m => m.move !== Moves.NONE)!;
-    const movesetMove = target.getMoveset().find(m => m?.moveId === lastMove.move)!;
+    const movesetMove = target.getMoveset().find(m => m.moveId === lastMove.move)!;
     // If the last move used can hit more than one target or has variable targets,
     // re-compute the targets for the attack
     // (mainly for alternating double/single battle shenanigans)
@@ -7039,7 +7048,7 @@ export class RepeatMoveAttr extends MoveEffectAttr {
   getCondition(): MoveConditionFunc {
     return (user, target, move) => {
       const lastMove = target.getLastXMoves(-1).find(m => m.move !== Moves.NONE);
-      const movesetMove = target.getMoveset().find(m => m?.moveId === lastMove?.move);
+      const movesetMove = target.getMoveset().find(m => m.moveId === lastMove?.move);
       const uninstructableMoves = [
         // Locking/Continually Executed moves
         Moves.OUTRAGE,
@@ -7134,19 +7143,19 @@ export class ReducePpMoveAttr extends MoveEffectAttr {
    *
    * @param user {@linkcode Pokemon} that used the attack
    * @param target {@linkcode Pokemon} targeted by the attack
-   * @param move {@linkcode Move} being used
+   * @param move N/A
    * @param args N/A
-   * @returns {boolean} true
+   * @returns `true`
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     // Null checks can be skipped due to condition function
-    const lastMove = target.getLastXMoves().find(() => true);
-    const movesetMove = target.getMoveset().find(m => m?.moveId === lastMove?.move);
-    const lastPpUsed = movesetMove?.ppUsed!; // TODO: is the bang correct?
-    movesetMove!.ppUsed = Math.min((movesetMove?.ppUsed!) + this.reduction, movesetMove?.getMovePp()!); // TODO: is the bang correct?
+    const lastMove = target.getLastXMoves()[0];
+    const movesetMove = target.getMoveset().find(m => m.moveId === lastMove.move)!;
+    const lastPpUsed = movesetMove.ppUsed;
+    movesetMove.ppUsed = Math.min((lastPpUsed) + this.reduction, movesetMove.getMovePp());
 
-    const message = i18next.t("battle:ppReduced", { targetName: getPokemonNameWithAffix(target), moveName: movesetMove?.getName(), reduction: (movesetMove?.ppUsed!) - lastPpUsed }); // TODO: is the bang correct?
-    globalScene.eventTarget.dispatchEvent(new MoveUsedEvent(target?.id, movesetMove?.getMove()!, movesetMove?.ppUsed!)); // TODO: are these bangs correct?
+    const message = i18next.t("battle:ppReduced", { targetName: getPokemonNameWithAffix(target), moveName: movesetMove.getName(), reduction: (movesetMove.ppUsed) - lastPpUsed });
+    globalScene.eventTarget.dispatchEvent(new MoveUsedEvent(target.id, movesetMove.getMove(), movesetMove.ppUsed));
     globalScene.queueMessage(message);
 
     return true;
@@ -7154,9 +7163,9 @@ export class ReducePpMoveAttr extends MoveEffectAttr {
 
   getCondition(): MoveConditionFunc {
     return (user, target, move) => {
-      const lastMove = target.getLastXMoves().find(() => true);
+      const lastMove = target.getLastXMoves()[0];
       if (lastMove) {
-        const movesetMove = target.getMoveset().find(m => m?.moveId === lastMove.move);
+        const movesetMove = target.getMoveset().find(m => m.moveId === lastMove.move);
         return !!movesetMove?.getPpRatio();
       }
       return false;
@@ -7164,9 +7173,9 @@ export class ReducePpMoveAttr extends MoveEffectAttr {
   }
 
   getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number {
-    const lastMove = target.getLastXMoves().find(() => true);
+    const lastMove = target.getLastXMoves()[0];
     if (lastMove) {
-      const movesetMove = target.getMoveset().find(m => m?.moveId === lastMove.move);
+      const movesetMove = target.getMoveset().find(m => m.moveId === lastMove.move);
       if (movesetMove) {
         const maxPp = movesetMove.getMovePp();
         const ppLeft = maxPp - movesetMove.ppUsed;
@@ -7203,7 +7212,7 @@ export class AttackReducePpMoveAttr extends ReducePpMoveAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const lastMove = target.getLastXMoves().find(() => true);
     if (lastMove) {
-      const movesetMove = target.getMoveset().find(m => m?.moveId === lastMove.move);
+      const movesetMove = target.getMoveset().find(m => m.moveId === lastMove.move);
       if (Boolean(movesetMove?.getPpRatio())) {
         super.apply(user, target, move, args);
       }
@@ -7249,7 +7258,7 @@ export class MovesetCopyMoveAttr extends OverrideMoveEffectAttr {
 
     const copiedMove = allMoves[targetMoves[0].move];
 
-    const thisMoveIndex = user.getMoveset().findIndex(m => m?.moveId === move.id);
+    const thisMoveIndex = user.getMoveset().findIndex(m => m.moveId === move.id);
 
     if (thisMoveIndex === -1) {
       return false;
@@ -7301,7 +7310,7 @@ export class SketchAttr extends MoveEffectAttr {
     }
 
     const sketchedMove = allMoves[targetMove.move];
-    const sketchIndex = user.getMoveset().findIndex(m => m?.moveId === move.id);
+    const sketchIndex = user.getMoveset().findIndex(m => m.moveId === move.id);
     if (sketchIndex === -1) {
       return false;
     }
@@ -7340,7 +7349,7 @@ export class SketchAttr extends MoveEffectAttr {
         return false;
       }
 
-      if (user.getMoveset().find(m => m?.moveId === targetMove.move)) {
+      if (user.getMoveset().find(m => m.moveId === targetMove.move)) {
         return false;
       }
 
@@ -7790,7 +7799,7 @@ export class LastResortAttr extends MoveAttr {
   getCondition(): MoveConditionFunc {
     return (user: Pokemon, target: Pokemon, move: Move) => {
       const uniqueUsedMoveIds = new Set<Moves>();
-      const movesetMoveIds = user.getMoveset().map(m => m?.moveId);
+      const movesetMoveIds = user.getMoveset().map(m => m.moveId);
       user.getMoveHistory().map(m => {
         if (m.move !== move.id && movesetMoveIds.find(mm => mm === m.move)) {
           uniqueUsedMoveIds.add(m.move);
@@ -9186,7 +9195,17 @@ export function initMoves() {
       .attr(FlinchAttr),
     new AttackMove(Moves.WEATHER_BALL, PokemonType.NORMAL, MoveCategory.SPECIAL, 50, 100, 10, -1, 0, 3)
       .attr(WeatherBallTypeAttr)
-      .attr(MovePowerMultiplierAttr, (user, target, move) => [ WeatherType.SUNNY, WeatherType.RAIN, WeatherType.SANDSTORM, WeatherType.HAIL, WeatherType.SNOW, WeatherType.FOG, WeatherType.HEAVY_RAIN, WeatherType.HARSH_SUN ].includes(globalScene.arena.weather?.weatherType!) && !globalScene.arena.weather?.isEffectSuppressed() ? 2 : 1) // TODO: is this bang correct?
+      .attr(MovePowerMultiplierAttr, (user, target, move) => {
+        const weather = globalScene.arena.weather;
+        if (!weather) {
+          return 1;
+        }
+        const weatherTypes = [ WeatherType.SUNNY, WeatherType.RAIN, WeatherType.SANDSTORM, WeatherType.HAIL, WeatherType.SNOW, WeatherType.FOG, WeatherType.HEAVY_RAIN, WeatherType.HARSH_SUN ];
+        if (weatherTypes.includes(weather.weatherType) && !weather.isEffectSuppressed()) {
+          return 2;
+        }
+        return 1;
+      })
       .ballBombMove(),
     new StatusMove(Moves.AROMATHERAPY, PokemonType.GRASS, -1, 5, -1, 0, 3)
       .attr(PartyStatusCureAttr, i18next.t("moveTriggers:soothingAromaWaftedThroughArea"), Abilities.SAP_SIPPER)
@@ -9426,7 +9445,13 @@ export function initMoves() {
       .attr(AbilityChangeAttr, Abilities.INSOMNIA)
       .reflectable(),
     new AttackMove(Moves.SUCKER_PUNCH, PokemonType.DARK, MoveCategory.PHYSICAL, 70, 100, 5, -1, 1, 4)
-      .condition((user, target, move) => globalScene.currentBattle.turnCommands[target.getBattlerIndex()]?.command === Command.FIGHT && !target.turnData.acted && allMoves[globalScene.currentBattle.turnCommands[target.getBattlerIndex()]?.move?.move!].category !== MoveCategory.STATUS), // TODO: is this bang correct?
+      .condition((user, target, move) => {
+        const turnCommand = globalScene.currentBattle.turnCommands[target.getBattlerIndex()];
+        if (!turnCommand || !turnCommand.move) {
+          return false;
+        }
+        return (turnCommand.command === Command.FIGHT && !target.turnData.acted && allMoves[turnCommand.move.move].category !== MoveCategory.STATUS);
+      }),
     new StatusMove(Moves.TOXIC_SPIKES, PokemonType.POISON, -1, 20, -1, 0, 4)
       .attr(AddArenaTrapTagAttr, ArenaTagType.TOXIC_SPIKES)
       .target(MoveTarget.ENEMY_SIDE)
@@ -10321,8 +10346,12 @@ export function initMoves() {
       .ignoresSubstitute(),
     new AttackMove(Moves.SMART_STRIKE, PokemonType.STEEL, MoveCategory.PHYSICAL, 70, -1, 10, -1, 0, 7),
     new StatusMove(Moves.PURIFY, PokemonType.POISON, -1, 20, -1, 0, 7)
-      .condition(
-        (user: Pokemon, target: Pokemon, move: Move) => isNonVolatileStatusEffect(target.status?.effect!)) // TODO: is this bang correct?
+      .condition((user, target, move) => {
+        if (!target.status) {
+          return false;
+        }
+        return isNonVolatileStatusEffect(target.status.effect);
+      })
       .attr(HealAttr, 0.5)
       .attr(HealStatusEffectAttr, false, getNonVolatileStatusEffects())
       .triageMove()
@@ -11041,7 +11070,13 @@ export function initMoves() {
       .slicingMove(),
     new AttackMove(Moves.HYDRO_STEAM, PokemonType.WATER, MoveCategory.SPECIAL, 80, 100, 15, -1, 0, 9)
       .attr(IgnoreWeatherTypeDebuffAttr, WeatherType.SUNNY)
-      .attr(MovePowerMultiplierAttr, (user, target, move) => [ WeatherType.SUNNY, WeatherType.HARSH_SUN ].includes(globalScene.arena.weather?.weatherType!) && !globalScene.arena.weather?.isEffectSuppressed() ? 1.5 : 1), // TODO: is this bang correct?
+      .attr(MovePowerMultiplierAttr, (user, target, move) => {
+        const weather = globalScene.arena.weather;
+        if (!weather) {
+          return 1;
+        }
+        return [ WeatherType.SUNNY, WeatherType.HARSH_SUN ].includes(weather.weatherType) && !weather.isEffectSuppressed() ? 1.5 : 1;
+      }),
     new AttackMove(Moves.RUINATION, PokemonType.DARK, MoveCategory.SPECIAL, -1, 90, 10, -1, 0, 9)
       .attr(TargetHalfHpDamageAttr),
     new AttackMove(Moves.COLLISION_COURSE, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 9)
@@ -11156,7 +11191,13 @@ export function initMoves() {
       .attr(ProtectAttr, BattlerTagType.BURNING_BULWARK)
       .condition(failIfLastCondition),
     new AttackMove(Moves.THUNDERCLAP, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 70, 100, 5, -1, 1, 9)
-      .condition((user, target, move) => globalScene.currentBattle.turnCommands[target.getBattlerIndex()]?.command === Command.FIGHT && !target.turnData.acted && allMoves[globalScene.currentBattle.turnCommands[target.getBattlerIndex()]?.move?.move!].category !== MoveCategory.STATUS), // TODO: is this bang correct?
+      .condition((user, target, move) => {
+        const turnCommand = globalScene.currentBattle.turnCommands[target.getBattlerIndex()];
+        if (!turnCommand || !turnCommand.move) {
+          return false;
+        }
+        return (turnCommand.command === Command.FIGHT && !target.turnData.acted && allMoves[turnCommand.move.move].category !== MoveCategory.STATUS);
+      }),
     new AttackMove(Moves.MIGHTY_CLEAVE, PokemonType.ROCK, MoveCategory.PHYSICAL, 95, 100, 5, -1, 0, 9)
       .slicingMove()
       .ignoresProtect(),
diff --git a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts
index d9bd6983d97..6118fe3d0de 100644
--- a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts
+++ b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts
@@ -140,7 +140,8 @@ export const FieryFalloutEncounter: MysteryEncounter = MysteryEncounterBuilder.w
     // Load animations/sfx for Volcarona moves
     loadCustomMovesForEncounter([Moves.FIRE_SPIN, Moves.QUIVER_DANCE]);
 
-    globalScene.arena.trySetWeather(WeatherType.SUNNY, true);
+    const pokemon = globalScene.getEnemyPokemon();
+    globalScene.arena.trySetWeather(WeatherType.SUNNY, pokemon);
 
     encounter.setDialogueToken("volcaronaName", getPokemonSpecies(Species.VOLCARONA).getName());
 
diff --git a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
index a81392941ba..2b7cd823af2 100644
--- a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
+++ b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
@@ -306,7 +306,7 @@ export const GlobalTradeSystemEncounter: MysteryEncounter = MysteryEncounterBuil
             if (eggMoves) {
               // Cannot gen the rare egg move, only 1 of the first 3 common moves
               const eggMove = eggMoves[randSeedInt(3)];
-              if (!tradePokemon.moveset.some(m => m?.moveId === eggMove)) {
+              if (!tradePokemon.moveset.some(m => m.moveId === eggMove)) {
                 if (tradePokemon.moveset.length < 4) {
                   tradePokemon.moveset.push(new PokemonMove(eggMove));
                 } else {
diff --git a/src/data/mystery-encounters/encounters/weird-dream-encounter.ts b/src/data/mystery-encounters/encounters/weird-dream-encounter.ts
index 758e3fabd76..5d3f834ed75 100644
--- a/src/data/mystery-encounters/encounters/weird-dream-encounter.ts
+++ b/src/data/mystery-encounters/encounters/weird-dream-encounter.ts
@@ -781,7 +781,7 @@ async function addEggMoveToNewPokemonMoveset(
     let randomEggMoveIndex = eggMoveIndices.pop();
     let randomEggMove = !isNullOrUndefined(randomEggMoveIndex) ? eggMoves[randomEggMoveIndex] : null;
     let retries = 0;
-    while (retries < 3 && (!randomEggMove || newPokemon.moveset.some(m => m?.moveId === randomEggMove))) {
+    while (retries < 3 && (!randomEggMove || newPokemon.moveset.some(m => m.moveId === randomEggMove))) {
       // If Pokemon already knows this move, roll for another egg move
       randomEggMoveIndex = eggMoveIndices.pop();
       randomEggMove = !isNullOrUndefined(randomEggMoveIndex) ? eggMoves[randomEggMoveIndex] : null;
@@ -789,7 +789,7 @@ async function addEggMoveToNewPokemonMoveset(
     }
 
     if (randomEggMove) {
-      if (!newPokemon.moveset.some(m => m?.moveId === randomEggMove)) {
+      if (!newPokemon.moveset.some(m => m.moveId === randomEggMove)) {
         if (newPokemon.moveset.length < 4) {
           newPokemon.moveset.push(new PokemonMove(randomEggMove));
         } else {
@@ -820,16 +820,13 @@ async function addEggMoveToNewPokemonMoveset(
  */
 function addFavoredMoveToNewPokemonMoveset(
   newPokemon: PlayerPokemon,
-  newPokemonGeneratedMoveset: (PokemonMove | null)[],
+  newPokemonGeneratedMoveset: PokemonMove[],
   newEggMoveIndex: number | null,
 ) {
   let favoredMove: PokemonMove | null = null;
   for (const move of newPokemonGeneratedMoveset) {
     // Needs to match first type, second type will be replaced
-    if (
-      move?.getMove().type === newPokemon.getTypes()[0] &&
-      !newPokemon.moveset.some(m => m?.moveId === move?.moveId)
-    ) {
+    if (move?.getMove().type === newPokemon.getTypes()[0] && !newPokemon.moveset.some(m => m.moveId === move.moveId)) {
       favoredMove = move;
       break;
     }
@@ -839,7 +836,7 @@ function addFavoredMoveToNewPokemonMoveset(
   if (!favoredMove) {
     for (const move of newPokemonGeneratedMoveset) {
       // Needs to match first type, second type will be replaced
-      if (!newPokemon.moveset.some(m => m?.moveId === move?.moveId)) {
+      if (!newPokemon.moveset.some(m => m.moveId === move.moveId)) {
         favoredMove = move;
         break;
       }
diff --git a/src/data/mystery-encounters/mystery-encounter-requirements.ts b/src/data/mystery-encounters/mystery-encounter-requirements.ts
index e9398547740..f9aedf2c1a7 100644
--- a/src/data/mystery-encounters/mystery-encounter-requirements.ts
+++ b/src/data/mystery-encounters/mystery-encounter-requirements.ts
@@ -576,19 +576,19 @@ export class MoveRequirement extends EncounterPokemonRequirement {
       return partyPokemon.filter(
         pokemon =>
           (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle()) &&
-          pokemon.moveset.some(move => move?.moveId && this.requiredMoves.includes(move.moveId)),
+          pokemon.moveset.some(move => move.moveId && this.requiredMoves.includes(move.moveId)),
       );
     }
     // for an inverted query, we only want to get the pokemon that don't have ANY of the listed moves
     return partyPokemon.filter(
       pokemon =>
         (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle()) &&
-        !pokemon.moveset.some(move => move?.moveId && this.requiredMoves.includes(move.moveId)),
+        !pokemon.moveset.some(move => move.moveId && this.requiredMoves.includes(move.moveId)),
     );
   }
 
   override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
-    const includedMoves = pokemon?.moveset.filter(move => move?.moveId && this.requiredMoves.includes(move.moveId));
+    const includedMoves = pokemon?.moveset.filter(move => move.moveId && this.requiredMoves.includes(move.moveId));
     if (includedMoves && includedMoves.length > 0 && includedMoves[0]) {
       return ["move", includedMoves[0].getName()];
     }
@@ -626,7 +626,7 @@ export class CompatibleMoveRequirement extends EncounterPokemonRequirement {
       return partyPokemon.filter(
         pokemon =>
           this.requiredMoves.filter(learnableMove =>
-            pokemon.compatibleTms.filter(tm => !pokemon.moveset.find(m => m?.moveId === tm)).includes(learnableMove),
+            pokemon.compatibleTms.filter(tm => !pokemon.moveset.find(m => m.moveId === tm)).includes(learnableMove),
           ).length > 0,
       );
     }
@@ -634,14 +634,14 @@ export class CompatibleMoveRequirement extends EncounterPokemonRequirement {
     return partyPokemon.filter(
       pokemon =>
         this.requiredMoves.filter(learnableMove =>
-          pokemon.compatibleTms.filter(tm => !pokemon.moveset.find(m => m?.moveId === tm)).includes(learnableMove),
+          pokemon.compatibleTms.filter(tm => !pokemon.moveset.find(m => m.moveId === tm)).includes(learnableMove),
         ).length === 0,
     );
   }
 
   override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
     const includedCompatMoves = this.requiredMoves.filter(reqMove =>
-      pokemon?.compatibleTms.filter(tm => !pokemon.moveset.find(m => m?.moveId === tm)).includes(reqMove),
+      pokemon?.compatibleTms.filter(tm => !pokemon.moveset.find(m => m.moveId === tm)).includes(reqMove),
     );
     if (includedCompatMoves.length > 0) {
       return ["compatibleMove", Moves[includedCompatMoves[0]]];
diff --git a/src/data/pokemon-forms.ts b/src/data/pokemon-forms.ts
index 4636e68d6d6..63e166c7fc4 100644
--- a/src/data/pokemon-forms.ts
+++ b/src/data/pokemon-forms.ts
@@ -363,7 +363,7 @@ export class SpeciesFormChangeMoveLearnedTrigger extends SpeciesFormChangeTrigge
   }
 
   canChange(pokemon: Pokemon): boolean {
-    return !!pokemon.moveset.filter(m => m?.moveId === this.move).length === this.known;
+    return !!pokemon.moveset.filter(m => m.moveId === this.move).length === this.known;
   }
 }
 
diff --git a/src/field/arena.ts b/src/field/arena.ts
index 2c538de890f..4f243789567 100644
--- a/src/field/arena.ts
+++ b/src/field/arena.ts
@@ -42,6 +42,7 @@ import { SpeciesFormChangeRevertWeatherFormTrigger, SpeciesFormChangeWeatherTrig
 import { CommonAnimPhase } from "#app/phases/common-anim-phase";
 import { ShowAbilityPhase } from "#app/phases/show-ability-phase";
 import { WeatherType } from "#enums/weather-type";
+import { FieldEffectModifier } from "#app/modifier/modifier";
 
 export class Arena {
   public biomeType: Biome;
@@ -311,10 +312,10 @@ export class Arena {
   /**
    * Attempts to set a new weather to the battle
    * @param weather {@linkcode WeatherType} new {@linkcode WeatherType} to set
-   * @param hasPokemonSource boolean if the new weather is from a pokemon
+   * @param user {@linkcode Pokemon} that caused the weather effect
    * @returns true if new weather set, false if no weather provided or attempting to set the same weather as currently in use
    */
-  trySetWeather(weather: WeatherType, hasPokemonSource: boolean): boolean {
+  trySetWeather(weather: WeatherType, user?: Pokemon): boolean {
     if (Overrides.WEATHER_OVERRIDE) {
       return this.trySetWeatherOverride(Overrides.WEATHER_OVERRIDE);
     }
@@ -336,7 +337,14 @@ export class Arena {
       return false;
     }
 
-    this.weather = weather ? new Weather(weather, hasPokemonSource ? 5 : 0) : null;
+    const weatherDuration = new Utils.NumberHolder(0);
+
+    if (!Utils.isNullOrUndefined(user)) {
+      weatherDuration.value = 5;
+      globalScene.applyModifier(FieldEffectModifier, user.isPlayer(), user, weatherDuration);
+    }
+
+    this.weather = weather ? new Weather(weather, weatherDuration.value) : null;
     this.eventTarget.dispatchEvent(
       new WeatherChangedEvent(oldWeatherType, this.weather?.weatherType!, this.weather?.turnsLeft!),
     ); // TODO: is this bang correct?
@@ -398,14 +406,29 @@ export class Arena {
     return !(this.terrain?.terrainType === (terrain || undefined));
   }
 
-  trySetTerrain(terrain: TerrainType, hasPokemonSource: boolean, ignoreAnim = false): boolean {
+  /**
+   * Attempts to set a new terrain effect to the battle
+   * @param terrain {@linkcode TerrainType} new {@linkcode TerrainType} to set
+   * @param ignoreAnim boolean if the terrain animation should be ignored
+   * @param user {@linkcode Pokemon} that caused the terrain effect
+   * @returns true if new terrain set, false if no terrain provided or attempting to set the same terrain as currently in use
+   */
+  trySetTerrain(terrain: TerrainType, ignoreAnim = false, user?: Pokemon): boolean {
     if (!this.canSetTerrain(terrain)) {
       return false;
     }
 
     const oldTerrainType = this.terrain?.terrainType || TerrainType.NONE;
 
-    this.terrain = terrain ? new Terrain(terrain, hasPokemonSource ? 5 : 0) : null;
+    const terrainDuration = new Utils.NumberHolder(0);
+
+    if (!Utils.isNullOrUndefined(user)) {
+      terrainDuration.value = 5;
+      globalScene.applyModifier(FieldEffectModifier, user.isPlayer(), user, terrainDuration);
+    }
+
+    this.terrain = terrain ? new Terrain(terrain, terrainDuration.value) : null;
+
     this.eventTarget.dispatchEvent(
       new TerrainChangedEvent(oldTerrainType, this.terrain?.terrainType!, this.terrain?.turnsLeft!),
     ); // TODO: are those bangs correct?
@@ -802,9 +825,9 @@ export class Arena {
   resetArenaEffects(): void {
     // Don't reset weather if a Biome's permanent weather is active
     if (this.weather?.turnsLeft !== 0) {
-      this.trySetWeather(WeatherType.NONE, false);
+      this.trySetWeather(WeatherType.NONE);
     }
-    this.trySetTerrain(TerrainType.NONE, false, true);
+    this.trySetTerrain(TerrainType.NONE, true);
     this.resetPlayerFaintCount();
     this.removeAllTags();
   }
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index c3b3ce86473..ca0877ce97d 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -296,7 +296,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   public stats: number[];
   public ivs: number[];
   public nature: Nature;
-  public moveset: (PokemonMove | null)[];
+  public moveset: PokemonMove[];
   public status: Status | null;
   public friendship: number;
   public metLevel: number;
@@ -694,7 +694,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
   loadAssets(ignoreOverride = true): Promise<void> {
     return new Promise(resolve => {
-      const moveIds = this.getMoveset().map(m => m!.getMove().id); // TODO: is this bang correct?
+      const moveIds = this.getMoveset().map(m => m.getMove().id);
       Promise.allSettled(moveIds.map(m => initMoveAnim(m))).then(() => {
         loadMoveAnimAssets(moveIds);
         this.getSpeciesForm().loadAssets(
@@ -1751,7 +1751,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
   abstract isBoss(): boolean;
 
-  getMoveset(ignoreOverride?: boolean): (PokemonMove | null)[] {
+  getMoveset(ignoreOverride?: boolean): PokemonMove[] {
     const ret =
       !ignoreOverride && this.summonData?.moveset
         ? this.summonData.moveset
@@ -1826,9 +1826,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         .filter(m => !levelMoves.includes(m))
         .concat(levelMoves);
     }
-    levelMoves = levelMoves.filter(
-      lm => !this.moveset.some(m => m?.moveId === lm),
-    );
+    levelMoves = levelMoves.filter(lm => !this.moveset.some(m => m.moveId === lm));
     return levelMoves;
   }
 
@@ -2942,7 +2940,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   setMove(moveIndex: number, moveId: Moves): void {
-    const move = moveId ? new PokemonMove(moveId) : null;
+    if (moveId === Moves.NONE) {
+      return;
+    }
+    const move = new PokemonMove(moveId);
     this.moveset[moveIndex] = move;
     if (this.summonData?.moveset) {
       this.summonData.moveset[moveIndex] = move;
@@ -3491,14 +3492,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         // Other damaging moves 2x weight if 0-1 damaging moves, 0.5x if 2, 0.125x if 3. These weights get 20x if STAB.
         // Status moves remain unchanged on weight, this encourages 1-2
         movePool = baseWeights
-          .filter(m => !this.moveset.some(mo => m[0] === mo?.moveId))
+          .filter(m => !this.moveset.some(mo => m[0] === mo.moveId))
           .map(m => {
             let ret: number;
             if (
               this.moveset.some(
                 mo =>
-                  mo?.getMove().category !== MoveCategory.STATUS &&
-                  mo?.getMove().type === allMoves[m[0]].type,
+                  mo.getMove().category !== MoveCategory.STATUS &&
+                  mo.getMove().type === allMoves[m[0]].type,
               )
             ) {
               ret = Math.ceil(Math.sqrt(m[1]));
@@ -3508,7 +3509,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
                   Math.max(
                     Math.pow(
                       4,
-                      this.moveset.filter(mo => (mo?.getMove().power ?? 0) > 1)
+                      this.moveset.filter(mo => (mo.getMove().power ?? 0) > 1)
                         .length,
                     ) / 8,
                     0.5,
@@ -3522,9 +3523,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
           });
       } else {
         // Non-trainer pokemon just use normal weights
-        movePool = baseWeights.filter(
-          m => !this.moveset.some(mo => m[0] === mo?.moveId),
-        );
+        movePool = baseWeights.filter(m => !this.moveset.some(mo => m[0] === mo.moveId));
       }
       const totalWeight = movePool.reduce((v, m) => v + m[1], 0);
       let rand = Utils.randSeedInt(totalWeight);
@@ -6856,18 +6855,7 @@ export class PlayerPokemon extends Pokemon {
   copyMoveset(): PokemonMove[] {
     const newMoveset: PokemonMove[] = [];
     this.moveset.forEach(move => {
-      // TODO: refactor `moveset` to not accept `null`s
-      if (move) {
-        newMoveset.push(
-          new PokemonMove(
-            move.moveId,
-            0,
-            move.ppUp,
-            move.virtual,
-            move.maxPpOverride,
-          ),
-        );
-      }
+      newMoveset.push(new PokemonMove(move.moveId, 0, move.ppUp, move.virtual, move.maxPpOverride));
     });
 
     return newMoveset;
@@ -7054,17 +7042,8 @@ export class EnemyPokemon extends Pokemon {
     if (moveQueue.length !== 0) {
       const queuedMove = moveQueue[0];
       if (queuedMove) {
-        const moveIndex = this.getMoveset().findIndex(
-          m => m?.moveId === queuedMove.move,
-        );
-        if (
-          (moveIndex > -1 &&
-            this.getMoveset()[moveIndex]!.isUsable(
-              this,
-              queuedMove.ignorePP,
-            )) ||
-          queuedMove.virtual
-        ) {
+        const moveIndex = this.getMoveset().findIndex(m => m.moveId === queuedMove.move);
+        if ((moveIndex > -1 && this.getMoveset()[moveIndex].isUsable(this, queuedMove.ignorePP)) || queuedMove.virtual) {
           return queuedMove;
         } else {
           this.getMoveQueue().shift();
@@ -7074,20 +7053,17 @@ export class EnemyPokemon extends Pokemon {
     }
 
     // Filter out any moves this Pokemon cannot use
-    let movePool = this.getMoveset().filter(m => m?.isUsable(this));
+    let movePool = this.getMoveset().filter(m => m.isUsable(this));
     // If no moves are left, use Struggle. Otherwise, continue with move selection
     if (movePool.length) {
       // If there's only 1 move in the move pool, use it.
       if (movePool.length === 1) {
-        return {
-          move: movePool[0]!.moveId,
-          targets: this.getNextTargets(movePool[0]!.moveId),
-        }; // TODO: are the bangs correct?
+        return { move: movePool[0].moveId, targets: this.getNextTargets(movePool[0].moveId) };
       }
       // If a move is forced because of Encore, use it.
       const encoreTag = this.getTag(EncoreTag) as EncoreTag;
       if (encoreTag) {
-        const encoreMove = movePool.find(m => m?.moveId === encoreTag.moveId);
+        const encoreMove = movePool.find(m => m.moveId === encoreTag.moveId);
         if (encoreMove) {
           return {
             move: encoreMove.moveId,
@@ -7097,8 +7073,7 @@ export class EnemyPokemon extends Pokemon {
       }
       switch (this.aiType) {
         case AiType.RANDOM: // No enemy should spawn with this AI type in-game
-          const moveId =
-            movePool[globalScene.randBattleSeedInt(movePool.length)]!.moveId; // TODO: is the bang correct?
+          const moveId = movePool[globalScene.randBattleSeedInt(movePool.length)].moveId;
           return { move: moveId, targets: this.getNextTargets(moveId) };
         case AiType.SMART_RANDOM:
         case AiType.SMART:
@@ -7160,11 +7135,9 @@ export class EnemyPokemon extends Pokemon {
            * For more information on how benefit scores are calculated, see `docs/enemy-ai.md`.
            */
           const moveScores = movePool.map(() => 0);
-          const moveTargets = Object.fromEntries(
-            movePool.map(m => [m!.moveId, this.getNextTargets(m!.moveId)]),
-          ); // TODO: are those bangs correct?
+          const moveTargets = Object.fromEntries(movePool.map(m => [ m.moveId, this.getNextTargets(m.moveId) ]));
           for (const m in movePool) {
-            const pokemonMove = movePool[m]!; // TODO: is the bang correct?
+            const pokemonMove = movePool[m];
             const move = pokemonMove.getMove();
 
             let moveScore = moveScores[m];
@@ -7273,16 +7246,8 @@ export class EnemyPokemon extends Pokemon {
               r++;
             }
           }
-          console.log(
-            movePool.map(m => m!.getName()),
-            moveScores,
-            r,
-            sortedMovePool.map(m => m!.getName()),
-          ); // TODO: are those bangs correct?
-          return {
-            move: sortedMovePool[r]!.moveId,
-            targets: moveTargets[sortedMovePool[r]!.moveId],
-          };
+          console.log(movePool.map(m => m.getName()), moveScores, r, sortedMovePool.map(m => m.getName()));
+          return { move: sortedMovePool[r]!.moveId, targets: moveTargets[sortedMovePool[r]!.moveId] };
       }
     }
 
@@ -7641,7 +7606,7 @@ export class PokemonSummonData {
   public gender: Gender;
   public fusionGender: Gender;
   public stats: number[] = [0, 0, 0, 0, 0, 0];
-  public moveset: (PokemonMove | null)[];
+  public moveset: PokemonMove[];
   // If not initialized this value will not be populated from save data.
   public types: PokemonType[] = [];
   public addedType: PokemonType | null = null;
diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts
index 3d2e67b0dc3..f9770e9c6cc 100644
--- a/src/modifier/modifier-type.ts
+++ b/src/modifier/modifier-type.ts
@@ -97,6 +97,7 @@ import {
   type PersistentModifier,
   TempExtraModifierModifier,
   CriticalCatchChanceBoosterModifier,
+  FieldEffectModifier,
 } from "#app/modifier/modifier";
 import { ModifierTier } from "#app/modifier/modifier-tier";
 import Overrides from "#app/overrides";
@@ -627,7 +628,7 @@ export class PokemonAllMovePpRestoreModifierType extends PokemonModifierType {
       iconImage,
       (_type, args) => new PokemonAllMovePpRestoreModifier(this, (args[0] as PlayerPokemon).id, this.restorePoints),
       (pokemon: PlayerPokemon) => {
-        if (!pokemon.getMoveset().filter(m => m?.ppUsed).length) {
+        if (!pokemon.getMoveset().filter(m => m.ppUsed).length) {
           return PartyUiHandler.NoEffectMessage;
         }
         return null;
@@ -1170,7 +1171,7 @@ export class TmModifierType extends PokemonModifierType {
       (pokemon: PlayerPokemon) => {
         if (
           pokemon.compatibleTms.indexOf(moveId) === -1 ||
-          pokemon.getMoveset().filter(m => m?.moveId === moveId).length
+          pokemon.getMoveset().filter(m => m.moveId === moveId).length
         ) {
           return PartyUiHandler.NoEffectMessage;
         }
@@ -1333,7 +1334,7 @@ class AttackTypeBoosterModifierTypeGenerator extends ModifierTypeGenerator {
       const attackMoveTypes = party.flatMap(p =>
         p
           .getMoveset()
-          .map(m => m?.getMove())
+          .map(m => m.getMove())
           .filter(m => m instanceof AttackMove)
           .map(m => m.type),
       );
@@ -1468,7 +1469,7 @@ class SpeciesStatBoosterModifierTypeGenerator extends ModifierTypeGenerator {
         const speciesId = p.getSpeciesForm(true).speciesId;
         const fusionSpeciesId = p.isFusion() ? p.getFusionSpeciesForm(true).speciesId : null;
         // TODO: Use commented boolean when Fling is implemented
-        const hasFling = false; /* p.getMoveset(true).some(m => m?.moveId === Moves.FLING) */
+        const hasFling = false; /* p.getMoveset(true).some(m => m.moveId === Moves.FLING) */
 
         for (const i in values) {
           const checkedSpecies = values[i].species;
@@ -1529,7 +1530,7 @@ class TmModifierTypeGenerator extends ModifierTypeGenerator {
       const partyMemberCompatibleTms = party.map(p => {
         const previousLevelMoves = p.getLearnableLevelMoves();
         return (p as PlayerPokemon).compatibleTms.filter(
-          tm => !p.moveset.find(m => m?.moveId === tm) && !previousLevelMoves.find(lm => lm === tm),
+          tm => !p.moveset.find(m => m.moveId === tm) && !previousLevelMoves.find(lm => lm === tm),
         );
       });
       const tierUniqueCompatibleTms = partyMemberCompatibleTms
@@ -1998,6 +1999,13 @@ export const modifierTypes = {
       return new PokemonNatureChangeModifierType(randSeedInt(getEnumValues(Nature).length) as Nature);
     }),
 
+  MYSTICAL_ROCK: () =>
+    new PokemonHeldItemModifierType(
+      "modifierType:ModifierType.MYSTICAL_ROCK",
+      "mystical_rock",
+      (type, args) => new FieldEffectModifier(type, (args[0] as Pokemon).id),
+    ),
+
   TERA_SHARD: () =>
     new ModifierTypeGenerator((party: Pokemon[], pregenArgs?: any[]) => {
       if (pregenArgs && pregenArgs.length === 1 && pregenArgs[0] in PokemonType) {
@@ -2433,7 +2441,7 @@ const modifierPool: ModifierPool = {
               !p.getHeldItems().some(m => m instanceof BerryModifier && m.berryType === BerryType.LEPPA) &&
               p
                 .getMoveset()
-                .filter(m => m?.ppUsed && m.getMovePp() - m.ppUsed <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2))
+                .filter(m => m.ppUsed && m.getMovePp() - m.ppUsed <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2))
                 .length,
           ).length,
           3,
@@ -2452,7 +2460,7 @@ const modifierPool: ModifierPool = {
               !p.getHeldItems().some(m => m instanceof BerryModifier && m.berryType === BerryType.LEPPA) &&
               p
                 .getMoveset()
-                .filter(m => m?.ppUsed && m.getMovePp() - m.ppUsed <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2))
+                .filter(m => m.ppUsed && m.getMovePp() - m.ppUsed <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2))
                 .length,
           ).length,
           3,
@@ -2574,7 +2582,7 @@ const modifierPool: ModifierPool = {
               !p.getHeldItems().some(m => m instanceof BerryModifier && m.berryType === BerryType.LEPPA) &&
               p
                 .getMoveset()
-                .filter(m => m?.ppUsed && m.getMovePp() - m.ppUsed <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2))
+                .filter(m => m.ppUsed && m.getMovePp() - m.ppUsed <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2))
                 .length,
           ).length,
           3,
@@ -2593,7 +2601,7 @@ const modifierPool: ModifierPool = {
               !p.getHeldItems().some(m => m instanceof BerryModifier && m.berryType === BerryType.LEPPA) &&
               p
                 .getMoveset()
-                .filter(m => m?.ppUsed && m.getMovePp() - m.ppUsed <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2))
+                .filter(m => m.ppUsed && m.getMovePp() - m.ppUsed <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2))
                 .length,
           ).length,
           3,
@@ -2810,6 +2818,47 @@ const modifierPool: ModifierPool = {
       },
       10,
     ),
+    new WeightedModifierType(
+      modifierTypes.MYSTICAL_ROCK,
+      (party: Pokemon[]) => {
+        return party.some(p => {
+          const moveset = p.getMoveset(true).map(m => m.moveId);
+
+          const hasAbility = [
+            Abilities.DRIZZLE,
+            Abilities.ORICHALCUM_PULSE,
+            Abilities.DRIZZLE,
+            Abilities.SAND_STREAM,
+            Abilities.SAND_SPIT,
+            Abilities.SNOW_WARNING,
+            Abilities.ELECTRIC_SURGE,
+            Abilities.HADRON_ENGINE,
+            Abilities.PSYCHIC_SURGE,
+            Abilities.GRASSY_SURGE,
+            Abilities.SEED_SOWER,
+            Abilities.MISTY_SURGE,
+          ].some(a => p.hasAbility(a, false, true));
+
+          const hasMoves = [
+            Moves.SUNNY_DAY,
+            Moves.RAIN_DANCE,
+            Moves.SANDSTORM,
+            Moves.SNOWSCAPE,
+            Moves.HAIL,
+            Moves.CHILLY_RECEPTION,
+            Moves.ELECTRIC_TERRAIN,
+            Moves.PSYCHIC_TERRAIN,
+            Moves.GRASSY_TERRAIN,
+            Moves.MISTY_TERRAIN,
+          ].some(m => moveset.includes(m));
+
+          return hasAbility || hasMoves;
+        })
+          ? 10
+          : 0;
+      },
+      10,
+    ),
     new WeightedModifierType(modifierTypes.REVIVER_SEED, 4),
     new WeightedModifierType(modifierTypes.CANDY_JAR, skipInLastClassicWaveOrDefault(5)),
     new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 9),
diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts
index 4c59bfe1ef1..7c9207bbea5 100644
--- a/src/modifier/modifier.ts
+++ b/src/modifier/modifier.ts
@@ -2014,6 +2014,38 @@ export class ResetNegativeStatStageModifier extends PokemonHeldItemModifier {
   }
 }
 
+/**
+ * Modifier used for held items, namely Mystical Rock, that extend the
+ * duration of weather and terrain effects.
+ * @extends PokemonHeldItemModifier
+ * @see {@linkcode apply}
+ */
+export class FieldEffectModifier extends PokemonHeldItemModifier {
+  /**
+   * Provides two more turns per stack to any weather or terrain effect caused
+   * by the holder.
+   * @param pokemon {@linkcode Pokemon} that holds the held item
+   * @param fieldDuration {@linkcode NumberHolder} that stores the current field effect duration
+   * @returns `true` if the field effect extension was applied successfully
+   */
+  override apply(_pokemon: Pokemon, fieldDuration: NumberHolder): boolean {
+    fieldDuration.value += 2 * this.stackCount;
+    return true;
+  }
+
+  override matchType(modifier: Modifier): boolean {
+    return modifier instanceof FieldEffectModifier;
+  }
+
+  override clone(): FieldEffectModifier {
+    return new FieldEffectModifier(this.type, this.pokemonId, this.stackCount);
+  }
+
+  override getMaxHeldItemCount(_pokemon?: Pokemon): number {
+    return 2;
+  }
+}
+
 export abstract class ConsumablePokemonModifier extends ConsumableModifier {
   public pokemonId: number;
 
diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index 055d52e7a8b..8691ac453ca 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -104,15 +104,14 @@ export class CommandPhase extends FieldPhase {
       moveQueue[0] &&
       moveQueue[0].move &&
       !moveQueue[0].virtual &&
-      (!playerPokemon.getMoveset().find(m => m?.moveId === moveQueue[0].move) ||
+      (!playerPokemon.getMoveset().find(m => m.moveId === moveQueue[0].move) ||
         !playerPokemon
           .getMoveset()
-          [playerPokemon.getMoveset().findIndex(m => m?.moveId === moveQueue[0].move)]!.isUsable(
+          [playerPokemon.getMoveset().findIndex(m => m.moveId === moveQueue[0].move)].isUsable(
             playerPokemon,
             moveQueue[0].ignorePP,
           ))
     ) {
-      // TODO: is the bang correct?
       moveQueue.shift();
     }
 
@@ -121,12 +120,11 @@ export class CommandPhase extends FieldPhase {
       if (!queuedMove.move) {
         this.handleCommand(Command.FIGHT, -1);
       } else {
-        const moveIndex = playerPokemon.getMoveset().findIndex(m => m?.moveId === queuedMove.move);
+        const moveIndex = playerPokemon.getMoveset().findIndex(m => m.moveId === queuedMove.move);
         if (
-          (moveIndex > -1 && playerPokemon.getMoveset()[moveIndex]!.isUsable(playerPokemon, queuedMove.ignorePP)) ||
+          (moveIndex > -1 && playerPokemon.getMoveset()[moveIndex].isUsable(playerPokemon, queuedMove.ignorePP)) ||
           queuedMove.virtual
         ) {
-          // TODO: is the bang correct?
           this.handleCommand(Command.FIGHT, moveIndex, queuedMove.ignorePP, queuedMove);
         } else {
           globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex);
@@ -157,7 +155,7 @@ export class CommandPhase extends FieldPhase {
         if (
           cursor === -1 ||
           playerPokemon.trySelectMove(cursor, args[0] as boolean) ||
-          (useStruggle = cursor > -1 && !playerPokemon.getMoveset().filter(m => m?.isUsable(playerPokemon)).length)
+          (useStruggle = cursor > -1 && !playerPokemon.getMoveset().filter(m => m.isUsable(playerPokemon)).length)
         ) {
           let moveId: Moves;
           if (useStruggle) {
@@ -165,7 +163,7 @@ export class CommandPhase extends FieldPhase {
           } else if (turnMove !== undefined) {
             moveId = turnMove.move;
           } else if (cursor > -1) {
-            moveId = playerPokemon.getMoveset()[cursor]!.moveId;
+            moveId = playerPokemon.getMoveset()[cursor].moveId;
           } else {
             moveId = Moves.NONE;
           }
@@ -195,10 +193,14 @@ export class CommandPhase extends FieldPhase {
           if (moveTargets.targets.length > 1 && moveTargets.multiple) {
             globalScene.unshiftPhase(new SelectTargetPhase(this.fieldIndex));
           }
-          if (moveTargets.targets.length <= 1 || moveTargets.multiple) {
-            turnCommand.move!.targets = moveTargets.targets; //TODO: is the bang correct here?
-          } else if (playerPokemon.getTag(BattlerTagType.CHARGING) && playerPokemon.getMoveQueue().length >= 1) {
-            turnCommand.move!.targets = playerPokemon.getMoveQueue()[0].targets; //TODO: is the bang correct here?
+          if (turnCommand.move && (moveTargets.targets.length <= 1 || moveTargets.multiple)) {
+            turnCommand.move.targets = moveTargets.targets;
+          } else if (
+            turnCommand.move &&
+            playerPokemon.getTag(BattlerTagType.CHARGING) &&
+            playerPokemon.getMoveQueue().length >= 1
+          ) {
+            turnCommand.move.targets = playerPokemon.getMoveQueue()[0].targets;
           } else {
             globalScene.unshiftPhase(new SelectTargetPhase(this.fieldIndex));
           }
@@ -206,7 +208,7 @@ export class CommandPhase extends FieldPhase {
           globalScene.currentBattle.turnCommands[this.fieldIndex] = turnCommand;
           success = true;
         } else if (cursor < playerPokemon.getMoveset().length) {
-          const move = playerPokemon.getMoveset()[cursor]!; //TODO: is this bang correct?
+          const move = playerPokemon.getMoveset()[cursor];
           globalScene.ui.setMode(Mode.MESSAGE);
 
           // Decides between a Disabled, Not Implemented, or No PP translation message
diff --git a/src/phases/encounter-phase.ts b/src/phases/encounter-phase.ts
index 903502a9f5a..25297d42f43 100644
--- a/src/phases/encounter-phase.ts
+++ b/src/phases/encounter-phase.ts
@@ -699,7 +699,7 @@ export class EncounterPhase extends BattlePhase {
    */
   trySetWeatherIfNewBiome(): void {
     if (!this.loaded) {
-      globalScene.arena.trySetWeather(getRandomWeatherType(globalScene.arena), false);
+      globalScene.arena.trySetWeather(getRandomWeatherType(globalScene.arena));
     }
   }
 }
diff --git a/src/phases/learn-move-phase.ts b/src/phases/learn-move-phase.ts
index 7bed71b3363..4107a9cf087 100644
--- a/src/phases/learn-move-phase.ts
+++ b/src/phases/learn-move-phase.ts
@@ -49,7 +49,7 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase {
     const currentMoveset = pokemon.getMoveset();
 
     // The game first checks if the Pokemon already has the move and ends the phase if it does.
-    const hasMoveAlready = currentMoveset.some(m => m?.moveId === move.id) && this.moveId !== Moves.SKETCH;
+    const hasMoveAlready = currentMoveset.some(m => m.moveId === move.id) && this.moveId !== Moves.SKETCH;
     if (hasMoveAlready) {
       return this.end();
     }
diff --git a/src/phases/new-biome-encounter-phase.ts b/src/phases/new-biome-encounter-phase.ts
index ed768742aac..bb1fe54fe9f 100644
--- a/src/phases/new-biome-encounter-phase.ts
+++ b/src/phases/new-biome-encounter-phase.ts
@@ -45,6 +45,6 @@ export class NewBiomeEncounterPhase extends NextEncounterPhase {
    * Set biome weather.
    */
   trySetWeatherIfNewBiome(): void {
-    globalScene.arena.trySetWeather(getRandomWeatherType(globalScene.arena), false);
+    globalScene.arena.trySetWeather(getRandomWeatherType(globalScene.arena));
   }
 }
diff --git a/src/phases/party-heal-phase.ts b/src/phases/party-heal-phase.ts
index d95400a3f48..a9b24309e24 100644
--- a/src/phases/party-heal-phase.ts
+++ b/src/phases/party-heal-phase.ts
@@ -23,7 +23,7 @@ export class PartyHealPhase extends BattlePhase {
         pokemon.hp = pokemon.getMaxHp();
         pokemon.resetStatus();
         for (const move of pokemon.moveset) {
-          move!.ppUsed = 0; // TODO: is this bang correct?
+          move.ppUsed = 0;
         }
         pokemon.updateInfo(true);
       }
diff --git a/src/phases/turn-end-phase.ts b/src/phases/turn-end-phase.ts
index c55f6d69a58..836647fbfb4 100644
--- a/src/phases/turn-end-phase.ts
+++ b/src/phases/turn-end-phase.ts
@@ -68,12 +68,12 @@ export class TurnEndPhase extends FieldPhase {
     globalScene.arena.lapseTags();
 
     if (globalScene.arena.weather && !globalScene.arena.weather.lapse()) {
-      globalScene.arena.trySetWeather(WeatherType.NONE, false);
+      globalScene.arena.trySetWeather(WeatherType.NONE);
       globalScene.arena.triggerWeatherBasedFormChangesToNormal();
     }
 
     if (globalScene.arena.terrain && !globalScene.arena.terrain.lapse()) {
-      globalScene.arena.trySetTerrain(TerrainType.NONE, false);
+      globalScene.arena.trySetTerrain(TerrainType.NONE);
     }
 
     this.end();
diff --git a/src/phases/turn-start-phase.ts b/src/phases/turn-start-phase.ts
index 6065a0caf6e..34dd7df3e89 100644
--- a/src/phases/turn-start-phase.ts
+++ b/src/phases/turn-start-phase.ts
@@ -178,7 +178,7 @@ export class TurnStartPhase extends FieldPhase {
             continue;
           }
           const move =
-            pokemon.getMoveset().find(m => m?.moveId === queuedMove.move && m?.ppUsed < m?.getMovePp()) ||
+            pokemon.getMoveset().find(m => m.moveId === queuedMove.move && m.ppUsed < m.getMovePp()) ||
             new PokemonMove(queuedMove.move);
           if (move.getMove().hasAttr(MoveHeaderAttr)) {
             globalScene.unshiftPhase(new MoveHeaderPhase(pokemon, move));
diff --git a/src/system/pokemon-data.ts b/src/system/pokemon-data.ts
index 76f5526e407..3fa07e8b085 100644
--- a/src/system/pokemon-data.ts
+++ b/src/system/pokemon-data.ts
@@ -35,7 +35,7 @@ export default class PokemonData {
   public stats: number[];
   public ivs: number[];
   public nature: Nature;
-  public moveset: (PokemonMove | null)[];
+  public moveset: PokemonMove[];
   public status: Status | null;
   public friendship: number;
   public metLevel: number;
diff --git a/src/ui/fight-ui-handler.ts b/src/ui/fight-ui-handler.ts
index a4f02e13303..9f76e85f228 100644
--- a/src/ui/fight-ui-handler.ts
+++ b/src/ui/fight-ui-handler.ts
@@ -243,7 +243,7 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
     const hasMove = cursor < moveset.length;
 
     if (hasMove) {
-      const pokemonMove = moveset[cursor]!; // TODO: is the bang correct?
+      const pokemonMove = moveset[cursor];
       const moveType = pokemon.getMoveType(pokemonMove.getMove());
       const textureKey = Utils.getLocalizedSpriteKey("types");
       this.typeIcon.setTexture(textureKey, PokemonType[moveType].toLowerCase()).setScale(0.8);
diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts
index 6a9b565989d..3c04692ea31 100644
--- a/src/ui/party-ui-handler.ts
+++ b/src/ui/party-ui-handler.ts
@@ -478,7 +478,7 @@ export default class PartyUiHandler extends MessageUiHandler {
               filterResult = this.FilterChallengeLegal(pokemon);
             }
             if (filterResult === null && this.partyUiMode === PartyUiMode.MOVE_MODIFIER) {
-              filterResult = this.moveSelectFilter(pokemon.moveset[this.optionsCursor]!); // TODO: is this bang correct?
+              filterResult = this.moveSelectFilter(pokemon.moveset[this.optionsCursor]);
             }
           } else {
             filterResult = (this.selectFilter as PokemonModifierTransferSelectFilter)(
@@ -1182,7 +1182,7 @@ export default class PartyUiHandler extends MessageUiHandler {
           case PartyOption.MOVE_2:
           case PartyOption.MOVE_3:
           case PartyOption.MOVE_4:
-            const move = pokemon.moveset[option - PartyOption.MOVE_1]!; // TODO: is the bang correct?
+            const move = pokemon.moveset[option - PartyOption.MOVE_1];
             if (this.showMovePp) {
               const maxPP = move.getMovePp();
               const currPP = maxPP - move.ppUsed;
@@ -1647,7 +1647,7 @@ class PartySlot extends Phaser.GameObjects.Container {
       this.slotHpText.setVisible(false);
       let slotTmText: string;
 
-      if (this.pokemon.getMoveset().filter(m => m?.moveId === tmMoveId).length > 0) {
+      if (this.pokemon.getMoveset().filter(m => m.moveId === tmMoveId).length > 0) {
         slotTmText = i18next.t("partyUiHandler:learned");
       } else if (this.pokemon.compatibleTms.indexOf(tmMoveId) === -1) {
         slotTmText = i18next.t("partyUiHandler:notAble");
diff --git a/src/ui/pokedex-ui-handler.ts b/src/ui/pokedex-ui-handler.ts
index 1f79d7006b0..d55b278a148 100644
--- a/src/ui/pokedex-ui-handler.ts
+++ b/src/ui/pokedex-ui-handler.ts
@@ -37,11 +37,10 @@ import { addWindow } from "./ui-theme";
 import type { OptionSelectConfig } from "./abstact-option-select-ui-handler";
 import { FilterText, FilterTextRow } from "./filter-text";
 import { allAbilities } from "#app/data/ability";
-import type { PassiveAbilities } from "#app/data/balance/passives";
 import { starterPassiveAbilities } from "#app/data/balance/passives";
 import { allMoves } from "#app/data/moves/move";
 import { speciesTmMoves } from "#app/data/balance/tms";
-import { pokemonStarters } from "#app/data/balance/pokemon-evolutions";
+import { pokemonPrevolutions, pokemonStarters } from "#app/data/balance/pokemon-evolutions";
 import { Biome } from "#enums/biome";
 import { globalScene } from "#app/global-scene";
 
@@ -1404,7 +1403,12 @@ export default class PokedexUiHandler extends MessageUiHandler {
 
       // Ability filter
       const abilities = [species.ability1, species.ability2, species.abilityHidden].map(a => allAbilities[a].name);
-      const passives = starterPassiveAbilities[starterId] ?? ({} as PassiveAbilities);
+      const passiveId = starterPassiveAbilities.hasOwnProperty(species.speciesId)
+        ? species.speciesId
+        : starterPassiveAbilities.hasOwnProperty(starterId)
+          ? starterId
+          : pokemonPrevolutions[starterId];
+      const passives = starterPassiveAbilities[passiveId];
 
       const selectedAbility1 = this.filterText.getValue(FilterTextRow.ABILITY_1);
       const fitsFormAbility1 = species.forms.some(form =>
diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts
index d42572cfef4..9b209ded57a 100644
--- a/src/ui/summary-ui-handler.ts
+++ b/src/ui/summary-ui-handler.ts
@@ -1208,7 +1208,7 @@ export default class SummaryUiHandler extends UiHandler {
     }
 
     if (this.moveCursor < 4 && this.pokemon && this.moveCursor < this.pokemon.moveset.length) {
-      return this.pokemon.moveset[this.moveCursor]!.getMove(); // TODO: is this bang correct?
+      return this.pokemon.moveset[this.moveCursor].getMove();
     }
     if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE && this.moveCursor === 4) {
       return this.newMove;
diff --git a/test/abilities/forecast.test.ts b/test/abilities/forecast.test.ts
index bdc32604bba..642b490da72 100644
--- a/test/abilities/forecast.test.ts
+++ b/test/abilities/forecast.test.ts
@@ -181,7 +181,7 @@ describe("Abilities - Forecast", () => {
 
       expect(castform.formIndex).toBe(SNOWY_FORM);
 
-      game.scene.arena.trySetWeather(WeatherType.FOG, false);
+      game.scene.arena.trySetWeather(WeatherType.FOG);
       game.move.select(Moves.SPLASH);
       game.move.select(Moves.SPLASH, 1);
       await game.phaseInterceptor.to("TurnStartPhase");
diff --git a/test/abilities/lightningrod.test.ts b/test/abilities/lightningrod.test.ts
index 1ca6c6b1e89..986899353ff 100644
--- a/test/abilities/lightningrod.test.ts
+++ b/test/abilities/lightningrod.test.ts
@@ -24,7 +24,7 @@ describe("Abilities - Lightningrod", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SPLASH, Moves.SHOCK_WAVE ])
+      .moveset([Moves.SPLASH, Moves.SHOCK_WAVE])
       .ability(Abilities.BALL_FETCH)
       .battleType("double")
       .disableCrits()
@@ -34,7 +34,7 @@ describe("Abilities - Lightningrod", () => {
   });
 
   it("should redirect electric type moves", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
 
     const enemy1 = game.scene.getEnemyField()[0];
     const enemy2 = game.scene.getEnemyField()[1];
@@ -49,8 +49,8 @@ describe("Abilities - Lightningrod", () => {
   });
 
   it("should not redirect non-electric type moves", async () => {
-    game.override.moveset([ Moves.SPLASH, Moves.AERIAL_ACE ]);
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]);
+    game.override.moveset([Moves.SPLASH, Moves.AERIAL_ACE]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
 
     const enemy1 = game.scene.getEnemyField()[0];
     const enemy2 = game.scene.getEnemyField()[1];
@@ -65,7 +65,7 @@ describe("Abilities - Lightningrod", () => {
   });
 
   it("should boost the user's spatk without damaging", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
 
     const enemy2 = game.scene.getEnemyField()[1];
 
@@ -81,7 +81,7 @@ describe("Abilities - Lightningrod", () => {
 
   it("should not redirect moves changed from electric type via ability", async () => {
     game.override.ability(Abilities.NORMALIZE);
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
 
     const enemy1 = game.scene.getEnemyField()[0];
     const enemy2 = game.scene.getEnemyField()[1];
@@ -96,9 +96,8 @@ describe("Abilities - Lightningrod", () => {
   });
 
   it("should redirect moves changed to electric type via ability", async () => {
-    game.override.ability(Abilities.GALVANIZE)
-      .moveset(Moves.TACKLE);
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]);
+    game.override.ability(Abilities.GALVANIZE).moveset(Moves.TACKLE);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
 
     const enemy1 = game.scene.getEnemyField()[0];
     const enemy2 = game.scene.getEnemyField()[1];
diff --git a/test/abilities/neutralizing_gas.test.ts b/test/abilities/neutralizing_gas.test.ts
index 0003ee56598..aa5a48d5e4e 100644
--- a/test/abilities/neutralizing_gas.test.ts
+++ b/test/abilities/neutralizing_gas.test.ts
@@ -176,11 +176,8 @@ describe("Abilities - Neutralizing Gas", () => {
   });
 
   it("should not activate abilities of pokemon no longer on the field", async () => {
-    game.override
-      .battleType("single")
-      .ability(Abilities.NEUTRALIZING_GAS)
-      .enemyAbility(Abilities.DELTA_STREAM);
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    game.override.battleType("single").ability(Abilities.NEUTRALIZING_GAS).enemyAbility(Abilities.DELTA_STREAM);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const enemy = game.scene.getEnemyPokemon()!;
     const weatherChangeAttr = enemy.getAbilityAttrs(PostSummonWeatherChangeAbAttr, false)[0];
diff --git a/test/abilities/storm_drain.test.ts b/test/abilities/storm_drain.test.ts
index e2a7b3e212e..58ff477fa43 100644
--- a/test/abilities/storm_drain.test.ts
+++ b/test/abilities/storm_drain.test.ts
@@ -24,7 +24,7 @@ describe("Abilities - Storm Drain", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SPLASH, Moves.WATER_GUN ])
+      .moveset([Moves.SPLASH, Moves.WATER_GUN])
       .ability(Abilities.BALL_FETCH)
       .battleType("double")
       .disableCrits()
@@ -34,7 +34,7 @@ describe("Abilities - Storm Drain", () => {
   });
 
   it("should redirect water type moves", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
 
     const enemy1 = game.scene.getEnemyField()[0];
     const enemy2 = game.scene.getEnemyField()[1];
@@ -49,8 +49,8 @@ describe("Abilities - Storm Drain", () => {
   });
 
   it("should not redirect non-water type moves", async () => {
-    game.override.moveset([ Moves.SPLASH, Moves.AERIAL_ACE ]);
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]);
+    game.override.moveset([Moves.SPLASH, Moves.AERIAL_ACE]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
 
     const enemy1 = game.scene.getEnemyField()[0];
     const enemy2 = game.scene.getEnemyField()[1];
@@ -65,7 +65,7 @@ describe("Abilities - Storm Drain", () => {
   });
 
   it("should boost the user's spatk without damaging", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
 
     const enemy2 = game.scene.getEnemyField()[1];
 
@@ -81,7 +81,7 @@ describe("Abilities - Storm Drain", () => {
 
   it("should not redirect moves changed from water type via ability", async () => {
     game.override.ability(Abilities.NORMALIZE);
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
 
     const enemy1 = game.scene.getEnemyField()[0];
     const enemy2 = game.scene.getEnemyField()[1];
@@ -96,9 +96,8 @@ describe("Abilities - Storm Drain", () => {
   });
 
   it("should redirect moves changed to water type via ability", async () => {
-    game.override.ability(Abilities.LIQUID_VOICE)
-      .moveset(Moves.PSYCHIC_NOISE);
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]);
+    game.override.ability(Abilities.LIQUID_VOICE).moveset(Moves.PSYCHIC_NOISE);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
 
     const enemy1 = game.scene.getEnemyField()[0];
     const enemy2 = game.scene.getEnemyField()[1];
diff --git a/test/items/mystical_rock.test.ts b/test/items/mystical_rock.test.ts
new file mode 100644
index 00000000000..0558bc21fe1
--- /dev/null
+++ b/test/items/mystical_rock.test.ts
@@ -0,0 +1,60 @@
+import { globalScene } from "#app/global-scene";
+import { Moves } from "#enums/moves";
+import { Abilities } from "#enums/abilities";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phase from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Items - Mystical Rock", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phase.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override
+      .enemySpecies(Species.SHUCKLE)
+      .enemyMoveset(Moves.SPLASH)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .moveset([Moves.SUNNY_DAY, Moves.GRASSY_TERRAIN])
+      .startingHeldItems([{ name: "MYSTICAL_ROCK", count: 2 }])
+      .battleType("single");
+  });
+
+  it("should increase weather duration by +2 turns per stack", async () => {
+    await game.classicMode.startBattle([Species.GASTLY]);
+
+    game.move.select(Moves.SUNNY_DAY);
+
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    const weather = globalScene.arena.weather;
+
+    expect(weather).toBeDefined();
+    expect(weather!.turnsLeft).to.equal(9);
+  });
+
+  it("should increase terrain duration by +2 turns per stack", async () => {
+    await game.classicMode.startBattle([Species.GASTLY]);
+
+    game.move.select(Moves.GRASSY_TERRAIN);
+
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    const terrain = globalScene.arena.terrain;
+
+    expect(terrain).toBeDefined();
+    expect(terrain!.turnsLeft).to.equal(9);
+  });
+});
diff --git a/test/moves/dive.test.ts b/test/moves/dive.test.ts
index 8d7b0f9dd00..d7b53701a25 100644
--- a/test/moves/dive.test.ts
+++ b/test/moves/dive.test.ts
@@ -120,7 +120,7 @@ describe("Moves - Dive", () => {
 
     await game.phaseInterceptor.to("TurnEndPhase");
     await game.phaseInterceptor.to("TurnStartPhase", false);
-    game.scene.arena.trySetWeather(WeatherType.HARSH_SUN, false);
+    game.scene.arena.trySetWeather(WeatherType.HARSH_SUN);
 
     await game.phaseInterceptor.to("MoveEndPhase");
     expect(playerPokemon.getLastXMoves(1)[0].result).toBe(MoveResult.FAIL);
diff --git a/test/moves/grudge.test.ts b/test/moves/grudge.test.ts
index ebd062a76ee..161fa38edd2 100644
--- a/test/moves/grudge.test.ts
+++ b/test/moves/grudge.test.ts
@@ -41,7 +41,7 @@ describe("Moves - Grudge", () => {
     await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase");
 
-    const playerMove = playerPokemon?.getMoveset().find(m => m?.moveId === Moves.EMBER);
+    const playerMove = playerPokemon?.getMoveset().find(m => m.moveId === Moves.EMBER);
 
     expect(playerMove?.getPpRatio()).toBe(0);
   });
@@ -60,7 +60,7 @@ describe("Moves - Grudge", () => {
     await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("BerryPhase");
 
-    const playerMove = playerPokemon?.getMoveset().find(m => m?.moveId === Moves.EMBER);
+    const playerMove = playerPokemon?.getMoveset().find(m => m.moveId === Moves.EMBER);
 
     expect(playerMove?.getPpRatio()).toBe(0);
   });
@@ -84,7 +84,7 @@ describe("Moves - Grudge", () => {
 
     expect(enemyPokemon?.isFainted()).toBe(true);
 
-    const playerMove = playerPokemon?.getMoveset().find(m => m?.moveId === Moves.FALSE_SWIPE);
+    const playerMove = playerPokemon?.getMoveset().find(m => m.moveId === Moves.FALSE_SWIPE);
     expect(playerMove?.getPpRatio()).toBeGreaterThan(0);
   });
 });
diff --git a/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts b/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts
index 3e1588f3a72..e00ce03333c 100644
--- a/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts
+++ b/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts
@@ -136,7 +136,7 @@ describe("Absolute Avarice - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
       expect(enemyField.length).toBe(1);
       expect(enemyField[0].species.speciesId).toBe(Species.GREEDENT);
-      const moveset = enemyField[0].moveset.map(m => m?.moveId);
+      const moveset = enemyField[0].moveset.map(m => m.moveId);
       expect(moveset?.length).toBe(4);
       expect(moveset).toEqual([Moves.THRASH, Moves.BODY_PRESS, Moves.STUFF_CHEEKS, Moves.CRUNCH]);
 
@@ -259,7 +259,7 @@ describe("Absolute Avarice - Mystery Encounter", () => {
       expect(partyCountBefore + 1).toBe(partyCountAfter);
       const greedent = scene.getPlayerParty()[scene.getPlayerParty().length - 1];
       expect(greedent.species.speciesId).toBe(Species.GREEDENT);
-      const moveset = greedent.moveset.map(m => m?.moveId);
+      const moveset = greedent.moveset.map(m => m.moveId);
       expect(moveset?.length).toBe(4);
       expect(moveset).toEqual([Moves.THRASH, Moves.BODY_PRESS, Moves.STUFF_CHEEKS, Moves.SLACK_OFF]);
     });
diff --git a/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts b/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts
index a4c1052463c..77cd65e51b9 100644
--- a/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts
+++ b/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts
@@ -112,7 +112,7 @@ describe("Dancing Lessons - Mystery Encounter", () => {
       expect(enemyField.length).toBe(1);
       expect(enemyField[0].species.speciesId).toBe(Species.ORICORIO);
       expect(enemyField[0].summonData.statStages).toEqual([1, 1, 1, 1, 0, 0, 0]);
-      const moveset = enemyField[0].moveset.map(m => m?.moveId);
+      const moveset = enemyField[0].moveset.map(m => m.moveId);
       expect(moveset.some(m => m === Moves.REVELATION_DANCE)).toBeTruthy();
 
       const movePhases = phaseSpy.mock.calls.filter(p => p[0] instanceof MovePhase).map(p => p[0]);
@@ -208,7 +208,7 @@ describe("Dancing Lessons - Mystery Encounter", () => {
       expect(partyCountBefore + 1).toBe(partyCountAfter);
       const oricorio = scene.getPlayerParty()[scene.getPlayerParty().length - 1];
       expect(oricorio.species.speciesId).toBe(Species.ORICORIO);
-      const moveset = oricorio.moveset.map(m => m?.moveId);
+      const moveset = oricorio.moveset.map(m => m.moveId);
       expect(moveset?.some(m => m === Moves.REVELATION_DANCE)).toBeTruthy();
       expect(moveset?.some(m => m === Moves.DRAGON_DANCE)).toBeTruthy();
     });
diff --git a/test/testUtils/gameManager.ts b/test/testUtils/gameManager.ts
index 0ebc83cae31..3289c0ade01 100644
--- a/test/testUtils/gameManager.ts
+++ b/test/testUtils/gameManager.ts
@@ -292,7 +292,7 @@ export default class GameManager {
         const move = (this.scene.getCurrentPhase() as SelectTargetPhase)
           .getPokemon()
           .getMoveset()
-          [movePosition]!.getMove(); // TODO: is the bang correct?
+          [movePosition].getMove();
         if (!move.isMultiTarget()) {
           handler.setCursor(targetIndex !== undefined ? targetIndex : BattlerIndex.ENEMY);
         }
diff --git a/test/testUtils/gameManagerUtils.ts b/test/testUtils/gameManagerUtils.ts
index ae6c11f5efa..11636bd66b4 100644
--- a/test/testUtils/gameManagerUtils.ts
+++ b/test/testUtils/gameManagerUtils.ts
@@ -99,7 +99,7 @@ export function waitUntil(truth): Promise<unknown> {
 export function getMovePosition(scene: BattleScene, pokemonIndex: 0 | 1, move: Moves): number {
   const playerPokemon = scene.getPlayerField()[pokemonIndex];
   const moveSet = playerPokemon.getMoveset();
-  const index = moveSet.findIndex(m => m?.moveId === move && m?.ppUsed < m?.getMovePp());
+  const index = moveSet.findIndex(m => m.moveId === move && m.ppUsed < m.getMovePp());
   console.log(`Move position for ${Moves[move]} (=${move}):`, index);
   return index;
 }