Merge pull request #456 from Rangi42/master

OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming

1 files changed, 19 insertions, 14 deletions

diff --git a/constants/text_constants.asm b/constants/text_constants.asm
index d867c77f7..a6052065c 100644
--- a/constants/text_constants.asm
+++ b/constants/text_constants.asm
@@ -1,22 +1,23 @@
 ; name lengths
-NAME_LENGTH        EQU 11
-PLAYER_NAME_LENGTH EQU 8
-BOX_NAME_LENGTH    EQU 9
-PKMN_NAME_LENGTH   EQU 11
-MOVE_NAME_LENGTH   EQU 13
-ITEM_NAME_LENGTH   EQU 13
+NAME_LENGTH          EQU 11
+PLAYER_NAME_LENGTH   EQU 8
+BOX_NAME_LENGTH      EQU 9
+MON_NAME_LENGTH      EQU 11
+MOVE_NAME_LENGTH     EQU 13
+ITEM_NAME_LENGTH     EQU 13
 TRAINER_CLASS_NAME_LENGTH EQU 13
 NAME_LENGTH_JAPANESE EQU 6
 
 ; GetName types (see home/names.asm)
-PKMN_NAME     EQU 1
-MOVE_NAME     EQU 2
-; dummied out EQU 3
-ITEM_NAME     EQU 4
-PARTY_OT_NAME EQU 5
-ENEMY_OT_NAME EQU 6
-TRAINER_NAME  EQU 7
-; broken ptr  EQU 8
+const_value set 1
+	const MON_NAME              ; 1
+	const MOVE_NAME             ; 2
+	const DUMMY_NAME            ; 3
+	const ITEM_NAME             ; 4
+	const PARTY_OT_NAME         ; 5
+	const ENEMY_OT_NAME         ; 6
+	const TRAINER_NAME          ; 7
+	const MOVE_DESC_NAME_BROKEN ; 8
 
 ; see home/text.asm
 BORDER_WIDTH   EQU 2
@@ -39,3 +40,7 @@ const_value set 5
 PRINTNUM_MONEY          EQU 1 << PRINTNUM_MONEY_F
 PRINTNUM_RIGHTALIGN     EQU 1 << PRINTNUM_RIGHTALIGN_F
 PRINTNUM_LEADINGZEROS   EQU 1 << PRINTNUM_LEADINGZEROS_F
+
+; character sets (see charmap.asm)
+FIRST_REGULAR_TEXT_CHAR EQU $60
+FIRST_HIRAGANA_DAKUTEN_CHAR EQU $20