summaryrefslogtreecommitdiff
path: root/constants/pokemon_data_constants.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2017-12-11 13:47:58 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2017-12-11 14:23:18 -0500
commit31cce83e9b3bab01d8a605b170549fbd25ca5fee (patch)
treea9fdeec61aea1be07a7bc71b65b9d71adc2b1eef /constants/pokemon_data_constants.asm
parentc2ad79c4f21b5f4dd661d69a7a81b69506be8821 (diff)
Move lots of data tables into individual data/ files
(This is not expected to be their final location, but it makes them easier to relocate when necessary, and easier for users to edit until the whole project's file structure is finalized.)
Diffstat (limited to 'constants/pokemon_data_constants.asm')
-rw-r--r--constants/pokemon_data_constants.asm7
1 files changed, 5 insertions, 2 deletions
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index c7cf9dccb..08d5bdbd8 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -27,8 +27,9 @@ const_value SET 1
const NO_EGGS ; f
-; IconPointers indexes (see menu/mon_icons.asm)
-const_value SET 1
+; IconPointers indexes (see gfx/icon_pointers.asm)
+ const_def
+ const ICON_NULL
const ICON_POLIWAG
const ICON_JIGGLYPUFF
const ICON_DIGLETT
@@ -94,6 +95,8 @@ const_value SET 1
BASE_HAPPINESS EQU 70
FRIEND_BALL_HAPPINESS EQU 200
HAPPINESS_TO_EVOLVE EQU 220
+HAPPINESS_THRESHOLD_1 EQU 100
+HAPPINESS_THRESHOLD_2 EQU 200
NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size