diff --git a/public/audio/cry/1020.ogg b/public/audio/cry/1020.ogg
new file mode 100644
index 000000000..421a6fd73
Binary files /dev/null and b/public/audio/cry/1020.ogg differ
diff --git a/public/audio/cry/1021.ogg b/public/audio/cry/1021.ogg
new file mode 100644
index 000000000..421a6fd73
Binary files /dev/null and b/public/audio/cry/1021.ogg differ
diff --git a/public/audio/cry/1022.ogg b/public/audio/cry/1022.ogg
new file mode 100644
index 000000000..421a6fd73
Binary files /dev/null and b/public/audio/cry/1022.ogg differ
diff --git a/public/audio/cry/1023.ogg b/public/audio/cry/1023.ogg
new file mode 100644
index 000000000..421a6fd73
Binary files /dev/null and b/public/audio/cry/1023.ogg differ
diff --git a/public/audio/cry/1024.ogg b/public/audio/cry/1024.ogg
new file mode 100644
index 000000000..421a6fd73
Binary files /dev/null and b/public/audio/cry/1024.ogg differ
diff --git a/public/audio/cry/1025.ogg b/public/audio/cry/1025.ogg
new file mode 100644
index 000000000..421a6fd73
Binary files /dev/null and b/public/audio/cry/1025.ogg differ
diff --git a/public/images/pokemon/1006.json b/public/images/pokemon/1006.json
index b407e15b7..e2bf2e4ba 100644
--- a/public/images/pokemon/1006.json
+++ b/public/images/pokemon/1006.json
@@ -4,8 +4,8 @@
 			"image": "1006.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 86,
-				"h": 86
+				"w": 81,
+				"h": 81
 			},
 			"scale": 1,
 			"frames": [
@@ -15,19 +15,19 @@
 					"trimmed": false,
 					"sourceSize": {
 						"w": 65,
-						"h": 86
+						"h": 81
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
 						"w": 65,
-						"h": 86
+						"h": 81
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
 						"w": 65,
-						"h": 86
+						"h": 81
 					}
 				}
 			]
