Merge branch 'master' of https://github.com/Rangi42/polishedcrystal

Rangi42 · Feb 12, 2025 · d798a55 · d798a55
2 parents bbb6357 + a323b46
commit d798a55
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/constants/ability_constants.asm b/constants/ability_constants.asm
@@ -147,13 +147,13 @@
 	const GALVANIZE
 	const CORROSION
 	const TANGLING_HAIR
+	const SCREEN_CLEANER
+	const STEELY_SPIRIT
+	const PERISH_BODY
 	const GORILLA_TACTICS
 	const NEUTRALIZING_GAS
 	const PASTEL_VEIL
 	const QUICK_DRAW
-	const STEELY_SPIRIT
-	const PERISH_BODY
-	const SCREEN_CLEANER
 	const CUD_CHEW
 	const SHARPNESS
 	const ARMOR_TAIL

diff --git a/data/abilities/descriptions.asm b/data/abilities/descriptions.asm
@@ -144,13 +144,13 @@ AbilityDescriptions:
 	dw GalvanizeDescription
 	dw CorrosionDescription
 	dw TanglingHairDescription
+	dw ScreenCleanerDescription
+	dw SteelySpiritDescription
+	dw PerishBodyDescription
 	dw GorillaTacticsDescription
 	dw NeutralizingGasDescription
 	dw PastelVeilDescription
 	dw QuickDrawDescription
-	dw SteelySpiritDescription
-	dw PerishBodyDescription
-	dw ScreenCleanerDescription
 	dw CudChewDescription
 	dw SharpnessDescription
 	dw ArmorTailDescription

diff --git a/data/abilities/names.asm b/data/abilities/names.asm
@@ -144,13 +144,13 @@ AbilityNames:
 	dw Galvanize
 	dw Corrosion
 	dw TanglingHair
+	dw ScreenCleaner
+	dw SteelySpirit
+	dw PerishBody
 	dw GorillaTactics
 	dw NeutralizingGas
 	dw PastelVeil
 	dw QuickDraw
-	dw SteelySpirit
-	dw PerishBody
-	dw ScreenCleaner
 	dw CudChew
 	dw Sharpness
 	dw ArmorTail
@@ -301,13 +301,13 @@ SlushRush:       rawchar "Slush Rush@"
 Galvanize:       rawchar "Galvanize@"
 Corrosion:       rawchar "Corrosion@"
 TanglingHair:    rawchar "Tangling Hair@"
+ScreenCleaner:   rawchar "Screen Cleaner@"
+SteelySpirit:    rawchar "Steely Spirit@"
+PerishBody:      rawchar "Perish Body@"
 GorillaTactics:  rawchar "Gorilla Tactics@"
 NeutralizingGas: rawchar "Neutralizing Gas@"
 PastelVeil:      rawchar "Pastel Veil@"
 QuickDraw:       rawchar "Quick Draw@"
-SteelySpirit:    rawchar "Steely Spirit@"
-PerishBody:      rawchar "Perish Body@"
-ScreenCleaner:   rawchar "Screen Cleaner@"
 CudChew:         rawchar "Cud Chew@"
 Sharpness:       rawchar "Sharpness@"
 ArmorTail:       rawchar "Armor Tail@"