summaryrefslogtreecommitdiff
path: root/constants/pokemon_data_constants.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2018-04-09 21:19:51 -0400
committerGitHub <noreply@github.com>2018-04-09 21:19:51 -0400
commite4b41fad4fd3787ca2e61adb5377ba8f68fca7ef (patch)
tree7c087c9f64133de533b2005a818ca6f100e2c62f /constants/pokemon_data_constants.asm
parentf750d4f4185529cfb440ac7825d202ebcf160766 (diff)
parent1b12109cb05fc1aa2e91c9be3504c2853c5727fd (diff)
Merge pull request #495 from mid-kid/master
Use stadium 2 egg group names
Diffstat (limited to 'constants/pokemon_data_constants.asm')
-rw-r--r--constants/pokemon_data_constants.asm44
1 files changed, 22 insertions, 22 deletions
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index e82902da3..3d27e5877 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -26,13 +26,13 @@ BASE_TMHM EQUS "(wBaseTMHM - wCurBaseData)"
BASE_DATA_SIZE EQUS "(wCurBaseDataEnd - wCurBaseData)"
; gender ratio constants
-GENDER_F0 EQU 0 percent
-GENDER_F12_5 EQU 12 percent + 1
-GENDER_F25 EQU 25 percent
-GENDER_F50 EQU 50 percent
-GENDER_F75 EQU 75 percent
-GENDER_F100 EQU 100 percent - 1
-GENDERLESS EQU -1
+GENDER_F0 EQU 0 percent
+GENDER_F12_5 EQU 12 percent + 1
+GENDER_F25 EQU 25 percent
+GENDER_F50 EQU 50 percent
+GENDER_F75 EQU 75 percent
+GENDER_F100 EQU 100 percent - 1
+GENDER_UNKNOWN EQU -1
; wBaseGrowthRate values
; GrowthRates indexes (see data/growth_rates.asm)
@@ -46,21 +46,21 @@ GENDERLESS EQU -1
; wBaseEggGroups values
const_def 1
- const EGG_MONSTER ; 1
- const EGG_AMPHIBIAN ; 2 (aka Water 1 in Stadium 2)
- const EGG_BUG ; 3
- const EGG_FLYING ; 4
- const EGG_FIELD ; 5 (aka Ground in Stadium 2)
- const EGG_FAIRY ; 6
- const EGG_GRASS ; 7 (aka Plant in Stadium 2)
- const EGG_HUMANSHAPE ; 8 (aka Human-Like)
- const EGG_INVERTEBRATE ; 9 (aka Water 3 in Stadium 2)
- const EGG_MINERAL ; a
- const EGG_AMORPHOUS ; b (aka Indeterminate in Stadium 2)
- const EGG_FISH ; c (aka Water 2 in Stadium 2)
- const EGG_DITTO ; d
- const EGG_DRAGON ; e
- const EGG_NONE ; f (aka Undiscovered, or No Eggs in Stadium 2)
+ 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)
; pokedex entries (see data/pokemon/dex_entries.asm)