diff --git a/public/images/pokemon/1006.png b/public/images/pokemon/1006.png
index 41f63c140..e0d106d08 100644
Binary files a/public/images/pokemon/1006.png and b/public/images/pokemon/1006.png differ
diff --git a/public/images/pokemon/1020.json b/public/images/pokemon/1020.json
new file mode 100644
index 000000000..5cd9b1a7b
--- /dev/null
+++ b/public/images/pokemon/1020.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1020.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 85,
+				"h": 85
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 85,
+						"h": 79
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 85,
+						"h": 79
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 85,
+						"h": 79
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}
diff --git a/public/images/pokemon/1020.png b/public/images/pokemon/1020.png
new file mode 100644
index 000000000..49b9b63ea
Binary files /dev/null and b/public/images/pokemon/1020.png differ
diff --git a/public/images/pokemon/1021.json b/public/images/pokemon/1021.json
new file mode 100644
index 000000000..5701a6271
--- /dev/null
+++ b/public/images/pokemon/1021.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1021.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 87,
+				"h": 87
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 81,
+						"h": 87
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 81,
+						"h": 87
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 81,
+						"h": 87
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}
diff --git a/public/images/pokemon/1021.png b/public/images/pokemon/1021.png
new file mode 100644
index 000000000..6168efb77
Binary files /dev/null and b/public/images/pokemon/1021.png differ
diff --git a/public/images/pokemon/1022.json b/public/images/pokemon/1022.json
new file mode 100644
index 000000000..15bbac0f5
--- /dev/null
+++ b/public/images/pokemon/1022.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1022.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 81,
+				"h": 81
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 81,
+						"h": 68
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 81,
+						"h": 68
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 81,
+						"h": 68
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}
diff --git a/public/images/pokemon/1022.png b/public/images/pokemon/1022.png
new file mode 100644
index 000000000..e283c3900
Binary files /dev/null and b/public/images/pokemon/1022.png differ
diff --git a/public/images/pokemon/1023.json b/public/images/pokemon/1023.json
new file mode 100644
index 000000000..bce6cded9
--- /dev/null
+++ b/public/images/pokemon/1023.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1023.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 83,
+				"h": 83
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 50,
+						"h": 83
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 50,
+						"h": 83
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 50,
+						"h": 83
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}
diff --git a/public/images/pokemon/1023.png b/public/images/pokemon/1023.png
new file mode 100644
index 000000000..5da747f12
Binary files /dev/null and b/public/images/pokemon/1023.png differ
diff --git a/public/images/pokemon/back/1020.json b/public/images/pokemon/back/1020.json
new file mode 100644
index 000000000..469ee4eae
--- /dev/null
+++ b/public/images/pokemon/back/1020.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1020.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 88,
+				"h": 88
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 88,
+						"h": 68
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 88,
+						"h": 68
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 88,
+						"h": 68
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}
diff --git a/public/images/pokemon/back/1020.png b/public/images/pokemon/back/1020.png
new file mode 100644
index 000000000..7d1057052
Binary files /dev/null and b/public/images/pokemon/back/1020.png differ
diff --git a/public/images/pokemon/back/1021.json b/public/images/pokemon/back/1021.json
new file mode 100644
index 000000000..242d1afd1
--- /dev/null
+++ b/public/images/pokemon/back/1021.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1021.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 90,
+				"h": 90
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 74,
+						"h": 90
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 74,
+						"h": 90
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 74,
+						"h": 90
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}
diff --git a/public/images/pokemon/back/1021.png b/public/images/pokemon/back/1021.png
new file mode 100644
index 000000000..de7afbdfa
Binary files /dev/null and b/public/images/pokemon/back/1021.png differ
diff --git a/public/images/pokemon/back/1022.json b/public/images/pokemon/back/1022.json
new file mode 100644
index 000000000..17d93a76f
--- /dev/null
+++ b/public/images/pokemon/back/1022.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1022.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 83,
+				"h": 83
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 83,
+						"h": 71
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 83,
+						"h": 71
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 83,
+						"h": 71
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}
diff --git a/public/images/pokemon/back/1022.png b/public/images/pokemon/back/1022.png
new file mode 100644
index 000000000..20a269a7f
Binary files /dev/null and b/public/images/pokemon/back/1022.png differ
diff --git a/public/images/pokemon/back/1023.json b/public/images/pokemon/back/1023.json
new file mode 100644
index 000000000..e59d8a567
--- /dev/null
+++ b/public/images/pokemon/back/1023.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1023.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 77,
+				"h": 77
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 46,
+						"h": 77
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 46,
+						"h": 77
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 46,
+						"h": 77
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}
diff --git a/public/images/pokemon/back/1023.png b/public/images/pokemon/back/1023.png
new file mode 100644
index 000000000..f60baf6a7
Binary files /dev/null and b/public/images/pokemon/back/1023.png differ
diff --git a/public/images/pokemon/back/shiny/1020.json b/public/images/pokemon/back/shiny/1020.json
new file mode 100644
index 000000000..469ee4eae
--- /dev/null
+++ b/public/images/pokemon/back/shiny/1020.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1020.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 88,
+				"h": 88
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 88,
+						"h": 68
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 88,
+						"h": 68
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 88,
+						"h": 68
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}
diff --git a/public/images/pokemon/back/shiny/1020.png b/public/images/pokemon/back/shiny/1020.png
new file mode 100644
index 000000000..7d1057052
Binary files /dev/null and b/public/images/pokemon/back/shiny/1020.png differ
diff --git a/public/images/pokemon/back/shiny/1021.json b/public/images/pokemon/back/shiny/1021.json
new file mode 100644
index 000000000..242d1afd1
--- /dev/null
+++ b/public/images/pokemon/back/shiny/1021.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1021.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 90,
+				"h": 90
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 74,
+						"h": 90
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 74,
+						"h": 90
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 74,
+						"h": 90
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}
diff --git a/public/images/pokemon/back/shiny/1021.png b/public/images/pokemon/back/shiny/1021.png
new file mode 100644
index 000000000..de7afbdfa
Binary files /dev/null and b/public/images/pokemon/back/shiny/1021.png differ
diff --git a/public/images/pokemon/back/shiny/1022.json b/public/images/pokemon/back/shiny/1022.json
new file mode 100644
index 000000000..17d93a76f
--- /dev/null
+++ b/public/images/pokemon/back/shiny/1022.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1022.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 83,
+				"h": 83
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 83,
+						"h": 71
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 83,
+						"h": 71
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 83,
+						"h": 71
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}
diff --git a/public/images/pokemon/back/shiny/1022.png b/public/images/pokemon/back/shiny/1022.png
new file mode 100644
index 000000000..20a269a7f
Binary files /dev/null and b/public/images/pokemon/back/shiny/1022.png differ
diff --git a/public/images/pokemon/back/shiny/1023.json b/public/images/pokemon/back/shiny/1023.json
new file mode 100644
index 000000000..e59d8a567
--- /dev/null
+++ b/public/images/pokemon/back/shiny/1023.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1023.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 77,
+				"h": 77
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 46,
+						"h": 77
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 46,
+						"h": 77
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 46,
+						"h": 77
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}
diff --git a/public/images/pokemon/back/shiny/1023.png b/public/images/pokemon/back/shiny/1023.png
new file mode 100644
index 000000000..f60baf6a7
Binary files /dev/null and b/public/images/pokemon/back/shiny/1023.png differ
diff --git a/public/images/pokemon/icons/1020.png b/public/images/pokemon/icons/1020.png
new file mode 100644
index 000000000..0ccdeb7b4
Binary files /dev/null and b/public/images/pokemon/icons/1020.png differ
diff --git a/public/images/pokemon/icons/1021.png b/public/images/pokemon/icons/1021.png
new file mode 100644
index 000000000..d0ea89ade
Binary files /dev/null and b/public/images/pokemon/icons/1021.png differ
diff --git a/public/images/pokemon/icons/1022.png b/public/images/pokemon/icons/1022.png
new file mode 100644
index 000000000..9e42933eb
Binary files /dev/null and b/public/images/pokemon/icons/1022.png differ
diff --git a/public/images/pokemon/icons/1023.png b/public/images/pokemon/icons/1023.png
new file mode 100644
index 000000000..d5876d0a0
Binary files /dev/null and b/public/images/pokemon/icons/1023.png differ
diff --git a/public/images/pokemon/shiny/1020.json b/public/images/pokemon/shiny/1020.json
new file mode 100644
index 000000000..5cd9b1a7b
--- /dev/null
+++ b/public/images/pokemon/shiny/1020.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1020.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 85,
+				"h": 85
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 85,
+						"h": 79
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 85,
+						"h": 79
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 85,
+						"h": 79
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}
diff --git a/public/images/pokemon/shiny/1020.png b/public/images/pokemon/shiny/1020.png
new file mode 100644
index 000000000..49b9b63ea
Binary files /dev/null and b/public/images/pokemon/shiny/1020.png differ
diff --git a/public/images/pokemon/shiny/1021.json b/public/images/pokemon/shiny/1021.json
new file mode 100644
index 000000000..5701a6271
--- /dev/null
+++ b/public/images/pokemon/shiny/1021.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1021.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 87,
+				"h": 87
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 81,
+						"h": 87
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 81,
+						"h": 87
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 81,
+						"h": 87
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}
diff --git a/public/images/pokemon/shiny/1021.png b/public/images/pokemon/shiny/1021.png
new file mode 100644
index 000000000..6168efb77
Binary files /dev/null and b/public/images/pokemon/shiny/1021.png differ
diff --git a/public/images/pokemon/shiny/1022.json b/public/images/pokemon/shiny/1022.json
new file mode 100644
index 000000000..15bbac0f5
--- /dev/null
+++ b/public/images/pokemon/shiny/1022.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1022.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 81,
+				"h": 81
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 81,
+						"h": 68
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 81,
+						"h": 68
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 81,
+						"h": 68
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}
diff --git a/public/images/pokemon/shiny/1022.png b/public/images/pokemon/shiny/1022.png
new file mode 100644
index 000000000..e283c3900
Binary files /dev/null and b/public/images/pokemon/shiny/1022.png differ
diff --git a/public/images/pokemon/shiny/1023.json b/public/images/pokemon/shiny/1023.json
new file mode 100644
index 000000000..bce6cded9
--- /dev/null
+++ b/public/images/pokemon/shiny/1023.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1023.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 83,
+				"h": 83
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 50,
+						"h": 83
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 50,
+						"h": 83
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 50,
+						"h": 83
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}
diff --git a/public/images/pokemon/shiny/1023.png b/public/images/pokemon/shiny/1023.png
new file mode 100644
index 000000000..5da747f12
Binary files /dev/null and b/public/images/pokemon/shiny/1023.png differ
diff --git a/public/images/ui/pokemon_icons_9.json b/public/images/ui/pokemon_icons_9.json
index 6052eb23d..df3383e08 100644
--- a/public/images/ui/pokemon_icons_9.json
+++ b/public/images/ui/pokemon_icons_9.json
@@ -512,6 +512,90 @@
 						"w": 26,
 						"h": 30
 					}
