FAIRY is a valid type constant now with EGG_FAIRY

1 files changed, 32 insertions, 32 deletions

diff --git a/Add-a-new-Fairy-type.md b/Add-a-new-Fairy-type.md
index 7a046c8..b8cfee1 100644
--- a/Add-a-new-Fairy-type.md
+++ b/Add-a-new-Fairy-type.md
@@ -3,7 +3,7 @@ This tutorial is for how to add a new type for Pokémon or moves. As an example,
 
 ## Contents
 
-1. [Add a `FAIRY_T` constant](#1-add-a-fairy_t-constant)
+1. [Add a `FAIRY` constant](#1-add-a-fairy-constant)
 2. [Update `TypeNames`](#2-update-typenames)
 3. [Update `TypeMatchups`](#3-update-typematchups)
 4. [Update `PokedexTypeSearchConversionTable` and `PokedexTypeSearchStrings`](#4-update-pokedextypesearchconversiontable-and-pokedextypesearchstrings)
@@ -12,7 +12,7 @@ This tutorial is for how to add a new type for Pokémon or moves. As an example,
 7. [Change `POLKADOT_BOW` to boost Fairy moves](#7-change-polkadot_bow-to-boost-fairy-moves)
 
 
-## 1. Add a `FAIRY_T` constant
+## 1. Add a `FAIRY` constant
 
 Gen 2 was before the physical/special split, so the types after `SPECIAL` count as special, and the rest count as physical. Fairy moves are mostly special, so we'll add it there.
 
@@ -28,11 +28,11 @@ SPECIAL EQU const_value
 	const ICE
 	const DRAGON
 	const DARK
-+	const FAIRY_T
++	const FAIRY
 TYPES_END EQU const_value
 ```
 
-Note that we have to call it `FAIRY_T` because `FAIRY` is already used for an egg group.
+(If you're using an old version of pokecrystal where the `EGG_FAIRY` egg group constant was still called `FAIRY`, you'll have to name the type something different, like `FAIRY_T` or `FAERIE`.)
 
 
 ## 2. Update `TypeNames`
@@ -64,16 +64,16 @@ TypeMatchups: ; 34bb1
 	db NORMAL,    ROCK,      NOT_VERY_EFFECTIVE
 	db NORMAL,    STEEL,     NOT_VERY_EFFECTIVE
 	...
-+	db FIGHTING,  FAIRY_T,   NOT_VERY_EFFECTIVE
-+	db POISON,    FAIRY_T,   SUPER_EFFECTIVE
-+	db BUG,       FAIRY_T,   NOT_VERY_EFFECTIVE
-+	db DRAGON,    FAIRY_T,   NO_EFFECT
-+	db DARK,      FAIRY_T,   NOT_VERY_EFFECTIVE
-+	db STEEL,     FAIRY_T,   SUPER_EFFECTIVE
-+	db FAIRY_T,   POISON,    NOT_VERY_EFFECTIVE
-+	db FAIRY_T,   DRAGON,    SUPER_EFFECTIVE
-+	db FAIRY_T,   DARK,      SUPER_EFFECTIVE
-+	db FAIRY_T,   STEEL,     NOT_VERY_EFFECTIVE
++	db FIGHTING,  FAIRY,     NOT_VERY_EFFECTIVE
++	db POISON,    FAIRY,     SUPER_EFFECTIVE
++	db BUG,       FAIRY,     NOT_VERY_EFFECTIVE
++	db DRAGON,    FAIRY,     NO_EFFECT
++	db DARK,      FAIRY,     NOT_VERY_EFFECTIVE
++	db STEEL,     FAIRY,     SUPER_EFFECTIVE
++	db FAIRY,     POISON,    NOT_VERY_EFFECTIVE
++	db FAIRY,     DRAGON,    SUPER_EFFECTIVE
++	db FAIRY,     DARK,      SUPER_EFFECTIVE
++	db FAIRY,     STEEL,     NOT_VERY_EFFECTIVE
 
 	db -2 ; end
 
@@ -97,7 +97,7 @@ PokedexTypeSearchConversionTable: ; 410f6
 	db NORMAL
 	...
 	db STEEL
-+	db FAIRY_T
++	db FAIRY
 ; 41107
 ```
 
@@ -119,28 +119,28 @@ PokedexTypeSearchStrings: ; 40fe4
 
 Edit the type entries in [data/pokemon/base_stats/](../blob/master/data/pokemon/base_stats/):
 
-- [azumarill.asm](../blob/master/data/pokemon/base_stats/azumarill.asm): `db WATER, WATER` → `db WATER, FAIRY_T`
-- [clefable.asm](../blob/master/data/pokemon/base_stats/clefable.asm): `db NORMAL, NORMAL` → `db FAIRY_T, FAIRY_T`
-- [clefairy.asm](../blob/master/data/pokemon/base_stats/clefairy.asm): `db NORMAL, NORMAL` → `db FAIRY_T, FAIRY_T`
-- [cleffa.asm](../blob/master/data/pokemon/base_stats/cleffa.asm): `db NORMAL, NORMAL` → `db FAIRY_T, FAIRY_T`
-- [granbull.asm](../blob/master/data/pokemon/base_stats/granbull.asm): `db NORMAL, NORMAL` → `db FAIRY_T, FAIRY_T`
-- [igglybuff.asm](../blob/master/data/pokemon/base_stats/igglybuff.asm): `db NORMAL, NORMAL` → `db NORMAL, FAIRY_T`
-- [jigglypuff.asm](../blob/master/data/pokemon/base_stats/jigglypuff.asm): `db NORMAL, NORMAL` → `db NORMAL, FAIRY_T`
-- [marill.asm](../blob/master/data/pokemon/base_stats/marill.asm): `db WATER, WATER` → `db WATER, FAIRY_T`
-- [mr__mime.asm](../blob/master/data/pokemon/base_stats/mr__mime.asm): `db PSYCHIC, PSYCHIC` → `db PSYCHIC, FAIRY_T`
-- [snubbull.asm](../blob/master/data/pokemon/base_stats/snubbull.asm): `db NORMAL, NORMAL` → `db FAIRY_T, FAIRY_T`
-- [togepi.asm](../blob/master/data/pokemon/base_stats/togepi.asm): `db NORMAL, NORMAL` → `db FAIRY_T, FAIRY_T`
-- [togetic.asm](../blob/master/data/pokemon/base_stats/togetic.asm): `db NORMAL, FLYING` → `db FAIRY_T, FLYING`
-- [wigglytuff.asm](../blob/master/data/pokemon/base_stats/wigglytuff.asm): `db NORMAL, NORMAL` → `db NORMAL, FAIRY_T`
+- [azumarill.asm](../blob/master/data/pokemon/base_stats/azumarill.asm): `WATER, WATER` → `WATER, FAIRY`
+- [clefable.asm](../blob/master/data/pokemon/base_stats/clefable.asm): `NORMAL, NORMAL` → `FAIRY, FAIRY`
+- [clefairy.asm](../blob/master/data/pokemon/base_stats/clefairy.asm): `NORMAL, NORMAL` → `FAIRY, FAIRY`
+- [cleffa.asm](../blob/master/data/pokemon/base_stats/cleffa.asm): `NORMAL, NORMAL` → `FAIRY, FAIRY`
+- [granbull.asm](../blob/master/data/pokemon/base_stats/granbull.asm): `NORMAL, NORMAL` → `FAIRY, FAIRY`
+- [igglybuff.asm](../blob/master/data/pokemon/base_stats/igglybuff.asm): `NORMAL, NORMAL` → `NORMAL, FAIRY`
+- [jigglypuff.asm](../blob/master/data/pokemon/base_stats/jigglypuff.asm): `NORMAL, NORMAL` → `NORMAL, FAIRY`
+- [marill.asm](../blob/master/data/pokemon/base_stats/marill.asm): `WATER, WATER` → `WATER, FAIRY`
+- [mr__mime.asm](../blob/master/data/pokemon/base_stats/mr__mime.asm): `PSYCHIC, PSYCHIC` → `PSYCHIC, FAIRY`
+- [snubbull.asm](../blob/master/data/pokemon/base_stats/snubbull.asm): `NORMAL, NORMAL` → `FAIRY, FAIRY`
+- [togepi.asm](../blob/master/data/pokemon/base_stats/togepi.asm): `NORMAL, NORMAL` → `FAIRY, FAIRY`
+- [togetic.asm](../blob/master/data/pokemon/base_stats/togetic.asm): `NORMAL, FLYING` → `FAIRY, FLYING`
+- [wigglytuff.asm](../blob/master/data/pokemon/base_stats/wigglytuff.asm): `NORMAL, NORMAL` → `NORMAL, FAIRY`
 
 
 ## 6. Update move types
 
 Edit the type columns in [data/moves/moves.asm](../blob/master/data/moves/moves.asm):
 
-- `CHARM`: `NORMAL` → `FAIRY_T`
-- `SWEET_KISS`: `NORMAL` → `FAIRY_T`
-- `MOONLIGHT`: `NORMAL` → `FAIRY_T`
+- `CHARM`: `NORMAL` → `FAIRY`
+- `SWEET_KISS`: `NORMAL` → `FAIRY`
+- `MOONLIGHT`: `NORMAL` → `FAIRY`
 
 
 ## 7. Change `POLKADOT_BOW` to boost Fairy moves
@@ -155,7 +155,7 @@ TypeBoostItems: ; 35703
 +	db HELD_NORMAL_BOOST,   NORMAL   ; PINK_BOW
 	...
 	db HELD_STEEL_BOOST,    STEEL    ; METAL_COAT
-+	db HELD_FAIRY_BOOST,    FAIRY_T  ; POLKADOT_BOW
++	db HELD_FAIRY_BOOST,    FAIRY    ; POLKADOT_BOW
 	db -1
 ; 35726
 ```