diff --git a/public/images/items.json b/public/images/items.json
index 3c9cff7a35a..779823d1293 100644
--- a/public/images/items.json
+++ b/public/images/items.json
@@ -3416,12 +3416,12 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 32,
-						"h": 32
+						"w": 24,
+						"h": 24
 					},
 					"spriteSourceSize": {
-						"x": 5,
-						"y": 7,
+						"x": 1,
+						"y": 2,
 						"w": 22,
 						"h": 19
 					},
@@ -6583,7 +6583,7 @@
 					}
 				},
 				{
-					"filename": "pb_silver",
+					"filename": "rb",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6666,27 +6666,6 @@
 						"h": 19
 					}
 				},
-				{
-					"filename": "rb",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 20,
-						"h": 20
-					},
-					"frame": {
-						"x": 254,
-						"y": 320,
-						"w": 20,
-						"h": 20
-					}
-				},
 				{
 					"filename": "smooth_meteorite",
 					"rotated": false,
@@ -6701,6 +6680,27 @@
 						"w": 20,
 						"h": 20
 					},
+					"frame": {
+						"x": 254,
+						"y": 320,
+						"w": 20,
+						"h": 20
+					}
+				},
+				{
+					"filename": "strange_ball",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 6,
+						"w": 20,
+						"h": 20
+					},
 					"frame": {
 						"x": 274,
 						"y": 325,
@@ -6709,7 +6709,7 @@
 					}
 				},
 				{
-					"filename": "strange_ball",
+					"filename": "ub",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6751,7 +6751,7 @@
 					}
 				},
 				{
-					"filename": "ub",
+					"filename": "apicot_berry",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6761,13 +6761,13 @@
 					"spriteSourceSize": {
 						"x": 6,
 						"y": 6,
-						"w": 20,
+						"w": 19,
 						"h": 20
 					},
 					"frame": {
 						"x": 221,
 						"y": 337,
-						"w": 20,
+						"w": 19,
 						"h": 20
 					}
 				},
@@ -6793,7 +6793,7 @@
 					}
 				},
 				{
-					"filename": "apicot_berry",
+					"filename": "big_mushroom",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6804,13 +6804,13 @@
 						"x": 6,
 						"y": 6,
 						"w": 19,
-						"h": 20
+						"h": 19
 					},
 					"frame": {
 						"x": 343,
 						"y": 287,
 						"w": 19,
-						"h": 20
+						"h": 19
 					}
 				},
 				{
@@ -6834,27 +6834,6 @@
 						"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,33 +6849,12 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 314,
-						"y": 325,
+						"x": 318,
+						"y": 306,
 						"w": 19,
 						"h": 20
 					}
 				},
-				{
-					"filename": "wl_ability_urge",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 8,
-						"w": 20,
-						"h": 18
-					},
-					"frame": {
-						"x": 337,
-						"y": 307,
-						"w": 20,
-						"h": 18
-					}
-				},
 				{
 					"filename": "miracle_seed",
 					"rotated": false,
@@ -6912,12 +6870,33 @@
 						"h": 19
 					},
 					"frame": {
-						"x": 333,
-						"y": 325,
+						"x": 337,
+						"y": 306,
 						"w": 19,
 						"h": 19
 					}
 				},
+				{
+					"filename": "wl_ability_urge",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 20,
+						"h": 18
+					},
+					"frame": {
+						"x": 314,
+						"y": 326,
+						"w": 20,
+						"h": 18
+					}
+				},
 				{
 					"filename": "wl_antidote",
 					"rotated": false,
@@ -6933,54 +6912,12 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 357,
+						"x": 356,
 						"y": 307,
 						"w": 20,
 						"h": 18
 					}
 				},
-				{
-					"filename": "wl_awakening",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 8,
-						"w": 20,
-						"h": 18
-					},
-					"frame": {
-						"x": 352,
-						"y": 325,
-						"w": 20,
-						"h": 18
-					}
-				},
-				{
-					"filename": "wl_burn_heal",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 8,
-						"w": 20,
-						"h": 18
-					},
-					"frame": {
-						"x": 241,
-						"y": 340,
-						"w": 20,
-						"h": 18
-					}
-				},
 				{
 					"filename": "golden_egg",
 					"rotated": false,
@@ -6996,12 +6933,33 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 372,
-						"y": 325,
+						"x": 376,
+						"y": 307,
 						"w": 17,
 						"h": 20
 					}
 				},
