Reorganize constants/

To do: add comments associating constants with data and code

1 files changed, 23 insertions, 16 deletions

diff --git a/constants/type_constants.asm b/constants/type_constants.asm
index b36dc179..c94d5c39 100755
--- a/constants/type_constants.asm
+++ b/constants/type_constants.asm
@@ -1,16 +1,23 @@
-; Elemental 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
-FIRE     EQU $14
-WATER    EQU $15
-GRASS    EQU $16
-ELECTRIC EQU $17
-PSYCHIC  EQU $18
-ICE      EQU $19
-DRAGON   EQU $1A
+	const_def
+
+PHYSICAL EQU const_value
+	const NORMAL   ; $00
+	const FIGHTING ; $01
+	const FLYING   ; $02
+	const POISON   ; $03
+	const GROUND   ; $04
+	const ROCK     ; $05
+	const BIRD     ; $06
+	const BUG      ; $07
+	const GHOST    ; $08
+
+const_value = $14
+
+SPECIAL EQU const_value
+	const FIRE     ; $14
+	const WATER    ; $15
+	const GRASS    ; $16
+	const ELECTRIC ; $17
+	const PSYCHIC  ; $18
+	const ICE      ; $19
+	const DRAGON   ; $1A