diff --git a/ps-items.sheet.mjs b/ps-items.sheet.mjs
index 18cf3dc4..9b76bd34 100644
--- a/ps-items.sheet.mjs
+++ b/ps-items.sheet.mjs
@@ -546,6 +546,7 @@ const ITEMS = {
 	"cornerstonemask": 758,
 	"wellspringmask": 759,
 	"hearthflamemask": 760,
+	"metalalloy": 761,
 };
 
 const found = new Map;
diff --git a/ps-pokemon.sheet.mjs b/ps-pokemon.sheet.mjs
index fc1ef3cc..42dec7ee 100644
--- a/ps-pokemon.sheet.mjs
+++ b/ps-pokemon.sheet.mjs
@@ -16,255 +16,300 @@ const BattlePokemonIconIndexes = {
 	unknown: 0,
     
 	// alt forms
-	egg: 1020 + 1,
-	pikachubelle: 1020 + 2,
-	pikachulibre: 1020 + 3,
-	pikachuphd: 1020 + 4,
-	pikachupopstar: 1020 + 5,
-	pikachurockstar: 1020 + 6,
-	pikachucosplay: 1020 + 7,
-	unownexclamation: 1020 + 8,
-	unownquestion: 1020 + 9,
-	unownb: 1020 + 10,
-	unownc: 1020 + 11,
-	unownd: 1020 + 12,
-	unowne: 1020 + 13,
-	unownf: 1020 + 14,
-	unowng: 1020 + 15,
-	unownh: 1020 + 16,
-	unowni: 1020 + 17,
-	unownj: 1020 + 18,
-	unownk: 1020 + 19,
-	unownl: 1020 + 20,
-	unownm: 1020 + 21,
-	unownn: 1020 + 22,
-	unowno: 1020 + 23,
-	unownp: 1020 + 24,
-	unownq: 1020 + 25,
-	unownr: 1020 + 26,
-	unowns: 1020 + 27,
-	unownt: 1020 + 28,
-	unownu: 1020 + 29,
-	unownv: 1020 + 30,
-	unownw: 1020 + 31,
-	unownx: 1020 + 32,
-	unowny: 1020 + 33,
-	unownz: 1020 + 34,
-	castformrainy: 1020 + 35,
-	castformsnowy: 1020 + 36,
-	castformsunny: 1020 + 37,
-	deoxysattack: 1020 + 38,
-	deoxysdefense: 1020 + 39,
-	deoxysspeed: 1020 + 40,
-	burmysandy: 1020 + 41,
-	burmytrash: 1020 + 42,
-	wormadamsandy: 1020 + 43,
-	wormadamtrash: 1020 + 44,
-	cherrimsunshine: 1020 + 45,
-	shelloseast: 1020 + 46,
-	gastrodoneast: 1020 + 47,
-	rotomfan: 1020 + 48,
-	rotomfrost: 1020 + 49,
-	rotomheat: 1020 + 50,
-	rotommow: 1020 + 51,
-	rotomwash: 1020 + 52,
-	giratinaorigin: 1020 + 53,
-	shayminsky: 1020 + 54,
-	unfezantf: 1020 + 55,
-	basculinbluestriped: 1020 + 56,
-	darmanitanzen: 1020 + 57,
-	deerlingautumn: 1020 + 58,
-	deerlingsummer: 1020 + 59,
-	deerlingwinter: 1020 + 60,
-	sawsbuckautumn: 1020 + 61,
-	sawsbucksummer: 1020 + 62,
-	sawsbuckwinter: 1020 + 63,
-	frillishf: 1020 + 64,
-	jellicentf: 1020 + 65,
-	tornadustherian: 1020 + 66,
-	thundurustherian: 1020 + 67,
-	landorustherian: 1020 + 68,
-	kyuremblack: 1020 + 69,
-	kyuremwhite: 1020 + 70,
-	keldeoresolute: 1020 + 71,
-	meloettapirouette: 1020 + 72,
-	vivillonarchipelago: 1020 + 73,
-	vivilloncontinental: 1020 + 74,
-	vivillonelegant: 1020 + 75,
-	vivillonfancy: 1020 + 76,
-	vivillongarden: 1020 + 77,
-	vivillonhighplains: 1020 + 78,
-	vivillonicysnow: 1020 + 79,
-	vivillonjungle: 1020 + 80,
-	vivillonmarine: 1020 + 81,
-	vivillonmodern: 1020 + 82,
-	vivillonmonsoon: 1020 + 83,
-	vivillonocean: 1020 + 84,
-	vivillonpokeball: 1020 + 85,
-	vivillonpolar: 1020 + 86,
-	vivillonriver: 1020 + 87,
-	vivillonsandstorm: 1020 + 88,
-	vivillonsavanna: 1020 + 89,
-	vivillonsun: 1020 + 90,
-	vivillontundra: 1020 + 91,
-	pyroarf: 1020 + 92,
-	flabebeblue: 1020 + 93,
-	flabebeorange: 1020 + 94,
-	flabebewhite: 1020 + 95,
-	flabebeyellow: 1020 + 96,
-	floetteblue: 1020 + 97,
-	floetteeternal: 1020 + 98,
-	floetteorange: 1020 + 99,
-	floettewhite: 1020 + 100,
-	floetteyellow: 1020 + 101,
-	florgesblue: 1020 + 102,
-	florgesorange: 1020 + 103,
-	florgeswhite: 1020 + 104,
-	florgesyellow: 1020 + 105,
-	furfroudandy: 1020 + 106,
-	furfroudebutante: 1020 + 107,
-	furfroudiamond: 1020 + 108,
-	furfrouheart: 1020 + 109,
-	furfroukabuki: 1020 + 110,
-	furfroulareine: 1020 + 111,
-	furfroumatron: 1020 + 112,
-	furfroupharaoh: 1020 + 113,
-	furfroustar: 1020 + 114,
-	meowsticf: 1020 + 115,
-	aegislashblade: 1020 + 116,
-	xerneasneutral: 1020 + 117,
-	hoopaunbound: 1020 + 118,
-	rattataalola: 1020 + 119,
-	raticatealola: 1020 + 120,
-	raichualola: 1020 + 121,
-	sandshrewalola: 1020 + 122,
-	sandslashalola: 1020 + 123,
-	vulpixalola: 1020 + 124,
-	ninetalesalola: 1020 + 125,
-	diglettalola: 1020 + 126,
-	dugtrioalola: 1020 + 127,
-	meowthalola: 1020 + 128,
-	persianalola: 1020 + 129,
-	geodudealola: 1020 + 130,
-	graveleralola: 1020 + 131,
-	golemalola: 1020 + 132,
-	grimeralola: 1020 + 133,
-	mukalola: 1020 + 134,
-	exeggutoralola: 1020 + 135,
-	marowakalola: 1020 + 136,
-	greninjaash: 1020 + 137,
-	zygarde10: 1020 + 138,
-	zygardecomplete: 1020 + 139,
-	oricoriopompom: 1020 + 140,
-	oricoriopau: 1020 + 141,
-	oricoriosensu: 1020 + 142,
-	lycanrocmidnight: 1020 + 143,
-	wishiwashischool: 1020 + 144,
-	miniormeteor: 1020 + 145,
-	miniororange: 1020 + 146,
-	minioryellow: 1020 + 147,
-	miniorgreen: 1020 + 148,
-	miniorblue: 1020 + 149,
-	miniorindigo: 1020 + 150,
-	miniorviolet: 1020 + 151,
-	magearnaoriginal: 1020 + 152,
-	pikachuoriginal: 1020 + 153,
-	pikachuhoenn: 1020 + 154,
-	pikachusinnoh: 1020 + 155,
-	pikachuunova: 1020 + 156,
-	pikachukalos: 1020 + 157,
-	pikachualola: 1020 + 158,
-	pikachupartner: 1020 + 159,
-	lycanrocdusk: 1020 + 160,
-	necrozmaduskmane: 1020 + 161,
-	necrozmadawnwings: 1020 + 162,
-	necrozmaultra: 1020 + 163,
-	pikachustarter: 1020 + 164,
-	eeveestarter: 1020 + 165,
-	meowthgalar: 1020 + 166,
-	ponytagalar: 1020 + 167,
-	rapidashgalar: 1020 + 168,
-	farfetchdgalar: 1020 + 169,
-	weezinggalar: 1020 + 170,
-	mrmimegalar: 1020 + 171,
-	corsolagalar: 1020 + 172,
-	zigzagoongalar: 1020 + 173,
-	linoonegalar: 1020 + 174,
-	darumakagalar: 1020 + 175,
-	darmanitangalar: 1020 + 176,
-	darmanitangalarzen: 1020 + 177,
-	yamaskgalar: 1020 + 178,
-	stunfiskgalar: 1020 + 179,
-	cramorantgulping: 1020 + 180,
-	cramorantgorging: 1020 + 181,
-	toxtricitylowkey: 1020 + 182,
-	alcremierubycream: 1020 + 183,
-	alcremiematchacream: 1020 + 184,
-	alcremiemintcream: 1020 + 185,
-	alcremielemoncream: 1020 + 186,
-	alcremiesaltedcream: 1020 + 187,
-	alcremierubyswirl: 1020 + 188,
-	alcremiecaramelswirl: 1020 + 189,
-	alcremierainbowswirl: 1020 + 190,
-	eiscuenoice: 1020 + 191,
-	indeedeef: 1020 + 192,
-	morpekohangry: 1020 + 193,
-	zaciancrowned: 1020 + 194,
-	zamazentacrowned: 1020 + 195,
-	slowpokegalar: 1020 + 196,
-	slowbrogalar: 1020 + 197,
-	zarudedada: 1020 + 198,
-	pikachuworld: 1020 + 199,
-	articunogalar: 1020 + 200,
-	zapdosgalar: 1020 + 201,
-	moltresgalar: 1020 + 202,
-	slowkinggalar: 1020 + 203,
-	calyrexice: 1020 + 204,
-	calyrexshadow: 1020 + 205,
-	growlithehisui: 1020 + 206,
-	arcaninehisui: 1020 + 207,
-	voltorbhisui: 1020 + 208,
-	electrodehisui: 1020 + 209,
-	typhlosionhisui: 1020 + 210,
-	qwilfishhisui: 1020 + 211,
-	sneaselhisui: 1020 + 212,
-	samurotthisui: 1020 + 213,
-	lilliganthisui: 1020 + 214,
-	zoruahisui: 1020 + 215,
-	zoroarkhisui: 1020 + 216,
-	braviaryhisui: 1020 + 217,
-	sliggoohisui: 1020 + 218,
-	goodrahisui: 1020 + 219,
-	avalugghisui: 1020 + 220,
-	decidueyehisui: 1020 + 221,
-	basculegionf: 1020 + 222,
-	enamorustherian: 1020 + 223,
-	taurospaldeacombat: 1020 + 224,
-	taurospaldeablaze: 1020 + 225,
-	taurospaldeaaqua: 1020 + 226,
-	wooperpaldea: 1020 + 227,
-	oinkolognef: 1020 + 228,
-	palafinhero: 1020 + 229,
-	mausholdfour: 1020 + 230,
-	tatsugiridroopy: 1020 + 231,
-	tatsugiristretchy: 1020 + 232,
-	squawkabillyblue: 1020 + 233,
-	squawkabillyyellow: 1020 + 234,
-	squawkabillywhite: 1020 + 235,
-	gimmighoulroaming: 1020 + 236,
-	dialgaorigin: 1020 + 237,
-	palkiaorigin: 1020 + 238,
-	basculinwhitestriped: 1020 + 239,
-	ursalunabloodmoon: 1020 + 240,
-	ogerponwellspring: 1020 + 241,
-	ogerponhearthflame: 1020 + 242,
-	ogerponcornerstone: 1020 + 243,
+	egg: 1032 + 1,
+	pikachubelle: 1032 + 2,
+	pikachulibre: 1032 + 3,
+	pikachuphd: 1032 + 4,
+	pikachupopstar: 1032 + 5,
+	pikachurockstar: 1032 + 6,
+	pikachucosplay: 1032 + 7,
+	unownexclamation: 1032 + 8,
+	unownquestion: 1032 + 9,
+	unownb: 1032 + 10,
+	unownc: 1032 + 11,
+	unownd: 1032 + 12,
+	unowne: 1032 + 13,
+	unownf: 1032 + 14,
+	unowng: 1032 + 15,
+	unownh: 1032 + 16,
+	unowni: 1032 + 17,
+	unownj: 1032 + 18,
+	unownk: 1032 + 19,
+	unownl: 1032 + 20,
+	unownm: 1032 + 21,
+	unownn: 1032 + 22,
+	unowno: 1032 + 23,
+	unownp: 1032 + 24,
+	unownq: 1032 + 25,
+	unownr: 1032 + 26,
+	unowns: 1032 + 27,
+	unownt: 1032 + 28,
+	unownu: 1032 + 29,
+	unownv: 1032 + 30,
+	unownw: 1032 + 31,
+	unownx: 1032 + 32,
+	unowny: 1032 + 33,
+	unownz: 1032 + 34,
+	castformrainy: 1032 + 35,
+	castformsnowy: 1032 + 36,
+	castformsunny: 1032 + 37,
+	deoxysattack: 1032 + 38,
+	deoxysdefense: 1032 + 39,
+	deoxysspeed: 1032 + 40,
+	burmysandy: 1032 + 41,
+	burmytrash: 1032 + 42,
+	wormadamsandy: 1032 + 43,
+	wormadamtrash: 1032 + 44,
+	cherrimsunshine: 1032 + 45,
+	shelloseast: 1032 + 46,
+	gastrodoneast: 1032 + 47,
+	rotomfan: 1032 + 48,
+	rotomfrost: 1032 + 49,
+	rotomheat: 1032 + 50,
+	rotommow: 1032 + 51,
+	rotomwash: 1032 + 52,
+	giratinaorigin: 1032 + 53,
+	shayminsky: 1032 + 54,
+	unfezantf: 1032 + 55,
+	basculinbluestriped: 1032 + 56,
+	darmanitanzen: 1032 + 57,
+	deerlingautumn: 1032 + 58,
+	deerlingsummer: 1032 + 59,
+	deerlingwinter: 1032 + 60,
+	sawsbuckautumn: 1032 + 61,
+	sawsbucksummer: 1032 + 62,
+	sawsbuckwinter: 1032 + 63,
+	frillishf: 1032 + 64,
+	jellicentf: 1032 + 65,
+	tornadustherian: 1032 + 66,
+	thundurustherian: 1032 + 67,
+	landorustherian: 1032 + 68,
+	kyuremblack: 1032 + 69,
+	kyuremwhite: 1032 + 70,
+	keldeoresolute: 1032 + 71,
+	meloettapirouette: 1032 + 72,
+	vivillonarchipelago: 1032 + 73,
+	vivilloncontinental: 1032 + 74,
+	vivillonelegant: 1032 + 75,
+	vivillonfancy: 1032 + 76,
+	vivillongarden: 1032 + 77,
+	vivillonhighplains: 1032 + 78,
+	vivillonicysnow: 1032 + 79,
+	vivillonjungle: 1032 + 80,
+	vivillonmarine: 1032 + 81,
+	vivillonmodern: 1032 + 82,
+	vivillonmonsoon: 1032 + 83,
+	vivillonocean: 1032 + 84,
+	vivillonpokeball: 1032 + 85,
+	vivillonpolar: 1032 + 86,
+	vivillonriver: 1032 + 87,
+	vivillonsandstorm: 1032 + 88,
+	vivillonsavanna: 1032 + 89,
+	vivillonsun: 1032 + 90,
+	vivillontundra: 1032 + 91,
+	pyroarf: 1032 + 92,
+	flabebeblue: 1032 + 93,
+	flabebeorange: 1032 + 94,
+	flabebewhite: 1032 + 95,
+	flabebeyellow: 1032 + 96,
+	floetteblue: 1032 + 97,
+	floetteeternal: 1032 + 98,
+	floetteorange: 1032 + 99,
+	floettewhite: 1032 + 100,
+	floetteyellow: 1032 + 101,
+	florgesblue: 1032 + 102,
+	florgesorange: 1032 + 103,
+	florgeswhite: 1032 + 104,
+	florgesyellow: 1032 + 105,
+	furfroudandy: 1032 + 106,
+	furfroudebutante: 1032 + 107,
+	furfroudiamond: 1032 + 108,
+	furfrouheart: 1032 + 109,
+	furfroukabuki: 1032 + 110,
+	furfroulareine: 1032 + 111,
+	furfroumatron: 1032 + 112,
+	furfroupharaoh: 1032 + 113,
+	furfroustar: 1032 + 114,
+	meowsticf: 1032 + 115,
+	aegislashblade: 1032 + 116,
+	xerneasneutral: 1032 + 117,
+	hoopaunbound: 1032 + 118,
+	rattataalola: 1032 + 119,
+	raticatealola: 1032 + 120,
+	raichualola: 1032 + 121,
+	sandshrewalola: 1032 + 122,
+	sandslashalola: 1032 + 123,
+	vulpixalola: 1032 + 124,
+	ninetalesalola: 1032 + 125,
+	diglettalola: 1032 + 126,
+	dugtrioalola: 1032 + 127,
+	meowthalola: 1032 + 128,
+	persianalola: 1032 + 129,
+	geodudealola: 1032 + 130,
+	graveleralola: 1032 + 131,
+	golemalola: 1032 + 132,
+	grimeralola: 1032 + 133,
+	mukalola: 1032 + 134,
+	exeggutoralola: 1032 + 135,
+	marowakalola: 1032 + 136,
+	greninjaash: 1032 + 137,
+	zygarde10: 1032 + 138,
+	zygardecomplete: 1032 + 139,
+	oricoriopompom: 1032 + 140,
+	oricoriopau: 1032 + 141,
+	oricoriosensu: 1032 + 142,
+	lycanrocmidnight: 1032 + 143,
+	wishiwashischool: 1032 + 144,
+	miniormeteor: 1032 + 145,
+	miniororange: 1032 + 146,
+	minioryellow: 1032 + 147,
+	miniorgreen: 1032 + 148,
+	miniorblue: 1032 + 149,
+	miniorindigo: 1032 + 150,
+	miniorviolet: 1032 + 151,
+	magearnaoriginal: 1032 + 152,
+	pikachuoriginal: 1032 + 153,
+	pikachuhoenn: 1032 + 154,
+	pikachusinnoh: 1032 + 155,
+	pikachuunova: 1032 + 156,
+	pikachukalos: 1032 + 157,
+	pikachualola: 1032 + 158,
+	pikachupartner: 1032 + 159,
+	lycanrocdusk: 1032 + 160,
+	necrozmaduskmane: 1032 + 161,
+	necrozmadawnwings: 1032 + 162,
+	necrozmaultra: 1032 + 163,
+	pikachustarter: 1032 + 164,
+	eeveestarter: 1032 + 165,
+	meowthgalar: 1032 + 166,
+	ponytagalar: 1032 + 167,
+	rapidashgalar: 1032 + 168,
+	farfetchdgalar: 1032 + 169,
+	weezinggalar: 1032 + 170,
+	mrmimegalar: 1032 + 171,
+	corsolagalar: 1032 + 172,
+	zigzagoongalar: 1032 + 173,
+	linoonegalar: 1032 + 174,
+	darumakagalar: 1032 + 175,
+	darmanitangalar: 1032 + 176,
+	darmanitangalarzen: 1032 + 177,
+	yamaskgalar: 1032 + 178,
+	stunfiskgalar: 1032 + 179,
+	cramorantgulping: 1032 + 180,
+	cramorantgorging: 1032 + 181,
+	toxtricitylowkey: 1032 + 182,
+	alcremierubycream: 1032 + 183,
+	alcremiematchacream: 1032 + 184,
+	alcremiemintcream: 1032 + 185,
+	alcremielemoncream: 1032 + 186,
+	alcremiesaltedcream: 1032 + 187,
+	alcremierubyswirl: 1032 + 188,
+	alcremiecaramelswirl: 1032 + 189,
+	alcremierainbowswirl: 1032 + 190,
+	eiscuenoice: 1032 + 191,
+	indeedeef: 1032 + 192,
+	morpekohangry: 1032 + 193,
+	zaciancrowned: 1032 + 194,
+	zamazentacrowned: 1032 + 195,
+	slowpokegalar: 1032 + 196,
+	slowbrogalar: 1032 + 197,
+	zarudedada: 1032 + 198,
+	pikachuworld: 1032 + 199,
+	articunogalar: 1032 + 200,
+	zapdosgalar: 1032 + 201,
+	moltresgalar: 1032 + 202,
+	slowkinggalar: 1032 + 203,
+	calyrexice: 1032 + 204,
+	calyrexshadow: 1032 + 205,
+	growlithehisui: 1032 + 206,
+	arcaninehisui: 1032 + 207,
+	voltorbhisui: 1032 + 208,
+	electrodehisui: 1032 + 209,
+	typhlosionhisui: 1032 + 210,
+	qwilfishhisui: 1032 + 211,
+	sneaselhisui: 1032 + 212,
+	samurotthisui: 1032 + 213,
+	lilliganthisui: 1032 + 214,
+	zoruahisui: 1032 + 215,
+	zoroarkhisui: 1032 + 216,
+	braviaryhisui: 1032 + 217,
+	sliggoohisui: 1032 + 218,
+	goodrahisui: 1032 + 219,
+	avalugghisui: 1032 + 220,
+	decidueyehisui: 1032 + 221,
+	basculegionf: 1032 + 222,
+	enamorustherian: 1032 + 223,
+	taurospaldeacombat: 1032 + 224,
+	taurospaldeablaze: 1032 + 225,
+	taurospaldeaaqua: 1032 + 226,
+	wooperpaldea: 1032 + 227,
+	oinkolognef: 1032 + 228,
+	palafinhero: 1032 + 229,
+	mausholdfour: 1032 + 230,
+	tatsugiridroopy: 1032 + 231,
+	tatsugiristretchy: 1032 + 232,
+	squawkabillyblue: 1032 + 233,
+	squawkabillyyellow: 1032 + 234,
+	squawkabillywhite: 1032 + 235,
+	gimmighoulroaming: 1032 + 236,
+	dialgaorigin: 1032 + 237,
+	palkiaorigin: 1032 + 238,
+	basculinwhitestriped: 1032 + 239,
+	ursalunabloodmoon: 1032 + 240,
+	ogerponwellspring: 1032 + 241,
+	ogerponhearthflame: 1032 + 242,
+	ogerponcornerstone: 1032 + 243,
+	terapagosterastal: 1032 + 244,
+	terapagosstellar: 1032 + 245,
+
+	arceusbug: 1032 + 246,
+	arceusdark: 1032 + 247,
+	arceusdragon: 1032 + 248,
+	arceuselectric: 1032 + 249,
+	arceusfairy: 1032 + 250,
+	arceusfighting: 1032 + 251,
+	arceusfire: 1032 + 252,
+	arceusflying: 1032 + 253,
+	arceusghost: 1032 + 254,
+	arceusgrass: 1032 + 255,
+	arceusground: 1032 + 256,
+	arceusice: 1032 + 257,
+	arceuspoison: 1032 + 258,
+	arceuspsychic: 1032 + 259,
+	arceusrock: 1032 + 260,
+	arceussteel: 1032 + 261,
+	arceuswater: 1032 + 262,
+
+	genesectdouse: 1032 + 263,
+	genesectshock: 1032 + 264,
+	genesectburn: 1032 + 265,
+	genesectchill: 1032 + 266,
+
+	silvallybug: 1032 + 267,
+	silvallydark: 1032 + 268,
+	silvallydragon: 1032 + 269,
+	silvallyelectric: 1032 + 270,
+	silvallyfairy: 1032 + 271,
+	silvallyfighting: 1032 + 272,
+	silvallyfire: 1032 + 273,
+	silvallyflying: 1032 + 274,
+	silvallyghost: 1032 + 275,
+	silvallygrass: 1032 + 276,
+	silvallyground: 1032 + 277,
+	silvallyice: 1032 + 278,
+	silvallypoison: 1032 + 279,
+	silvallypsychic: 1032 + 280,
+	silvallyrock: 1032 + 281,
+	silvallysteel: 1032 + 282,
+	silvallywater: 1032 + 283,
+
+
 
 	// alt forms with duplicate icons
 	/* greninjabond: 658,
 	gumshoostotem: 735,
-	raticatealolatotem: 1020 + 120,
-	marowakalolatotem: 1020 + 136,
+	raticatealolatotem: 1032 + 120,
+	marowakalolatotem: 1032 + 136,
 	araquanidtotem: 752,
 	lurantistotem: 754,
 	salazzletotem: 758,
@@ -279,282 +324,281 @@ const BattlePokemonIconIndexes = {
 	poltchageistartisan: 1012,
 	sinistchamasterpiece: 1013,
 	ogerpontealtera: 1017,
-	ogerponwellspringtera: 1020 + 241,
-	ogerponhearthflametera: 1020 + 242,
-	ogerponcornerstonetera: 1020 + 243,
- 	toxtricitylowkeygmax: 1272 + 69, */
+	ogerponwellspringtera: 1032 + 241,
+	ogerponhearthflametera: 1032 + 242,
+	ogerponcornerstonetera: 1032 + 243,
+ 	toxtricitylowkeygmax: 1308 + 69, */
 
 	// Mega/G-Max
-	venusaurmega: 1272 + 0,
-	charizardmegax: 1272 + 1,
-	charizardmegay: 1272 + 2,
-	blastoisemega: 1272 + 3,
-	beedrillmega: 1272 + 4,
-	pidgeotmega: 1272 + 5,
-	alakazammega: 1272 + 6,
-	slowbromega: 1272 + 7,
-	gengarmega: 1272 + 8,
-	kangaskhanmega: 1272 + 9,
-	pinsirmega: 1272 + 10,
-	gyaradosmega: 1272 + 11,
-	aerodactylmega: 1272 + 12,
-	mewtwomegax: 1272 + 13,
-	mewtwomegay: 1272 + 14,
-	ampharosmega: 1272 + 15,
-	steelixmega: 1272 + 16,
-	scizormega: 1272 + 17,
-	heracrossmega: 1272 + 18,
-	houndoommega: 1272 + 19,
-	tyranitarmega: 1272 + 20,
-	sceptilemega: 1272 + 21,
-	blazikenmega: 1272 + 22,
-	swampertmega: 1272 + 23,
-	gardevoirmega: 1272 + 24,
-	sableyemega: 1272 + 25,
-	mawilemega: 1272 + 26,
-	aggronmega: 1272 + 27,
-	medichammega: 1272 + 28,
-	manectricmega: 1272 + 29,
-	sharpedomega: 1272 + 30,
-	cameruptmega: 1272 + 31,
-	altariamega: 1272 + 32,
-	banettemega: 1272 + 33,
-	absolmega: 1272 + 34,
-	glaliemega: 1272 + 35,
-	salamencemega: 1272 + 36,
-	metagrossmega: 1272 + 37,
-	latiasmega: 1272 + 38,
-	latiosmega: 1272 + 39,
-	kyogreprimal: 1272 + 40,
-	groudonprimal: 1272 + 41,
-	rayquazamega: 1272 + 42,
-	lopunnymega: 1272 + 43,
-	garchompmega: 1272 + 44,
-	lucariomega: 1272 + 45,
-	abomasnowmega: 1272 + 46,
-	gallademega: 1272 + 47,
-	audinomega: 1272 + 48,
-	dianciemega: 1272 + 49,
-	charizardgmax: 1272 + 50,
-	butterfreegmax: 1272 + 51,
-	pikachugmax: 1272 + 52,
-	meowthgmax: 1272 + 53,
-	machampgmax: 1272 + 54,
-	gengargmax: 1272 + 55,
-	kinglergmax: 1272 + 56,
-	laprasgmax: 1272 + 57,
-	eeveegmax: 1272 + 58,
-	snorlaxgmax: 1272 + 59,
-	garbodorgmax: 1272 + 60,
-	melmetalgmax: 1272 + 61,
-	corviknightgmax: 1272 + 62,
-	orbeetlegmax: 1272 + 63,
-	drednawgmax: 1272 + 64,
-	coalossalgmax: 1272 + 65,
-	flapplegmax: 1272 + 66,
-	appletungmax: 1272 + 67,
-	sandacondagmax: 1272 + 68,
-	toxtricitygmax: 1272 + 69,
-	centiskorchgmax: 1272 + 70,
-	hatterenegmax: 1272 + 71,
-	grimmsnarlgmax: 1272 + 72,
-	alcremiegmax: 1272 + 73,
-	copperajahgmax: 1272 + 74,
-	duraludongmax: 1272 + 75,
-	eternatuseternamax: 1272 + 76,
-	venusaurgmax: 1272 + 77,
-	blastoisegmax: 1272 + 78,
-	rillaboomgmax: 1272 + 79,
-	cinderacegmax: 1272 + 80,
-	inteleongmax: 1272 + 81,
-	urshifugmax: 1272 + 82,
-	urshifurapidstrikegmax: 1272 + 83,
+	venusaurmega: 1308 + 0,
+	charizardmegax: 1308 + 1,
+	charizardmegay: 1308 + 2,
+	blastoisemega: 1308 + 3,
+	beedrillmega: 1308 + 4,
+	pidgeotmega: 1308 + 5,
+	alakazammega: 1308 + 6,
+	slowbromega: 1308 + 7,
+	gengarmega: 1308 + 8,
+	kangaskhanmega: 1308 + 9,
+	pinsirmega: 1308 + 10,
+	gyaradosmega: 1308 + 11,
+	aerodactylmega: 1308 + 12,
+	mewtwomegax: 1308 + 13,
+	mewtwomegay: 1308 + 14,
+	ampharosmega: 1308 + 15,
+	steelixmega: 1308 + 16,
+	scizormega: 1308 + 17,
+	heracrossmega: 1308 + 18,
+	houndoommega: 1308 + 19,
+	tyranitarmega: 1308 + 20,
+	sceptilemega: 1308 + 21,
+	blazikenmega: 1308 + 22,
+	swampertmega: 1308 + 23,
+	gardevoirmega: 1308 + 24,
+	sableyemega: 1308 + 25,
+	mawilemega: 1308 + 26,
+	aggronmega: 1308 + 27,
+	medichammega: 1308 + 28,
+	manectricmega: 1308 + 29,
+	sharpedomega: 1308 + 30,
+	cameruptmega: 1308 + 31,
+	altariamega: 1308 + 32,
+	banettemega: 1308 + 33,
+	absolmega: 1308 + 34,
+	glaliemega: 1308 + 35,
+	salamencemega: 1308 + 36,
+	metagrossmega: 1308 + 37,
+	latiasmega: 1308 + 38,
+	latiosmega: 1308 + 39,
+	kyogreprimal: 1308 + 40,
+	groudonprimal: 1308 + 41,
+	rayquazamega: 1308 + 42,
+	lopunnymega: 1308 + 43,
+	garchompmega: 1308 + 44,
+	lucariomega: 1308 + 45,
+	abomasnowmega: 1308 + 46,
+	gallademega: 1308 + 47,
+	audinomega: 1308 + 48,
+	dianciemega: 1308 + 49,
+	charizardgmax: 1308 + 50,
+	butterfreegmax: 1308 + 51,
+	pikachugmax: 1308 + 52,
+	meowthgmax: 1308 + 53,
+	machampgmax: 1308 + 54,
+	gengargmax: 1308 + 55,
+	kinglergmax: 1308 + 56,
+	laprasgmax: 1308 + 57,
+	eeveegmax: 1308 + 58,
+	snorlaxgmax: 1308 + 59,
+	garbodorgmax: 1308 + 60,
+	melmetalgmax: 1308 + 61,
+	corviknightgmax: 1308 + 62,
+	orbeetlegmax: 1308 + 63,
+	drednawgmax: 1308 + 64,
+	coalossalgmax: 1308 + 65,
+	flapplegmax: 1308 + 66,
+	appletungmax: 1308 + 67,
+	sandacondagmax: 1308 + 68,
+	toxtricitygmax: 1308 + 69,
+	centiskorchgmax: 1308 + 70,
+	hatterenegmax: 1308 + 71,
+	grimmsnarlgmax: 1308 + 72,
+	alcremiegmax: 1308 + 73,
+	copperajahgmax: 1308 + 74,
+	duraludongmax: 1308 + 75,
+	eternatuseternamax: 1308 + 76,
+	venusaurgmax: 1308 + 77,
+	blastoisegmax: 1308 + 78,
+	rillaboomgmax: 1308 + 79,
+	cinderacegmax: 1308 + 80,
+	inteleongmax: 1308 + 81,
+	urshifugmax: 1308 + 82,
+	urshifurapidstrikegmax: 1308 + 83,
 
 	// CAP
-	syclant: 1464 + 0,
-	revenankh: 1464 + 1,
-	pyroak: 1464 + 2,
-	fidgit: 1464 + 3,
-	stratagem: 1464 + 4,
-	arghonaut: 1464 + 5,
-	kitsunoh: 1464 + 6,
-	cyclohm: 1464 + 7,
-	colossoil: 1464 + 8,
-	krilowatt: 1464 + 9,
-	voodoom: 1464 + 10,
-	tomohawk: 1464 + 11,
-	necturna: 1464 + 12,
-	mollux: 1464 + 13,
-	aurumoth: 1464 + 14,
-	malaconda: 1464 + 15,
-	cawmodore: 1464 + 16,
-	volkraken: 1464 + 17,
-	plasmanta: 1464 + 18,
-	naviathan: 1464 + 19,
-	crucibelle: 1464 + 20,
-	crucibellemega: 1464 + 21,
-	kerfluffle: 1464 + 22,
-	pajantom: 1464 + 23,
-	jumbao: 1464 + 24,
-	caribolt: 1464 + 25,
-	smokomodo: 1464 + 26,
-	snaelstrom: 1464 + 27,
-	equilibra: 1464 + 28,
-	astrolotl: 1464 + 29,
-	miasmaw: 1464 + 30,
-	chromera: 1464 + 31,
-	venomicon: 1464 + 32,
-	venomiconepilogue: 1464 + 33,
-	saharaja: 1464 + 34,
-	hemogoblin: 1464 + 35,
-
-	// CAP prevos
-	syclar: 1500 + 0,
-	embirch: 1500 + 1,
-	flarelm: 1500 + 2,
-	breezi: 1500 + 3,
-	scratchet: 1500 + 4,
-	necturine: 1500 + 5,
-	cupra: 1500 + 6,
-	argalis: 1500 + 7,
-	brattler: 1500 + 8,
-	cawdet: 1500 + 9,
-	volkritter: 1500 + 10,
-	snugglow: 1500 + 11,
-	floatoy: 1500 + 12,
-	caimanoe: 1500 + 13,
-	pluffle: 1500 + 14,
-	rebble: 1500 + 15,
-	tactite: 1500 + 16,
-	privatyke: 1500 + 17,
-	nohface: 1500 + 18,
-	monohm: 1500 + 19,
-	duohm: 1500 + 20,
-	protowatt: 1500 + 21,
-	voodoll: 1500 + 22,
-	mumbao: 1500 + 23,
-	fawnifer: 1500 + 24,
-	electrelk: 1500 + 25,
-	smogecko: 1500 + 26,
-	smoguana: 1500 + 27,
-	swirlpool: 1500 + 28,
-	coribalis: 1500 + 29,
-	justyke: 1500 + 30,
-	solotl: 1500 + 31,
-	miasmite: 1500 + 32,
-	dorsoil: 1500 + 33,
-	saharascal: 1500 + 34,
-	ababo: 1500 + 35,
-	scattervein: 1500 + 36,
+	syclant: 1500 + 0,
+	revenankh: 1500 + 1,
+	pyroak: 1500 + 2,
+	fidgit: 1500 + 3,
+	stratagem: 1500 + 4,
+	arghonaut: 1500 + 5,
+	kitsunoh: 1500 + 6,
+	cyclohm: 1500 + 7,
+	colossoil: 1500 + 8,
+	krilowatt: 1500 + 9,
+	voodoom: 1500 + 10,
+	tomohawk: 1500 + 11,
+	necturna: 1500 + 12,
+	mollux: 1500 + 13,
+	aurumoth: 1500 + 14,
+	malaconda: 1500 + 15,
+	cawmodore: 1500 + 16,
+	volkraken: 1500 + 17,
+	plasmanta: 1500 + 18,
+	naviathan: 1500 + 19,
+	crucibelle: 1500 + 20,
+	crucibellemega: 1500 + 21,
+	kerfluffle: 1500 + 22,
+	pajantom: 1500 + 23,
+	jumbao: 1500 + 24,
+	caribolt: 1500 + 25,
+	smokomodo: 1500 + 26,
+	snaelstrom: 1500 + 27,
+	equilibra: 1500 + 28,
+	astrolotl: 1500 + 29,
+	miasmaw: 1500 + 30,
+	chromera: 1500 + 31,
+	venomicon: 1500 + 32,
+	venomiconepilogue: 1500 + 33,
+	saharaja: 1500 + 34,
+	hemogoblin: 1500 + 35,
+	syclar: 1500 + 36,
+	embirch: 1500 + 37,
+	flarelm: 1500 + 38,
+	breezi: 1500 + 39,
+	scratchet: 1500 + 40,
+	necturine: 1500 + 41,
+	cupra: 1500 + 42,
+	argalis: 1500 + 43,
+	brattler: 1500 + 44,
+	cawdet: 1500 + 45,
+	volkritter: 1500 + 46,
+	snugglow: 1500 + 47,
+	floatoy: 1500 + 48,
+	caimanoe: 1500 + 49,
+	pluffle: 1500 + 50,
+	rebble: 1500 + 51,
+	tactite: 1500 + 52,
+	privatyke: 1500 + 53,
+	nohface: 1500 + 54,
+	monohm: 1500 + 55,
+	duohm: 1500 + 56,
+	protowatt: 1500 + 57,
+	voodoll: 1500 + 58,
+	mumbao: 1500 + 59,
+	fawnifer: 1500 + 60,
+	electrelk: 1500 + 61,
+	smogecko: 1500 + 62,
+	smoguana: 1500 + 63,
+	swirlpool: 1500 + 64,
+	coribalis: 1500 + 65,
+	justyke: 1500 + 66,
+	solotl: 1500 + 67,
+	miasmite: 1500 + 68,
+	dorsoil: 1500 + 69,
+	saharascal: 1500 + 70,
+	ababo: 1500 + 71,
+	scattervein: 1500 + 72,
+	cresceidon: 1500 + 73,
 };
 
 const BattlePokemonIconIndexesLeft = {
-	pikachubelle: 1344 + 0,
-	pikachupopstar: 1344 + 1,
-	clefairy: 1344 + 2,
-	clefable: 1344 + 3,
-	jigglypuff: 1344 + 4,
-	wigglytuff: 1344 + 5,
-	dugtrioalola: 1344 + 6,
-	poliwhirl: 1344 + 7,
-	poliwrath: 1344 + 8,
-	mukalola: 1344 + 9,
-	kingler: 1344 + 10,
-	croconaw: 1344 + 11,
-	cleffa: 1344 + 12,
-	igglybuff: 1344 + 13,
-	politoed: 1344 + 14,
-	unownb: 1344 + 15,
-	unownc: 1344 + 16,
-	unownd: 1344 + 17,
-	unowne: 1344 + 18,
-	unownf: 1344 + 19,
-	unowng: 1344 + 20,
-	unownh: 1344 + 21,
-	unownj: 1344 + 22,
-	unownk: 1344 + 23,
-	unownl: 1344 + 24,
-	unownm: 1344 + 25,
-	unownn: 1344 + 26,
-	unownp: 1344 + 27,
-	unownq: 1344 + 28,
-	unownquestion: 1344 + 29,
-	unownr: 1344 + 30,
-	unowns: 1344 + 31,
-	unownt: 1344 + 32,
-	unownv: 1344 + 33,
-	unownz: 1344 + 34,
-	sneasel: 1344 + 35,
-	teddiursa: 1344 + 36,
-	roselia: 1344 + 37,
-	zangoose: 1344 + 38,
-	seviper: 1344 + 39,
-	castformsnowy: 1344 + 40,
-	absolmega: 1344 + 41,
-	absol: 1344 + 42,
-	regirock: 1344 + 43,
-	torterra: 1344 + 44,
-	budew: 1344 + 45,
-	roserade: 1344 + 46,
-	magmortar: 1344 + 47,
-	togekiss: 1344 + 48,
-	rotomwash: 1344 + 49,
-	shayminsky: 1344 + 50,
-	emboar: 1344 + 51,
-	pansear: 1344 + 52,
-	simisear: 1344 + 53,
-	drilbur: 1344 + 54,
-	excadrill: 1344 + 55,
-	sawk: 1344 + 56,
-	lilligant: 1344 + 57,
-	garbodor: 1344 + 58,
-	solosis: 1344 + 59,
-	vanilluxe: 1344 + 60,
-	amoonguss: 1344 + 61,
-	klink: 1344 + 62,
-	klang: 1344 + 63,
-	klinklang: 1344 + 64,
-	litwick: 1344 + 65,
-	golett: 1344 + 66,
-	golurk: 1344 + 67,
-	kyuremblack: 1344 + 68,
-	kyuremwhite: 1344 + 69,
-	kyurem: 1344 + 70,
-	keldeoresolute: 1344 + 71,
-	meloetta: 1344 + 72,
-	greninja: 1344 + 73,
-	greninjaash: 1344 + 74,
-	furfroudebutante: 1344 + 75,
-	barbaracle: 1344 + 76,
-	clauncher: 1344 + 77,
-	clawitzer: 1344 + 78,
-	sylveon: 1344 + 79,
-	klefki: 1344 + 80,
-	zygarde: 1344 + 81,
-	zygarde10: 1344 + 82,
-	zygardecomplete: 1344 + 83,
-	dartrix: 1344 + 84,
-	steenee: 1344 + 85,
-	tsareena: 1344 + 86,
-	comfey: 1344 + 87,
-	miniormeteor: 1344 + 88,
-	minior: 1344 + 89,
-	miniororange: 1344 + 90,
-	minioryellow: 1344 + 91,
-	miniorgreen: 1344 + 92,
-	miniorblue: 1344 + 93,
-	miniorviolet: 1344 + 94,
-	miniorindigo: 1344 + 95,
-	dhelmise: 1344 + 96,
-	necrozma: 1344 + 97,
-	marshadow: 1344 + 98,
-	pikachuoriginal: 1344 + 99,
-	pikachupartner: 1344 + 100,
-	necrozmaduskmane: 1344 + 101,
-	necrozmadawnwings: 1344 + 102,
-	necrozmaultra: 1344 + 103,
-	stakataka: 1344 + 104,
-	blacephalon: 1344 + 105,
+	pikachubelle: 1380 + 0,
+	pikachupopstar: 1380 + 1,
+	clefairy: 1380 + 2,
+	clefable: 1380 + 3,
+	jigglypuff: 1380 + 4,
+	wigglytuff: 1380 + 5,
+	dugtrioalola: 1380 + 6,
+	poliwhirl: 1380 + 7,
+	poliwrath: 1380 + 8,
+	mukalola: 1380 + 9,
+	kingler: 1380 + 10,
+	croconaw: 1380 + 11,
+	cleffa: 1380 + 12,
+	igglybuff: 1380 + 13,
+	politoed: 1380 + 14,
+	unownb: 1380 + 15,
+	unownc: 1380 + 16,
+	unownd: 1380 + 17,
+	unowne: 1380 + 18,
+	unownf: 1380 + 19,
+	unowng: 1380 + 20,
+	unownh: 1380 + 21,
+	unownj: 1380 + 22,
+	unownk: 1380 + 23,
+	unownl: 1380 + 24,
+	unownm: 1380 + 25,
+	unownn: 1380 + 26,
+	unownp: 1380 + 27,
+	unownq: 1380 + 28,
+	unownquestion: 1380 + 29,
+	unownr: 1380 + 30,
+	unowns: 1380 + 31,
+	unownt: 1380 + 32,
+	unownv: 1380 + 33,
+	unownz: 1380 + 34,
+	sneasel: 1380 + 35,
+	teddiursa: 1380 + 36,
+	roselia: 1380 + 37,
+	zangoose: 1380 + 38,
+	seviper: 1380 + 39,
+	castformsnowy: 1380 + 40,
+	absolmega: 1380 + 41,
+	absol: 1380 + 42,
+	regirock: 1380 + 43,
+	torterra: 1380 + 44,
+	budew: 1380 + 45,
+	roserade: 1380 + 46,
+	magmortar: 1380 + 47,
+	togekiss: 1380 + 48,
+	rotomwash: 1380 + 49,
+	shayminsky: 1380 + 50,
+	emboar: 1380 + 51,
+	pansear: 1380 + 52,
+	simisear: 1380 + 53,
+	drilbur: 1380 + 54,
+	excadrill: 1380 + 55,
+	sawk: 1380 + 56,
+	lilligant: 1380 + 57,
+	garbodor: 1380 + 58,
+	solosis: 1380 + 59,
+	vanilluxe: 1380 + 60,
+	amoonguss: 1380 + 61,
+	klink: 1380 + 62,
+	klang: 1380 + 63,
+	klinklang: 1380 + 64,
+	litwick: 1380 + 65,
+	golett: 1380 + 66,
+	golurk: 1380 + 67,
+	kyuremblack: 1380 + 68,
+	kyuremwhite: 1380 + 69,
+	kyurem: 1380 + 70,
+	keldeoresolute: 1380 + 71,
+	meloetta: 1380 + 72,
+	greninja: 1380 + 73,
+	greninjaash: 1380 + 74,
+	furfroudebutante: 1380 + 75,
+	barbaracle: 1380 + 76,
+	clauncher: 1380 + 77,
+	clawitzer: 1380 + 78,
+	sylveon: 1380 + 79,
+	klefki: 1380 + 80,
+	zygarde: 1380 + 81,
+	zygarde10: 1380 + 82,
+	zygardecomplete: 1380 + 83,
+	dartrix: 1380 + 84,
+	steenee: 1380 + 85,
+	tsareena: 1380 + 86,
+	comfey: 1380 + 87,
+	miniormeteor: 1380 + 88,
+	minior: 1380 + 89,
+	miniororange: 1380 + 90,
+	minioryellow: 1380 + 91,
+	miniorgreen: 1380 + 92,
+	miniorblue: 1380 + 93,
+	miniorviolet: 1380 + 94,
+	miniorindigo: 1380 + 95,
+	dhelmise: 1380 + 96,
+	necrozma: 1380 + 97,
+	marshadow: 1380 + 98,
+	pikachuoriginal: 1380 + 99,
+	pikachupartner: 1380 + 100,
+	necrozmaduskmane: 1380 + 101,
+	necrozmadawnwings: 1380 + 102,
+	necrozmaultra: 1380 + 103,
+	stakataka: 1380 + 104,
+	blacephalon: 1380 + 105,
 };
 
 const entries = [];