+				{
+					"filename": "wl_awakening",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 20,
+						"h": 18
+					},
+					"frame": {
+						"x": 393,
+						"y": 241,
+						"w": 20,
+						"h": 18
+					}
+				},
 				{
 					"filename": "toxic_orb",
 					"rotated": false,
@@ -7017,35 +6975,14 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 377,
-						"y": 307,
+						"x": 413,
+						"y": 258,
 						"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",
+					"filename": "wl_burn_heal",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -7059,201 +6996,12 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 352,
-						"y": 343,
-						"w": 20,
-						"h": 18
-					}
-				},
-				{
-					"filename": "wl_custom_thief",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 8,
-						"w": 20,
-						"h": 18
-					},
-					"frame": {
-						"x": 372,
-						"y": 345,
-						"w": 20,
-						"h": 18
-					}
-				},
-				{
-					"filename": "wl_elixir",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 8,
-						"w": 20,
-						"h": 18
-					},
-					"frame": {
-						"x": 392,
-						"y": 345,
-						"w": 20,
-						"h": 18
-					}
-				},
-				{
-					"filename": "wl_ether",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 8,
-						"w": 20,
-						"h": 18
-					},
-					"frame": {
-						"x": 378,
-						"y": 241,
-						"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,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 8,
-						"w": 20,
-						"h": 18
-					},
-					"frame": {
-						"x": 377,
+						"x": 393,
 						"y": 259,
 						"w": 20,
 						"h": 18
 					}
 				},
-				{
-					"filename": "wl_full_restore",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 8,
-						"w": 20,
-						"h": 18
-					},
-					"frame": {
-						"x": 381,
-						"y": 277,
-						"w": 20,
-						"h": 18
-					}
-				},
-				{
-					"filename": "wl_guard_spec",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 8,
-						"w": 20,
-						"h": 18
-					},
-					"frame": {
-						"x": 397,
-						"y": 259,
-						"w": 20,
-						"h": 18
-					}
-				},
-				{
-					"filename": "wl_hyper_potion",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 8,
-						"w": 20,
-						"h": 18
-					},
-					"frame": {
-						"x": 401,
-						"y": 277,
-						"w": 20,
-						"h": 18
-					}
-				},
-				{
-					"filename": "wl_ice_heal",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 8,
-						"w": 20,
-						"h": 18
-					},
-					"frame": {
-						"x": 395,
-						"y": 295,
-						"w": 20,
-						"h": 18
-					}
-				},
 				{
 					"filename": "ampharosite",
 					"rotated": false,
@@ -7269,8 +7017,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 415,
-						"y": 295,
+						"x": 377,
+						"y": 243,
 						"w": 16,
 						"h": 16
 					}
@@ -7290,14 +7038,56 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 415,
-						"y": 311,
+						"x": 377,
+						"y": 259,
 						"w": 16,
 						"h": 16
 					}
 				},
 				{
-					"filename": "wl_item_drop",
+					"filename": "relic_gold",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 11,
+						"w": 15,
+						"h": 11
+					},
+					"frame": {
+						"x": 377,
+						"y": 275,
+						"w": 15,
+						"h": 11
+					}
+				},
+				{
+					"filename": "lucky_egg",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 6,
+						"w": 17,
+						"h": 20
+					},
+					"frame": {
+						"x": 381,
+						"y": 286,
+						"w": 17,
+						"h": 20
+					}
+				},
+				{
+					"filename": "wl_custom_spliced",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -7311,8 +7101,71 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 406,
-						"y": 327,
+						"x": 398,
+						"y": 277,
+						"w": 20,
+						"h": 18
+					}
+				},
+				{
+					"filename": "wl_custom_thief",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 20,
+						"h": 18
+					},
+					"frame": {
+						"x": 398,
+						"y": 295,
+						"w": 20,
+						"h": 18
+					}
+				},
+				{
+					"filename": "wl_elixir",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 20,
+						"h": 18
+					},
+					"frame": {
+						"x": 393,
+						"y": 313,
+						"w": 20,
+						"h": 18
+					}
+				},
+				{
+					"filename": "wl_ether",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 20,
+						"h": 18
+					},
+					"frame": {
+						"x": 240,
+						"y": 340,
 						"w": 20,
 						"h": 18
 					}
