diff options
| author | IIMarckus <iimarckus@gmail.com> | 2019-10-14 03:23:18 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2019-10-14 03:23:18 -0600 |
| commit | 3ed059f6505975133a9b7fca745dd6b2ec6ccf4c (patch) | |
| tree | 8483dd8cc29d3e7a3c8bf28372165fe79c95e0e5 /constants | |
| parent | c01ed32c8b274f4d2312e70782071d68dea91f97 (diff) | |
| parent | 351f50a454b7b37521f9a1c6dad3db7a302a89da (diff) | |
Merge branch 'base_stats' of iihub:rtandy/pokegold
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/item_constants.asm | 2 | ||||
| -rw-r--r-- | constants/pokemon_data_constants.asm | 52 |
2 files changed, 27 insertions, 27 deletions
diff --git a/constants/item_constants.asm b/constants/item_constants.asm index e48d0fa1..f8429010 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -227,7 +227,7 @@ add_tm RETURN ; $DA add_tm DIG ; $DB const ITEM_DC ; $DC - add_tm PSYCHIC ; $DD + add_tm PSYCHIC_M ; $DD add_tm SHADOW_BALL ; $DE add_tm MUD_SLAP ; $DF add_tm DOUBLE_TEAM ; $E0 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index dc4d8f40..04df889b 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -34,33 +34,33 @@ GENDER_F75 EQU 75 percent GENDER_F100 EQU 100 percent - 1 GENDER_UNKNOWN EQU -1 -; growth rate +; wBaseGrowthRate values +; GrowthRates indexes (see data/growth_rates.asm) const_def - const MEDIUM_FAST - const SLIGHTLY_FAST - const SLIGHTLY_SLOW - const MEDIUM_SLOW - const FAST - const SLOW - -; egg group constants -const_value SET 1 - const MONSTER ; 1 - const AMPHIBIAN ; 2 - const INSECT ; 3 - const AVIAN ; 4 - const FIELD ; 5 - const FAIRY ; 6 - const PLANT ; 7 - const HUMANSHAPE ; 8 - const INVERTEBRATE ; 9 - const INANIMATE ; a - const AMORPHOUS ; b - const FISH ; c - const LADIES_MAN ; d - const REPTILE ; e - const NO_EGGS ; f - + const GROWTH_MEDIUM_FAST + const GROWTH_SLIGHTLY_FAST + const GROWTH_SLIGHTLY_SLOW + const GROWTH_MEDIUM_SLOW + const GROWTH_FAST + const GROWTH_SLOW + +; wBaseEggGroups values + const_def 1 + const EGG_MONSTER ; 1 + const EGG_WATER_1 ; 2 (Amphibian) + const EGG_BUG ; 3 + const EGG_FLYING ; 4 + const EGG_GROUND ; 5 (Field) + const EGG_FAIRY ; 6 + const EGG_PLANT ; 7 (Grass) + const EGG_HUMANSHAPE ; 8 (Human-Like) + const EGG_WATER_3 ; 9 (Invertebrate) + const EGG_MINERAL ; a + const EGG_INDETERMINATE ; b (Amorphous) + const EGG_WATER_2 ; c (Fish) + const EGG_DITTO ; d + const EGG_DRAGON ; e + const EGG_NONE ; f (Undiscovered) ; menu sprites const_value SET 1 |