aboutsummaryrefslogtreecommitdiffstats
path: root/constants
diff options
context:
space:
mode:
Diffstat (limited to 'constants')
-rw-r--r--constants/pokemon_data_constants.asm6
-rw-r--r--constants/text_constants.asm10
2 files changed, 7 insertions, 9 deletions
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index e174f78d..1234acab 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -64,7 +64,6 @@ DEF HOF_MON EQU $10
DEF HOF_TEAM EQU PARTY_LENGTH * HOF_MON
DEF HOF_TEAM_CAPACITY EQU 50
-
; mon data locations
; Note that some values are not supported by all functions that use these values.
const_def
@@ -74,15 +73,14 @@ DEF HOF_TEAM_CAPACITY EQU 50
const DAYCARE_DATA ; 3
const BATTLE_MON_DATA ; 4
-
-; See data/pokemon/evos_moves.asm
-
; Evolution types
const_def 1
const EVOLVE_LEVEL ; 1
const EVOLVE_ITEM ; 2
const EVOLVE_TRADE ; 3
+; evolution data (see data/pokemon/evos_moves.asm)
+DEF NUM_EVOS_IN_BUFFER EQU 3
; wMonHGrowthRate values
; GrowthRateTable indexes (see data/growth_rates.asm)
diff --git a/constants/text_constants.asm b/constants/text_constants.asm
index d4e259fe..4dbdf666 100644
--- a/constants/text_constants.asm
+++ b/constants/text_constants.asm
@@ -1,5 +1,5 @@
-DEF NAME_LENGTH EQU 11
-DEF ITEM_NAME_LENGTH EQU 13
+DEF NAME_LENGTH EQU 11
+DEF ITEM_NAME_LENGTH EQU 13
DEF NAME_BUFFER_LENGTH EQU 20
; PrintNumber, PrintBCDNumber
@@ -8,9 +8,9 @@ DEF NAME_BUFFER_LENGTH EQU 20
const BIT_LEFT_ALIGN ; 6
const BIT_LEADING_ZEROES ; 7
-DEF MONEY_SIGN EQU (1 << BIT_MONEY_SIGN)
-DEF LEFT_ALIGN EQU (1 << BIT_LEFT_ALIGN)
-DEF LEADING_ZEROES EQU (1 << BIT_LEADING_ZEROES)
+DEF MONEY_SIGN EQU 1 << BIT_MONEY_SIGN
+DEF LEFT_ALIGN EQU 1 << BIT_LEFT_ALIGN
+DEF LEADING_ZEROES EQU 1 << BIT_LEADING_ZEROES
; special text IDs (see home/text_script.asm)
const_def $d0