@@ -7332,12 +7185,180 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 412,
-						"y": 345,
+						"x": 413,
+						"y": 313,
 						"w": 16,
 						"h": 16
 					}
 				},
+				{
+					"filename": "wl_full_heal",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 20,
+						"h": 18
+					},
+					"frame": {
+						"x": 202,
+						"y": 358,
+						"w": 20,
+						"h": 18
+					}
+				},
+				{
+					"filename": "wl_full_restore",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 20,
+						"h": 18
+					},
+					"frame": {
+						"x": 201,
+						"y": 376,
+						"w": 20,
+						"h": 18
+					}
+				},
+				{
+					"filename": "wl_guard_spec",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 20,
+						"h": 18
+					},
+					"frame": {
+						"x": 201,
+						"y": 394,
+						"w": 20,
+						"h": 18
+					}
+				},
+				{
+					"filename": "wl_hyper_potion",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 20,
+						"h": 18
+					},
+					"frame": {
+						"x": 201,
+						"y": 412,
+						"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": 222,
+						"y": 357,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "wl_ice_heal",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 20,
+						"h": 18
+					},
+					"frame": {
+						"x": 238,
+						"y": 358,
+						"w": 20,
+						"h": 18
+					}
+				},
+				{
+					"filename": "blastoisinite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 222,
+						"y": 373,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "wl_item_drop",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 20,
+						"h": 18
+					},
+					"frame": {
+						"x": 221,
+						"y": 389,
+						"w": 20,
+						"h": 18
+					}
+				},
 				{
 					"filename": "wl_item_urge",
 					"rotated": false,
@@ -7354,7 +7375,7 @@
 					},
 					"frame": {
 						"x": 221,
-						"y": 357,
+						"y": 407,
 						"w": 20,
 						"h": 18
 					}
@@ -7373,132 +7394,6 @@
 						"w": 20,
 						"h": 18
 					},
-					"frame": {
-						"x": 241,
-						"y": 358,
-						"w": 20,
-						"h": 18
-					}
-				},
-				{
-					"filename": "wl_max_ether",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 8,
-						"w": 20,
-						"h": 18
-					},
-					"frame": {
-						"x": 201,
-						"y": 360,
-						"w": 20,
-						"h": 18
-					}
-				},
-				{
-					"filename": "wl_max_potion",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 8,
-						"w": 20,
-						"h": 18
-					},
-					"frame": {
-						"x": 201,
-						"y": 378,
-						"w": 20,
-						"h": 18
-					}
-				},
-				{
-					"filename": "wl_max_revive",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 8,
-						"w": 20,
-						"h": 18
-					},
-					"frame": {
-						"x": 221,
-						"y": 375,
-						"w": 20,
-						"h": 18
-					}
-				},
-				{
-					"filename": "wl_paralyze_heal",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 8,
-						"w": 20,
-						"h": 18
-					},
-					"frame": {
-						"x": 201,
-						"y": 396,
-						"w": 20,
-						"h": 18
-					}
-				},
-				{
-					"filename": "wl_potion",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 8,
-						"w": 20,
-						"h": 18
-					},
-					"frame": {
-						"x": 221,
-						"y": 393,
-						"w": 20,
-						"h": 18
-					}
-				},
-				{
-					"filename": "wl_reset_urge",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 8,
-						"w": 20,
-						"h": 18
-					},
 					"frame": {
 						"x": 241,
 						"y": 376,
@@ -7507,7 +7402,7 @@
 					}
 				},
 				{
-					"filename": "wl_revive",
+					"filename": "wl_max_ether",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -7528,7 +7423,7 @@
 					}
 				},
 				{
-					"filename": "beedrillite",
+					"filename": "wl_max_potion",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -7536,16 +7431,121 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 8,
+						"x": 6,
 						"y": 8,
-						"w": 16,
-						"h": 16
+						"w": 20,
+						"h": 18
 					},
 					"frame": {
-						"x": 201,
-						"y": 414,
-						"w": 16,
-						"h": 16
+						"x": 241,
+						"y": 412,
+						"w": 20,
+						"h": 18
+					}
+				},
+				{
+					"filename": "wl_max_revive",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 20,
+						"h": 18
+					},
+					"frame": {
+						"x": 258,
+						"y": 358,
+						"w": 20,
+						"h": 18
+					}
+				},
+				{
+					"filename": "wl_paralyze_heal",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 20,
+						"h": 18
+					},
+					"frame": {
+						"x": 261,
+						"y": 376,
+						"w": 20,
+						"h": 18
+					}
+				},
+				{
+					"filename": "wl_potion",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 20,
+						"h": 18
+					},
+					"frame": {
+						"x": 261,
+						"y": 394,
+						"w": 20,
+						"h": 18
+					}
+				},
+				{
+					"filename": "wl_reset_urge",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 20,
+						"h": 18
+					},
+					"frame": {
+						"x": 261,
+						"y": 412,
+						"w": 20,
+						"h": 18
+					}
+				},
+				{
+					"filename": "wl_revive",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 20,
+						"h": 18
+					},
+					"frame": {
+						"x": 278,
+						"y": 345,
+						"w": 20,
+						"h": 18
 					}
 				},
 				{
@@ -7563,33 +7563,12 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 261,
+						"x": 298,
 						"y": 345,
 						"w": 20,
 						"h": 18
 					}
 				},