+				},
+				{
+					"filename": "1020",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 0,
+						"w": 29,
+						"h": 29
+					},
+					"frame": {
+						"x": 0,
+						"y": 170,
+						"w": 29,
+						"h": 29
+					}
+				},
+				{
+					"filename": "1021",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 0,
+						"w": 30,
+						"h": 30
+					},
+					"frame": {
+						"x": 30,
+						"y": 171,
+						"w": 30,
+						"h": 30
+					}
+				},
+				{
+					"filename": "1022",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 5,
+						"w": 26,
+						"h": 23
+					},
+					"frame": {
+						"x": 61,
+						"y": 172,
+						"w": 26,
+						"h": 23
+					}
+				},
+				{
+					"filename": "1023",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 1,
+						"w": 20,
+						"h": 28
+					},
+					"frame": {
+						"x": 88,
+						"y": 172,
+						"w": 20,
+						"h": 28
+					}
 				}
 			]
 		}
diff --git a/public/images/ui/pokemon_icons_9.png b/public/images/ui/pokemon_icons_9.png
index 48a24c9b7..ff121ff7e 100644
Binary files a/public/images/ui/pokemon_icons_9.png and b/public/images/ui/pokemon_icons_9.png differ
diff --git a/src/data/biome.ts b/src/data/biome.ts
index 17626c6ed..a03e257f7 100644
--- a/src/data/biome.ts
+++ b/src/data/biome.ts
@@ -1058,7 +1058,7 @@ export const biomePokemonPools: BiomePokemonPools = {
       Species.IRON_THORNS
     ],
     [BiomePoolTier.UNCOMMON]: [ Species.ROARING_MOON, Species.IRON_VALIANT ],
