PSYCHIC -> PSYCHIC_TYPE

3 files changed, 5 insertions, 5 deletions

diff --git a/Add-a-new-trainer-class.md b/Add-a-new-trainer-class.md
index 0bd7ff5..f333727 100644
--- a/Add-a-new-trainer-class.md
+++ b/Add-a-new-trainer-class.md
@@ -55,7 +55,7 @@ The `trainerclass` macro defines the next trainer class constant, and prepares t
 
 (Note the `CHRIS` and `KRIS` constants, equal to 0 and 1 respectively; they're used for getting the correct color palette when displaying the player's sprite in the introduction and on the trainer card. `KRIS` is equal to `FALKNER`, which is why they share a palette.)
 
-Be careful when naming trainer constants; either make them unique, or make them unambiguous (like `BUG_CATCHER_BENNY` and `BIKER_BENNY`). I once made a trainer constant `SPARK` and caused a bug because `SPARK` was already a move constant. (That's why `BLACKBELT_T` and `PSYCHIC_T` have the `_T` suffix, since `BLACKBELT` is an item and `PSYCHIC` is a type.)
+Be careful when naming trainer constants; either make them unique, or make them unambiguous (like `BUG_CATCHER_BENNY` and `BIKER_BENNY`). I once made a trainer constant `SPARK` and caused a bug because `SPARK` was already a move constant. (That's why we have suffixes for `BLACKBELT_T` (trainer) and `BLACKBELT_I` (item), or `PSYCHIC_T` (trainer), `PSYCHIC_M` (move), and `PSYCHIC_TYPE` (type).)
 
 Next we'll add data for the new `PARASOL_LADY` class to all those tables mentioned in the top comment.
 
diff --git a/Add-a-new-type.md b/Add-a-new-type.md
index 2936074..e253d4f 100644
--- a/Add-a-new-type.md
+++ b/Add-a-new-type.md
@@ -24,7 +24,7 @@ Edit [constants/type_constants.asm](../blob/master/constants/type_constants.asm)
  	const WATER
  	const GRASS
  	const ELECTRIC
- 	const PSYCHIC
+ 	const PSYCHIC_TYPE
  	const ICE
  	const DRAGON
  	const DARK
@@ -32,7 +32,7 @@ Edit [constants/type_constants.asm](../blob/master/constants/type_constants.asm)
  TYPES_END EQU const_value
 ```
 
-(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`.)
+(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_TYPE` or `FAERIE`.)
 
 
 ## 2. Give the type a name
@@ -138,7 +138,7 @@ Edit the type entries in [data/pokemon/base_stats/](../blob/master/data/pokemon/
 - [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`
+- [mr__mime.asm](../blob/master/data/pokemon/base_stats/mr__mime.asm): `PSYCHIC_TYPE, PSYCHIC_TYPE` → `PSYCHIC_TYPE, 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`
diff --git a/Physical-Special-split.md b/Physical-Special-split.md
index 22484fd..51080af 100644
--- a/Physical-Special-split.md
+++ b/Physical-Special-split.md
@@ -53,7 +53,7 @@ Edit [constants/type_constants.asm](../blob/master/constants/type_constants.asm)
  	const WATER
  	const GRASS
  	const ELECTRIC
- 	const PSYCHIC
+ 	const PSYCHIC_TYPE
  	const ICE
  	const DRAGON
  	const DARK