-				{
-					"filename": "blastoisinite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 261,
-						"y": 363,
-						"w": 16,
-						"h": 16
-					}
-				},
 				{
 					"filename": "blazikenite",
 					"rotated": false,
@@ -7605,8 +7584,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 281,
-						"y": 345,
+						"x": 318,
+						"y": 344,
 						"w": 16,
 						"h": 16
 					}
@@ -7626,8 +7605,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 261,
-						"y": 379,
+						"x": 334,
+						"y": 326,
 						"w": 16,
 						"h": 16
 					}
@@ -7647,8 +7626,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 297,
-						"y": 345,
+						"x": 334,
+						"y": 342,
 						"w": 16,
 						"h": 16
 					}
@@ -7668,8 +7647,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 261,
-						"y": 395,
+						"x": 350,
+						"y": 325,
 						"w": 16,
 						"h": 16
 					}
@@ -7689,8 +7668,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 313,
-						"y": 345,
+						"x": 350,
+						"y": 341,
 						"w": 16,
 						"h": 16
 					}
@@ -7710,8 +7689,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 217,
-						"y": 414,
+						"x": 366,
+						"y": 327,
 						"w": 16,
 						"h": 16
 					}
@@ -7731,8 +7710,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 233,
-						"y": 412,
+						"x": 366,
+						"y": 343,
 						"w": 16,
 						"h": 16
 					}
@@ -7752,8 +7731,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 249,
-						"y": 412,
+						"x": 382,
+						"y": 331,
 						"w": 16,
 						"h": 16
 					}
@@ -7773,8 +7752,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 265,
-						"y": 411,
+						"x": 398,
+						"y": 331,
 						"w": 16,
 						"h": 16
 					}
@@ -7794,8 +7773,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 329,
-						"y": 345,
+						"x": 414,
+						"y": 329,
 						"w": 16,
 						"h": 16
 					}
@@ -7815,8 +7794,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 277,
-						"y": 363,
+						"x": 382,
+						"y": 347,
 						"w": 16,
 						"h": 16
 					}
@@ -7836,8 +7815,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 277,
-						"y": 379,
+						"x": 398,
+						"y": 347,
 						"w": 16,
 						"h": 16
 					}
@@ -7857,8 +7836,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 277,
-						"y": 395,
+						"x": 414,
+						"y": 345,
 						"w": 16,
 						"h": 16
 					}
@@ -7878,8 +7857,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 293,
-						"y": 361,
+						"x": 281,
+						"y": 363,
 						"w": 16,
 						"h": 16
 					}
@@ -7899,8 +7878,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 309,
-						"y": 361,
+						"x": 281,
+						"y": 379,
 						"w": 16,
 						"h": 16
 					}
@@ -7920,8 +7899,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 293,
-						"y": 377,
+						"x": 297,
+						"y": 363,
 						"w": 16,
 						"h": 16
 					}
@@ -7941,8 +7920,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 325,
-						"y": 361,
+						"x": 281,
+						"y": 395,
 						"w": 16,
 						"h": 16
 					}
@@ -7962,8 +7941,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 293,
-						"y": 393,
+						"x": 297,
+						"y": 379,
 						"w": 16,
 						"h": 16
 					}
@@ -7982,90 +7961,6 @@
 						"w": 16,
 						"h": 16
 					},