-    [BiomePoolTier.RARE]: [ Species.WALKING_WAKE, Species.IRON_LEAVES ],
+    [BiomePoolTier.RARE]: [ Species.WALKING_WAKE, Species.IRON_LEAVES, Species.GOUGING_FIRE, Species.RAGING_BOLT, Species.IRON_BOULDER, Species.IRON_CROWN ],
     [BiomePoolTier.SUPER_RARE]: [],
     [BiomePoolTier.ULTRA_RARE]: [],
     [BiomePoolTier.BOSS]: [ Species.ETERNATUS ],
@@ -6084,15 +6084,19 @@ export const biomeTrainerPools: BiomeTrainerPools = {
       ]
     ],
     [ Species.GOUGING_FIRE, Type.FIRE, Type.DRAGON, [
+        [ Biome.END, BiomePoolTier.RARE ]
       ]
     ],
     [ Species.RAGING_BOLT, Type.ELECTRIC, Type.DRAGON, [
+        [ Biome.END, BiomePoolTier.RARE ]
       ]
     ],
     [ Species.IRON_BOULDER, Type.ROCK, Type.PSYCHIC, [
+        [ Biome.END, BiomePoolTier.RARE ]
       ]
     ],
     [ Species.IRON_CROWN, Type.STEEL, Type.PSYCHIC, [
+        [ Biome.END, BiomePoolTier.RARE ]
       ]
     ],
     [ Species.TERAPAGOS, Type.NORMAL, -1, [
diff --git a/src/data/move.ts b/src/data/move.ts
index abaa92010..206f73d46 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -1616,7 +1616,7 @@ export class MultiHitAttr extends MoveAttr {
             hitTimes = 1;
           else if (hitValue.value >= 73)
             hitTimes = 2;
-          else if (hitValue.value>= 66)
+          else if (hitValue.value >= 66)
             hitTimes = 3;
           else if (hitValue.value >= 60)
             hitTimes = 4;
diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts
index dc5829284..7f0c0b5da 100644
--- a/src/data/pokemon-species.ts
+++ b/src/data/pokemon-species.ts
@@ -441,7 +441,7 @@ export default class PokemonSpecies extends PokemonSpeciesForm {
   }
 
   isObtainable() {
-    return super.isObtainable() || (this.species === 'Paradox Pokémon' && !this.legendary && this.speciesId <= 1017);
+    return super.isObtainable() || (this.species === 'Paradox Pokémon' && !this.legendary && this.speciesId <= 1025);
   }
 
   getFormSpriteKey(formIndex?: integer) {
@@ -2074,7 +2074,7 @@ export function initSpecies() {
     new PokemonSpecies(Species.IRON_BOULDER, "Iron Boulder", 9, false, false, false, "Paradox Pokémon", Type.ROCK, Type.PSYCHIC, 1.5, 162.5, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.QUARK_DRIVE, 590, 90, 120, 80, 68, 108, 124, 10, 0, null, GrowthRate.SLOW, null, false),
     new PokemonSpecies(Species.IRON_CROWN, "Iron Crown", 9, false, false, false, "Paradox Pokémon", Type.STEEL, Type.PSYCHIC, 1.6, 156, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.QUARK_DRIVE, 590, 90, 72, 100, 122, 108, 98, 10, 0, null, GrowthRate.SLOW, null, false),
     new PokemonSpecies(Species.TERAPAGOS, "Terapagos", 9, false, true, false, "Tera Pokémon", Type.NORMAL, null, 0.2, 6.5, Abilities.TERA_SHIFT, Abilities.NONE, Abilities.NONE, 450, 90, 65, 85, 65, 85, 60, 5, 50, null, GrowthRate.SLOW, 50, false, false,
-      new PokemonForm("Normal Form", "normal", Type.NORMAL, null, 0.2, 6.5, Abilities.TERA_SHIFT, Abilities.NONE, Abilities.NONE, 450, 90, 65, 85, 65, 85, 60, 5, 50, null),
+      new PokemonForm("Normal Form", "", Type.NORMAL, null, 0.2, 6.5, Abilities.TERA_SHIFT, Abilities.NONE, Abilities.NONE, 450, 90, 65, 85, 65, 85, 60, 5, 50, null),
       new PokemonForm("Terastal Form", "terastal", Type.NORMAL, null, 0.3, 16, Abilities.TERA_SHELL, Abilities.NONE, Abilities.NONE, 600, 95, 95, 110, 105, 110, 85, 5, 50, null),
       new PokemonForm("Stellar Form", "stellar", Type.NORMAL, null, 1.7, 77, Abilities.TERAFORM_ZERO, Abilities.NONE, Abilities.NONE, 700, 160, 105, 110, 130, 110, 85, 5, 50, null),
     ),
@@ -2632,7 +2632,6 @@ export const speciesStarters = {
   [Species.GALAR_PONYTA]: 4,
   [Species.GALAR_SLOWPOKE]: 3,
   [Species.GALAR_FARFETCHD]: 5,
-  [Species.GALAR_MR_MIME]: 5,
   [Species.GALAR_CORSOLA]: 4,
   [Species.GALAR_ZIGZAGOON]: 3,
   [Species.GALAR_DARUMAKA]: 4,
@@ -2716,12 +2715,12 @@ export const speciesStarters = {
   [Species.MUNKIDORI]: 7,
   [Species.FEZANDIPITI]: 7,
   [Species.OGERPON]: 8,
-//[Species.GOUGING_FIRE]: 7,
-//[Species.RAGING_BOLT]: 7,
-//[Species.IRON_BOULDER]: 7,
-//[Species.IRON_CROWN]: 7,
-//[Species.TERAPAGOS]: 8,
-//[Species.PECHARUNT]: 7,
+  [Species.GOUGING_FIRE]: 7,
+  [Species.RAGING_BOLT]: 7,
+  [Species.IRON_BOULDER]: 7,
+  [Species.IRON_CROWN]: 7,
+  [Species.TERAPAGOS]: 8,
+  [Species.PECHARUNT]: 7,
 };
 
 // TODO: Remove