Earth & Sky misc fixes

data/mods/earthsky/learnsets.ts

@@ -969,17 +969,17 @@ export const Learnsets: {[speciesid: string]: ModdedLearnsetData} = {
 			doublehit: ["9L1"],
 			springleap: ["9L1"],
 			endure: ["9L1", "9M"],
-			pinmissile: ["9L1"],
-			poisontail: ["9L1"],
-			slash: ["9L1"],
-			xscissor: ["9L1", "9M"],
-			autotomize: ["9L1"],
-			crosspoison: ["9L1"],
-			uturn: ["9L1", "9M"],
-			flail: ["9L1"],
-			swordsdance: ["9L1", "9M"],
-			fellstinger: ["9L1"],
-			direclaw: ["9L1"],
+			pinmissile: ["9L12"],
+			poisontail: ["9L14"],
+			slash: ["9L18"],
+			xscissor: ["9L22", "9M"],
+			autotomize: ["9L24"],
+			crosspoison: ["9L28"],
+			uturn: ["9L32", "9M"],
+			flail: ["9L34"],
+			swordsdance: ["9L38", "9M"],
+			fellstinger: ["9L42"],
+			direclaw: ["9L44"],
 			hyperbeam: ["9M"],
 			gigaimpact: ["9M"],
 			hiddenpower: ["9M"],
@@ -1029,17 +1029,17 @@ export const Learnsets: {[speciesid: string]: ModdedLearnsetData} = {
 			furyswipes: ["9L1"],
 			strugglebug: ["9L1"],
 			endure: ["9L1", "9M"],
-			pinmissile: ["9L1"],
-			mirrorshot: ["9L1"],
-			quickattack: ["9L1"],
-			signalbeam: ["9L1", "9M"],
-			autotomize: ["9L1"],
-			irontail: ["9L1", "9M"],
-			uturn: ["9L1", "9M"],
-			flail: ["9L1"],
-			irondefense: ["9L1", "9M"],
-			fellstinger: ["9L1"],
-			metaledge: ["9L1"],
+			pinmissile: ["9L12"],
+			mirrorshot: ["9L14"],
+			quickattack: ["9L18"],
+			signalbeam: ["9L22", "9M"],
+			autotomize: ["9L24"],
+			irontail: ["9L28", "9M"],
+			uturn: ["9L32", "9M"],
+			flail: ["9L34"],
+			irondefense: ["9L38", "9M"],
+			fellstinger: ["9L42"],
+			metaledge: ["9L44"],
 			hyperbeam: ["9M"],
 			gigaimpact: ["9M"],
 			hiddenpower: ["9M"],

data/mods/earthsky/moves.ts

@@ -3740,6 +3740,9 @@ export const Moves: {[moveid: string]: ModdedMoveData} = {
 	milkdrink: {
 		inherit: true,
 		pp: 10,
+		target: 'adjacentAllyOrSelf',
+		desc: "The target restores 1/2 of its maximum HP, rounded half up.",
+		shortDesc: "Heals user or ally by 50% of its max HP.",
 	},
 	mindreader: {
 		num: 170,

data/mods/earthsky/pokedex.ts

@@ -898,7 +898,7 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 	pikeral: {
 		num: -567,
 		name: "Pikeral",
-		//forme: "Red-Striped",
+		baseForme: "Red-Striped",
 		types: ["Water", "Fighting"],
 		baseStats: {hp: 70, atk: 112, def: 75, spa: 100, spd: 65, spe: 108},
 		abilities: {0: "Reckless", 1: "Adaptability", H: "Mold Breaker"},
@@ -1016,12 +1016,13 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		color: "Black",
 		prevo: "Kricketune-Sartori",
 		evoType: "levelExtra",
-		evoCondition: "in a special magnetic field",
+		evoCondition: "near a special magnetic field",
 		eggGroups: ["Amorphous"],
 	},
 	squawkapo: {
 		num: -586,
 		name: "Squawkapo",
+		baseForme: "Green",
 		types: ["Normal", "Flying"],
 		baseStats: {hp: 102, atk: 116, def: 91, spa: 45, spd: 81, spe: 92},
 		abilities: {0: "Cacophony", 1: "Hustle", H: "Intimidate"},
@@ -1401,6 +1402,7 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		weightkg: 99.0,
 		color: "Gray",
 		prevo: "Ponyta-Egelas",
+		evoLevel: 40,
 		eggGroups: ["Field"],
 	},
 	cuboneegelas: {
@@ -1471,6 +1473,7 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		weightkg: 41.4,
 		color: "Black",
 		prevo: "Hoothoot-Egelas",
+		evoLevel: 20,
 		eggGroups: ["Flying"],
 	},
 	delibirdegelas: {
@@ -1514,6 +1517,8 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		weightkg: 23.0,
 		color: "Pink",
 		prevo: "Tynamo",
+		evoLevel: 39,
+		evoRegion: "Egelas",
 		evos: ["Eelektross-Egelas"],
 		eggGroups: ["Amorphous"],
 	},
@@ -1529,6 +1534,8 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		weightkg: 82.5,
 		color: "Pink",
 		prevo: "Eelektrik-Egelas",
+		evoType: "useItem",
+		evoItem: "Thunder Stone",
 		eggGroups: ["Amorphous"],
 	},
 	heatmoregelas: {
@@ -1583,6 +1590,7 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		weightkg: 22.8,
 		color: "Yellow",
 		prevo: "Kricketot-Sartori",
+		evoLevel: 10,
 		evos: ["Amplitune"],
 		eggGroups: ["Bug"],
 	},
@@ -1644,6 +1652,7 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		color: "Pink",
 		prevo: "Remoraid",
 		evoLevel: 25,
+		evoRegion: "Hassrim",
 		eggGroups: ["Water 1", "Water 2"],
 	},
 	indeedeehassrim: {
@@ -2096,7 +2105,7 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 	mrmimegalar: {
 		inherit: true,
 		types: ["Psychic", "Ice"],
-		abilities: {0: "Vital Spirit", 1: "Clean House", H: "Ice Bddy"},
+		abilities: {0: "Vital Spirit", 1: "Clean House", H: "Ice Body"},
 		isNonstandard: null,
 	},
 	taurospaldeacombat: {
@@ -2930,6 +2939,7 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		inherit: true,
 		abilities: {0: "Levitate", H: "Schooling"},
 		evos: ["Eelektrik", "Eelektrik-Egelas"],
+		baseForme: "Solo",
 		otherFormes: ["Tynamo-School"],
 		formeOrder: ["Tynamo", "Tynamo-School"],
 	},
@@ -3025,6 +3035,26 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		abilities: {0: "Download", H: "Battle Armor"},
 		isNonstandard: null,
 	},
+	genesectdouse: {
+		inherit: true,
+		abilities: {0: "Download", H: "Battle Armor"},
+		isNonstandard: null,
+	},
+	genesectshock: {
+		inherit: true,
+		abilities: {0: "Download", H: "Battle Armor"},
+		isNonstandard: null,
+	},
+	genesectburn: {
+		inherit: true,
+		abilities: {0: "Download", H: "Battle Armor"},
+		isNonstandard: null,
+	},
+	genesectchill: {
+		inherit: true,
+		abilities: {0: "Download", H: "Battle Armor"},
+		isNonstandard: null,
+	},
 	greninja: {
 		inherit: true,
 		abilities: {0: "Torrent", H: "Protean"},
@@ -3371,8 +3401,8 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		inherit: true,
 		abilities: {0: "Iron Fist", H: "Clear Body"},
 		prevo: "Meltan",
-		evoType: "other",
-		evoCondition: "Level up with 400 Spare Parts in the bag",
+		evoType: "levelExtra",
+		evoCondition: "400 Spare Parts in bag",
 		isNonstandard: null,
 
 	},
@@ -3584,6 +3614,7 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 	},
 	eternatus: {
 		inherit: true,
+		abilities: {0: "Pressure", H: "Unnerve"},
 		baseStats: {hp: 140, atk: 90, def: 100, spa: 145, spd: 100, spe: 115},
 	},
 	kubfu: {
@@ -3594,21 +3625,26 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		inherit: true,
 		abilities: {0: "Iron Fist", H: "No Guard"},
 		evoLevel: 50,
+		evoType: "useItem",
+		evoItem: "Scroll of Darkness",
 	},
 	urshifurapidstrike: {
 		inherit: true,
 		abilities: {0: "Iron Fist", H: "No Guard"},
 		evoLevel: 50,
+		evoType: "useItem",
+		evoItem: "Scroll of Waters",
 	},
 	zarude: {
 		name: "Zarude",
+		num: 893,
 		types: ["Dark", "Grass"],
 		gender: "N",
 		baseStats: {hp: 105, atk: 120, def: 105, spa: 70, spd: 95, spe: 105},
 		abilities: {0: "Leaf Guard", H: "Unburden"},
 		heightm: 1.8,
 		weightkg: 70,
-		color: "Green",
+		color: "Black",
 		eggGroups: ["Undiscovered"],
 	},
 	regieleki: {
@@ -3645,12 +3681,14 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		abilities: {0: "Fur Coat", 1: "Frisk", H: "Sap Sipper"},
 		evoType: "levelMove",
 		evoMove: "Barrier Bash",
+		evoCondition: null,
 	},
 	kleavor: {
 		inherit: true,
 		baseStats: {hp: 70, atk: 130, def: 100, spa: 55, spd: 60, spe: 85},
 		evoType: "trade",
 		evoItem: "Black Augurite",
+		evoCondition: null,
 	},
 	ursaluna: {
 		num: 901,
@@ -3662,8 +3700,9 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		weightkg: 290,
 		color: "Brown",
 		prevo: "Ursaring",
-		evoType: "other",
-		evoCondition: "Peat Block when there's a full moon",
+		evoType: "useItem",
+		evoItem: "Peat Block",
+		evoCondition: "Between 11 PM and 1 AM",
 		eggGroups: ["Field"],
 	},
 	basculegionf: {
@@ -3683,6 +3722,7 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		abilities: {0: "Poison Point", 1: "Poison Touch", H: "Disturbance"},
 		evoType: "levelMove",
 		evoMove: "Barb Barrage",
+		evoCondition: null,
 	},
 	enamorus: {
 		inherit: true,
@@ -3772,10 +3812,12 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 	armarouge: {
 		inherit: true,
 		abilities: {0: "Flash Fire", 1: "Weak Armor", H: "Mega Launcher"},
+		evoType: "trade",
 	},
 	ceruledge: {
 		inherit: true,
 		abilities: {0: "Flash Fire", 1: "Weak Armor", H: "Sharpness"},
+		evoType: "trade",
 	},
 	tadbulb: {
 		inherit: true,
@@ -3981,6 +4023,8 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		inherit: true,
 		types: ["Ghost", "Steel"],
 		exclusiveHidden: true,
+		evoType: "levelExtra",
+		evoCondition: "999 Gimmighoul Coins in bag",
 	},
 	roaringmoon: {
 		inherit: true,
@@ -4116,6 +4160,7 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		inherit: true,
 		baseStats: {hp: 116, atk: 80, def: 110, spa: 120, spd: 80, spe: 34},
 		abilities: {0: "Sweet Veil", 1: "Regenerator", H: "Sticky Hold"},
+		evoMove: "Shelter",
 	},
 	gougingfire: {
 		inherit: true,
@@ -4236,6 +4281,7 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 	marowakalola: {
 		inherit: true,
 		prevo: "Cubone-Egelas",
+		evoRegion: null,
 		isNonstandard: null,
 	},
 	tauros: {
@@ -5488,22 +5534,6 @@ export const Pokedex: {[speciesid: string]: ModdedSpeciesData} = {
 		inherit: true,
 		isNonstandard: null,
 	},
-	genesectdouse: {
-		inherit: true,
-		isNonstandard: null,
-	},
-	genesectshock: {
-		inherit: true,
-		isNonstandard: null,
-	},
-	genesectburn: {
-		inherit: true,
-		isNonstandard: null,
-	},
-	genesectchill: {
-		inherit: true,
-		isNonstandard: null,
-	},
 	bunnelby: {
 		inherit: true,
 		isNonstandard: null,

data/mods/earthsky/scripts.ts

@@ -9295,6 +9295,8 @@ export const Scripts: ModdedBattleScriptsData = {
 		delete this.modData('Learnsets','hakamoo').learnset.earthquake;
 		// Kommo-o
 		this.modData('Learnsets','kommoo').learnset.dizzypunch = ["9D"];
+		this.modData('Learnsets','kommoo').learnset.warriorssoul = ["9L75"];
+		this.modData('Learnsets','kommoo').learnset.closecombat = ["9L83"];
 		this.modData('Learnsets','kommoo').learnset.flash = ["9M"];
 		this.modData('Learnsets','kommoo').learnset.fullcollide = ["9M"];
 		this.modData('Learnsets','kommoo').learnset.retaliate = ["9M"];
@@ -9556,7 +9558,7 @@ export const Scripts: ModdedBattleScriptsData = {
 		this.modData('Learnsets','thwackey').learnset.rocksmash = ["9M"];
 		this.modData('Learnsets','thwackey').learnset.strength = ["9M"];
 		// Rillaboom
-		this.modData('Learnsets','rillaboom').learnset.dizzypunch = ["9D"];
+		this.modData('Learnsets','rillaboom').learnset.ivycudgel = ["9D"];
 		this.modData('Learnsets','rillaboom').learnset.chipaway = ["9M"];
 		this.modData('Learnsets','rillaboom').learnset.dualchop = ["9M"];
 		this.modData('Learnsets','rillaboom').learnset.echoedvoice = ["9M"];
@@ -12640,6 +12642,7 @@ export const Scripts: ModdedBattleScriptsData = {
 		delete this.modData('Learnsets','ogerponcornerstone').learnset.highjumpkick;
 		// Archaludon
 		this.modData('Learnsets','archaludon').learnset.cuttinglaser = ["9D"];
+		this.modData('Learnsets','archaludon').learnset.zapcannon = ["9L0"];
 		this.modData('Learnsets','archaludon').learnset.crushclaw = ["9L30"];
 		this.modData('Learnsets','archaludon').learnset.metalburst = ["9L42"];
 		this.modData('Learnsets','archaludon').learnset.hardpress = ["9L60"];
@@ -13296,6 +13299,5 @@ export const Scripts: ModdedBattleScriptsData = {
 		delete this.modData('Learnsets','hemogoblin').learnset.moonlight;
 		delete this.modData('Learnsets','hemogoblin').learnset.thunder;
 		delete this.modData('Learnsets','hemogoblin').learnset.wrap;
-
 	},
 };