-					"frame": {
-						"x": 309,
-						"y": 377,
-						"w": 16,
-						"h": 16
-					}
-				},
-				{
-					"filename": "mawilite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 309,
-						"y": 393,
-						"w": 16,
-						"h": 16
-					}
-				},
-				{
-					"filename": "medichamite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 325,
-						"y": 377,
-						"w": 16,
-						"h": 16
-					}
-				},
-				{
-					"filename": "metagrossite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 325,
-						"y": 393,
-						"w": 16,
-						"h": 16
-					}
-				},
-				{
-					"filename": "mewtwonite_x",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
 					"frame": {
 						"x": 281,
 						"y": 411,
@@ -8074,7 +7969,7 @@
 					}
 				},
 				{
-					"filename": "mewtwonite_y",
+					"filename": "mawilite",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -8089,7 +7984,91 @@
 					},
 					"frame": {
 						"x": 297,
-						"y": 409,
+						"y": 395,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "medichamite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 297,
+						"y": 411,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "metagrossite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 313,
+						"y": 363,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "mewtwonite_x",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 313,
+						"y": 379,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "mewtwonite_y",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 313,
+						"y": 395,
 						"w": 16,
 						"h": 16
 					}
@@ -8110,7 +8089,7 @@
 					},
 					"frame": {
 						"x": 313,
-						"y": 409,
+						"y": 411,
 						"w": 16,
 						"h": 16
 					}
@@ -8130,8 +8109,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 329,
-						"y": 409,
+						"x": 350,
+						"y": 357,
 						"w": 16,
 						"h": 16
 					}
@@ -8151,8 +8130,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 341,
-						"y": 361,
+						"x": 366,
+						"y": 359,
 						"w": 16,
 						"h": 16
 					}
@@ -8172,8 +8151,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 341,
-						"y": 377,
+						"x": 334,
+						"y": 358,
 						"w": 16,
 						"h": 16
 					}
@@ -8193,8 +8172,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 341,
-						"y": 393,
+						"x": 382,
+						"y": 363,
 						"w": 16,
 						"h": 16
 					}
@@ -8214,8 +8193,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 345,
-						"y": 409,
+						"x": 398,
+						"y": 363,
 						"w": 16,
 						"h": 16
 					}
@@ -8235,7 +8214,7 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 412,
+						"x": 414,
 						"y": 361,
 						"w": 16,
 						"h": 16
@@ -8256,8 +8235,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 357,
-						"y": 363,
+						"x": 329,
+						"y": 374,
 						"w": 16,
 						"h": 16
 					}
@@ -8277,8 +8256,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 357,
-						"y": 379,
+						"x": 329,
+						"y": 390,
 						"w": 16,
 						"h": 16
 					}
@@ -8298,8 +8277,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 373,
-						"y": 363,
+						"x": 329,
+						"y": 406,
 						"w": 16,
 						"h": 16
 					}
@@ -8319,8 +8298,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 373,
-						"y": 379,
+						"x": 345,
+						"y": 374,
 						"w": 16,
 						"h": 16
 					}
@@ -8340,8 +8319,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 389,
-						"y": 363,
+						"x": 345,
+						"y": 390,
 						"w": 16,
 						"h": 16
 					}
@@ -8361,8 +8340,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 389,
-						"y": 379,
+						"x": 345,
+						"y": 406,
 						"w": 16,
 						"h": 16
 					}
@@ -8382,8 +8361,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 405,
-						"y": 377,
+						"x": 361,
+						"y": 375,
 						"w": 16,
 						"h": 16
 					}
@@ -8404,7 +8383,7 @@
 					},
 					"frame": {
 						"x": 361,
-						"y": 395,
+						"y": 391,
 						"w": 16,
 						"h": 16
 					}
@@ -8424,8 +8403,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 377,
-						"y": 395,
+						"x": 361,
+						"y": 407,
 						"w": 16,
 						"h": 16
 					}
@@ -8436,6 +8415,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:875c6d67e72590dfc6d319101aa31cfa:dd2bb865ecbc5ac7b975ddf70b993334:110e074689c9edd2c54833ce2e4d9270$"
+		"smartupdate": "$TexturePacker:SmartUpdate:934ea4080bad980d4fea720cc771f133:ed564bc47b79b15a763de57045178e88:110e074689c9edd2c54833ce2e4d9270$"
 	}
 }
diff --git a/public/images/items.png b/public/images/items.png
index 1bd7b3af9c3..5f032b30cfb 100644
Binary files a/public/images/items.png and b/public/images/items.png differ