clean up type constants

constants.asm

@@ -32,24 +32,39 @@ NONE       EQU 0
 
 
 ; types
-NORMAL   EQU $00
-FIGHTING EQU $01
-FLYING   EQU $02
-POISON   EQU $03
-GROUND   EQU $04
-ROCK     EQU $05
-BUG      EQU $07
-GHOST    EQU $08
-STEEL    EQU $09
-CURSE_T  EQU $13
-FIRE     EQU $14
-WATER    EQU $15
-GRASS    EQU $16
-ELECTRIC EQU $17
-PSYCHIC  EQU $18
-ICE      EQU $19
-DRAGON   EQU $1A
-DARK     EQU $1B
+PHYSICAL EQU  0
+NORMAL   EQU  0
+FIGHTING EQU  1
+FLYING   EQU  2
+POISON   EQU  3
+GROUND   EQU  4
+ROCK     EQU  5
+BIRD     EQU  6
+BUG      EQU  7
+GHOST    EQU  8
+STEEL    EQU  9
+
+TYPE_10  EQU 10
+TYPE_11  EQU 11
+TYPE_12  EQU 12
+TYPE_13  EQU 13
+TYPE_14  EQU 14
+TYPE_15  EQU 15
+TYPE_16  EQU 16
+TYPE_17  EQU 17
+TYPE_18  EQU 18
+CURSE_T  EQU 19
+
+SPECIAL  EQU 20
+FIRE     EQU 20
+WATER    EQU 21
+GRASS    EQU 22
+ELECTRIC EQU 23
+PSYCHIC  EQU 24
+ICE      EQU 25
+DRAGON   EQU 26
+DARK     EQU 27
+
 
 ; egg group constants
 MONSTER       EQU $01